[Gzz-commits] gzz doc/pegboard/buoydesign--tjl/peg.rst gzz/vi...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/03 01:57:50

Modified files:
        doc/pegboard/buoydesign--tjl: peg.rst 
        gzz/view/buoy  : BuoyViewMainNode.java BuoyViewNodeType.java 
Added files:
        gzz/view/buoy  : BuoyAdaptor.java CellBuoyViewLinker.java 
                         CellBuoyViewNodeType.java 

Log message:
        More buoy design

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/buoydesign--tjl/peg.rst.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyAdaptor.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/CellBuoyViewLinker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/CellBuoyViewNodeType.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyViewMainNode.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyViewNodeType.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/doc/pegboard/buoydesign--tjl/peg.rst
diff -u gzz/doc/pegboard/buoydesign--tjl/peg.rst:1.9 
gzz/doc/pegboard/buoydesign--tjl/peg.rst:1.10
--- gzz/doc/pegboard/buoydesign--tjl/peg.rst:1.9        Sun Feb  2 09:23:52 2003
+++ gzz/doc/pegboard/buoydesign--tjl/peg.rst    Mon Feb  3 01:57:48 2003
@@ -3,8 +3,8 @@
 =============================================================
 
 :Author:   Tuomas J. Lukka
-:Last-Modified: $Date: 2003/02/02 14:23:52 $
-:Revision: $Revision: 1.9 $
+:Last-Modified: $Date: 2003/02/03 06:57:48 $
+:Revision: $Revision: 1.10 $
 :Status:   Incomplete
 
 Goals: get the xupdf and pp functionality under one model.
@@ -173,7 +173,7 @@
        fields
            cursor, zoom, coordsystems...
        methods
-           void renderMain(VobScene vs, int into, BuoyLinkListener l)
+           void renderMain(VobScene vs, int into)
            keystroke(...)
            mouse(...)
     
@@ -181,7 +181,7 @@
        jlink
        methods
            void renderBuoy(VobScene vs, int into, Object linkId, Object anchor)
-           BuoyViewNodeType createMainNode(Object linkId, Object anchor)
+           BuoyViewNodeType createMainNode(Object linkId, Object anchor, 
BuoyLinkListener l)
 
 
     dep "calls" BuoyViewMainNode BuoyLinkListener
@@ -238,19 +238,49 @@
     class BuoyViewNodeType "interface"
        jlink
 
+    class BuoyAdaptor
+       inherit BuoyViewNodeType
+       assoc multi(*) - multi(*) CellBuoyViewNodeType
+
+    class BuoyAdaptor.LinkAdaptor
+       inherit gzz.view.CellPlacementHook
+       assoc multi(*) - multi(1) BuoyAdaptor
+       assoc multi(*) - multi(1) BuoyLinkListener
+
     class gzz.view.CellPlacementHook "interface"
        jlink
 
     class CellBuoyViewNodeType "interface"
-       inherit BuoyViewNodeType
+       methods
+           boolean ownsCell(Cell c)
+           void renderBuoy(VobScene vs, int into, Cell c, Object content)
+           BuoyViewMainNode createMainNode(Cell c, Object content, 
CellPlacementHook hook)
 
     class BuoyViewMainNode "interface"
 
-    class CellBuoyViewMainNode 
-       inherit BuoyViewMainNode
+    class BuoyLinkListener "interface"
+
+    class PPCanvasNode
+       inherit CellBuoyViewNodeType
+
+    class PPCanvasCursor
        fields
-           Cell cursor
+           float x, y
+           float zoom
+       inherit BuoyViewMainNode
+       assoc - multi(1) gzz.view.CellPlacementHook
+
+    ---
+
+    gzz.view.CellPlacementHook.c = (-200,0);
+
+    vertically(150, gazz, BuoyViewNodeType, BuoyViewMainNode, 
BuoyLinkListener);
+
+    vertically(30, foo, BuoyAdaptor, BuoyAdaptor.LinkAdaptor, 
gzz.view.CellPlacementHook);
+    horizontally(80, faz, BuoyViewNodeType, BuoyAdaptor, CellBuoyViewNodeType);
+    vertically(80, bar, CellBuoyViewNodeType, PPCanvasNode, PPCanvasCursor);
 
-    class PPCanvas
 
+There are two different types of links that this part of the systme
+needs to know: Cell to Cell and Cell to PermaScroll.
 
Index: gzz/gzz/view/buoy/BuoyViewMainNode.java
diff -u gzz/gzz/view/buoy/BuoyViewMainNode.java:1.2 
gzz/gzz/view/buoy/BuoyViewMainNode.java:1.3
--- gzz/gzz/view/buoy/BuoyViewMainNode.java:1.2 Fri Jan 31 09:04:10 2003
+++ gzz/gzz/view/buoy/BuoyViewMainNode.java     Mon Feb  3 01:57:50 2003
@@ -7,12 +7,9 @@
 /** An interface representing a single node of the buoy view.
  * This node must keep its own information about cursor location 
  * and handle keystrokes when it is a main view.
- * <p>
- * This interface will be made cloneable later, in order to support
- * multiple main buoys in one window.
  */
 public interface BuoyViewMainNode {
-    void renderMain(VobScene vs, int into, BuoyLinkListener l);
+    void renderMain(VobScene vs, int into);
 
     /** A keystroke was not interpreted to the buoy framework and is
      * passed to this node as the main buoy.
Index: gzz/gzz/view/buoy/BuoyViewNodeType.java
diff -u gzz/gzz/view/buoy/BuoyViewNodeType.java:1.1 
gzz/gzz/view/buoy/BuoyViewNodeType.java:1.2
--- gzz/gzz/view/buoy/BuoyViewNodeType.java:1.1 Fri Jan 31 06:35:50 2003
+++ gzz/gzz/view/buoy/BuoyViewNodeType.java     Mon Feb  3 01:57:50 2003
@@ -4,14 +4,9 @@
 import gzz.vob.*;
 
 /** An interface representing a single node of the buoy view.
- * This node must keep its own information about cursor location 
- * and handle keystrokes when it is a main view.
- * <p>
- * This interface will be made cloneable later, in order to support
- * multiple main buoys in one window.
  */
 public interface BuoyViewNodeType {
     void renderBuoy(VobScene vs, int into, Object linkId, Object anchor);
-    BuoyViewMainNode createMainNode(Object linkId, Object anchor);
+    BuoyViewMainNode createMainNode(Object linkId, Object anchor, 
BuoyLinkListener l);
 }