aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorWilliam Victor Mote <vmote@apache.org>2003-08-25 18:10:30 +0000
committerWilliam Victor Mote <vmote@apache.org>2003-08-25 18:10:30 +0000
commit97d951521c5899e032631bcf86cf782c8bf96779 (patch)
treee4042fd23122bdf161f241adb6af6990b43ddf1f /src/java
parente2e87bec61fc0f36023221b099c469f8ba2251ed (diff)
downloadxmlgraphics-fop-97d951521c5899e032631bcf86cf782c8bf96779.tar.gz
xmlgraphics-fop-97d951521c5899e032631bcf86cf782c8bf96779.zip
move fo/flow/ListItemBody.getItemLayoutManager() to layoutmgr/AddLMVisitor.getListItemBodyLayoutManager()
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196838 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/fo/flow/ListItemBody.java12
-rw-r--r--src/java/org/apache/fop/layoutmgr/AddLMVisitor.java14
2 files changed, 13 insertions, 13 deletions
diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java
index 3a8113714..960f6a610 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemBody.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java
@@ -55,8 +55,6 @@ import org.apache.fop.fo.FONode;
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-body object. See Sec. 6.8.4 of the XSL-FO
@@ -71,16 +69,6 @@ public class ListItemBody extends FObj {
super(parent);
}
- /**
- * @return Item layout manager
- */
- public Item getItemLayoutManager() {
- Item item = new Item();
- item.setUserAgent(getUserAgent());
- item.setFObj(this);
- return item;
- }
-
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 4a3139df5..eb35aea80 100644
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -84,6 +84,7 @@ import org.apache.fop.fo.flow.ExternalGraphic;
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.InstreamForeignObject;
import org.apache.fop.fo.flow.InlineContainer;
import org.apache.fop.fo.flow.ListItem;
@@ -108,6 +109,7 @@ import org.apache.fop.layoutmgr.table.Cell;
import org.apache.fop.layoutmgr.table.Body;
import org.apache.fop.layoutmgr.table.Row;
import org.apache.fop.layoutmgr.table.TableLayoutManager;
+import org.apache.fop.layoutmgr.list.Item;
import org.apache.fop.layoutmgr.list.ListBlockLayoutManager;
import org.apache.fop.layoutmgr.list.ListItemLayoutManager;
import org.apache.fop.util.CharUtilities;
@@ -637,7 +639,7 @@ public class AddLMVisitor extends FOTreeVisitor {
blm.setUserAgent(node.getUserAgent());
blm.setFObj(node);
blm.setLabel(node.getLabel().getItemLayoutManager());
- blm.setBody(node.getBody().getItemLayoutManager());
+ blm.setBody(getListItemBodyLayoutManager(node.getBody()));
currentLMList.add(blm);
} else {
node.getLogger().error("list-item requires list-item-label and list-item-body");
@@ -645,6 +647,16 @@ public class AddLMVisitor extends FOTreeVisitor {
}
/**
+ * @return Item layout manager
+ */
+ public Item getListItemBodyLayoutManager(ListItemBody node) {
+ Item item = new Item();
+ item.setUserAgent(node.getUserAgent());
+ item.setFObj(node);
+ return item;
+ }
+
+ /**
* Overridden from FObj
* @param lms the list to which the layout manager(s) should be added
*/