Fixed some remaining problems with the TextBuffer patch for

FObjMixed
Slightly Optimized extensions.Label

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195003 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/extensions/Label.java b/src/org/apache/fop/extensions/Label.java
index aa6bf1c3110e6457f2978876ecc69a2c09fbf27f..c46384f386b958870c14ca5ca04f5762bf55d290 100644 (file)
--- a/src/org/apache/fop/extensions/Label.java
+++ b/src/org/apache/fop/extensions/Label.java
@@ -11,7 +11,7 @@ import org.apache.fop.fo.*;
 
 
 public class Label extends ExtensionObj {
-    private String _label = "";
+    private StringBuffer textBuffer;
 
     public static class Maker extends FObj.Maker {
         public FObj make(FObj parent, PropertyList propertyList) {
@@ -28,12 +28,15 @@ public class Label extends ExtensionObj {
         super(parent, propertyList);
     }
 
-    protected void addCharacters(char data[], int start, int end) {
-        _label += new String(data, start, end - start);
+    protected void addCharacters(char data[], int start, int length) {
+        if (textBuffer==null) {
+            textBuffer = new StringBuffer();
+        }
+        textBuffer.append(data,start,length);
     }
 
     public String toString() {
-        return _label;
+        return textBuffer.toString();
     }
 
 

diff --git a/src/org/apache/fop/fo/XMLObj.java b/src/org/apache/fop/fo/XMLObj.java
index c7631efac12be845b4d9c92c7e6cc17910770305..f4df1cb2b09f472b54d5c39c490f8ab87b1d976c 100644 (file)
--- a/src/org/apache/fop/fo/XMLObj.java
+++ b/src/org/apache/fop/fo/XMLObj.java
@@ -128,7 +128,7 @@ public abstract class XMLObj extends FObj {
     }
 
     protected void addCharacters(char data[], int start, int length) {
-        String str = new String(data, start, length - start);
+        String str = new String(data, start, length);
         org.w3c.dom.Text text = doc.createTextNode(str);
         element.appendChild(text);
     }