[Gzz-commits] libvob org/nongnu/libvob/buoy/BuoyViewConnector...

[Benja Fallenstein]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Benja Fallenstein <address@hidden>      03/04/25 09:41:58

Modified files:
        org/nongnu/libvob/buoy: BuoyViewConnector.java 
        org/nongnu/libvob/impl: DefaultVobMatcher.java 
        vob/buoy       : buoymanager.py 

Log message:
        buoy fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java
diff -u libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java:1.1 
libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java:1.2
--- libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java:1.1    Thu Apr 24 
14:41:52 2003
+++ libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java        Fri Apr 25 
09:41:58 2003
@@ -21,7 +21,7 @@
  *    MA  02111-1307  USA
  *    
  */
-/*connections between bu
+/*
  * Written by Benja Fallenstein
  */
 package org.nongnu.libvob.buoy;
@@ -42,5 +42,6 @@
      *  by the main node and adds buoys accordingly.
      */
     void addBuoys(VobScene vs, int cs,
-                 BuoyViewMainNode mainNode);
+                 BuoyViewMainNode mainNode,
+                 BuoyLinkListener into);
 }
Index: libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java
diff -u libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java:1.3 
libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java:1.4
--- libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java:1.3    Thu Apr 24 
10:44:18 2003
+++ libvob/org/nongnu/libvob/impl/DefaultVobMatcher.java        Fri Apr 25 
09:41:58 2003
@@ -33,7 +33,7 @@
 /** A simple hierarchical implementation of VobMatcher.
  */
 public class DefaultVobMatcher implements VobMatcher {
-private static final String rcsid = "$Id: DefaultVobMatcher.java,v 1.3 
2003/04/24 14:44:18 benja Exp $";  
+private static final String rcsid = "$Id: DefaultVobMatcher.java,v 1.4 
2003/04/25 13:41:58 benja Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
@@ -77,7 +77,7 @@
     public Set getKeys(int cs) {
        Set result = new HashSet();
        for(int i=0; i<=maxcs; i++)
-           if(keyByCs[i].parent == cs)
+           if(keyByCs[i] != null && keyByCs[i].parent == cs)
                result.add(keyByCs[i].key);
        return result;
     }
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.7 libvob/vob/buoy/buoymanager.py:1.8
--- libvob/vob/buoy/buoymanager.py:1.7  Thu Apr 24 14:41:52 2003
+++ libvob/vob/buoy/buoymanager.py      Fri Apr 25 09:41:58 2003
@@ -91,7 +91,7 @@
 
        self.links = []
         for connector in self.connectors:
-            connector.addBuoys(vs, into, self)
+            connector.addBuoys(vs, into, self.mainNode, self)
        for l in self.links: self.linkReally(*l)
        self.cs[into] = None