gmazza 2004/05/15 14:52:00
Modified: src/java/org/apache/fop/fo/flow TableColumn.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
AddLMVisitor.java BlockContainerLayoutManager.java
BlockLayoutManager.java
BlockStackingLayoutManager.java
FlowLayoutManager.java ICLayoutManager.java
InlineStackingLayoutManager.java LayoutManager.java
LayoutManagerLS.java LeafNodeLayoutManager.java
LineLayoutManager.java PageLayoutManager.java
RetrieveMarkerLayoutManager.java
src/java/org/apache/fop/layoutmgr/list Item.java
ListBlockLayoutManager.java
ListItemLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Body.java Cell.java
Column.java Row.java TableLayoutManager.java
Log:
Moved FOUserAgent, FObj initialization from AddLMVisitor to constructors of
respective LayoutManagers.
Revision Changes Path
1.15 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TableColumn.java 27 Feb 2004 17:44:24 -0000 1.14
+++ TableColumn.java 15 May 2004 21:51:59 -0000 1.15
@@ -45,7 +45,7 @@
private int numColumnsRepeated;
private int iColumnNumber;
- private boolean setup = false;
+ private boolean initialized = false;
/**
* @param parent FONode that is the parent of this object
@@ -75,7 +75,7 @@
return numColumnsRepeated;
}
- public void doSetup() {
+ public void initialize() {
// Common Border, Padding, and Background Properties
// only background apply, border apply if border-collapse
@@ -101,7 +101,7 @@
// initialize id
setupID();
- setup = true;
+ initialized = true;
}
/**
@@ -121,7 +121,7 @@
*/
public void handleAttrs(Attributes attlist) throws FOPException {
super.handleAttrs(attlist);
- doSetup(); // init some basic property values
+ initialize(); // init some basic property values
getFOTreeControl().getFOInputHandler().startColumn(this);
}
1.12 +1 -0
xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractLayoutManager.java 12 May 2004 23:19:52 -0000 1.11
+++ AbstractLayoutManager.java 15 May 2004 21:51:59 -0000 1.12
@@ -67,6 +67,7 @@
*/
public AbstractLayoutManager(FObj fo) {
setFObj(fo);
+ setUserAgent(fo.getUserAgent());
}
/**
1.40 +24 -70 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- AddLMVisitor.java 25 Apr 2004 04:45:28 -0000 1.39
+++ AddLMVisitor.java 15 May 2004 21:51:59 -0000 1.40
@@ -187,9 +187,7 @@
public void serveFObjMixed(FObjMixed node) {
if (node.getChildren() != null) {
InlineStackingLayoutManager lm;
- lm = new InlineStackingLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ lm = new InlineStackingLayoutManager(node);
lm.setLMiter(new LMiter(lm, node.getChildren()));
currentLMList.add(lm);
}
@@ -238,9 +236,7 @@
currentLMList = childList;
serveFObj((FObj)node);
currentLMList = saveLMList;
- LayoutManager lm = new ICLayoutManager(childList);
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ LayoutManager lm = new ICLayoutManager(node, childList);
currentLMList.add(lm);
}
@@ -250,15 +246,13 @@
public void serveBasicLink(final BasicLink node) {
node.setup();
InlineStackingLayoutManager lm;
- lm = new InlineStackingLayoutManager() {
+ lm = new InlineStackingLayoutManager(node) {
protected InlineParent createArea() {
InlineParent area = super.createArea();
setupBasicLinkArea(node, parentLM, area);
return area;
}
};
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
lm.setLMiter(new LMiter(lm, node.getChildren()));
currentLMList.add(lm);
}
@@ -287,7 +281,7 @@
}
public void serveLeader(final Leader node) {
- LeafNodeLayoutManager lm = new LeafNodeLayoutManager() {
+ LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node) {
public InlineArea get(LayoutContext context) {
return getLeaderInlineArea(node, this);
}
@@ -302,8 +296,6 @@
}
}*/
};
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
lm.setAlignment(node.propertyList.get(Constants.PR_LEADER_ALIGNMENT).getEnum());
currentLMList.add(lm);
}
@@ -360,9 +352,7 @@
return null;
}
InlineStackingLayoutManager lm;
- lm = new InlineStackingLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ lm = new InlineStackingLayoutManager(node);
lm.setLMiter(new LMiter(lm, node.getChildren()));
lm.initialize();
@@ -393,20 +383,14 @@
public void serveRetrieveMarker(RetrieveMarker node) {
RetrieveMarkerLayoutManager rmlm;
- rmlm = new RetrieveMarkerLayoutManager(node.getRetrieveClassName(),
- node.getRetrievePosition(),
- node.getRetrieveBoundary());
- rmlm.setUserAgent(node.getUserAgent());
- rmlm.setFObj(node);
+ rmlm = new RetrieveMarkerLayoutManager(node);
currentLMList.add(rmlm);
}
public void serveCharacter(Character node) {
InlineArea inline = getCharacterInlineArea(node);
if (inline != null) {
- LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
lm.setCurrentArea(inline);
currentLMList.add(lm);
}
@@ -431,9 +415,7 @@
InlineArea area = getExternalGraphicInlineArea(node);
if (area != null) {
node.setupID();
- LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
lm.setCurrentArea(area);
lm.setAlignment(node.propertyList.get(Constants.PR_VERTICAL_ALIGN).getEnum());
lm.setLead(node.getViewHeight());
@@ -470,26 +452,20 @@
}
public void serveBlockContainer(BlockContainer node) {
- BlockContainerLayoutManager blm = new BlockContainerLayoutManager();
- blm.setUserAgent(node.getUserAgent());
- blm.setFObj(node);
+ BlockContainerLayoutManager blm = new BlockContainerLayoutManager(node);
blm.setOverflow(node.propertyList.get(Constants.PR_OVERFLOW).getEnum());
currentLMList.add(blm);
}
public void serveListBlock(ListBlock node) {
- ListBlockLayoutManager blm = new ListBlockLayoutManager();
- blm.setUserAgent(node.getUserAgent());
- blm.setFObj(node);
+ ListBlockLayoutManager blm = new ListBlockLayoutManager(node);
currentLMList.add(blm);
}
public void serveInstreamForeignObject(InstreamForeignObject node) {
Viewport areaCurrent = getInstreamForeignObjectInlineArea(node);
if (areaCurrent != null) {
- LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ LeafNodeLayoutManager lm = new LeafNodeLayoutManager(node);
lm.setCurrentArea(areaCurrent);
lm.setAlignment(node.propertyList.get(Constants.PR_VERTICAL_ALIGN).getEnum());
lm.setLead(areaCurrent.getHeight());
@@ -649,9 +625,7 @@
public void serveListItem(ListItem node) {
if (node.getLabel() != null && node.getBody() != null) {
- ListItemLayoutManager blm = new ListItemLayoutManager();
- blm.setUserAgent(node.getUserAgent());
- blm.setFObj(node);
+ ListItemLayoutManager blm = new ListItemLayoutManager(node);
blm.setLabel(getListItemLabelLayoutManager(node.getLabel()));
blm.setBody(getListItemBodyLayoutManager(node.getBody()));
currentLMList.add(blm);
@@ -664,9 +638,7 @@
* @return this object's Item layout manager
*/
public Item getListItemLabelLayoutManager(ListItemLabel node) {
- Item itemLabel = new Item();
- itemLabel.setUserAgent(node.getUserAgent());
- itemLabel.setFObj(node);
+ Item itemLabel = new Item(node);
return itemLabel;
}
@@ -674,9 +646,7 @@
* @return Item layout manager
*/
public Item getListItemBodyLayoutManager(ListItemBody node) {
- Item item = new Item();
- item.setUserAgent(node.getUserAgent());
- item.setFObj(node);
+ Item item = new Item(node);
return item;
}
@@ -687,7 +657,7 @@
public void servePageNumber(final PageNumber node) {
node.setup();
LayoutManager lm;
- lm = new LeafNodeLayoutManager() {
+ lm = new LeafNodeLayoutManager(node) {
public InlineArea get(LayoutContext context) {
// get page string from parent, build area
TextArea inline = new TextArea();
@@ -715,15 +685,13 @@
curArea.setOffset(context.getBaseline());
}
};
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
currentLMList.add(lm);
}
public void servePageNumberCitation(final PageNumberCitation node) {
node.setup();
LayoutManager lm;
- lm = new LeafNodeLayoutManager() {
+ lm = new LeafNodeLayoutManager(node) {
public InlineArea get(LayoutContext context) {
curArea = getPageNumberCitationInlineArea(node, parentLM);
return curArea;
@@ -742,8 +710,6 @@
curArea.setOffset(context.getBaseline());
}
};
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
currentLMList.add(lm);
}
@@ -791,9 +757,7 @@
}
public void serveTable(Table node) {
- TableLayoutManager tlm = new TableLayoutManager();
- tlm.setUserAgent(node.getUserAgent());
- tlm.setFObj(node);
+ TableLayoutManager tlm = new TableLayoutManager(node);
ArrayList columns = node.getColumns();
if (columns != null) {
ArrayList columnLMs = new ArrayList();
@@ -813,10 +777,8 @@
}
public LayoutManager getTableColumnLayoutManager(TableColumn node) {
- node.doSetup();
- Column clm = new Column();
- clm.setUserAgent(node.getUserAgent());
- clm.setFObj(node);
+ node.initialize();
+ Column clm = new Column(node);
return clm;
}
@@ -825,30 +787,22 @@
}
public Body getTableBodyLayoutManager(TableBody node) {
- Body blm = new Body();
- blm.setUserAgent(node.getUserAgent());
- blm.setFObj(node);
+ Body blm = new Body(node);
return blm;
}
public void serveTableCell(TableCell node) {
- Cell clm = new Cell();
- clm.setUserAgent(node.getUserAgent());
- clm.setFObj(node);
+ Cell clm = new Cell(node);
currentLMList.add(clm);
}
public void serveTableRow(TableRow node) {
- Row rlm = new Row();
- rlm.setUserAgent(node.getUserAgent());
- rlm.setFObj(node);
+ Row rlm = new Row(node);
currentLMList.add(rlm);
}
public void serveFlow(Flow node) {
- FlowLayoutManager lm = new FlowLayoutManager();
- lm.setUserAgent(node.getUserAgent());
- lm.setFObj(node);
+ FlowLayoutManager lm = new FlowLayoutManager(node);
currentLMList.add(lm);
}
1.18 +8 -0
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BlockContainerLayoutManager.java 12 May 2004 23:19:52 -0000 1.17
+++ BlockContainerLayoutManager.java 15 May 2004 21:51:59 -0000 1.18
@@ -24,6 +24,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.Block;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -63,6 +64,13 @@
* Create a new block container layout manager.
*/
public BlockContainerLayoutManager() {
+ }
+
+ /**
+ * Create a new block container layout manager.
+ */
+ public BlockContainerLayoutManager(FObj node) {
+ super(node);
}
public void setOverflow(int of) {
1.17 +1 -3
xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockLayoutManager.java 25 Apr 2004 04:45:28 -0000 1.16
+++ BlockLayoutManager.java 15 May 2004 21:51:59 -0000 1.17
@@ -131,10 +131,8 @@
}
}
LineLayoutManager child;
- child = new LineLayoutManager(lineHeight,
+ child = new LineLayoutManager(fobj, lineHeight,
lead, follow);
- child.setUserAgent(getUserAgent());
- child.setFObj(fobj);
child.setLMiter(inlines.listIterator());
return child;
1.7 +5 -0
xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BlockStackingLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.6
+++ BlockStackingLayoutManager.java 15 May 2004 21:51:59 -0000 1.7
@@ -21,6 +21,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockParent;
import org.apache.fop.area.Block;
+import org.apache.fop.fo.FObj;
import org.apache.fop.traits.MinOptMax;
/**
@@ -36,6 +37,10 @@
protected BlockParent parentArea = null;
public BlockStackingLayoutManager() {
+ }
+
+ public BlockStackingLayoutManager(FObj node) {
+ super(node);
}
private BreakCost evaluateBreakCost(Area parent, Area child) {
1.7 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FlowLayoutManager.java 12 May 2004 23:19:52 -0000 1.6
+++ FlowLayoutManager.java 15 May 2004 21:51:59 -0000 1.7
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockParent;
@@ -46,7 +47,8 @@
* This is the top level layout manager.
* It is created by the PageSequence FO.
*/
- public FlowLayoutManager() {
+ public FlowLayoutManager(FObj node) {
+ super(node);
}
/**
1.3 +4 -2 xml-fop/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
Index: ICLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.2
+++ ICLayoutManager.java 15 May 2004 21:52:00 -0000 1.3
@@ -23,6 +23,7 @@
// FOP
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.fo.FObj;
/**
* This creates a single inline container area after
@@ -33,7 +34,8 @@
private List childrenLM;
- ICLayoutManager(List childLM) {
+ ICLayoutManager(FObj node, List childLM) {
+ super(node);
childrenLM = childLM;
}
1.8 +11 -3
xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InlineStackingLayoutManager.java 12 May 2004 23:19:52 -0000 1.7
+++ InlineStackingLayoutManager.java 15 May 2004 21:52:00 -0000 1.8
@@ -87,11 +87,19 @@
* Create an inline stacking layout manager.
* This is used for fo's that create areas that
* contain inline areas.
- *
- * @param fobj the formatting object that creates the area
- * @param childLMiter the iterator for child areas
*/
public InlineStackingLayoutManager() {
+ }
+
+ /**
+ * Create an inline stacking layout manager.
+ * This is used for fo's that create areas that
+ * contain inline areas.
+ *
+ * @param node the formatting object that creates the area
+ */
+ public InlineStackingLayoutManager(FObj node) {
+ super(node);
}
/**
1.5 +1 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LayoutManager.java 21 Mar 2004 12:03:08 -0000 1.4
+++ LayoutManager.java 15 May 2004 21:52:00 -0000 1.5
@@ -43,8 +43,7 @@
void setFObj(FObj obj);
/**
- * Set the user agent. For resolving user agent values
- * and getting logger.
+ * Set the user agent. For resolving user agent values.
*
* @param ua the user agent
*/
1.23 +2 -6 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- LayoutManagerLS.java 24 Apr 2004 07:03:56 -0000 1.22
+++ LayoutManagerLS.java 15 May 2004 21:52:00 -0000 1.23
@@ -71,8 +71,6 @@
// This will layout pages and add them to the area tree
PageLayoutManager pageLM = new PageLayoutManager(areaTree, pageSeq, this);
- pageLM.setUserAgent(pageSeq.getUserAgent());
- pageLM.setFObj(pageSeq);
pageLM.setPageCounting(pageSeq.getCurrentPageNumber(),
pageSeq.getPageNumberGenerator());
@@ -102,9 +100,7 @@
// use special layout manager to add the inline areas
// to the Title.
InlineStackingLayoutManager lm;
- lm = new InlineStackingLayoutManager();
- lm.setUserAgent(foTitle.getUserAgent());
- lm.setFObj(foTitle);
+ lm = new InlineStackingLayoutManager(foTitle);
lm.setLMiter(new LMiter(lm, foTitle.children.listIterator()));
lm.initialize();
1.6 +9 -0
xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LeafNodeLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.5
+++ LeafNodeLayoutManager.java 15 May 2004 21:52:00 -0000 1.6
@@ -20,6 +20,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.fo.FObj;
import org.apache.fop.traits.MinOptMax;
/**
@@ -37,6 +38,14 @@
private int alignment;
private int lead;
private MinOptMax ipd;
+
+ /**
+ * Create a Leaf node layout mananger.
+ * @param node the FObj to attach to this LM.
+ */
+ public LeafNodeLayoutManager(FObj node) {
+ super(node);
+ }
/**
* Create a Leaf node layout mananger.
1.20 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LineLayoutManager.java 12 May 2004 23:19:52 -0000 1.19
+++ LineLayoutManager.java 15 May 2004 21:52:00 -0000 1.20
@@ -19,6 +19,7 @@
package org.apache.fop.layoutmgr;
import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.CommonHyphenation;
@@ -98,7 +99,8 @@
* @param l the default lead, from top to baseline
* @param f the default follow, from baseline to bottom
*/
- public LineLayoutManager(int lh, int l, int f) {
+ public LineLayoutManager(FObj node, int lh, int l, int f) {
+ super(node);
lineHeight = lh;
lead = l;
follow = f;
1.36 +1 -0 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PageLayoutManager.java 12 May 2004 23:19:52 -0000 1.35
+++ PageLayoutManager.java 15 May 2004 21:52:00 -0000 1.36
@@ -132,6 +132,7 @@
*/
public PageLayoutManager(AreaTree areaTree, PageSequence pageseq,
LayoutManagerLS lmls) {
+ super(pageseq);
this.areaTree = areaTree;
pageSequence = pageseq;
this.lmls = lmls;
1.8 +7 -4
xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
Index: RetrieveMarkerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RetrieveMarkerLayoutManager.java 12 May 2004 23:19:52 -0000 1.7
+++ RetrieveMarkerLayoutManager.java 15 May 2004 21:52:00 -0000 1.8
@@ -22,7 +22,9 @@
import java.util.List;
import org.apache.fop.area.Area;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.flow.RetrieveMarker;
/**
* LayoutManager for a block FO.
@@ -38,10 +40,11 @@
/**
* Create a new block container layout manager.
*/
- public RetrieveMarkerLayoutManager(String n, int pos, int bound) {
- name = n;
- position = pos;
- boundary = bound;
+ public RetrieveMarkerLayoutManager(RetrieveMarker node) {
+ super(node);
+ name = node.getRetrieveClassName();
+ position = node.getRetrievePosition();
+ boundary = node.getRetrieveBoundary();
}
public boolean generatesInlineAreas() {
1.6 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Item.java 21 Mar 2004 12:03:08 -0000 1.5
+++ Item.java 15 May 2004 21:52:00 -0000 1.6
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.list;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
@@ -56,7 +57,8 @@
/**
* Create a new Cell layout manager.
*/
- public Item() {
+ public Item(FObj node) {
+ super(node);
}
/**
1.6 +3 -1
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListBlockLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.5
+++ ListBlockLayoutManager.java 15 May 2004 21:52:00 -0000 1.6
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.list;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
@@ -62,7 +63,8 @@
* Create a new table layout manager.
*
*/
- public ListBlockLayoutManager() {
+ public ListBlockLayoutManager(FObj node) {
+ super(node);
}
/**
1.9 +3 -1
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ListItemLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.8
+++ ListItemLayoutManager.java 15 May 2004 21:52:00 -0000 1.9
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.list;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
@@ -64,7 +65,8 @@
* Create a new list item layout manager.
*
*/
- public ListItemLayoutManager() {
+ public ListItemLayoutManager(FObj node) {
+ super(node);
}
/**
1.8 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Body.java 12 May 2004 23:19:52 -0000 1.7
+++ Body.java 15 May 2004 21:52:00 -0000 1.8
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.table;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
@@ -59,7 +60,8 @@
/**
* Create a new body layout manager.
*/
- public Body() {
+ public Body(FObj node) {
+ super(node);
}
/**
1.8 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Cell.java 12 May 2004 23:19:52 -0000 1.7
+++ Cell.java 15 May 2004 21:52:00 -0000 1.8
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.table;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
@@ -58,7 +59,8 @@
/**
* Create a new Cell layout manager.
*/
- public Cell() {
+ public Cell(FObj node) {
+ super(node);
}
/**
1.5 +2 -8 xml-fop/src/java/org/apache/fop/layoutmgr/table/Column.java
Index: Column.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Column.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Column.java 27 Feb 2004 17:48:35 -0000 1.4
+++ Column.java 15 May 2004 21:52:00 -0000 1.5
@@ -45,14 +45,8 @@
/**
* Create a new column layout manager.
*/
- public Column() {
- }
-
- /**
- * @see org.apache.fop.layoutmgr.LayoutManager#setFObj(FObj)
- */
- public void setFObj(FObj fobj) {
- super.setFObj(fobj);
+ public Column(FObj node) {
+ super(node);
}
/**
1.11 +3 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Row.java 21 Mar 2004 12:03:08 -0000 1.10
+++ Row.java 15 May 2004 21:52:00 -0000 1.11
@@ -18,6 +18,7 @@
package org.apache.fop.layoutmgr.table;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
@@ -66,7 +67,8 @@
* Create a new row layout manager.
*
*/
- public Row() {
+ public Row(FObj node) {
+ super(node);
}
/**
1.10 +3 -1
xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TableLayoutManager.java 13 May 2004 10:32:48 -0000 1.9
+++ TableLayoutManager.java 15 May 2004 21:52:00 -0000 1.10
@@ -20,6 +20,7 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentBase;
+import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.fo.properties.TableColLength;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
@@ -75,7 +76,8 @@
* Create a new table layout manager.
*
*/
- public TableLayoutManager() {
+ public TableLayoutManager(FObj node) {
+ super(node);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
