From: William Victor Mote Date: Tue, 26 Aug 2003 14:35:42 +0000 (+0000) Subject: move fo/flow/ListItemLabel.getItemLayoutManager() to layoutmgr/AddLMVisitor.getListIt... X-Git-Tag: Root_Temp_KnuthStylePageBreaking~1163 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9b9f9ef9f0026d20a979d54d2ccfa96f1be0ba6;p=xmlgraphics-fop.git move fo/flow/ListItemLabel.getItemLayoutManager() to layoutmgr/AddLMVisitor.getListItemLabelLayoutManager() 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 502b70392..100ad4926 100644 --- 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 eb35aea80..d4a1c066a 100644 --- 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 */