move fo/flow/ListItemLabel.getItemLayoutManager() to layoutmgr/AddLMVisitor.getListIt...

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

diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index 502b703925dbb7a55076e469601b5ac8b183dd22..100ad492630b0a7296b823f43a7ba11bf46d60ac 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -56,7 +56,6 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.layoutmgr.list.Item;
-import org.apache.fop.apps.*;
 
 /**
  * Class modelling the fo:list-item-label object. See Sec. 6.8.5 of the XSL-FO
@@ -71,16 +70,6 @@ public class ListItemLabel extends FObj {
         super(parent);
     }
 
-    /**
-     * @return this object's Item layout manager
-     */
-    public Item getItemLayoutManager() {
-        Item itemLabel = new Item();
-        itemLabel.setUserAgent(getUserAgent());
-        itemLabel.setFObj(this);
-        return itemLabel;
-    }
-
     private void setup() {
 
         // Common Accessibility Properties

diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index eb35aea800005ea3d642d586d51f3dfa30b1aa2d..d4a1c066abee890eb3d28495736c16728667f3a1 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -85,6 +85,7 @@ import org.apache.fop.fo.flow.BlockContainer;
 import org.apache.fop.fo.flow.Footnote;
 import org.apache.fop.fo.flow.ListBlock;
 import org.apache.fop.fo.flow.ListItemBody;
+import org.apache.fop.fo.flow.ListItemLabel;
 import org.apache.fop.fo.flow.InstreamForeignObject;
 import org.apache.fop.fo.flow.InlineContainer;
 import org.apache.fop.fo.flow.ListItem;
@@ -638,7 +639,7 @@ public class AddLMVisitor extends FOTreeVisitor {
              ListItemLayoutManager blm = new ListItemLayoutManager();
              blm.setUserAgent(node.getUserAgent());
              blm.setFObj(node);
-             blm.setLabel(node.getLabel().getItemLayoutManager());
+             blm.setLabel(getListItemLabelLayoutManager(node.getLabel()));
              blm.setBody(getListItemBodyLayoutManager(node.getBody()));
              currentLMList.add(blm);
          } else {
@@ -646,6 +647,16 @@ public class AddLMVisitor extends FOTreeVisitor {
          }
      }
 
+     /**
+      * @return this object's Item layout manager
+      */
+     public Item getListItemLabelLayoutManager(ListItemLabel node) {
+         Item itemLabel = new Item();
+         itemLabel.setUserAgent(node.getUserAgent());
+         itemLabel.setFObj(node);
+         return itemLabel;
+     }
+
      /**
       * @return Item layout manager
       */