You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2004/06/17 06:46:08 UTC
cvs commit: xml-fop/src/java/org/apache/fop/tools AreaTreeBuilder.java
gmazza 2004/06/16 21:46:08
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/area AreaTree.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
Log:
No-constructor loader created for Area Tree.
Revision Changes Path
1.65 +2 -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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Driver.java 15 Jun 2004 06:26:55 -0000 1.64
+++ Driver.java 17 Jun 2004 04:46:08 -0000 1.65
@@ -490,7 +490,7 @@
"Renderer not set when using standard foInputHandler");
}
foInputHandler = new FOTreeHandler(currentDocument, true);
- currentDocument.areaTree = new AreaTree(currentDocument);
+ currentDocument.areaTree = new AreaTree();
currentDocument.atModel = new RenderPagesModel(renderer);
//this.atModel = new CachedRenderPagesModel(renderer);
currentDocument.areaTree.setTreeModel(currentDocument.atModel);
1.12 +8 -10 xml-fop/src/java/org/apache/fop/area/AreaTree.java
Index: AreaTree.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTree.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AreaTree.java 15 Jun 2004 00:30:43 -0000 1.11
+++ AreaTree.java 17 Jun 2004 04:46:08 -0000 1.12
@@ -18,7 +18,6 @@
package org.apache.fop.area;
-import org.apache.fop.apps.Document;
import org.apache.fop.area.extensions.BookmarkData;
import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.extensions.Bookmarks;
@@ -31,6 +30,10 @@
import java.util.HashSet;
import java.util.Iterator;
+// Commons-Logging
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Area tree for formatting objects.
*
@@ -52,7 +55,6 @@
// allows for different models to deal with adding/rendering
// in different situations
private AreaTreeModel model;
- private Document document;
// hashmap of arraylists containing pages with id area
private Map idLocations = new HashMap();
@@ -60,12 +62,12 @@
private Map resolve = new HashMap();
private List treeExtensions = new ArrayList();
+ private static Log log = LogFactory.getLog(AreaTree.class);
+
/**
* Constructor.
- * @param document the apps.Document object controlling this AreaTree
*/
- public AreaTree (Document document) {
- this.document = document;
+ public AreaTree () {
}
@@ -225,7 +227,7 @@
return;
}
- document.getDriver().getLogger().debug("adding bookmarks to area tree");
+ log.debug("adding bookmarks to area tree");
BookmarkData data = new BookmarkData();
for (int count = 0; count < bookmarks.getOutlines().size(); count++) {
Outline out = (Outline)(bookmarks.getOutlines()).get(count);
@@ -252,10 +254,6 @@
data.addSubData(createBookmarkData(out));
}
return data;
- }
-
- public Document getDocument() {
- return document;
}
}
1.17 +1 -1 xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AreaTreeBuilder.java 12 May 2004 23:19:53 -0000 1.16
+++ AreaTreeBuilder.java 17 Jun 2004 04:46:08 -0000 1.17
@@ -271,7 +271,7 @@
Element root = null;
root = doc.getDocumentElement();
- areaTree = new AreaTree(document);
+ areaTree = new AreaTree();
areaTree.setTreeModel(model);
readAreaTree(root);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org