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 bc...@apache.org on 2004/10/20 15:39:33 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/list Item.java
bckfnn 2004/10/20 06:39:33
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
src/java/org/apache/fop/layoutmgr/list Item.java
Log:
Fourth phase of performance improvement.
- Field AbstractLayoutManager.fobj no longer needed.
PR: 31699
Revision Changes Path
1.29 +3 -5 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AbstractLayoutManager.java 20 Oct 2004 13:19:24 -0000 1.28
+++ AbstractLayoutManager.java 20 Oct 2004 13:39:33 -0000 1.29
@@ -41,7 +41,6 @@
public abstract class AbstractLayoutManager implements LayoutManager, Constants {
protected LayoutManager parentLM = null;
protected List childLMs = new ArrayList(10);
- protected FObj fobj;
protected ListIterator fobjIter = null;
protected Map markers = null;
@@ -82,9 +81,8 @@
* @param fo the formatting object for this layout manager
*/
public void setFObj(FObj fo) {
- this.fobj = fo;
- markers = fobj.getMarkers();
- fobjIter = fobj.getChildNodes();
+ markers = fo.getMarkers();
+ fobjIter = fo.getChildNodes();
childLMiter = new LMiter(this);
}
@@ -93,7 +91,7 @@
* for the areas it will create, based on Properties set on its FO.
*/
public void initialize() {
- if (fobj != null && bInited == false) {
+ if (bInited == false) {
initProperties();
bInited = true;
}
1.10 +2 -0 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Item.java 19 Oct 2004 21:47:15 -0000 1.9
+++ Item.java 20 Oct 2004 13:39:33 -0000 1.10
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.list;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.ListItemBody;
import org.apache.fop.fo.flow.ListItemLabel;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
@@ -40,6 +41,7 @@
* A cell contains blocks. These blocks fill the cell.
*/
public class Item extends BlockStackingLayoutManager {
+ private FObj fobj;
private Block curBlockArea;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org