[ff-cvs] fenfire/org/fenfire/view TextNodeView.java

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/17 17:22:48

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

Log message:
        another too-tired-to-code bug fixed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.18 
fenfire/org/fenfire/view/TextNodeView.java:1.19
--- fenfire/org/fenfire/view/TextNodeView.java:1.18     Sun Aug 17 16:23:31 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Sun Aug 17 17:22:48 2003
@@ -40,7 +40,7 @@
  * The maximum size of a single line is determined by <pre>width</pre>.
  */
 public class TextNodeView implements PureNodeFunction {
-    public static final String rcsid = "$Id: TextNodeView.java,v 1.18 
2003/08/17 20:23:31 humppake Exp $";
+    public static final String rcsid = "$Id: TextNodeView.java,v 1.19 
2003/08/17 21:22:48 humppake Exp $";
 
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
@@ -85,7 +85,6 @@
 
     public Object f(ConstGraph g, Object node) {
        final Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
-       final Object objNode = node;
        final String s = enf.makeString();
        if (s.length() == 0) 
            return new org.nongnu.libvob.lava.placeable.Placeable() {
@@ -130,10 +129,9 @@
     /**
      *  Get the position of the first character placed after given coordinates.
      */
-    public void getPos(ConstGraph g, Object node, float x, float y) {
+    public int getPos(ConstGraph g, Object node, float x, float y) {
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
-       Object objNode = node;
-       getPos(enf.makeString(), x, y);
+       return getPos(enf.makeString(), x, y);
     }
     public int getPos(String s, float x, float y) {
        if (s.length() == 0) return 0;
@@ -188,7 +186,6 @@
      */
     public void getXY(ConstGraph g, Object node, int pos, float[] xy) {
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
-       Object objNode = node;
        getXY(enf.makeString(), pos, xy);
     }
     public void getXY(String s, int pos, float[] xy) {