gmazza 2004/06/18 04:43:25
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo FOTreeBuilder.java
PropertyManager.java
Log:
Unused apps.Document object removed from FOTreeBuilder.
Revision Changes Path
1.69 +1 -2 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Driver.java 18 Jun 2004 04:13:53 -0000 1.68
+++ Driver.java 18 Jun 2004 11:43:25 -0000 1.69
@@ -495,7 +495,6 @@
foInputHandler.setLogger(getLogger());
treeBuilder.setFOInputHandler(foInputHandler);
- treeBuilder.setDocument(currentDocument);
return new ProxyContentHandler(treeBuilder) {
1.34 +1 -13 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FOTreeBuilder.java 16 Jun 2004 23:40:58 -0000 1.33
+++ FOTreeBuilder.java 18 Jun 2004 11:43:25 -0000 1.34
@@ -31,7 +31,6 @@
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 @@
*/
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 @@
}
/**
- * 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 @@
if (rootFObj == null) {
rootFObj = (Root) foNode;
- rootFObj.setFOInputHandler(document.getFOInputHandler());
+ rootFObj.setFOInputHandler(foInputHandler);
} else {
currentFObj.addChild(foNode);
}
1.31 +1 -1 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PropertyManager.java 18 Jun 2004 04:13:53 -0000 1.30
+++ PropertyManager.java 18 Jun 2004 11:43:25 -0000 1.31
@@ -83,7 +83,7 @@
/**
* 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
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
