gmazza 2004/10/02 05:39:10 Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java ContentLayoutManager.java LayoutManager.java PageSequenceLayoutManager.java Log: Removed no-longer-used getAreaTreeHandler() from LM's. Revision Changes Path 1.24 +0 -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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- AbstractLayoutManager.java 2 Oct 2004 04:34:13 -0000 1.23 +++ AbstractLayoutManager.java 2 Oct 2004 12:39:10 -0000 1.24 @@ -21,7 +21,6 @@ import org.apache.fop.fo.FObj; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.area.Area; -import org.apache.fop.area.AreaTreeHandler; import org.apache.fop.area.Resolveable; import org.apache.fop.area.PageViewport; import org.apache.fop.fo.Constants; @@ -118,10 +117,6 @@ return this.parentLM; } - public AreaTreeHandler getAreaTreeHandler() { - return getParent().getAreaTreeHandler(); - } - // /** // * Ask the parent LayoutManager to add the current (full) area to the // * appropriate parent area. @@ -415,7 +410,6 @@ if (fobjIter == null) { return null; } - AreaTreeHandler areaTreeHandler = getAreaTreeHandler(); List newLMs = new ArrayList(size); while (fobjIter.hasNext() && newLMs.size() < size ) { Object theobj = fobjIter.next(); 1.14 +0 -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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ContentLayoutManager.java 5 Sep 2004 18:16:32 -0000 1.13 +++ ContentLayoutManager.java 2 Oct 2004 12:39:10 -0000 1.14 @@ -22,7 +22,6 @@ import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.flow.Marker; import org.apache.fop.area.Area; -import org.apache.fop.area.AreaTreeHandler; import org.apache.fop.area.Resolveable; import org.apache.fop.area.PageViewport; @@ -180,10 +179,6 @@ public LayoutManager getParent() { return this.parentLM; - } - - public AreaTreeHandler getAreaTreeHandler() { - return getParent().getAreaTreeHandler(); } /** @see org.apache.fop.layoutmgr.LayoutManager */ 1.13 +0 -7 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- LayoutManager.java 7 Sep 2004 20:47:11 -0000 1.12 +++ LayoutManager.java 2 Oct 2004 12:39:10 -0000 1.13 @@ -28,7 +28,6 @@ import org.apache.fop.area.Resolveable; import org.apache.fop.area.PageViewport; import org.apache.fop.fo.FObj; -import org.apache.fop.area.AreaTreeHandler; /** * The interface for all LayoutManagers. @@ -57,12 +56,6 @@ * @return the parent layout manager. */ LayoutManager getParent(); - - /** - * Get the AreaTreeHandler object that is activating the LM Tree - * @return the AreaTreeHandler object - */ - AreaTreeHandler getAreaTreeHandler(); /** * Initialize this layout manager. 1.4 +1 -8 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PageSequenceLayoutManager.java 27 Sep 2004 10:18:11 -0000 1.3 +++ PageSequenceLayoutManager.java 2 Oct 2004 12:39:10 -0000 1.4 @@ -918,11 +918,4 @@ staticContentLMs.put(sc.getPropString(PR_FLOW_NAME), lm); return lm; } - - /** - * @return the apps.FOTreeHandler object controlling this generation - */ - public AreaTreeHandler getAreaTreeHandler() { - return areaTreeHandler; - } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]