[Gzz-commits] gzz ./TODO gzz/media/Span.java gzz/view/Cell1DB...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/04 00:31:39

Modified files:
        .              : TODO 
        gzz/media      : Span.java 
        gzz/view       : Cell1DBuoyHook.java 
        gzz/view/buoy  : BuoyAdaptor.java BuoyLinkListener.java 
                         BuoyViewMainNode.java BuoyViewNodeType.java 

Log message:
        More buoy work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.548&tr2=1.549&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/Span.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/Cell1DBuoyHook.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyAdaptor.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyLinkListener.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyViewMainNode.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyViewNodeType.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.548 gzz/TODO:1.549
--- gzz/TODO:1.548      Mon Feb  3 06:52:58 2003
+++ gzz/TODO    Tue Feb  4 00:31:38 2003
@@ -278,6 +278,13 @@
          colors (not "not" tests but test that the 
          color really is right)
     tjl:
+       - the great buoy redesign
+           - figure out how scrollblock nodes shall be linked back with right
+             coordsys
+               - use the spancoordsys definition?
+           - implement and test scrollblock nodes and zzstructure nodes.
+           - combine with mudyc's PP nodes.
+       - multi-buoy handler: skew buoys away from each other
        - xupdf: distorted multi-page PDF view with xu links
            - clean the code: split PageSpanPaper &c.
            - adjustable zoom / distortion area by mouse
Index: gzz/gzz/media/Span.java
diff -u gzz/gzz/media/Span.java:1.1 gzz/gzz/media/Span.java:1.2
--- gzz/gzz/media/Span.java:1.1 Wed Jun 26 06:06:26 2002
+++ gzz/gzz/media/Span.java     Tue Feb  4 00:31:39 2003
@@ -33,16 +33,6 @@
  * <p>
  * Spans are always of some type, like TextSpan or ImageSpan,
  * and belong to a particular ScrollBlock.
- * <p>
- * The operations for comparing spans are somewhat interesting.
- * XXX Something not right...
- * <img src="../../../doc-images/spancomp-1.jpg"/>
- * <img src="../../../doc-images/spancomp-2.jpg"/>
- * Important invariants:
- * <pre>
- *     a.intersectsAfter(b) == b.intersectsBefore(a)
- *     a.intersects(b) == a.intersectsBefore(b) &amp;&amp; a.intersectsAfter(b)
- * </pre>
  * @see Span
  * @see Span1D
  * @see TextSpan
@@ -51,7 +41,7 @@
  */
 
 public interface Span {
-String rcsid = "$Id: Span.java,v 1.1 2002/06/26 10:06:26 tjl Exp $";
+String rcsid = "$Id: Span.java,v 1.2 2003/02/04 05:31:39 tjl Exp $";
 
     String toString();
 
@@ -62,19 +52,6 @@
     /** Get the ScrollBlock that this span points to.
      */
     ScrollBlock getScrollBlock();
-
-    /** If the given span is contained in the same scrollblock after this. 
-     * See the images above.
-     */
-    // boolean intersectsAfter(Span s);
-
-    /** If the given span is  contained in the same scrollblock before this. 
-     */
-    // boolean intersectsBefore(Span s);
-
-    // int compareStart(Span s);
-    // int compareEnd(Span s);
-
 
 }
 
Index: gzz/gzz/view/Cell1DBuoyHook.java
diff -u gzz/gzz/view/Cell1DBuoyHook.java:1.7 
gzz/gzz/view/Cell1DBuoyHook.java:1.8
--- gzz/gzz/view/Cell1DBuoyHook.java:1.7        Fri Jan 10 11:10:30 2003
+++ gzz/gzz/view/Cell1DBuoyHook.java    Tue Feb  4 00:31:39 2003
@@ -31,9 +31,10 @@
 /** Float association buoys for cells placed.
  * This class assumes that all cells placed are root clones (!!!).
  * XXX Tjl Doc
+ * @deprecated Superceded by gzz.view.buoy.PPLinker
  */
 public class Cell1DBuoyHook implements CellPlacementHook {
-public static final String rcsid = "$Id: Cell1DBuoyHook.java,v 1.7 2003/01/10 
16:10:30 mudyc Exp $";
+public static final String rcsid = "$Id: Cell1DBuoyHook.java,v 1.8 2003/02/04 
05:31:39 tjl Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
Index: gzz/gzz/view/buoy/BuoyAdaptor.java
diff -u gzz/gzz/view/buoy/BuoyAdaptor.java:1.1 
gzz/gzz/view/buoy/BuoyAdaptor.java:1.2
--- gzz/gzz/view/buoy/BuoyAdaptor.java:1.1      Mon Feb  3 01:57:50 2003
+++ gzz/gzz/view/buoy/BuoyAdaptor.java  Tue Feb  4 00:31:39 2003
@@ -8,8 +8,18 @@
 /** A class that manages the types of nodes in a buoy view.
  */
 public class BuoyAdaptor implements BuoyViewNodeType {
-    CellBuoyViewNodeType[] cellNodes;
 
+    /** The cell node types used by the current instance.
+     */
+    public CellBuoyViewNodeType[] cellNodes;
+
+    /** The cell-to-X link types used by the current instance.
+     */
+    public CellBuoyViewLinker[] cellLinkers;
+
+    /** Get the node type that is responsible for showing the 
+     * given Cell.
+     */
     private CellBuoyViewNodeType getNode(Cell c) {
        for(int i=0; i<cellNodes.length; i++) {
            if(cellNodes[i].ownsCell(c)) {
@@ -38,11 +48,15 @@
        throw new Error("Unknown anchor!");
     }
 
+    /** An adaptor class that call
+     */
     private class LinkAdaptor implements CellPlacementHook {
        LinkAdaptor(BuoyLinkListener l) { this.l = l; }
        BuoyLinkListener l;
 
-       public void placed(Cell c, VobScene sc, int b, ViewContext context) {
+       public void placed(Cell c, VobScene vs, int cs, ViewContext context) {
+           for(int i=0; i<cellLinkers.length; i++)
+               cellLinkers[i].doLinks(c, vs, cs, BuoyAdaptor.this, l);
        }
     }
 
Index: gzz/gzz/view/buoy/BuoyLinkListener.java
diff -u gzz/gzz/view/buoy/BuoyLinkListener.java:1.2 
gzz/gzz/view/buoy/BuoyLinkListener.java:1.3
--- gzz/gzz/view/buoy/BuoyLinkListener.java:1.2 Fri Jan 31 09:04:10 2003
+++ gzz/gzz/view/buoy/BuoyLinkListener.java     Tue Feb  4 00:31:39 2003
@@ -8,5 +8,6 @@
 public interface BuoyLinkListener {
     /** A buoy link was found.
      */
-    void link(int dir, int anchorCS, BuoyViewNodeType otherNode, Object 
linkId, Object otherAnchor);
+    void link(int dir, int anchorCS, BuoyViewNodeType otherNode, 
+           Object linkId, Object otherAnchor);
 }
Index: gzz/gzz/view/buoy/BuoyViewMainNode.java
diff -u gzz/gzz/view/buoy/BuoyViewMainNode.java:1.3 
gzz/gzz/view/buoy/BuoyViewMainNode.java:1.4
--- gzz/gzz/view/buoy/BuoyViewMainNode.java:1.3 Mon Feb  3 01:57:50 2003
+++ gzz/gzz/view/buoy/BuoyViewMainNode.java     Tue Feb  4 00:31:39 2003
@@ -9,6 +9,9 @@
  * and handle keystrokes when it is a main view.
  */
 public interface BuoyViewMainNode {
+
+    /** Render this main view into the given box in the given vs.
+     */
     void renderMain(VobScene vs, int into);
 
     /** A keystroke was not interpreted to the buoy framework and is
Index: gzz/gzz/view/buoy/BuoyViewNodeType.java
diff -u gzz/gzz/view/buoy/BuoyViewNodeType.java:1.2 
gzz/gzz/view/buoy/BuoyViewNodeType.java:1.3
--- gzz/gzz/view/buoy/BuoyViewNodeType.java:1.2 Mon Feb  3 01:57:50 2003
+++ gzz/gzz/view/buoy/BuoyViewNodeType.java     Tue Feb  4 00:31:39 2003
@@ -6,7 +6,15 @@
 /** An interface representing a single node of the buoy view.
  */
 public interface BuoyViewNodeType {
+    /** Render portion of the view relevant to linkId and anchor
+     * into the given box.
+     */
     void renderBuoy(VobScene vs, int into, Object linkId, Object anchor);
-    BuoyViewMainNode createMainNode(Object linkId, Object anchor, 
BuoyLinkListener l);
+
+    /** Focus was set to the buoy -- create an object that knows
+     * the user interface and motion in that space.
+     */
+    BuoyViewMainNode createMainNode(Object linkId, Object anchor, 
+                       BuoyLinkListener l);
 }