gmazza 2004/06/12 18:11:49
Modified: src/java/org/apache/fop/apps Document.java
src/java/org/apache/fop/fo FOTreeHandler.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
ContentLayoutManager.java LMiter.java
LayoutManager.java PageLayoutManager.java
Log:
Moved AddLMVisitor accessors into FOTreeHandler.
Revision Changes Path
1.17 +1 -28 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Document.java 11 Jun 2004 17:18:51 -0000 1.16
+++ Document.java 13 Jun 2004 01:11:49 -0000 1.17
@@ -32,8 +32,6 @@
import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
import org.apache.commons.logging.Log;
@@ -60,10 +58,6 @@
private Bookmarks bookmarks = null;
- /** Useful only for allowing subclasses of AddLMVisitor to be set by those
- extending FOP **/
- private AddLMVisitor addLMVisitor = null;
-
/**
* The current set of id's in the FO tree.
* This is used so we know if the FO tree contains duplicates.
@@ -142,25 +136,4 @@
return foInputHandler;
}
- /**
- * Public accessor to set the AddLMVisitor object that should be used.
- * This allows subclasses of AddLMVisitor to be used, which can be useful
- * for extensions to the FO Tree.
- * @param addLMVisitor the AddLMVisitor object that should be used.
- */
- public void setAddLMVisitor(AddLMVisitor addLMVisitor) {
- this.addLMVisitor = addLMVisitor;
- }
-
- /**
- * Public accessor to get the AddLMVisitor object that should be used.
- * @return the AddLMVisitor object that should be used.
- */
- public AddLMVisitor getAddLMVisitor() {
- if (this.addLMVisitor == null) {
- this.addLMVisitor = new AddLMVisitor();
- }
- return this.addLMVisitor;
- }
-
}
1.17 +28 -2 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
Index: FOTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FOTreeHandler.java 11 Jun 2004 17:18:51 -0000 1.16
+++ FOTreeHandler.java 13 Jun 2004 01:11:49 -0000 1.17
@@ -50,6 +50,7 @@
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.layoutmgr.ContentLayoutManager;
import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
import org.apache.fop.layoutmgr.LMiter;
@@ -90,6 +91,10 @@
*/
private long startTime;
+ /** Useful only for allowing subclasses of AddLMVisitor to be set by those
+ extending FOP **/
+ private AddLMVisitor addLMVisitor = null;
+
/**
* Main constructor
* @param foTreeControl the FOTreeControl implementation that governs this
@@ -504,7 +509,7 @@
// This will layout pages and add them to the area tree
PageLayoutManager pageLM = new PageLayoutManager(areaTree, pageSeq,
- getDocument());
+ this);
pageLM.setPageCounting(pageSeq.getCurrentPageNumber(),
pageSeq.getPageNumberGenerator());
@@ -550,6 +555,27 @@
clm.fillArea(lm);
return title;
+ }
+
+ /**
+ * Public accessor to set the AddLMVisitor object that should be used.
+ * This allows subclasses of AddLMVisitor to be used, which can be useful
+ * for extensions to the FO Tree.
+ * @param addLMVisitor the AddLMVisitor object that should be used.
+ */
+ public void setAddLMVisitor(AddLMVisitor addLMVisitor) {
+ this.addLMVisitor = addLMVisitor;
+ }
+
+ /**
+ * Public accessor to get the AddLMVisitor object that should be used.
+ * @return the AddLMVisitor object that should be used.
+ */
+ public AddLMVisitor getAddLMVisitor() {
+ if (this.addLMVisitor == null) {
+ this.addLMVisitor = new AddLMVisitor();
+ }
+ return this.addLMVisitor;
}
/**
1.16 +4 -4
xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.15
+++ AbstractLayoutManager.java 13 Jun 2004 01:11:49 -0000 1.16
@@ -20,12 +20,12 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Document;
-import org.apache.fop.fo.flow.Marker;
import org.apache.fop.area.Area;
import org.apache.fop.area.Resolveable;
import org.apache.fop.area.PageViewport;
import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.FOTreeHandler;
import org.apache.fop.fo.PropertyManager;
import org.apache.commons.logging.Log;
@@ -108,8 +108,8 @@
return this.parentLM;
}
- public Document getDocument() {
- return getParent().getDocument();
+ public FOTreeHandler getFOTreeHandler() {
+ return getParent().getFOTreeHandler();
}
// /**
1.10 +3 -3
xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContentLayoutManager.java 18 May 2004 11:42:08 -0000 1.9
+++ ContentLayoutManager.java 13 Jun 2004 01:11:49 -0000 1.10
@@ -19,7 +19,7 @@
package org.apache.fop.layoutmgr;
import org.apache.fop.fo.FObj;
-import org.apache.fop.apps.Document;
+import org.apache.fop.fo.FOTreeHandler;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.area.Area;
@@ -171,8 +171,8 @@
return this.parentLM;
}
- public Document getDocument() {
- return getParent().getDocument();
+ public FOTreeHandler getFOTreeHandler() {
+ return getParent().getFOTreeHandler();
}
/** @see org.apache.fop.layoutmgr.LayoutManager */
1.7 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java
Index: LMiter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LMiter.java 18 May 2004 11:42:08 -0000 1.6
+++ LMiter.java 13 Jun 2004 01:11:49 -0000 1.7
@@ -46,7 +46,7 @@
}
protected boolean preLoadNext() {
- AddLMVisitor addLMVisitor = lp.getDocument().getAddLMVisitor();
+ AddLMVisitor addLMVisitor = lp.getFOTreeHandler().getAddLMVisitor();
// skip over child FObj's that don't add lms
while (baseIter != null && baseIter.hasNext()) {
Object theobj = baseIter.next();
1.8 +4 -3 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LayoutManager.java 12 Jun 2004 18:03:47 -0000 1.7
+++ LayoutManager.java 13 Jun 2004 01:11:49 -0000 1.8
@@ -27,6 +27,7 @@
import org.apache.fop.area.PageViewport;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FOTreeHandler;
/**
* The interface for all LayoutManagers.
@@ -57,10 +58,10 @@
LayoutManager getParent();
/**
- * Get the Document object that is at the top of the LM Tree
- * @return the Document object that is at the top of the LM Tree
+ * Get the FOTreeHandler object that is activating the LM Tree
+ * @return the FOTreeHandler object
*/
- org.apache.fop.apps.Document getDocument();
+ FOTreeHandler getFOTreeHandler();
/**
* Initialize this layout manager.
1.41 +7 -7 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PageLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.40
+++ PageLayoutManager.java 13 Jun 2004 01:11:49 -0000 1.41
@@ -18,7 +18,6 @@
package org.apache.fop.layoutmgr;
-import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.CTM;
@@ -42,6 +41,7 @@
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FOTreeHandler;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.pagination.PageNumberGenerator;
@@ -110,7 +110,7 @@
*/
private AreaTree areaTree;
private PageSequence pageSequence;
- private Document doc;
+ private FOTreeHandler foTreeHandler;
/**
* This is the SimplePageMaster that should be used to create the page. It
@@ -134,11 +134,11 @@
* @param pageseq the page sequence fo
*/
public PageLayoutManager(AreaTree areaTree, PageSequence pageseq,
- Document doc) {
+ FOTreeHandler foTreeHandler) {
super(pageseq);
this.areaTree = areaTree;
pageSequence = pageseq;
- this.doc = doc;
+ this.foTreeHandler = foTreeHandler;
}
/**
@@ -899,9 +899,9 @@
}
/**
- * @return the apps.Document object controlling this generation
+ * @return the apps.FOTreeHandler object controlling this generation
*/
- public Document getDocument() {
- return doc;
+ public FOTreeHandler getFOTreeHandler() {
+ return foTreeHandler;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
