PR:

Obtained from:
Submitted by:
Reviewed by:
Moved FOUserAgent, FObj initialization from AddLMVisitor to constructors of respective LayoutManagers.

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

diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index f3c31978d0733569bffcd6d4379b923e0bed0499..7003bc4d79441988b41271cc2fda8aedffe1a471 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -45,7 +45,7 @@ public class TableColumn extends FObj {
     private int numColumnsRepeated;
     private int iColumnNumber;
 
-    private boolean setup = false;
+    private boolean initialized = false;
 
     /**
      * @param parent FONode that is the parent of this object
@@ -75,7 +75,7 @@ public class TableColumn extends FObj {
         return numColumnsRepeated;
     }
 
-    public void doSetup() {
+    public void initialize() {
 
         // Common Border, Padding, and Background Properties
         // only background apply, border apply if border-collapse
@@ -101,7 +101,7 @@ public class TableColumn extends FObj {
         // initialize id
         setupID();
 
-        setup = true;
+        initialized = true;
     }
 
     /**
@@ -121,7 +121,7 @@ public class TableColumn extends FObj {
      */
     public void handleAttrs(Attributes attlist) throws FOPException {
         super.handleAttrs(attlist);
-        doSetup();    // init some basic property values
+        initialize();    // init some basic property values
 
         getFOTreeControl().getFOInputHandler().startColumn(this);
     }

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 0f5d51542b769ea86d29963176901b4f1f904839..3f6e9e0e656cb28e34f523a7b5f16442a3250f09 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -67,6 +67,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
      */
     public AbstractLayoutManager(FObj fo) {
         setFObj(fo);
+        setUserAgent(fo.getUserAgent());
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index 990dbafe6667f0995e68a53a2d1399b14d0d098e..c6014407226e51810e61dd322e0d17251cc32bf2 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -187,9 +187,7 @@ public class AddLMVisitor implements FOTreeVisitor {
     public void serveFObjMixed(FObjMixed node) {
         if (node.getChildren() != null) {
             InlineStackingLayoutManager lm;
-            lm = new InlineStackingLayoutManager();
-            lm.setUserAgent(node.getUserAgent());
-            lm.setFObj(node);
+            lm = new InlineStackingLayoutManager(node);
             lm.setLMiter(new LMiter(lm, node.getChildren()));
             currentLMList.add(lm);
         }
@@ -238,9 +236,7 @@ public class AddLMVisitor implements FOTreeVisitor {
         currentLMList = childList;
         serveFObj((FObj)node);
         currentLMList = saveLMList;
-        LayoutManager lm = new ICLayoutManager(childList);
-        lm.setUserAgent(node.getUserAgent());
-        lm.setFObj(node);
+        LayoutManager lm = new ICLayoutManager(node, childList);
         currentLMList.add(lm);
     }
 
@@ -250,15 +246,13 @@ public class AddLMVisitor implements FOTreeVisitor {
     public void serveBasicLink(final BasicLink node) {
         node.setup();
         InlineStackingLayoutManager lm;
-        lm = new InlineStackingLayoutManager() {
+        lm = new InlineStackingLayoutManager(node) {
             protected InlineParent createArea() {
                 InlineParent area = super.createArea();
                 setupBasicLinkArea(node, parentLM, area);
                 return area;
             }
         };
-        lm.setUserAgent(node.getUserAgent());
-        lm.setFObj(node);
         lm.setLMiter(new LMiter(lm, node.getChildren()));
         currentLMList.add(lm);
     }
@@ -287,7 +281,7 @@ public class AddLMVisitor implements FOTreeVisitor {
      }
 
      public void serveLeader(final Leader node) {
-         LeafNodeLayoutManager lm = new LeafNodeLayoutManager() {
+         LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node) {
              public InlineArea get(LayoutContext context) {
                  return getLeaderInlineArea(node, this);
              }
@@ -302,8 +296,6 @@ public class AddLMVisitor implements FOTreeVisitor {
                  }
              }*/
          };
-         lm.setUserAgent(node.getUserAgent());
-         lm.setFObj(node);
          lm.setAlignment(node.propertyList.get(Constants.PR_LEADER_ALIGNMENT).getEnum());
          currentLMList.add(lm);
      }
@@ -360,9 +352,7 @@ public class AddLMVisitor implements FOTreeVisitor {
                  return null;
              }
              InlineStackingLayoutManager lm;
-             lm = new InlineStackingLayoutManager();
-             lm.setUserAgent(node.getUserAgent());
-             lm.setFObj(node);
+             lm = new InlineStackingLayoutManager(node);
              lm.setLMiter(new LMiter(lm, node.getChildren()));
              lm.initialize();
 
@@ -393,20 +383,14 @@ public class AddLMVisitor implements FOTreeVisitor {
 
      public void serveRetrieveMarker(RetrieveMarker node) {
          RetrieveMarkerLayoutManager rmlm;
-         rmlm = new RetrieveMarkerLayoutManager(node.getRetrieveClassName(),
-                 node.getRetrievePosition(),
-                 node.getRetrieveBoundary());
-         rmlm.setUserAgent(node.getUserAgent());
-         rmlm.setFObj(node);
+         rmlm = new RetrieveMarkerLayoutManager(node);
          currentLMList.add(rmlm);
      }
 
      public void serveCharacter(Character node) {
          InlineArea inline = getCharacterInlineArea(node);
          if (inline != null) {
-             LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
-             lm.setUserAgent(node.getUserAgent());
-             lm.setFObj(node);
+             LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
              lm.setCurrentArea(inline);
              currentLMList.add(lm);
          }
@@ -431,9 +415,7 @@ public class AddLMVisitor implements FOTreeVisitor {
          InlineArea area = getExternalGraphicInlineArea(node);
          if (area != null) {
              node.setupID();
-             LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
-             lm.setUserAgent(node.getUserAgent());
-             lm.setFObj(node);
+             LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
              lm.setCurrentArea(area);
              lm.setAlignment(node.propertyList.get(Constants.PR_VERTICAL_ALIGN).getEnum());
              lm.setLead(node.getViewHeight());
@@ -470,26 +452,20 @@ public class AddLMVisitor implements FOTreeVisitor {
      }
 
      public void serveBlockContainer(BlockContainer node) {
-         BlockContainerLayoutManager blm = new BlockContainerLayoutManager();
-         blm.setUserAgent(node.getUserAgent());
-         blm.setFObj(node);
+         BlockContainerLayoutManager blm = new BlockContainerLayoutManager(node);
          blm.setOverflow(node.propertyList.get(Constants.PR_OVERFLOW).getEnum());
          currentLMList.add(blm);
      }
 
      public void serveListBlock(ListBlock node) {
-         ListBlockLayoutManager blm = new ListBlockLayoutManager();
-         blm.setUserAgent(node.getUserAgent());
-         blm.setFObj(node);
+         ListBlockLayoutManager blm = new ListBlockLayoutManager(node);
          currentLMList.add(blm);
      }
 
      public void serveInstreamForeignObject(InstreamForeignObject node) {
          Viewport areaCurrent = getInstreamForeignObjectInlineArea(node);
          if (areaCurrent != null) {
-             LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
-             lm.setUserAgent(node.getUserAgent());
-             lm.setFObj(node);
+             LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
              lm.setCurrentArea(areaCurrent);
              lm.setAlignment(node.propertyList.get(Constants.PR_VERTICAL_ALIGN).getEnum());
              lm.setLead(areaCurrent.getHeight());
@@ -649,9 +625,7 @@ public class AddLMVisitor implements FOTreeVisitor {
 
      public void serveListItem(ListItem node) {
          if (node.getLabel() != null && node.getBody() != null) {
-             ListItemLayoutManager blm = new ListItemLayoutManager();
-             blm.setUserAgent(node.getUserAgent());
-             blm.setFObj(node);
+             ListItemLayoutManager blm = new ListItemLayoutManager(node);
              blm.setLabel(getListItemLabelLayoutManager(node.getLabel()));
              blm.setBody(getListItemBodyLayoutManager(node.getBody()));
              currentLMList.add(blm);
@@ -664,9 +638,7 @@ public class AddLMVisitor implements FOTreeVisitor {
       * @return this object's Item layout manager
       */
      public Item getListItemLabelLayoutManager(ListItemLabel node) {
-         Item itemLabel = new Item();
-         itemLabel.setUserAgent(node.getUserAgent());
-         itemLabel.setFObj(node);
+         Item itemLabel = new Item(node);
          return itemLabel;
      }
 
@@ -674,9 +646,7 @@ public class AddLMVisitor implements FOTreeVisitor {
       * @return Item layout manager
       */
      public Item getListItemBodyLayoutManager(ListItemBody node) {
-         Item item = new Item();
-         item.setUserAgent(node.getUserAgent());
-         item.setFObj(node);
+         Item item = new Item(node);
          return item;
      }
 
@@ -687,7 +657,7 @@ public class AddLMVisitor implements FOTreeVisitor {
      public void servePageNumber(final PageNumber node) {
          node.setup();
          LayoutManager lm;
-         lm = new LeafNodeLayoutManager() {
+         lm = new LeafNodeLayoutManager(node) {
                      public InlineArea get(LayoutContext context) {
                          // get page string from parent, build area
                          TextArea inline = new TextArea();
@@ -715,15 +685,13 @@ public class AddLMVisitor implements FOTreeVisitor {
                          curArea.setOffset(context.getBaseline());
                      }
                  };
-         lm.setUserAgent(node.getUserAgent());
-         lm.setFObj(node);
          currentLMList.add(lm);
      }
 
      public void servePageNumberCitation(final PageNumberCitation node) {
          node.setup();
          LayoutManager lm;
-         lm = new LeafNodeLayoutManager() {
+         lm = new LeafNodeLayoutManager(node) {
                      public InlineArea get(LayoutContext context) {
                          curArea = getPageNumberCitationInlineArea(node, parentLM);
                          return curArea;
@@ -742,8 +710,6 @@ public class AddLMVisitor implements FOTreeVisitor {
                          curArea.setOffset(context.getBaseline());
                      }
                  };
-         lm.setUserAgent(node.getUserAgent());
-         lm.setFObj(node);
          currentLMList.add(lm);
      }
 
@@ -791,9 +757,7 @@ public class AddLMVisitor implements FOTreeVisitor {
      }
 
      public void serveTable(Table node) {
-         TableLayoutManager tlm = new TableLayoutManager();
-         tlm.setUserAgent(node.getUserAgent());
-         tlm.setFObj(node);
+         TableLayoutManager tlm = new TableLayoutManager(node);
          ArrayList columns = node.getColumns();
          if (columns != null) {
              ArrayList columnLMs = new ArrayList();
@@ -813,10 +777,8 @@ public class AddLMVisitor implements FOTreeVisitor {
      }
 
      public LayoutManager getTableColumnLayoutManager(TableColumn node) {
-         node.doSetup();
-         Column clm = new Column();
-         clm.setUserAgent(node.getUserAgent());
-         clm.setFObj(node);
+         node.initialize();
+         Column clm = new Column(node);
          return clm;
      }
 
@@ -825,30 +787,22 @@ public class AddLMVisitor implements FOTreeVisitor {
      }
 
      public Body getTableBodyLayoutManager(TableBody node) {
-         Body blm = new Body();
-         blm.setUserAgent(node.getUserAgent());
-         blm.setFObj(node);
+         Body blm = new Body(node);
          return blm;
      }
 
      public void serveTableCell(TableCell node) {
-         Cell clm = new Cell();
-         clm.setUserAgent(node.getUserAgent());
-         clm.setFObj(node);
+         Cell clm = new Cell(node);
          currentLMList.add(clm);
      }
 
      public void serveTableRow(TableRow node) {
-         Row rlm = new Row();
-         rlm.setUserAgent(node.getUserAgent());
-         rlm.setFObj(node);
+         Row rlm = new Row(node);
          currentLMList.add(rlm);
      }
 
      public void serveFlow(Flow node) {
-         FlowLayoutManager lm = new FlowLayoutManager();
-         lm.setUserAgent(node.getUserAgent());
-         lm.setFObj(node);
+         FlowLayoutManager lm = new FlowLayoutManager(node);
          currentLMList.add(lm);
      }
 

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 156d6efee64105b04c793f990f95e6f9ecdc25ef..b2166b8c0f66bc5054944d56a309541ae2b0236a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -24,6 +24,7 @@ import java.awt.geom.Rectangle2D;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.BlockViewport;
 import org.apache.fop.area.Block;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.fo.properties.CommonAbsolutePosition;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -65,6 +66,13 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
     public BlockContainerLayoutManager() {
     }
 
+    /**
+     * Create a new block container layout manager.
+     */
+    public BlockContainerLayoutManager(FObj node) {
+        super(node);
+    }
+
     public void setOverflow(int of) {
         overflow = of;
     }

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 3929fc4cb2f8b80eec6fadc1a98447a12e18a2cf..2d2e287fc949e94dc2ec2578693d924bae6b11a4 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -131,10 +131,8 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
                 }
             }
             LineLayoutManager child;
-            child = new LineLayoutManager(lineHeight,
+            child = new LineLayoutManager(fobj, lineHeight,
                                             lead, follow);
-            child.setUserAgent(getUserAgent());
-            child.setFObj(fobj);
             child.setLMiter(inlines.listIterator());
             return child;
 

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index bb2881c11d64e52f07ba35a7848a3fe8316779ba..9bbae285733f5f7dc3c65705311d6c82f7e9ace5 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -21,6 +21,7 @@ package org.apache.fop.layoutmgr;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.BlockParent;
 import org.apache.fop.area.Block;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.traits.MinOptMax;
 
 /**
@@ -38,6 +39,10 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
     public BlockStackingLayoutManager() {
     }
 
+    public BlockStackingLayoutManager(FObj node) {
+        super(node);
+    }
+
     private BreakCost evaluateBreakCost(Area parent, Area child) {
         return new BreakCost(child, 0);
     }

diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index ae47270a75b00ef0e98a0b846186d4f4ec61a257..c78bed7f57d1e07cd12d71370a3270b048b42742 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -18,6 +18,7 @@
 
 package org.apache.fop.layoutmgr;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.BlockParent;
@@ -46,7 +47,8 @@ public class FlowLayoutManager extends BlockStackingLayoutManager {
      * This is the top level layout manager.
      * It is created by the PageSequence FO.
      */
-    public FlowLayoutManager() {
+    public FlowLayoutManager(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
index 4e7ccb41c03a08605804fd500e98e1552b919c5d..b35346e9818639afc726c42a4d6de056def28742 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
@@ -23,6 +23,7 @@ import java.util.List;
 
 // FOP
 import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.fo.FObj;
 
 /**
  * This creates a single inline container area after
@@ -33,7 +34,8 @@ public class ICLayoutManager extends LeafNodeLayoutManager {
 
     private List childrenLM;
 
-    ICLayoutManager(List childLM) {
+    ICLayoutManager(FObj node, List childLM) {
+        super(node);
         childrenLM = childLM;
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
index a052618289a7bf33d3ecc8e49247ed973128237f..3cb4f3b960fe043cf5d0c229a4ee73ecd2a25d78 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
@@ -87,13 +87,21 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager {
      * Create an inline stacking layout manager.
      * This is used for fo's that create areas that
      * contain inline areas.
-     *
-     * @param fobj the formatting object that creates the area
-     * @param childLMiter the iterator for child areas
      */
     public InlineStackingLayoutManager() {
     }
 
+    /**
+     * Create an inline stacking layout manager.
+     * This is used for fo's that create areas that
+     * contain inline areas.
+     *
+     * @param node the formatting object that creates the area
+     */
+    public InlineStackingLayoutManager(FObj node) {
+        super(node);
+    }
+
     /**
      * Set the FO object for this layout manager
      *

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 88005e64caf53e9e17eb41f7071fe1f695a48b6d..c4662164d417665f18e9f6ecd9fc32e729060f61 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -43,8 +43,7 @@ public interface LayoutManager {
     void setFObj(FObj obj);
 
     /**
-     * Set the user agent. For resolving user agent values
-     * and getting logger.
+     * Set the user agent. For resolving user agent values.
      *
      * @param ua the user agent
      */

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
index 859ae5ff177be9ed66b049be933d69f096260eb7..6426bdc69e1f391843710090f0c175bdb1a3634d 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
@@ -71,8 +71,6 @@ public class LayoutManagerLS extends LayoutStrategy {
 
         // This will layout pages and add them to the area tree
         PageLayoutManager pageLM = new PageLayoutManager(areaTree, pageSeq, this);
-        pageLM.setUserAgent(pageSeq.getUserAgent());
-        pageLM.setFObj(pageSeq);
         pageLM.setPageCounting(pageSeq.getCurrentPageNumber(),
                                pageSeq.getPageNumberGenerator());
 
@@ -102,9 +100,7 @@ public class LayoutManagerLS extends LayoutStrategy {
         // use special layout manager to add the inline areas
         // to the Title.
         InlineStackingLayoutManager lm;
-        lm = new InlineStackingLayoutManager();
-        lm.setUserAgent(foTitle.getUserAgent());
-        lm.setFObj(foTitle);
+        lm = new InlineStackingLayoutManager(foTitle);
         lm.setLMiter(new LMiter(lm, foTitle.children.listIterator()));
         lm.initialize();
 

diff --git a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
index ff0f3a0b2b0d65674ca881983a9e48dd18b3cdd6..61952e9e22b7f3d97a7ae62443576bbb6574fad7 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
@@ -20,6 +20,7 @@ package org.apache.fop.layoutmgr;
 
 import org.apache.fop.area.Area;
 import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.traits.MinOptMax;
 
 /**
@@ -38,6 +39,14 @@ public class LeafNodeLayoutManager extends AbstractLayoutManager {
     private int lead;
     private MinOptMax ipd;
 
+    /**
+     * Create a Leaf node layout mananger.
+     * @param node the FObj to attach to this LM.
+     */
+    public LeafNodeLayoutManager(FObj node) {
+        super(node);
+    }
+
     /**
      * Create a Leaf node layout mananger.
      */

diff --git a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
index a511c2cb39d7767871eafa7657278f82fe8029f8..a5ad82a8b8054cb64711f61aed6885ec3f32edbd 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
@@ -19,6 +19,7 @@
 package org.apache.fop.layoutmgr;
 
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.fo.properties.CommonMarginBlock;
 import org.apache.fop.fo.properties.CommonHyphenation;
@@ -98,7 +99,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager {
      * @param l the default lead, from top to baseline
      * @param f the default follow, from baseline to bottom
      */
-    public LineLayoutManager(int lh, int l, int f) {
+    public LineLayoutManager(FObj node, int lh, int l, int f) {
+        super(node);
         lineHeight = lh;
         lead = l;
         follow = f;

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index b5711cb140a0f579ef1db6883d50359fc3d9f35e..8313563d71636604a0c044e54599096a3ce6d395 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -132,6 +132,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
      */
     public PageLayoutManager(AreaTree areaTree, PageSequence pageseq,
                              LayoutManagerLS lmls) {
+        super(pageseq);
         this.areaTree = areaTree;
         pageSequence = pageseq;
         this.lmls = lmls;

diff --git a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
index 1675d875f6eadb11234068c1e5bdf22813b354ec..f66962afc2b3e7cc7cfe9bb2a0d54179aede05cf 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
@@ -22,7 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.fop.area.Area;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.flow.RetrieveMarker;
 
 /**
  * LayoutManager for a block FO.
@@ -38,10 +40,11 @@ public class RetrieveMarkerLayoutManager extends AbstractLayoutManager {
     /**
      * Create a new block container layout manager.
      */
-    public RetrieveMarkerLayoutManager(String n, int pos, int bound) {
-        name = n;
-        position = pos;
-        boundary = bound;
+    public RetrieveMarkerLayoutManager(RetrieveMarker node) {
+        super(node);
+        name = node.getRetrieveClassName();
+        position = node.getRetrievePosition();
+        boundary = node.getRetrieveBoundary();
     }
 
     public boolean generatesInlineAreas() {

diff --git a/src/java/org/apache/fop/layoutmgr/list/Item.java b/src/java/org/apache/fop/layoutmgr/list/Item.java
index 980f3e24f4394ed9827181eb42cc2f0a2ca7d639..9ba9d9f566923189e1d29aabf5f17459c518487d 100644 (file)
--- 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.PropertyManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManager;
@@ -56,7 +57,8 @@ public class Item extends BlockStackingLayoutManager {
     /**
      * Create a new Cell layout manager.
      */
-    public Item() {
+    public Item(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index 815242a05d521b2dcdecf23580dcae3d70b1d901..92b46dcce1e9917c373dabdf05f552f232cef584 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -18,6 +18,7 @@
  
 package org.apache.fop.layoutmgr.list;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManager;
@@ -62,7 +63,8 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager {
      * Create a new table layout manager.
      *
      */
-    public ListBlockLayoutManager() {
+    public ListBlockLayoutManager(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index f2601d2305270a283c2751509bfcc1d0e72e4c9c..3f10d7526a830157508976a213b321ef58fade2f 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -18,6 +18,7 @@
 
 package org.apache.fop.layoutmgr.list;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManager;
@@ -64,7 +65,8 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
      * Create a new list item layout manager.
      *
      */
-    public ListItemLayoutManager() {
+    public ListItemLayoutManager(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/Body.java b/src/java/org/apache/fop/layoutmgr/table/Body.java
index 4ba9a70622019c70f82b2b7c04c35923ab6d215e..59a0ec0ce851b1ffeee0cc1c29775eabdcac3d17 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Body.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Body.java
@@ -18,6 +18,7 @@
  
 package org.apache.fop.layoutmgr.table;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
@@ -59,7 +60,8 @@ public class Body extends BlockStackingLayoutManager {
     /**
      * Create a new body layout manager.
      */
-    public Body() {
+    public Body(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/Cell.java b/src/java/org/apache/fop/layoutmgr/table/Cell.java
index 9d39d058aabea6f46d2cdfc5ceb5002bca061b8b..75aa16ed972974b4b0a1dd21f5adcb3794ea256b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Cell.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Cell.java
@@ -18,6 +18,7 @@
  
 package org.apache.fop.layoutmgr.table;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManager;
@@ -58,7 +59,8 @@ public class Cell extends BlockStackingLayoutManager {
     /**
      * Create a new Cell layout manager.
      */
-    public Cell() {
+    public Cell(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/Column.java b/src/java/org/apache/fop/layoutmgr/table/Column.java
index c436d2e7fa4b9e1ba756a9df899d2d10f722b3de..662394e8fcdcc8d1315ff9a40f782ce33d20a0c4 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Column.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Column.java
@@ -45,14 +45,8 @@ public class Column extends AbstractLayoutManager {
     /**
      * Create a new column layout manager.
      */
-    public Column() {
-    }
-
-    /**
-     * @see org.apache.fop.layoutmgr.LayoutManager#setFObj(FObj)
-     */
-    public void setFObj(FObj fobj) {
-        super.setFObj(fobj);
+    public Column(FObj node) {
+         super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/Row.java b/src/java/org/apache/fop/layoutmgr/table/Row.java
index eb6b2701c00dceb559c1f470cb7de8fdded7e3de..5ae91879fb90e69bac9b4fcf3e2c14feae75e223 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Row.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Row.java
@@ -18,6 +18,7 @@
 
 package org.apache.fop.layoutmgr.table;
 
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManager;
@@ -66,7 +67,8 @@ public class Row extends BlockStackingLayoutManager {
      * Create a new row layout manager.
      *
      */
-    public Row() {
+    public Row(FObj node) {
+        super(node);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 7b6189c6eab89ab9a305d2b822d75075d34dca77..fa464aea7881dc267896c67a39a7276efbdb9dda 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -20,6 +20,7 @@ package org.apache.fop.layoutmgr.table;
 
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.PercentBase;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.fo.properties.TableColLength;
 import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
@@ -75,7 +76,8 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
      * Create a new table layout manager.
      *
      */
-    public TableLayoutManager() {
+    public TableLayoutManager(FObj node) {
+        super(node);
     }
 
     /**