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 2005/04/05 01:10:30 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr ContentLayoutManager.java AbstractLayoutManager.java PageSequenceLayoutManager.java LayoutManager.java
gmazza 2005/04/04 16:10:30
Modified: src/java/org/apache/fop/layoutmgr Tag:
Temp_KnuthStylePageBreaking
ContentLayoutManager.java
AbstractLayoutManager.java
PageSequenceLayoutManager.java LayoutManager.java
Log:
Pulled out the AreaTreeHandler from the LayoutManager interface, only
its LayoutManagerMaker (now included) was being called.
Revision Changes Path
No revision
No revision
1.24.2.2 +3 -5 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.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- ContentLayoutManager.java 18 Mar 2005 09:02:55 -0000 1.24.2.1
+++ ContentLayoutManager.java 4 Apr 2005 23:10:30 -0000 1.24.2.2
@@ -24,7 +24,6 @@
import org.apache.fop.fo.pagination.Title;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.area.Area;
-import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.Resolvable;
@@ -47,7 +46,6 @@
*/
public class ContentLayoutManager implements InlineLevelLayoutManager {
private FOUserAgent userAgent;
- private AreaTreeHandler areaTreeHandler;
private Area holder;
private int stackSize;
private LayoutManager parentLM;
@@ -284,10 +282,10 @@
/**
* @see org.apache.fop.layoutmgr.LayoutManager
- * @return the AreaTreeHandler object.
+ * @return the LayoutManagerMaker object.
*/
- public AreaTreeHandler getAreaTreeHandler() {
- return parentLM.getAreaTreeHandler();
+ public LayoutManagerMaker getLayoutManagerMaker() {
+ return parentLM.getLayoutManagerMaker();
}
/**
1.41.2.2 +5 -6 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.41.2.1
retrieving revision 1.41.2.2
diff -u -r1.41.2.1 -r1.41.2.2
--- AbstractLayoutManager.java 18 Mar 2005 09:02:55 -0000 1.41.2.1
+++ AbstractLayoutManager.java 4 Apr 2005 23:10:30 -0000 1.41.2.2
@@ -23,7 +23,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Resolvable;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.RetrieveMarker;
import org.apache.fop.fo.flow.Marker;
@@ -422,13 +421,13 @@
}
/**
- * Delegate getAreaTreeHandler to the parent layout manager.
+ * Delegate getLayoutManagerMaker to the parent layout manager.
*
* @see org.apache.fop.layoutmgr.LayoutManager
- * @return the AreaTreeHandler object.
+ * @return the LayoutManagerMaker object.
*/
- public AreaTreeHandler getAreaTreeHandler() {
- return parentLM.getAreaTreeHandler();
+ public LayoutManagerMaker getLayoutManagerMaker() {
+ return parentLM.getLayoutManagerMaker();
}
/**
@@ -470,7 +469,7 @@
FONode foNode = (FONode) theobj;
foNode = handleRetrieveMarker(foNode);
if (foNode != null) {
- getAreaTreeHandler().getLayoutManagerMaker().
+ getLayoutManagerMaker().
makeLayoutManagers(foNode, newLMs);
}
}
1.50.2.11 +4 -4 xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.50.2.10
retrieving revision 1.50.2.11
diff -u -r1.50.2.10 -r1.50.2.11
--- PageSequenceLayoutManager.java 31 Mar 2005 04:32:54 -0000 1.50.2.10
+++ PageSequenceLayoutManager.java 4 Apr 2005 23:10:30 -0000 1.50.2.11
@@ -115,10 +115,10 @@
/**
* @see org.apache.fop.layoutmgr.LayoutManager
- * @return the AreaTreeHandler object
+ * @return the LayoutManagerMaker object
*/
- public AreaTreeHandler getAreaTreeHandler() {
- return areaTreeHandler;
+ public LayoutManagerMaker getLayoutManagerMaker() {
+ return areaTreeHandler.getLayoutManagerMaker();
}
/**
1.21.2.2 +2 -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.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- LayoutManager.java 18 Mar 2005 09:02:55 -0000 1.21.2.1
+++ LayoutManager.java 4 Apr 2005 23:10:30 -0000 1.21.2.2
@@ -27,7 +27,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Resolvable;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.fo.FObj;
/**
@@ -226,9 +225,9 @@
Marker retrieveMarker(String name, int pos, int boundary);
/**
- * @return the AreaTreeHandler object.
+ * @return the LayoutManagerMaker object.
*/
- AreaTreeHandler getAreaTreeHandler();
+ LayoutManagerMaker getLayoutManagerMaker();
/**
* Load next child LMs, up to child LM index pos
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org