[Gzz-commits] gzz/gzz/vob OrthoCoorder.java VobMatcher.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/25 13:56:00

Modified files:
        gzz/vob        : OrthoCoorder.java VobMatcher.java 

Log message:
        Get AWT client to show something again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/OrthoCoorder.java.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobMatcher.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/OrthoCoorder.java
diff -c gzz/gzz/vob/OrthoCoorder.java:1.32 gzz/gzz/vob/OrthoCoorder.java:1.33
*** gzz/gzz/vob/OrthoCoorder.java:1.32  Wed Sep 25 10:45:43 2002
--- gzz/gzz/vob/OrthoCoorder.java       Wed Sep 25 13:56:00 2002
***************
*** 28,34 ****
   */
  
  public class OrthoCoorder implements VobCoorder {
! public static final String rcsid = "$Id: OrthoCoorder.java,v 1.32 2002/09/25 
14:45:43 tjl Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
--- 28,34 ----
   */
  
  public class OrthoCoorder implements VobCoorder {
! public static final String rcsid = "$Id: OrthoCoorder.java,v 1.33 2002/09/25 
17:56:00 benja Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
***************
*** 173,180 ****
                                        (OrthoRenderInfo) info);
                          return true;
                      }
  
-                   other = interpList[my];
                    setInterpInfo(my, interpTo, other, fract,
                                  xoffs, yoffs, xscale, yscale,
                                  (OrthoRenderInfo)info);
--- 173,189 ----
                                        (OrthoRenderInfo) info);
                          return true;
                      }
+                     
+                   try {
+                       other = interpList[my];
+                       if(other < 0) return false;
+                   } catch(ArrayIndexOutOfBoundsException _) {
+                       // XXX Not all coordsys must be in the matcher.
+                       // Therefore, it is legal for the matcher
+                       // to return an array that is too short.
+                       return false;
+                   }
  
                    setInterpInfo(my, interpTo, other, fract,
                                  xoffs, yoffs, xscale, yscale,
                                  (OrthoRenderInfo)info);
Index: gzz/gzz/vob/VobMatcher.java
diff -c gzz/gzz/vob/VobMatcher.java:1.1 gzz/gzz/vob/VobMatcher.java:1.2
*** gzz/gzz/vob/VobMatcher.java:1.1     Wed Sep 25 10:46:12 2002
--- gzz/gzz/vob/VobMatcher.java Wed Sep 25 13:56:00 2002
***************
*** 36,42 ****
  
      /** Return, for each coordinate system of this matcher, an integer
       * giving the coordinate system of the other matcher that system should 
move
!      * to.
       */
      int[] interpList(VobMatcher other);
  }
--- 36,43 ----
  
      /** Return, for each coordinate system of this matcher, an integer
       * giving the coordinate system of the other matcher that system should 
move
!      * to. A number smaller than zero means that the the coordsys
!      * should not be interpolated.
       */
      int[] interpList(VobMatcher other);
  }