[Gzz-commits] gzz/gzz/view/buoy PPLinker.java ScrollblockCell...

[Tuomas J. Lukka]

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

Modified files:
        gzz/view/buoy  : PPLinker.java ScrollblockCellLinker.java 

Log message:
        Make things compile again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/PPLinker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/ScrollblockCellLinker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/view/buoy/PPLinker.java
diff -u gzz/gzz/view/buoy/PPLinker.java:1.1 gzz/gzz/view/buoy/PPLinker.java:1.2
--- gzz/gzz/view/buoy/PPLinker.java:1.1 Tue Feb  4 01:22:12 2003
+++ gzz/gzz/view/buoy/PPLinker.java     Tue Feb  4 01:29:50 2003
@@ -3,6 +3,7 @@
 package gzz.view.buoy;
 import gzz.view.*;
 import gzz.vob.*;
+import gzz.util.*;
 import gzz.*;
 
 /** Make the kinds of links familiar from PP structure.
@@ -14,14 +15,14 @@
  * is not possible to clone the cell to another paper.
  */
 public class PPLinker implements CellBuoyViewLinker {
-public static final String rcsid = "$Id: PPLinker.java,v 1.1 2003/02/04 
06:22:12 tjl Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.2 2003/02/04 
06:29:50 tjl Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
     private Dim d_clone;
     private Dim d_assoc;
 
-    void doLinks(Cell c, VobScene vs, int cs, 
+    public void doLinks(Cell c, VobScene vs, int cs, 
                            BuoyViewNodeType cellNodeType, 
                            BuoyLinkListener l) {
        // XXX Right? Allow only main cell to link?
@@ -33,11 +34,11 @@
            if(dbg) pa("PPLinker: LINKS "+c+" "+left+" "+right);
            if(right != null) {
                Cell rl = right.h(d_clone);
-               l.link(1, cs, cellNodeType, new Pair(c, rl));
+               l.link(1, cs, cellNodeType, new Pair(c, rl), rl);
            }
            if(left != null) {
                Cell ll = left.h(d_clone);
-               l.link(-1, cs, cellNodeType, new Pair(ll, c));
+               l.link(-1, cs, cellNodeType, new Pair(ll, c), ll);
            }
        }
     }
Index: gzz/gzz/view/buoy/ScrollblockCellLinker.java
diff -u gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.1 
gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.2
--- gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.1    Tue Feb  4 01:22:12 2003
+++ gzz/gzz/view/buoy/ScrollblockCellLinker.java        Tue Feb  4 01:29:50 2003
@@ -1,9 +1,14 @@
 // (c): Tuomas J. Lukka
 
 package gzz.view.buoy;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Iterator;
 import gzz.view.*;
 import gzz.media.*;
 import gzz.vob.*;
+import gzz.util.*;
 import gzz.*;
 
 /** Make links between cells that transclude from scrollblocks and
@@ -16,10 +21,11 @@
 
     BuoyViewNodeType pageSpanNodeType;
 
-    void doLinks(Cell c, VobScene vs, int cs, 
+    public void doLinks(Cell c, VobScene vs, int cs, 
                            BuoyViewNodeType cellNodeType, 
-                           BuoyLinkListener l) {
-       Enfilade1D enf = c.space.getCellTexter().getEnfilade(c);
+                           BuoyLinkListener listener) {
+       Enfilade1D enf = ((VStreamCellTexter)c.space.getCellTexter()).
+                               getEnfilade(c, null);
        List l = enf.getList();
        Set done = new HashSet();
        for(Iterator i = l.iterator(); i.hasNext(); ) {
@@ -30,10 +36,12 @@
            if(s instanceof PageSpan) {
                sb.getCurrent();
 
-               l.link(1, cs, pageSpanNodeType, new Pair(c, sb), s);
+               listener.link(1, cs, pageSpanNodeType, new Pair(c, sb), s);
            }
        }
     }
+
+
 
     // XXX Reverse links! Scrollblock to 
 }