diff options
| -rw-r--r-- | src/java/org/apache/fop/apps/Driver.java | 1 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/FOTreeBuilder.java | 14 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/PropertyManager.java | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index 9808c1cdf..ca308ed5a 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -495,7 +495,6 @@ public class Driver { foInputHandler.setLogger(getLogger()); treeBuilder.setFOInputHandler(foInputHandler); - treeBuilder.setDocument(currentDocument); return new ProxyContentHandler(treeBuilder) { diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java index ffb45bfb7..e8be41305 100644 --- a/src/java/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java @@ -31,7 +31,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.ElementMapping.Maker; import org.apache.fop.fo.pagination.Root; @@ -80,9 +79,6 @@ public class FOTreeBuilder extends DefaultHandler { */ private FOInputHandler foInputHandler; - /** The Document object managing the FO Tree that is being built */ - private Document document; - /** The SAX locator object managing the line and column counters */ private Locator locator; @@ -94,14 +90,6 @@ public class FOTreeBuilder extends DefaultHandler { } /** - * Sets the apps.Document for this object - * @param doc Document instance - */ - public void setDocument(Document doc) { - this.document = doc; - } - - /** * Sets the structure handler to receive events. * @param foih FOInputHandler instance */ @@ -254,7 +242,7 @@ public class FOTreeBuilder extends DefaultHandler { if (rootFObj == null) { rootFObj = (Root) foNode; - rootFObj.setFOInputHandler(document.getFOInputHandler()); + rootFObj.setFOInputHandler(foInputHandler); } else { currentFObj.addChild(foNode); } diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index 00033b28c..4dcad675d 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/src/java/org/apache/fop/fo/PropertyManager.java @@ -83,7 +83,7 @@ public class PropertyManager implements Constants { /** * Constructs a FontState object. If it was constructed before it is * reused. - * @param document apps.Document implementation containing the font + * @param fontInfo the FontInfo implementation containing the font * information * @return a FontState object */ |