[Gzz-commits] gzz/gzz modules/pp2/PPCanvasNode.java view/buoy...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/06 07:41:16

Modified files:
        gzz/modules/pp2: PPCanvasNode.java 
        gzz/view/buoy  : BuoyAdaptor.java BuoyViewNodeType.java 
                         CellBuoyViewNodeType.java 

Log message:
        Placing work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyAdaptor.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyViewNodeType.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/CellBuoyViewNodeType.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.5 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.6
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.5   Wed Feb  5 15:21:05 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Thu Feb  6 07:41:13 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.5 2003/02/05 
20:21:05 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.6 2003/02/06 
12:41:13 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -75,7 +75,7 @@
        return null;
     }
 
-    public void renderBuoy(VobScene vs, int into, Cell c, Object content,
+    public int renderBuoy(VobScene vs, int into, Cell c, Object content,
                            Object cachedSize) {
        pa("Tee poiju!!!");
 
@@ -87,6 +87,7 @@
        vs.matcher.add(into, c2fCS, "C2F");
 
        SinglePaper.i(avc,d,win).render(vs, into, c2fCS);
+       return into;
     }
 
     public BuoyViewMainNode createMainNode(Cell c, Object content, 
CellPlacementHook hook) {
Index: gzz/gzz/view/buoy/BuoyAdaptor.java
diff -u gzz/gzz/view/buoy/BuoyAdaptor.java:1.7 
gzz/gzz/view/buoy/BuoyAdaptor.java:1.8
--- gzz/gzz/view/buoy/BuoyAdaptor.java:1.7      Wed Feb  5 15:21:05 2003
+++ gzz/gzz/view/buoy/BuoyAdaptor.java  Thu Feb  6 07:41:16 2003
@@ -44,12 +44,11 @@
     }
 
 
-    public void renderBuoy(VobScene vs, int into, 
+    public int renderBuoy(VobScene vs, int into, 
                            Object linkId, Object anchor, Object cachedSize) {
        if(anchor instanceof Cell) {
            Cell c = (Cell)anchor;
-           getNode(c).renderBuoy(vs, into, c, null, cachedSize);
-           return;
+           return getNode(c).renderBuoy(vs, into, c, null, cachedSize);
        }
        throw new Error("Unknown anchor!");
     }
Index: gzz/gzz/view/buoy/BuoyViewNodeType.java
diff -u gzz/gzz/view/buoy/BuoyViewNodeType.java:1.6 
gzz/gzz/view/buoy/BuoyViewNodeType.java:1.7
--- gzz/gzz/view/buoy/BuoyViewNodeType.java:1.6 Thu Feb  6 02:38:42 2003
+++ gzz/gzz/view/buoy/BuoyViewNodeType.java     Thu Feb  6 07:41:16 2003
@@ -19,8 +19,9 @@
      * The box should be filled <b>completely</b> because it will
      * be used for sensing mouse clicks to this buoy
      * (XXX kludge! Will change later)
+     * @return The coordinate system of the anchor
      */
-    void renderBuoy(VobScene vs, int into, Object linkId, Object anchor,
+    int renderBuoy(VobScene vs, int into, Object linkId, Object anchor,
                        Object cachedSize);
 
     /** Focus was set to the buoy -- create an object that knows
Index: gzz/gzz/view/buoy/CellBuoyViewNodeType.java
diff -u gzz/gzz/view/buoy/CellBuoyViewNodeType.java:1.3 
gzz/gzz/view/buoy/CellBuoyViewNodeType.java:1.4
--- gzz/gzz/view/buoy/CellBuoyViewNodeType.java:1.3     Thu Feb  6 02:38:42 2003
+++ gzz/gzz/view/buoy/CellBuoyViewNodeType.java Thu Feb  6 07:41:16 2003
@@ -26,8 +26,9 @@
      * @see BuoyViewNodeType#renderBuoy
      * @param content If not null, an object describing the part of content
      *                         that the view should be centered on. Can be 
ignored.
+     * @return The coordinate system of the anchor
      */
-    void renderBuoy(VobScene vs, int into, Cell c, Object content, 
+    int renderBuoy(VobScene vs, int into, Cell c, Object content, 
                Object cachedSize);
 
     BuoyViewMainNode createMainNode(Cell c, Object content, CellPlacementHook 
hook);