[Gzz-commits] fenfire/org/fenfire/view TextNodeView.java lava...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/14 17:08:24

Modified files:
        org/fenfire/view: TextNodeView.java 
        org/fenfire/view/lava: TextHandler.java 

Log message:
        text colorizing should work now. I couldn't test it unfortunately 
because I left my laptop's power cable around. It just compiled.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/TextHandler.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.6 
fenfire/org/fenfire/view/TextNodeView.java:1.7
--- fenfire/org/fenfire/view/TextNodeView.java:1.6      Mon Jun  9 11:10:43 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Sat Jun 14 17:08:24 2003
@@ -26,6 +26,7 @@
  * Written by Benja Fallenstein
  */
 package org.fenfire.view;
+import org.fenfire.view.lava.*;
 import org.fenfire.swamp.*;
 import org.nongnu.alph.*;
 import org.nongnu.libvob.*;
@@ -37,16 +38,14 @@
  *  <em>Should</em> take a width and do linebreaking;
  *  currently, places text as a single very long line.
  */
-public class TextNodeView implements NodeFunction {
-public static final String rcsid = "$Id: TextNodeView.java,v 1.6 2003/06/09 
15:10:43 benja Exp $";
+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 boolean dbg = false;
     private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
 
     final SimpleLinebreaker breaker = new SimpleLinebreaker();
 
     final NodeFunction nodeContent;
-    final TextStyle style;
-    final float scale;
 
     final float width = 300;
 
@@ -54,11 +53,17 @@
                        TextStyle style,
                        float scale) {
        this.nodeContent = nodeContent;
-       this.style = style;
-       this.scale = scale;
+        super.setStyle(style);
+        super.setScale(scale);
     }
 
+    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);
+
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
        
        final Object objNode = node;
@@ -79,7 +84,7 @@
        //final float height = style.getHeight(scale);
 
        if(dbg) {
-           pa("Textnodeview: '"+s+"' "+width+" "+height+" "+scale+" "+br);
+           pa(" "+s+"' "+width+" "+height+" "+scale+" "+br);
        }
 
        return new org.nongnu.libvob.lava.placeable.Placeable() {
@@ -126,7 +131,8 @@
        s = s.substring(start, end);
 
        if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
-        TextVob vob = new TextVob(style, s, false, key);
+
+        TextVob vob = new TextVob(style, s, false, key, color);
         ch.addBox(vob);
     }
 }
Index: fenfire/org/fenfire/view/lava/TextHandler.java
diff -u fenfire/org/fenfire/view/lava/TextHandler.java:1.2 
fenfire/org/fenfire/view/lava/TextHandler.java:1.3
--- fenfire/org/fenfire/view/lava/TextHandler.java:1.2  Wed Jun 11 13:00:25 2003
+++ fenfire/org/fenfire/view/lava/TextHandler.java      Sat Jun 14 17:08:24 2003
@@ -37,7 +37,7 @@
        setColor(java.awt.Color.black);
        setScale(1);
        setCursorOffset(-1);
-       setStyle(GraphicsAPI.getInstance().getTextStyle("sans", 0, 24));
+       //setStyle(GraphicsAPI.getInstance().getTextStyle("sans", 0, 24));
     }
 
 
@@ -49,7 +49,7 @@
     public float getScale() { return scale; }
     public void setScale(float fontScale) { scale = fontScale; }
 
-    protected TextStyle style;
+    protected TextStyle style = null;
     public void setStyle(TextStyle fontStyle) { style = fontStyle; }
     public TextStyle getStyle() { return style; }