[Gzz-commits] fenfire/org/fenfire swamp/Graphs.test swamp/imp...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/16 07:55:04

Modified files:
        org/fenfire/swamp: Graphs.test 
        org/fenfire/swamp/impl: hashgraph.test 
        org/fenfire/view: TextNodeView.java TextNodeView.test 
                          papercanvas2d.test 

Log message:
        need to pass a test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/hashgraph.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.7 
fenfire/org/fenfire/swamp/Graphs.test:1.8
--- fenfire/org/fenfire/swamp/Graphs.test:1.7   Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/swamp/Graphs.test       Mon Jun 16 07:55:04 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Matti Katila
 # This file is part of Fenfire.
@@ -19,7 +20,6 @@
 # 
 
 
-# -*-python-*-
 
 import org.fenfire.swamp as swamp
 import java
Index: fenfire/org/fenfire/swamp/impl/hashgraph.test
diff -u fenfire/org/fenfire/swamp/impl/hashgraph.test:1.5 
fenfire/org/fenfire/swamp/impl/hashgraph.test:1.6
--- fenfire/org/fenfire/swamp/impl/hashgraph.test:1.5   Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/swamp/impl/hashgraph.test       Mon Jun 16 07:55:04 2003
@@ -1,3 +1,4 @@
+#-*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
 # This file is part of Fenfire.
@@ -19,7 +20,6 @@
 # 
 
 
-#-*-python-*-
 from org.fenfire import swamp
 
 from org.fenfire.swamp.graphtest import *
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.7 
fenfire/org/fenfire/view/TextNodeView.java:1.8
--- fenfire/org/fenfire/view/TextNodeView.java:1.7      Sat Jun 14 17:08:24 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Mon Jun 16 07:55:04 2003
@@ -39,7 +39,7 @@
  *  currently, places text as a single very long line.
  */
 public class TextNodeView extends TextHandler implements NodeFunction {
-public static final String rcsid = "$Id: TextNodeView.java,v 1.7 2003/06/14 
21:08:24 mudyc Exp $";
+public static final String rcsid = "$Id: TextNodeView.java,v 1.8 2003/06/16 
11:55:04 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
 
@@ -57,12 +57,17 @@
         super.setScale(scale);
     }
 
+    private boolean hasContext = true;
+    public void setHasNoContext() { hasContext = false; }
+
     private FenPDFContext context = null;
     public void setContext(FenPDFContext context) { this.context = context; }
 
     public Object f(ConstGraph g, Object node) {
-       if (context == null) throw new Error("No context set");
-       context.isToBePlaced(node, this);
+        if (hasContext) {
+            if (context == null) throw new Error("No context set");
+            context.isToBePlaced(node, this);
+        }
 
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
        
Index: fenfire/org/fenfire/view/TextNodeView.test
diff -u fenfire/org/fenfire/view/TextNodeView.test:1.4 
fenfire/org/fenfire/view/TextNodeView.test:1.5
--- fenfire/org/fenfire/view/TextNodeView.test:1.4      Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/view/TextNodeView.test  Mon Jun 16 07:55:04 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka
 # This file is part of Fenfire.
@@ -19,7 +20,6 @@
 # 
 
 
-# -*-python-*-
 
 import java
 import vob
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.12 
fenfire/org/fenfire/view/papercanvas2d.test:1.13
--- fenfire/org/fenfire/view/papercanvas2d.test:1.12    Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Mon Jun 16 07:55:04 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka
 # This file is part of Fenfire.
@@ -19,7 +20,6 @@
 # 
 
 
-# -*-python-*-
 import java
 import vob
 
@@ -74,7 +74,7 @@
        fen.txtfunc, 
        vs.gfxapi.getTextStyle("Sans", 0, 50),
        1)
-
+    textnodeview.setHasNoContext()
 
     canvasView2D = ff.view.CanvasView2D(fen, textnodeview)