[Gzz-commits] fenfire/org/fenfire/view CanvasView2D.java RSTT...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/08 13:30:19

Modified files:
        org/fenfire/view: CanvasView2D.java RSTText.test 
        org/fenfire/view/buoy: MainNode2D.java 

Log message:
        fix check etc.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/RSTText.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.11 
fenfire/org/fenfire/view/CanvasView2D.java:1.12
--- fenfire/org/fenfire/view/CanvasView2D.java:1.11     Sun May  4 21:38:49 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Thu May  8 13:30:19 2003
@@ -20,7 +20,7 @@
 /** A View2D on a PP-like canvas.
  */
 public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.11 2003/05/05 
01:38:49 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.12 2003/05/08 
17:30:19 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("CanvasView2D::"+s); 
}
     
@@ -36,6 +36,11 @@
     public void render(VobScene vs, Object container,
                       int matchingParent, int box2screen, int box2plane)
     {
+
+       if (RDFUtil.isNodeType(fen, container, PP.Paper) ||
+           RDFUtil.isNodeType(fen, container, RST.Canvas)) ;
+       else throw new Error("plane is NOT a container!");
+
        int paper2box = vs.invertCS(box2plane, "canvasview_INv");
        int paper2screen = vs.concatCS(box2screen, "canvasview_conc",
                        paper2box);
Index: fenfire/org/fenfire/view/RSTText.test
diff -u fenfire/org/fenfire/view/RSTText.test:1.2 
fenfire/org/fenfire/view/RSTText.test:1.3
--- fenfire/org/fenfire/view/RSTText.test:1.2   Thu May  8 12:20:47 2003
+++ fenfire/org/fenfire/view/RSTText.test       Thu May  8 13:30:19 2003
@@ -57,10 +57,12 @@
     mainNode.context = context
 
     # put up some empty nodes
-    mainNode.keystroke('Space')
-    mainNode.keystroke('Space')
-    mainNode.keystroke('Space')
-    mainNode.keystroke('Return')
+    # if you set this to 0 - this test'll pass
+    if 1:
+        mainNode.keystroke('Space')
+        mainNode.keystroke('Space')
+        mainNode.keystroke('Space')
+        mainNode.keystroke('Return')
     rst.util.generateBasicSpatialCoords(canvas, nodeview)
 
     vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.green))
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.18 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.19
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.18  Wed May  7 12:04:54 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Thu May  8 13:30:19 2003
@@ -33,9 +33,6 @@
 
 import java.awt.event.MouseEvent;
 
-import org.fenfire.util.*;
-import org.fenfire.vocab.*;
-
 /** A BuoyViewMainNode showing a 2D plane rendered through
  *  a View2D. This class implements the keyboard and mouse
  *  command for moving on the spatial plane.
@@ -44,10 +41,6 @@
     public static boolean dbg = true;
     private static void p(String s) { System.out.println("MainNode2D:: "+s); }
 
-    /** Ugly hack!!! XXX
-     */
-    static public org.fenfire.Fen fen = null;
-    
     protected float zoom;
 
     private float tmp[] = new float[2];
@@ -92,12 +85,6 @@
        box2paper = vs.coords.orthoBox(0,0,0,0,0,0,0,0);
        vs.matcher.add(box2screen, box2paper, "BOX2PAPER");
        setZoomPan(vs, box2paper);
-
-       if (fen != null)
-            if (RDFUtil.isNodeType(fen, plane, PP.Paper) ||
-                RDFUtil.isNodeType(fen, plane, RST.Canvas)) ;
-            else throw new Error("plane is NOT a container!");
-
        view2d.render(vs, plane, into, into, box2paper);
     }