[Gzz-commits] fenfire/org/fenfire/view/buoy AbstractNodeType2...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/30 11:46:45

Modified files:
        org/fenfire/view/buoy: AbstractNodeType2D.java 
                               NodeType2DFull.java 
                               TransclusionConnector.java 

Log message:
        fixed s/Pair/View2D.Anchor/

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2DFull.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.6 
fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.7
--- fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.6   Wed Jul 30 
11:04:22 2003
+++ fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java       Wed Jul 30 
11:46:45 2003
@@ -50,6 +50,7 @@
 
     public BuoyViewMainNode createMainNode(Object linkId, 
                                           Object anchor) {
+       System.out.println("AbstractNodeType2D:: Object anchor: "+anchor);
        View2D.Anchor a = (View2D.Anchor)anchor;
        return mainNodeFactory.create(a.plane, view2d,
                                      a.x+a.w/2f,
Index: fenfire/org/fenfire/view/buoy/NodeType2DFull.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.7 
fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.8
--- fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.7       Fri Jun 27 
18:18:41 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2DFull.java   Wed Jul 30 11:46:45 2003
@@ -50,9 +50,8 @@
 
     public Object getSize(Object linkId, Object anchor,
                          float wh[]) {
-       Pair p = (Pair)anchor;
-       Object plane = p.first;
-       view2d.getSize(plane, wh);
+       View2D.Anchor a = (View2D.Anchor)anchor;
+       view2d.getSize(a.plane, wh);
        return null;
     }
 
@@ -66,12 +65,9 @@
            vs.map.put( eff, into);
            return into;
        }
-       Pair p = (Pair)anchor;
-       Object plane = p.first;
-       Pair q = (Pair)p.second;
-       Rectangle rect = (Rectangle)q.first;
+       View2D.Anchor a = (View2D.Anchor)anchor;
 
-       view2d.getSize(plane, tmpSize);
+       view2d.getSize(a.plane, tmpSize);
        vs.coords.getSqSize(into, tmpSqSize);
 
        
@@ -84,11 +80,11 @@
                                           tmpSqSize[0], tmpSqSize[1]);
        vs.matcher.add(into, box2paper, "BOX2PAPER");
 
-       view2d.render(vs, plane, into, into, box2paper);
+       view2d.render(vs, a.plane, into, into, box2paper);
 
        if (dbg) pa("renderBuoy..DONE");
        return vs.coords.translate(into, 
-                                  (rect.x+rect.width/2f) / scale, 
-                                  (rect.y+rect.height/2f) / scale);
+                                  (a.x+a.w/2f) / scale, 
+                                  (a.y+a.h/2f) / scale);
     }
 }
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.18 
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.19
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.18       Wed Jul 
30 08:38:32 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java    Wed Jul 30 
11:46:45 2003
@@ -44,7 +44,7 @@
 /** Hang transclusion buoys.
  */
 public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.18 
2003/07/30 12:38:32 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.19 
2003/07/30 15:46:45 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("TransclusionConnector:: "+s); }
 
@@ -79,7 +79,8 @@
            for(int i=0; i<sp.getPageIndex(); i++)
                x += b.getPage(i).getSize().width;
 
-           return new Pair(b, new Pair(new Rectangle(x,y,w,h), null));
+           //      return new Pair(b, new Pair(new Rectangle(x,y,w,h), null));
+           return new View2D.Anchor(b, x,y,w,h, null);
        }
     }
 
@@ -122,7 +123,7 @@
                if(culledCS > 0) cs = culledCS;
 
                l.link(1, cs, pageImageScrollNodeType,
-                           new Pair(node, ((Pair)anchor).first), 
+                           new Pair(node, ((View2D.Anchor)anchor).plane), 
                            anchor);
 
            }