Fourth phase of performance improvement.

- Field AbstractLayoutManager.fobj no longer needed.

PR: 31699


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198088 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 5 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index fa02d775f..abb647e1e 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -41,7 +41,6 @@ import java.util.Map;
 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 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
      * @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 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
      * 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;
         }
diff --git a/src/java/org/apache/fop/layoutmgr/list/Item.java b/src/java/org/apache/fop/layoutmgr/list/Item.java
index da35dd383..2650e67a9 100644
--- a/src/java/org/apache/fop/layoutmgr/list/Item.java
+++ b/src/java/org/apache/fop/layoutmgr/list/Item.java
@@ -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 @@ import java.util.List;
  * A cell contains blocks. These blocks fill the cell.
  */
 public class Item extends BlockStackingLayoutManager {
+    private FObj fobj;
 
     private Block curBlockArea;