gzz-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gzz-commits] fenfire ./Makefile org/fenfire/demo/buoyoing.py...


From: Tuomas J. Lukka
Subject: [Gzz-commits] fenfire ./Makefile org/fenfire/demo/buoyoing.py...
Date: Fri, 25 Apr 2003 07:19:40 -0400

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/25 07:19:39

Modified files:
        .              : Makefile 
        org/fenfire/demo: buoyoing.py 
        org/fenfire/modules/pp: PPActionsImpl.java PPCanvasCursor.java 
                                PPCanvasNode.java Pp.java 
                                SinglePaper.java 
        org/fenfire/util: Dbg.java PUIClipboard.java RDFUtil.java 
        org/fenfire/view: CanvasView2D.java IrregularViewportView2D.java 
                          LinebrokenText.java SpatialPlane.java 

Log message:
        Fix irregu

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/Dbg.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/PUIClipboard.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/IrregularViewportView2D.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/LinebrokenText.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.11 fenfire/Makefile:1.12
--- fenfire/Makefile:1.11       Thu Apr 24 08:05:30 2003
+++ fenfire/Makefile    Fri Apr 25 07:19:39 2003
@@ -13,7 +13,7 @@
 
PYTHONPATH=-Dpython.path=../fenfire-depends/jythonlib.jar:../fenfire-depends/jython.jar:../fenfire-depends/pythonlib.jar:.:../libvob:../alph
 
 
 test:
-       $(LDLIB) java $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
org/fenfire/test/test.py -Dvob.api=gl $(TEST)
+       $(LDLIB) java $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
org/fenfire/test/test.py -Dvob.api=gl $(DBG) $(TEST)
 
 DEMO=org/fenfire/demo/buoyoing.py
 
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.21 
fenfire/org/fenfire/demo/buoyoing.py:1.22
--- fenfire/org/fenfire/demo/buoyoing.py:1.21   Thu Apr 24 18:41:04 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri Apr 25 07:19:39 2003
@@ -200,8 +200,15 @@
 view = ff.view.CanvasView2D(fen, nodeview)
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
 irregu = ff.view.IrregularViewportView2D(paperview)
+
+# irregu.debugFlags = irregu.DEBUG_CONTENT
+# irregu.border = 10
+irregu.type = 2
+
 plane = ff.swamp.Nodes.get(paperA)
+
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
+# mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.22 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.23
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.22      Wed Apr 16 
01:36:12 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Fri Apr 25 07:19:39 2003
@@ -16,9 +16,8 @@
 /** The implementation of PPActions.
  */
 public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.22 2003/04/16 
05:36:12 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.23 2003/04/25 
11:19:39 tjl Exp $";
     public static final boolean dbg = false;
-    protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("PPActionsImpl: 
"+s); }
 
     private Fen fen = null;
@@ -39,9 +38,9 @@
     //
     public String newPaper() throws RemoteException 
     { synchronized(fen) {
-       p("make a new paper");
+       if(dbg) pa("make a new paper");
        Object paper = RDFUtil.N(fen, PP.Paper);
-       p("new paper done.");
+       if(dbg) pa("new paper done.");
 
        // set creation time
        // XXX we need iso 8601 time presentation here
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.28 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.29
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.28     Wed Apr 23 
19:40:40 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Fri Apr 25 07:19:39 2003
@@ -22,9 +22,8 @@
 /** PPCanvas which has been selected/created to be the focus one.
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.28 
2003/04/23 23:40:40 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.29 
2003/04/25 11:19:39 tjl Exp $";  
     public static boolean dbg = false;
-    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
 
 
@@ -92,7 +91,7 @@
     private int focusFrame = -1;
     private int c2fCS = -1;
     public void renderMain(VobScene vs, int into) {
-       p("con: "+ context);
+       if(dbg) pa("con: "+ context);
        focusFrame = into;
        Object node = context.getAccursed();
        Object paper = node;
@@ -111,7 +110,7 @@
                                       size[0]/10,
                                       size[1]/10);
            vs.put(new LineVob(0,0,0,1, java.awt.Color.yellow), cursor);
-           p("Cursor");
+           if(dbg) pa("Cursor");
        }
        
        // Create the coordinate systems for the viewport.
@@ -227,7 +226,7 @@
            return false;
        }
 
-       p("nothing!");
+       if(dbg) pa("nothing!");
        return false;
     }
 
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.22 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.23
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.22       Wed Apr 23 
19:40:40 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Fri Apr 25 07:19:39 2003
@@ -17,9 +17,8 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.22 2003/04/23 
23:40:40 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.23 2003/04/25 
11:19:39 tjl Exp $";  
     public static boolean dbg = false;
-    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
     static private boolean paperReady = false;
@@ -89,7 +88,7 @@
      */
     public int renderBuoy(VobScene vs, int into, Object node, Object content,
                   Object cachedSize){
-       p("renderBuoy: "+ node);
+       if(dbg) pa("renderBuoy: "+ node);
 
        int[] pan = getCoords(node);
         float [] bs = new float[2];
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.33 
fenfire/org/fenfire/modules/pp/Pp.java:1.34
--- fenfire/org/fenfire/modules/pp/Pp.java:1.33 Thu Apr 24 18:59:34 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Fri Apr 25 07:19:39 2003
@@ -28,9 +28,8 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.33 2003/04/24 22:59:34 
benja Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.34 2003/04/25 11:19:39 
tjl Exp $";
     public static final boolean dbg = false;
-    protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
 
     private static Pp pp;
@@ -254,7 +253,7 @@
     ArrayList realLinks = new ArrayList();
     public void link(int dir, int anchorCS, BuoyViewNodeType otherNode, 
                     Object linkId, Object otherAnchor) {
-       p("link!");
+       if(dbg) pa("link!");
        realLinks.add(new Object[] { new Integer(dir), new Integer(anchorCS),
                                     otherNode, linkId, otherAnchor });
     }
@@ -264,7 +263,7 @@
      */
     private void linkReally(int dir, int anchorCS, BuoyViewNodeType otherNode,
                           Object linkId, Object otherAnchor) {
-       p("linkReally!");
+       if(dbg) pa("linkReally!");
        int anchorUnit = curVs.unitSqCS(anchorCS, "UN");
        int anchorCenter = curVs.translateCS(anchorUnit, "TR55", 0.5f, 0.5f);
        float r = ctrY * 0.9f;
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.12 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.13
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.12        Wed Apr 23 
19:40:40 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Fri Apr 25 07:19:39 2003
@@ -17,9 +17,8 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.12 2003/04/23 
23:40:40 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.13 2003/04/25 
11:19:39 tjl Exp $";  
     public static boolean dbg = false;
-    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("SinglePaper::"+s); }
 
     // Singleton  <sigh> why do I do everything with singleton?
@@ -94,12 +93,12 @@
                final int panZoom, final int inversePanZoom,
                NodePlacementHook hook) 
     {
-       p("render paper: "+node);
+       if(dbg) pa("render paper: "+node);
        final NodePlacementHook hook_final = hook;
 
        float[] sqs = new float[2];
        vs.coords.getSqSize(frameCS, sqs);
-       p("Sqs frame: "+sqs[0]+" "+sqs[1]);
+       if(dbg) pa("Sqs frame: "+sqs[0]+" "+sqs[1]);
        //if (sqs[1] < 5) return;
 
        // CS from center of frameCS to screen
Index: fenfire/org/fenfire/util/Dbg.java
diff -u fenfire/org/fenfire/util/Dbg.java:1.1 
fenfire/org/fenfire/util/Dbg.java:1.2
--- fenfire/org/fenfire/util/Dbg.java:1.1       Sun Mar 16 11:24:12 2003
+++ fenfire/org/fenfire/util/Dbg.java   Fri Apr 25 07:19:39 2003
@@ -2,6 +2,7 @@
 Dbg.java
  *    
  *    Copyright (c) 2001, Ted Nelson and Tuomas Lukka
+ *    Copyright (c) 2003, Tuomas Lukka
  *
  *    This file is part of Fenfire.
  *    
@@ -36,11 +37,11 @@
  * class Foo {
  *     static public boolean dbg = false;
  *      ...
- *     private final void p(String s) { if(dbg) System.out.println(s); }
+ *     private final void pa(String s) { System.out.println(s); }
  *      ...
  *      ...
  *      void method() {
- *         p("Here");
+ *         if(dbg) pa("Here");
  *         ...
  *         if(dbg)
  *             object-&lt;printDebugInfo();
@@ -82,10 +83,10 @@
  */
 
 public final class Dbg {
-public static final String rcsid = "$Id: Dbg.java,v 1.1 2003/03/16 16:24:12 
benja Exp $";
+public static final String rcsid = "$Id: Dbg.java,v 1.2 2003/04/25 11:19:39 
tjl Exp $";
 
     static boolean dbg = true;
-    final void p(String s) { if(dbg) System.out.println(s); }
+    final void pa(String s) { System.out.println(s); }
 
     List dbgClasses = new ArrayList();
 
@@ -95,7 +96,7 @@
      */
     public void debugClass(String name, boolean dbg) {
        try {
-           p("Turning on debugging for class "+name);
+           if(dbg) pa("Turning on debugging for class "+name);
            Class clazz = Class.forName("gzz."+name);
            Field f = clazz.getField("dbg");
            f.setBoolean(null, dbg);
@@ -103,7 +104,7 @@
            dbgClasses.add(f);
        } catch(Exception e) {
            e.printStackTrace();
-           p(""+e);
+           if(dbg) pa(""+e);
            throw new Error("Error while turning on debug info");
        }
     }
Index: fenfire/org/fenfire/util/PUIClipboard.java
diff -u fenfire/org/fenfire/util/PUIClipboard.java:1.1 
fenfire/org/fenfire/util/PUIClipboard.java:1.2
--- fenfire/org/fenfire/util/PUIClipboard.java:1.1      Sat Mar 22 16:04:44 2003
+++ fenfire/org/fenfire/util/PUIClipboard.java  Fri Apr 25 07:19:39 2003
@@ -35,9 +35,9 @@
 /** Handle copy and paste of PUI clipboard
  */
 public class PUIClipboard {
-public static final String rcsid = "$Id: PUIClipboard.java,v 1.1 2003/03/22 
21:04:44 benja Exp $";
+public static final String rcsid = "$Id: PUIClipboard.java,v 1.2 2003/04/25 
11:19:39 tjl Exp $";
     public static boolean dbg = false;
-    private static void p(String s) { System.err.println(s); }
+    private static void pa(String s) { System.err.println(s); }
 
     static private Clipboard getClipboard() {
         return Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -55,7 +55,7 @@
                 s = (String) content.getTransferData(DataFlavor.stringFlavor);
             } catch (Exception e) {
                if(!dbg)
-                   p("Paste failed: "+e.toString());
+                   pa("Paste failed: "+e.toString());
                else
                    e.printStackTrace();
                return null;
@@ -65,7 +65,7 @@
     }
 
     static public void puiCopy(String str) {
-        if(dbg) p("PuiCOPY '"+str+"'");
+        if(dbg) pa("PuiCOPY '"+str+"'");
         Clipboard clipboard = getClipboard();
         StringSelection contents = new StringSelection(str);
         clipboard.setContents(contents, new ClipboardOwner() {
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.7 
fenfire/org/fenfire/util/RDFUtil.java:1.8
--- fenfire/org/fenfire/util/RDFUtil.java:1.7   Wed Apr 16 01:36:12 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Fri Apr 25 07:19:39 2003
@@ -8,7 +8,6 @@
 
 public class RDFUtil {
     public static boolean dbg = false;
-    static private void p(String s) { if (dbg) pa(s); }
     static private void pa(String s) { System.out.println("RDFUtil: "+s); }
 
     /** Create a new resource with given type.
@@ -17,7 +16,7 @@
        Object obj = Nodes.N();
        fen.graph.add(obj, RDF.type, type);
 
-       p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
+       if(dbg) pa("N: "+fen+" "+fen.graph+" "+fen.constgraph+
          " "+obj+" "+type);
 
        if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
@@ -29,14 +28,14 @@
     /** Check if node is the type which is asked.
      */
     static public boolean isNodeType(Fen fen, Object node, Object type) {
-       p("Isnodetype: "+node+" "+type);
+       if(dbg) pa("Isnodetype: "+node+" "+type);
        Iterator it = fen.constgraph.findN_11X_Iter(node, RDF.type);
        while(it.hasNext()) {
            Object obj = it.next();
-           p(" entry: "+ obj);
+           if(dbg) pa(" entry: "+ obj);
            if ( obj.equals(type) ) return true;
        }
-       p("None matched");
+       if(dbg) pa("None matched");
        return false;
     }
 
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.2 
fenfire/org/fenfire/view/CanvasView2D.java:1.3
--- fenfire/org/fenfire/view/CanvasView2D.java:1.2      Thu Apr 24 16:10:03 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Fri Apr 25 07:19:39 2003
@@ -20,9 +20,8 @@
 /** A View2D on a PP-like canvas.
  */
 public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.2 2003/04/24 
20:10:03 benja Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.3 2003/04/25 
11:19:39 tjl Exp $";
     public static boolean dbg = false;
-    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
     
     private Fen fen;
Index: fenfire/org/fenfire/view/IrregularViewportView2D.java
diff -u fenfire/org/fenfire/view/IrregularViewportView2D.java:1.3 
fenfire/org/fenfire/view/IrregularViewportView2D.java:1.4
--- fenfire/org/fenfire/view/IrregularViewportView2D.java:1.3   Thu Apr 24 
18:41:04 2003
+++ fenfire/org/fenfire/view/IrregularViewportView2D.java       Fri Apr 25 
07:19:39 2003
@@ -5,14 +5,25 @@
 import org.nongnu.libvob.gl.*;
 
 /** A View2D which renders a sub-view2D framed 
- * using an irregularframe..
+ * using an irregularframe.
+ * The parameters are tuned to having the paper coordinate system
+ * approximately pixel-size being normal.
  */
 public class IrregularViewportView2D extends View2D {
-    public float border = 50;
-    public float ripple = 500;
+    public float border = 25;
+    public float ripple = 300;
     public int type = 2;
     public boolean needDepth = true;
 
+    public static final int DEBUG_CONTENT = 1;
+    public static final int DEBUG_FRAME = 2;
+    public static final int DEBUG_BLANK = 4;
+    public static final int DEBUG_CHILD = 8;
+    /** What to render. If 0, render the stencil completely.
+     * Else, render according to flags, without stenciling.
+     */
+    public int debugFlags = 0;
+
     public View2D child;
 
     public IrregularViewportView2D(View2D child) {
@@ -66,14 +77,19 @@
        this.matchingParent = matchingParent;
 
        child.getSize(plane, wh);
+           // XXX May thrash!
        if(irregu == null ||
            cw != wh[0] ||
            ch != wh[1]) {
            cw = wh[0];
            ch = wh[1];
-           // XXX May thrash!
-           irregu = IrregularFrame.create(0,0,cw,ch,
-                   border, ripple, type);
+           if(cw < 0) {
+               irregu = IrregularFrame.create(-1e10f,-1e10f,1e10f,1e10f,
+                       border, ripple, type);
+           } else {
+               irregu = IrregularFrame.create(0,0,cw,ch,
+                       border, ripple, type);
+           }
        }
 
        int paper2box = vs.invertCS(box2paper, "INVE");
@@ -83,12 +99,19 @@
        this.box2paper = box2paper;
        this.vs = vs;
 
-       Stencil.drawStenciled(vs,
-                   putContent,
-                   putFrame,
-                   putBlank,
-                   putChild,
-                   needDepth);
+       if(debugFlags == 0) {
+           Stencil.drawStenciled(vs,
+                       putContent,
+                       putFrame,
+                       putBlank,
+                       putChild,
+                       needDepth);
+       } else {
+           if((debugFlags & DEBUG_CONTENT) != 0) putContent.run();
+           if((debugFlags & DEBUG_FRAME) != 0) putFrame.run();
+           if((debugFlags & DEBUG_BLANK) != 0) putBlank.run();
+           if((debugFlags & DEBUG_CHILD) != 0) putChild.run();
+       }
     }
 
     public void getSize(Object plane, float[] wh) {
Index: fenfire/org/fenfire/view/LinebrokenText.java
diff -u fenfire/org/fenfire/view/LinebrokenText.java:1.2 
fenfire/org/fenfire/view/LinebrokenText.java:1.3
--- fenfire/org/fenfire/view/LinebrokenText.java:1.2    Wed Apr 23 16:58:08 2003
+++ fenfire/org/fenfire/view/LinebrokenText.java        Fri Apr 25 07:19:39 2003
@@ -45,9 +45,8 @@
  *  Doesn't scroll, currently.
  */
 public class LinebrokenText extends TextHandler {
-public static final String rcsid = "$Id: LinebrokenText.java,v 1.2 2003/04/23 
20:58:08 mudyc Exp $";
+public static final String rcsid = "$Id: LinebrokenText.java,v 1.3 2003/04/25 
11:19:39 tjl Exp $";
     public static boolean dbg = false;
-    private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { 
System.out.println("LinebrokenText::"+s); }
     
     static Object CONTENT_KEY = new Object();
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.25 
fenfire/org/fenfire/view/SpatialPlane.java:1.26
--- fenfire/org/fenfire/view/SpatialPlane.java:1.25     Wed Apr 23 16:58:08 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Fri Apr 25 07:19:39 2003
@@ -25,9 +25,8 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.25 2003/04/23 
20:58:08 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.26 2003/04/25 
11:19:39 tjl Exp $";
     public static boolean dbg = false;
-    private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
     
@@ -49,7 +48,7 @@
                          Object node, NodeView nodeview, 
                          Fen fen, NodePlacementHook hook) 
     {
-       p("RenderAwt");
+       if(dbg) pa("RenderAwt");
        Object current = node;
        Object container = current;
 
@@ -114,7 +113,7 @@
                       Object node, int cullCS, 
                       Fen fen, NodePlacementHook hook, NodeView nodeview) 
     {
-       p("render GL, node: "+ node);
+       if(dbg) pa("render GL, node: "+ node);
 
        Object current = node;
        Object container = current;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]