vmote 2003/08/25 11:10:30
Modified: src/java/org/apache/fop/fo/flow ListItemBody.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/ListItemBody.getItemLayoutManager() to
layoutmgr/AddLMVisitor.getListItemBodyLayoutManager()
Revision Changes Path
1.7 +0 -12 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListItemBody.java 22 Aug 2003 17:42:41 -0000 1.6
+++ ListItemBody.java 25 Aug 2003 18:10:30 -0000 1.7
@@ -55,8 +55,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-body object. See Sec. 6.8.4 of the XSL-FO
@@ -69,16 +67,6 @@
*/
public ListItemBody(FONode parent) {
super(parent);
- }
-
- /**
- * @return Item layout manager
- */
- public Item getItemLayoutManager() {
- Item item = new Item();
- item.setUserAgent(getUserAgent());
- item.setFObj(this);
- return item;
}
private void setup() {
1.9 +14 -2 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddLMVisitor.java 25 Aug 2003 17:06:46 -0000 1.8
+++ AddLMVisitor.java 25 Aug 2003 18:10:30 -0000 1.9
@@ -84,6 +84,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.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.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,11 +639,21 @@
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");
}
+ }
+
+ /**
+ * @return Item layout manager
+ */
+ public Item getListItemBodyLayoutManager(ListItemBody node) {
+ Item item = new Item();
+ item.setUserAgent(node.getUserAgent());
+ item.setFObj(node);
+ return item;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
