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

[Benja Fallenstein]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Benja Fallenstein <address@hidden>      03/04/24 14:41:52

Modified files:
        org/nongnu/libvob/buoy: BuoyViewMainNode.java 
                                BuoyViewNodeType.java 
        vob/buoy       : buoymanager.py 
Added files:
        org/nongnu/libvob/buoy: BuoyViewConnector.java 

Log message:
        New BuoyView interfaces, as discussed with Tuomas.
        Now, a buoy manager knows a list of *connectors*,
        which are actually outside the views, that
        know how to connect certain views by creating
        buoys for them. We'll have one connector for e.g.
        connecting transclusions on a PP canvas to the
        scroll block they were transcluded from, one
        connector for Xu links, and so on. Now to update
        Fenfire buoyoing to work with this.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyViewConnector.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java
diff -u libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java:1.1 
libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java:1.2
--- libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java:1.1     Tue Mar 25 
07:04:10 2003
+++ libvob/org/nongnu/libvob/buoy/BuoyViewMainNode.java Thu Apr 24 14:41:52 2003
@@ -3,20 +3,20 @@
  *    
  *    Copyright (c) 2003, : Tuomas J. Lukka
  *    
- *    This file is part of Gzz.
+ *    This file is part of Libvob.
  *    
- *    Gzz is free software; you can redistribute it and/or modify it under
+ *    Libvob is free software; you can redistribute it and/or modify it under
  *    the terms of the GNU Lesser General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *    
- *    Gzz is distributed in the hope that it will be useful, but WITHOUT
+ *    Libvob is distributed in the hope that it will be useful, but WITHOUT
  *    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  *    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
  *    Public License for more details.
  *    
  *    You should have received a copy of the GNU Lesser General
- *    Public License along with Gzz; if not, write to the Free
+ *    Public License along with Libvob; if not, write to the Free
  *    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *    
@@ -25,7 +25,6 @@
 /*
  * Written by : Tuomas J. Lukka
  */
-
 package org.nongnu.libvob.buoy;
 import org.nongnu.libvob.*;
 import java.awt.event.MouseEvent;
Index: libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java
diff -u libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.1 
libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.2
--- libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.1     Tue Mar 25 
07:04:10 2003
+++ libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java Thu Apr 24 14:41:52 2003
@@ -3,20 +3,20 @@
  *    
  *    Copyright (c) 2003, : Tuomas J. Lukka
  *    
- *    This file is part of Gzz.
+ *    This file is part of Libvob.
  *    
- *    Gzz is free software; you can redistribute it and/or modify it under
+ *    Libvob is free software; you can redistribute it and/or modify it under
  *    the terms of the GNU Lesser General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *    
- *    Gzz is distributed in the hope that it will be useful, but WITHOUT
+ *    Libvob is distributed in the hope that it will be useful, but WITHOUT
  *    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  *    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
  *    Public License for more details.
  *    
  *    You should have received a copy of the GNU Lesser General
- *    Public License along with Gzz; if not, write to the Free
+ *    Public License along with Libvob; if not, write to the Free
  *    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *    
@@ -25,7 +25,6 @@
 /*
  * Written by : Tuomas J. Lukka
  */
-
 package org.nongnu.libvob.buoy;
 import org.nongnu.libvob.*;
 
@@ -52,11 +51,7 @@
 
     /** Focus was set to the buoy -- create an object that knows
      * the user interface and motion in that space.
-     * The object will use the given BuoyLinkListener to call back
-     * when it is rendered and there are buoys that should
-     * be rendered.
      */
-    BuoyViewMainNode createMainNode(Object linkId, Object anchor, 
-                       BuoyLinkListener l);
+    BuoyViewMainNode createMainNode(Object linkId, Object anchor);
 }
 
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.6 libvob/vob/buoy/buoymanager.py:1.7
--- libvob/vob/buoy/buoymanager.py:1.6  Wed Apr 23 10:38:16 2003
+++ libvob/vob/buoy/buoymanager.py      Thu Apr 24 14:41:52 2003
@@ -46,17 +46,16 @@
 
     This is a demo "scene"
     """
-    def __init__(self, initBuoyviewnodetype, initLinkId, initAnchor):
+    def __init__(self, mainNode, connectors):
        """Create a new RealBuoyManager.
 
-       Parameters are the initial node type, whose 
-       createMainNode method is called with the given
-       initLinkId and initAnchor parameters to create
-       the main view.
+        Parameters are the initial main node
+        and the BuoyViewConnectors to be used
+        by the buoy manager to create buoys.
        """
        self.replaceScene = None
-       self.mainNode = initBuoyviewnodetype.createMainNode(
-                           initLinkId, initAnchor, self)
+       self.mainNode = mainNode
+        self.connectors = connectors
     def nadir(self, cs):
        n =  self.vs.coords.nadirUnitSq(cs, self.nadirCS)
        self.vs.matcher.add(cs, n, "NADIR")
@@ -88,8 +87,11 @@
 
        self.vs.activate(into)
 
-       self.links = []
        self.mainNode.renderMain(vs, into)
+
+       self.links = []
+        for connector in self.connectors:
+            connector.addBuoys(vs, into, self)
        for l in self.links: self.linkReally(*l)
        self.cs[into] = None