Fourth phase of performance improvement.

- Get rid of calls to FObj.getProperty() and its friends. Replace them
  with the property getters on the FO nodes.

PR: 31699


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

2 files changed, 5 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index 06669a316..7c69b9d9d 100644
--- a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -145,7 +145,7 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager {
     public void addAreas(PositionIterator parentIter,
                          LayoutContext layoutContext) {
         getParentArea(null);
-        addID();
+        addID(fobj.getId());
 
         // the list block contains areas stacked from each list item
 
diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 3e600cad8..d2be85e41 100644
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -42,6 +42,8 @@ import java.util.List;
  * The list item contains a list item label and a list item body.
  */
 public class ListItemLayoutManager extends BlockStackingLayoutManager {
+    private ListItem fobj;
+    
     private Item label;
     private Item body;
 
@@ -64,6 +66,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
      */
     public ListItemLayoutManager(ListItem node) {
         super(node);
+        fobj = node;
         setLabel(node.getLabel());
         setBody(node.getBody());
     }
@@ -203,7 +206,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
     public void addAreas(PositionIterator parentIter,
                          LayoutContext layoutContext) {
         getParentArea(null);
-        addID();
+        addID(fobj.getId());
 
         Item childLM;
         LayoutContext lc = new LayoutContext(0);