[Gzz-commits] gzz/gzz view/VobVanishingClient.java vob/Defaul...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/25 14:18:51

Modified files:
        gzz/view       : VobVanishingClient.java 
        gzz/vob        : DefaultVobMatcher.java 

Log message:
        fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/DefaultVobMatcher.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.6 
gzz/gzz/view/VobVanishingClient.java:1.7
*** gzz/gzz/view/VobVanishingClient.java:1.6    Wed Sep 25 10:45:43 2002
--- gzz/gzz/view/VobVanishingClient.java        Wed Sep 25 14:18:51 2002
***************
*** 173,179 ****
          int cs1 = into.matcher.getCS(cell1);
          int cs2 = into.matcher.getCS(cell2);
  
!         if(cs2 < 0)
              into.map.put(pstubs[dx], cs1);
          else if(cs1 < 0)
              into.map.put(nstubs[dx], cs2);
--- 173,181 ----
          int cs1 = into.matcher.getCS(cell1);
          int cs2 = into.matcher.getCS(cell2);
  
!       if(cs1 < 0 && cs2 < 0)
!           throw new Error("Neither cell seems to have been put, yet");
!         else if(cs2 < 0)
              into.map.put(pstubs[dx], cs1);
          else if(cs1 < 0)
              into.map.put(nstubs[dx], cs2);
Index: gzz/gzz/vob/DefaultVobMatcher.java
diff -c gzz/gzz/vob/DefaultVobMatcher.java:1.1 
gzz/gzz/vob/DefaultVobMatcher.java:1.2
*** gzz/gzz/vob/DefaultVobMatcher.java:1.1      Wed Sep 25 10:46:12 2002
--- gzz/gzz/vob/DefaultVobMatcher.java  Wed Sep 25 14:18:51 2002
***************
*** 50,56 ****
        // a REAL kludge
        if(dbg) pa("Passed key: "+key);
        key = new Integer(
!               mix(key.hashCode(), 
                    keys[into] != null ? 1 : 0,
                    keys[into] != null ? keys[into].hashCode() : 0));
        if(dbg) {
--- 50,56 ----
        // a REAL kludge
        if(dbg) pa("Passed key: "+key);
        key = new Integer(
!               mix(key.hashCode(),
                    keys[into] != null ? 1 : 0,
                    keys[into] != null ? keys[into].hashCode() : 0));
        if(dbg) {
***************
*** 60,80 ****
        add(cs, key);
      }
  
!     public int getCS(Object key) {
        Integer i = (Integer)inds.get(key);
        if(i==null) return -1;
        return i.intValue();
      }
  
      public Object getKey(int cs) {
        return keys[cs];
      }
  
!     public int[] interpList(VobMatcher other) {
        int[] interpList = new int[maxcs];
        for(int i=0; i<maxcs; i++) {
            if(keys[i] == null) continue; // default: zero
!           int ind = other.getCS(keys[i]);
            interpList[i] = ind;
        }
        return interpList;
--- 60,86 ----
        add(cs, key);
      }
  
!     protected int getCSByInt(Object key) {
        Integer i = (Integer)inds.get(key);
        if(i==null) return -1;
        return i.intValue();
      }
  
+     public int getCS(Object key) {
+         // XXX ARGH
+         return getCSByInt(new Integer(mix(key.hashCode(), 0, 0)));
+     }
+ 
      public Object getKey(int cs) {
        return keys[cs];
      }
  
!     public int[] interpList(VobMatcher other0) {
!         DefaultVobMatcher other = (DefaultVobMatcher)other0;
        int[] interpList = new int[maxcs];
        for(int i=0; i<maxcs; i++) {
            if(keys[i] == null) continue; // default: zero
!           int ind = other.getCSByInt(keys[i]);
            interpList[i] = ind;
        }
        return interpList;