bckfnn 2004/10/20 06:41:06 Modified: src/java/org/apache/fop/layoutmgr BidiLayoutManager.java BlockStackingLayoutManager.java LeafNodeLayoutManager.java StaticContentLayoutManager.java TextLayoutManager.java Log: Fourth phase of performance improvement. - Use correct AbstractLayoutManager constructor. PR: 31699 Revision Changes Path 1.7 +2 -1 xml-fop/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java Index: BidiLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- BidiLayoutManager.java 7 Aug 2004 13:01:17 -0000 1.6 +++ BidiLayoutManager.java 20 Oct 2004 13:41:06 -0000 1.7 @@ -35,6 +35,7 @@ private List children; public BidiLayoutManager(BidiOverride node, InlineStackingLayoutManager cLM) { + super(node); children = new ArrayList(); setFObj(node); /* 1.9 +0 -3 xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Index: BlockStackingLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BlockStackingLayoutManager.java 22 Sep 2004 08:24:32 -0000 1.8 +++ BlockStackingLayoutManager.java 20 Oct 2004 13:41:06 -0000 1.9 @@ -36,9 +36,6 @@ protected LayoutManager curChildLM = null; protected BlockParent parentArea = null; - public BlockStackingLayoutManager() { - } - public BlockStackingLayoutManager(FObj node) { super(node); } 1.10 +0 -6 xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java Index: LeafNodeLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- LeafNodeLayoutManager.java 20 Oct 2004 13:19:24 -0000 1.9 +++ LeafNodeLayoutManager.java 20 Oct 2004 13:41:06 -0000 1.10 @@ -77,12 +77,6 @@ } /** - * Create a Leaf node layout mananger. - */ - public LeafNodeLayoutManager() { - } - - /** * get the inline area. * @param context the context used to create the area * @return the current inline area for this layout manager 1.6 +5 -0 xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Index: StaticContentLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- StaticContentLayoutManager.java 26 Sep 2004 13:51:01 -0000 1.5 +++ StaticContentLayoutManager.java 20 Oct 2004 13:41:06 -0000 1.6 @@ -21,6 +21,7 @@ import org.apache.fop.area.RegionReference; import org.apache.fop.area.Area; import org.apache.fop.area.Block; +import org.apache.fop.fo.pagination.Flow; import java.util.ArrayList; import java.util.List; @@ -36,6 +37,10 @@ private RegionReference region; private List blockBreaks = new ArrayList(); + + public StaticContentLayoutManager(Flow node) { + super(node); + } /** * Sets the region reference 1.25 +1 -2 xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java Index: TextLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- TextLayoutManager.java 20 Oct 2004 11:55:32 -0000 1.24 +++ TextLayoutManager.java 20 Oct 2004 13:41:06 -0000 1.25 @@ -123,9 +123,8 @@ * @param node The FOText object to be rendered */ public TextLayoutManager(FOText node) { - super(); - foText = node; + textArray = new char[node.endIndex - node.startIndex]; System.arraycopy(node.ca, node.startIndex, textArray, 0, node.endIndex - node.startIndex);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]