You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2003/03/04 04:48:09 UTC
cvs commit: xml-fop/src/org/apache/fop/layoutmgr/table Body.java Caption.java Cell.java Row.java TableAndCaptionLayoutManager.java TableLayoutManager.java
keiron 2003/03/03 19:48:09
Modified: src/org/apache/fop/layoutmgr AbstractLayoutManager.java
BlockContainerLayoutManager.java
BlockLayoutManager.java
BlockStackingLayoutManager.java BreakPoss.java
BreakPossPosIter.java ContentLayoutManager.java
FlowLayoutManager.java
InlineStackingLayoutManager.java LayoutManager.java
LeafPosition.java LineLayoutManager.java
NonLeafPosition.java PageLayoutManager.java
Position.java PositionIterator.java
RetrieveMarkerLayoutManager.java
StaticContentLayoutManager.java
src/org/apache/fop/layoutmgr/list Item.java
ListBlockLayoutManager.java
ListItemLayoutManager.java
src/org/apache/fop/layoutmgr/table Body.java Caption.java
Cell.java Row.java
TableAndCaptionLayoutManager.java
TableLayoutManager.java
Added: src/org/apache/fop/layoutmgr LayoutProcessor.java
Log:
split LayoutManager interface so that the new LayoutProcessor
interface is the local interface used by the implementation
to do the layout
Revision Changes Path
1.23 +9 -9 xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AbstractLayoutManager.java 27 Feb 2003 23:30:48 -0000 1.22
+++ AbstractLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.23
@@ -23,16 +23,16 @@
/**
* The base class for all LayoutManagers.
*/
-public abstract class AbstractLayoutManager implements LayoutManager {
+public abstract class AbstractLayoutManager implements LayoutProcessor {
protected FOUserAgent userAgent;
- protected LayoutManager parentLM = null;
+ protected LayoutProcessor parentLM = null;
protected FObj fobj;
protected String foID = null;
protected Map markers = null;
/** True if this LayoutManager has handled all of its content. */
private boolean bFinished = false;
- protected LayoutManager curChildLM = null;
+ protected LayoutProcessor curChildLM = null;
protected ListIterator childLMiter;
protected boolean bInited = false;
@@ -76,7 +76,7 @@
return userAgent.getLogger();
}
- public void setParentLM(LayoutManager lm) {
+ public void setParent(LayoutProcessor lm) {
this.parentLM = lm;
}
@@ -128,14 +128,14 @@
* Note: child must implement LayoutManager! If it doesn't, skip it
* and print a warning.
*/
- protected LayoutManager getChildLM() {
+ protected LayoutProcessor getChildLM() {
if (curChildLM != null && !curChildLM.isFinished()) {
return curChildLM;
}
while (childLMiter.hasNext()) {
- curChildLM = (LayoutManager) childLMiter.next();
+ curChildLM = (LayoutProcessor) childLMiter.next();
curChildLM.setUserAgent(getUserAgent());
- curChildLM.setParentLM(this);
+ curChildLM.setParent(this);
curChildLM.init();
return curChildLM;
}
@@ -172,7 +172,7 @@
}
while (curChildLM != lm && childLMiter.hasPrevious()) {
curChildLM.resetPosition(null);
- curChildLM = (LayoutManager) childLMiter.previous();
+ curChildLM = (LayoutProcessor) childLMiter.previous();
}
// Otherwise next returns same object
childLMiter.next();
1.12 +4 -4 xml-fop/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BlockContainerLayoutManager.java 27 Feb 2003 23:30:49 -0000 1.11
+++ BlockContainerLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.12
@@ -98,7 +98,7 @@
stackLimit = context.getStackLimit();
}
- LayoutManager curLM ; // currently active LM
+ LayoutProcessor curLM ; // currently active LM
MinOptMax stackSize = new MinOptMax();
// if starting add space before
@@ -156,7 +156,7 @@
public BreakPoss getAbsoluteBreakPoss(LayoutContext context) {
- LayoutManager curLM ; // currently active LM
+ LayoutProcessor curLM ; // currently active LM
MinOptMax stackSize = new MinOptMax();
@@ -204,7 +204,7 @@
addID();
addMarkers(true, true);
- LayoutManager childLM ;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.31 +9 -9 xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- BlockLayoutManager.java 27 Feb 2003 23:30:49 -0000 1.30
+++ BlockLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.31
@@ -57,8 +57,8 @@
protected boolean preLoadNext() {
while (proxy.hasNext()) {
- LayoutManager lm = (LayoutManager) proxy.next();
- lm.setParentLM(BlockLayoutManager.this);
+ LayoutProcessor lm = (LayoutProcessor) proxy.next();
+ lm.setParent(BlockLayoutManager.this);
if(lm.generatesInlineAreas()) {
LineLayoutManager lineLM = createLineManager(lm);
listLMs.add(lineLM);
@@ -74,12 +74,12 @@
protected LineLayoutManager createLineManager(
LayoutManager firstlm) {
- LayoutManager lm;
+ LayoutProcessor lm;
List inlines = new ArrayList();
inlines.add(firstlm);
while (proxy.hasNext()) {
- lm = (LayoutManager) proxy.next();
- lm.setParentLM(BlockLayoutManager.this);
+ lm = (LayoutProcessor) proxy.next();
+ lm.setParent(BlockLayoutManager.this);
if (lm.generatesInlineAreas()) {
inlines.add(lm);
} else {
@@ -128,7 +128,7 @@
}
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
int ipd = context.getRefIPD();
@@ -162,7 +162,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -222,7 +222,7 @@
addID();
addMarkers(true, true);
- LayoutManager childLM ;
+ LayoutProcessor childLM;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
LeafPosition lfp = (LeafPosition) parentIter.next();
1.17 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockStackingLayoutManager.java 19 Feb 2003 05:49:28 -0000 1.16
+++ BlockStackingLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.17
@@ -20,7 +20,7 @@
* Reference to FO whose areas it's managing or to the traits
* of the FO.
*/
- protected LayoutManager curChildLM = null;
+ protected LayoutProcessor curChildLM = null;
protected BlockParent parentArea = null;
public BlockStackingLayoutManager() {
1.12 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/BreakPoss.java
Index: BreakPoss.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BreakPoss.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BreakPoss.java 13 Feb 2003 04:24:17 -0000 1.11
+++ BreakPoss.java 4 Mar 2003 03:48:08 -0000 1.12
@@ -86,7 +86,7 @@
/**
* The top-level layout manager responsible for this break
*/
- public LayoutManager getLayoutManager() {
+ public LayoutProcessor getLayoutManager() {
return m_position.getLM();
}
1.9 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/BreakPossPosIter.java
Index: BreakPossPosIter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BreakPossPosIter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BreakPossPosIter.java 19 Feb 2003 05:49:28 -0000 1.8
+++ BreakPossPosIter.java 4 Mar 2003 03:48:08 -0000 1.9
@@ -38,7 +38,7 @@
return (BreakPoss) peekNext();
}
- protected LayoutManager getLM(Object nextObj) {
+ protected LayoutProcessor getLM(Object nextObj) {
return ((BreakPoss) nextObj).getLayoutManager();
}
1.16 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContentLayoutManager.java 27 Feb 2003 23:30:51 -0000 1.15
+++ ContentLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.16
@@ -24,11 +24,11 @@
* For use with objects that contain inline areas such as
* leader use-content and title.
*/
-public class ContentLayoutManager implements LayoutManager {
+public class ContentLayoutManager implements LayoutProcessor {
private FOUserAgent userAgent;
private Area holder;
private int stackSize;
- private LayoutManager parentLM;
+ private LayoutProcessor parentLM;
/**
* Constructs a new ContentLayoutManager
@@ -47,7 +47,7 @@
public void setFObj(FObj fo) {
}
- public void fillArea(LayoutManager curLM) {
+ public void fillArea(LayoutProcessor curLM) {
List childBreaks = new ArrayList();
MinOptMax stack = new MinOptMax();
@@ -152,7 +152,7 @@
}
/** @see org.apache.fop.layoutmgr.LayoutManager */
- public void setParentLM(LayoutManager lm) {
+ public void setParent(LayoutProcessor lm) {
parentLM = lm;
}
1.20 +3 -3 xml-fop/src/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FlowLayoutManager.java 19 Feb 2003 05:49:28 -0000 1.19
+++ FlowLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.20
@@ -39,7 +39,7 @@
public BreakPoss getNextBreakPoss(LayoutContext context) {
// currently active LM
- LayoutManager curLM;
+ LayoutProcessor curLM;
MinOptMax stackSize = new MinOptMax();
while ((curLM = getChildLM()) != null) {
@@ -93,7 +93,7 @@
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
- LayoutManager childLM;
+ LayoutProcessor childLM;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
LeafPosition lfp = (LeafPosition) parentIter.next();
1.12 +6 -6 xml-fop/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InlineStackingLayoutManager.java 19 Feb 2003 05:49:28 -0000 1.11
+++ InlineStackingLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.12
@@ -34,7 +34,7 @@
super(parentIter);
}
- protected LayoutManager getLM(Object nextObj) {
+ protected LayoutProcessor getLM(Object nextObj) {
return ((Position) nextObj).getPosition().getLM();
}
@@ -202,7 +202,7 @@
hasLeadingFence(false)) {
return true;
}
- LayoutManager lm = getChildLM();
+ LayoutProcessor lm = getChildLM();
if (lm != null) {
return lm.canBreakBefore(context);
} else {
@@ -232,7 +232,7 @@
public BreakPoss getNextBreakPoss(LayoutContext lc) {
// Get a break from currently active child LM
BreakPoss bp = null;
- LayoutManager curLM ;
+ LayoutProcessor curLM;
SpaceSpecifier leadingSpace = lc.getLeadingSpace();
if (lc.startsNewArea()) {
@@ -470,8 +470,8 @@
// posIter iterates over positions returned by this LM
StackingIter childPosIter = new StackingIter(parentIter);
- LayoutManager prevLM = null;
- LayoutManager childLM ;
+ LayoutProcessor prevLM = null;
+ LayoutProcessor childLM ;
while ((childLM = childPosIter.getNextChildLM()) != null) {
//getContext().setTrailingSpace(new SpaceSpecifier(false));
childLM.addAreas(childPosIter, getContext());
1.17 +1 -171 xml-fop/src/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LayoutManager.java 27 Feb 2003 23:30:48 -0000 1.16
+++ LayoutManager.java 4 Mar 2003 03:48:08 -0000 1.17
@@ -10,14 +10,6 @@
import org.apache.fop.fo.FOUserAgent;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.flow.Marker;
-
-import org.apache.fop.area.Area;
-import org.apache.fop.area.Resolveable;
-import org.apache.fop.area.PageViewport;
-
-import java.util.Map;
-
/**
* The interface for all LayoutManagers.
*/
@@ -47,166 +39,4 @@
*/
public FOUserAgent getUserAgent();
- /**
- * Set the parent layout manager.
- * The parent layout manager is required for adding areas.
- *
- * @param lm the parent layout manager
- */
- public void setParentLM(LayoutManager lm);
-
- /**
- * Initialise this layout manager.
- */
- public void init();
-
- /**
- * Generates inline areas.
- * This is used to check if the layout manager generates inline
- * areas.
- *
- * @return true if the layout manager generates inline areas
- */
- public boolean generatesInlineAreas();
-
- /**
- * Return true if the next area which would be generated by this
- * LayoutManager could start a new line (or flow for block-level FO).
- *
- * @param lc the layout context
- * @return true if can break before
- */
- public boolean canBreakBefore(LayoutContext lc);
-
- /**
- * Generate and return the next break possibility.
- *
- * @param context The layout context contains information about pending
- * space specifiers from ancestor areas or previous areas, reference
- * area inline-progression-dimension and various other layout-related
- * information.
- * @return the next break position
- */
- public BreakPoss getNextBreakPoss(LayoutContext context);
-
- /**
- * Reset to the position.
- *
- * @param position
- */
- public void resetPosition(Position position);
-
- /**
- * Get the word chars between two positions and
- * append to the string buffer. The positions could
- * span multiple layout managers.
- *
- * @param sbChars the string buffer to append the word chars
- * @param bp1 the start position
- * @param bp2 the end position
- */
- public void getWordChars(StringBuffer sbChars, Position bp1,
- Position bp2);
-
- /**
- * Return a value indicating whether this LayoutManager has laid out
- * all its content (or generated BreakPossibilities for all content.)
- *
- * @return true if this layout manager is finished
- */
- public boolean isFinished();
-
- /**
- * Set a flag indicating whether the LayoutManager has laid out all
- * its content. This is generally called by the LM itself, but can
- * be called by a parentLM when backtracking.
- *
- * @param isFinished the value to set the finished flag to
- */
- public void setFinished(boolean isFinished);
-
- /**
- * Get the parent area for an area.
- * This should get the parent depending on the class of the
- * area passed in.
- *
- * @param childArea the child area to get the parent for
- * @return the parent Area
- */
- public Area getParentArea(Area childArea);
-
- /**
- * Add the area as a child of the current area.
- * This is called by child layout managers to add their
- * areas as children of the current area.
- *
- * @param childArea the child area to add
- */
- public void addChild(Area childArea);
-
- /**
- * Tell the layout manager to add all the child areas implied
- * by Position objects which will be returned by the
- * Iterator.
- *
- * @param posIter the position iterator
- * @param context the context
- */
- public void addAreas(PositionIterator posIter, LayoutContext context);
-
- /**
- * Get the string of the current page number.
- *
- * @return the string for the current page number
- */
- public String getCurrentPageNumber();
-
- /**
- * Resolve the id reference.
- * This is called by an area looking for an id reference.
- * If the id reference is not found then it should add a resolveable object.
- *
- * @param ref the id reference
- * @return the page containing the id reference or null if not found
- */
- public PageViewport resolveRefID(String ref);
-
- /**
- * Add an id to the page.
- * @todo add the location of the area on the page
- *
- * @param id the id reference to add.
- */
- public void addIDToPage(String id);
-
- /**
- * Add an unresolved area.
- * The is used to add a resolveable object to the page for a given id.
- *
- * @param id the id reference this object needs for resolving
- * @param res the resolveable object
- */
- public void addUnresolvedArea(String id, Resolveable res);
-
- /**
- * Add the marker.
- * A number of formatting objects may contain markers. This
- * method is used to add those markers to the page.
- *
- * @param name the marker class name
- * @param start true if the formatting object is starting false is finishing
- * @param isfirst a flag for is first
- */
- public void addMarkerMap(Map marks, boolean start, boolean isfirst);
-
- /**
- * Retrieve a marker.
- * This method is used when retrieve a marker.
- *
- * @param name the class name of the marker
- * @param pos the retrieve position
- * @param boundary the boundary for retrieving the marker
- * @return the layout manaager of the retrieved marker if any
- */
- public Marker retrieveMarker(String name, int pos, int boundary);
}
1.5 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/LeafPosition.java
Index: LeafPosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LeafPosition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LeafPosition.java 13 Nov 2002 10:25:48 -0000 1.4
+++ LeafPosition.java 4 Mar 2003 03:48:08 -0000 1.5
@@ -11,7 +11,7 @@
private int iLeafPos;
- public LeafPosition(LayoutManager lm, int pos) {
+ public LeafPosition(LayoutProcessor lm, int pos) {
super(lm);
iLeafPos = pos;
}
1.23 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- LineLayoutManager.java 19 Feb 2003 05:49:28 -0000 1.22
+++ LineLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.23
@@ -48,7 +48,7 @@
int lineHeight;
int baseline;
- LineBreakPosition(LayoutManager lm, int iBreakIndex,
+ LineBreakPosition(LayoutProcessor lm, int iBreakIndex,
double ipdA, double adjust, int ind, int lh, int bl) {
super(lm, iBreakIndex);
// iPos = iBreakIndex;
@@ -119,7 +119,7 @@
// Get a break from currently active child LM
// Set up constraints for inline level managers
- LayoutManager curLM ; // currently active LM
+ LayoutProcessor curLM ; // currently active LM
BreakPoss prev = null;
BreakPoss bp = null; // proposed BreakPoss
@@ -309,7 +309,7 @@
// See if could break before next area
// TODO: do we need to set anything on the layout context?
LayoutContext lc = new LayoutContext(0);
- LayoutManager nextLM = getChildLM();
+ LayoutProcessor nextLM = getChildLM();
return (nextLM == null || nextLM.canBreakBefore(lc));
}
}
@@ -573,7 +573,7 @@
* @param dSpaceAdjust the space adjustment
*/
public void addAreas(PositionIterator parentIter, double dSpaceAdjust) {
- LayoutManager childLM;
+ LayoutProcessor childLM;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
LineBreakPosition lbp = (LineBreakPosition) parentIter.next();
1.5 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/NonLeafPosition.java
Index: NonLeafPosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/NonLeafPosition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NonLeafPosition.java 13 Nov 2002 10:25:48 -0000 1.4
+++ NonLeafPosition.java 4 Mar 2003 03:48:08 -0000 1.5
@@ -11,7 +11,7 @@
private Position subPos;
- public NonLeafPosition(LayoutManager lm, Position sub) {
+ public NonLeafPosition(LayoutProcessor lm, Position sub) {
super(lm);
subPos = sub;
}
1.32 +4 -4 xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageLayoutManager.java 27 Feb 2003 23:30:50 -0000 1.31
+++ PageLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.32
@@ -43,7 +43,7 @@
private static class BlockBreakPosition extends LeafPosition {
protected BreakPoss breakps;
- protected BlockBreakPosition(LayoutManager lm, BreakPoss bp) {
+ protected BlockBreakPosition(LayoutProcessor lm, BreakPoss bp) {
super(lm, 0);
breakps = bp;
}
@@ -170,7 +170,7 @@
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM ; // currently active LM
+ LayoutProcessor curLM ; // currently active LM
while ((curLM = getChildLM()) != null) {
BreakPoss bp = null;
@@ -415,7 +415,7 @@
lm.setUserAgent(getUserAgent());
lm.init();
lm.setRegionReference(reg.getRegion());
- lm.setParentLM(this);
+ lm.setParent(this);
LayoutContext childLC = new LayoutContext(0);
childLC.setStackLimit(new MinOptMax((int)curPage.getViewArea().getHeight()));
childLC.setRefIPD((int)reg.getViewArea().getWidth());
1.5 +4 -4 xml-fop/src/org/apache/fop/layoutmgr/Position.java
Index: Position.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/Position.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Position.java 13 Nov 2002 10:25:48 -0000 1.4
+++ Position.java 4 Mar 2003 03:48:08 -0000 1.5
@@ -8,13 +8,13 @@
package org.apache.fop.layoutmgr;
public class Position {
- private LayoutManager layoutManager;
+ private LayoutProcessor layoutManager;
- public Position(LayoutManager lm) {
+ public Position(LayoutProcessor lm) {
layoutManager = lm;
}
- public LayoutManager getLM() {
+ public LayoutProcessor getLM() {
return layoutManager;
}
1.10 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/PositionIterator.java
Index: PositionIterator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PositionIterator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PositionIterator.java 13 Nov 2002 10:25:48 -0000 1.9
+++ PositionIterator.java 4 Mar 2003 03:48:08 -0000 1.10
@@ -14,7 +14,7 @@
public abstract class PositionIterator implements Iterator {
Iterator parentIter;
Object nextObj;
- LayoutManager childLM;
+ LayoutProcessor childLM;
boolean bHasNext;
PositionIterator(Iterator pIter) {
@@ -23,7 +23,7 @@
//checkNext();
}
- public LayoutManager getNextChildLM() {
+ public LayoutProcessor getNextChildLM() {
// Move to next "segment" of iterator, ie: new childLM
if (childLM == null && nextObj != null) {
childLM = getLM(nextObj);
@@ -32,7 +32,7 @@
return childLM;
}
- protected abstract LayoutManager getLM(Object nextObj);
+ protected abstract LayoutProcessor getLM(Object nextObj);
protected abstract Position getPos(Object nextObj);
@@ -46,7 +46,7 @@
}
protected boolean checkNext() {
- LayoutManager lm = getLM(nextObj);
+ LayoutProcessor lm = getLM(nextObj);
if (childLM == null) {
childLM = lm;
} else if (childLM != lm) {
1.3 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
Index: RetrieveMarkerLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RetrieveMarkerLayoutManager.java 20 Feb 2003 02:47:45 -0000 1.2
+++ RetrieveMarkerLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.3
@@ -17,7 +17,7 @@
* LayoutManager for a block FO.
*/
public class RetrieveMarkerLayoutManager extends AbstractLayoutManager {
- private LayoutManager replaceLM = null;
+ private LayoutProcessor replaceLM = null;
private boolean loaded = false;
private String name;
private int position;
@@ -82,8 +82,8 @@
if (marker != null) {
marker.addLayoutManager(list);
if (list.size() > 0) {
- replaceLM = (LayoutManager)list.get(0);
- replaceLM.setParentLM(this);
+ replaceLM = (LayoutProcessor)list.get(0);
+ replaceLM.setParent(this);
replaceLM.init();
getLogger().debug("retrieved: " + replaceLM + ":" + list.size());
} else {
@@ -119,7 +119,7 @@
reset(null);
}
if (replaceLM != null) {
- replaceLM.resetPosition(resetPos);
+ replaceLM.resetPosition(null);
}
loaded = false;
replaceLM = null;
1.12 +3 -3 xml-fop/src/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Index: StaticContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StaticContentLayoutManager.java 27 Feb 2003 23:30:50 -0000 1.11
+++ StaticContentLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.12
@@ -36,7 +36,7 @@
public BreakPoss getNextBreakPoss(LayoutContext context) {
// currently active LM
- LayoutManager curLM;
+ LayoutProcessor curLM;
while ((curLM = getChildLM()) != null) {
// Make break positions and return page break
@@ -63,7 +63,7 @@
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.1 xml-fop/src/org/apache/fop/layoutmgr/LayoutProcessor.java
Index: LayoutProcessor.java
===================================================================
/*
* $Id: LayoutProcessor.java,v 1.1 2003/03/04 03:48:08 keiron Exp $
* Copyright (C) 2003 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
package org.apache.fop.layoutmgr;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.area.Area;
import org.apache.fop.area.Resolveable;
import org.apache.fop.area.PageViewport;
import java.util.Map;
/**
* The interface for all LayoutProcessors.
* This interface is used by the layout implementation to
* do the layout and add the areas.
*/
public interface LayoutProcessor extends LayoutManager {
/**
* Set the parent layout manager.
* The parent layout manager is required for adding areas.
*
* @param lm the parent layout manager
*/
public void setParent(LayoutProcessor lm);
/**
* Initialise this layout manager.
*/
public void init();
/**
* Generates inline areas.
* This is used to check if the layout manager generates inline
* areas.
*
* @return true if the layout manager generates inline areas
*/
public boolean generatesInlineAreas();
/**
* Return true if the next area which would be generated by this
* LayoutManager could start a new line (or flow for block-level FO).
*
* @param lc the layout context
* @return true if can break before
*/
public boolean canBreakBefore(LayoutContext lc);
/**
* Generate and return the next break possibility.
*
* @param context The layout context contains information about pending
* space specifiers from ancestor areas or previous areas, reference
* area inline-progression-dimension and various other layout-related
* information.
* @return the next break position
*/
public BreakPoss getNextBreakPoss(LayoutContext context);
/**
* Reset to the position.
*
* @param position
*/
public void resetPosition(Position position);
/**
* Get the word chars between two positions and
* append to the string buffer. The positions could
* span multiple layout managers.
*
* @param sbChars the string buffer to append the word chars
* @param bp1 the start position
* @param bp2 the end position
*/
public void getWordChars(StringBuffer sbChars, Position bp1,
Position bp2);
/**
* Return a value indicating whether this LayoutManager has laid out
* all its content (or generated BreakPossibilities for all content.)
*
* @return true if this layout manager is finished
*/
public boolean isFinished();
/**
* Set a flag indicating whether the LayoutManager has laid out all
* its content. This is generally called by the LM itself, but can
* be called by a parentLM when backtracking.
*
* @param isFinished the value to set the finished flag to
*/
public void setFinished(boolean isFinished);
/**
* Get the parent area for an area.
* This should get the parent depending on the class of the
* area passed in.
*
* @param childArea the child area to get the parent for
* @return the parent Area
*/
public Area getParentArea(Area childArea);
/**
* Add the area as a child of the current area.
* This is called by child layout managers to add their
* areas as children of the current area.
*
* @param childArea the child area to add
*/
public void addChild(Area childArea);
/**
* Tell the layout manager to add all the child areas implied
* by Position objects which will be returned by the
* Iterator.
*
* @param posIter the position iterator
* @param context the context
*/
public void addAreas(PositionIterator posIter, LayoutContext context);
/**
* Get the string of the current page number.
*
* @return the string for the current page number
*/
public String getCurrentPageNumber();
/**
* Resolve the id reference.
* This is called by an area looking for an id reference.
* If the id reference is not found then it should add a resolveable object.
*
* @param ref the id reference
* @return the page containing the id reference or null if not found
*/
public PageViewport resolveRefID(String ref);
/**
* Add an id to the page.
* @todo add the location of the area on the page
*
* @param id the id reference to add.
*/
public void addIDToPage(String id);
/**
* Add an unresolved area.
* The is used to add a resolveable object to the page for a given id.
*
* @param id the id reference this object needs for resolving
* @param res the resolveable object
*/
public void addUnresolvedArea(String id, Resolveable res);
/**
* Add the marker.
* A number of formatting objects may contain markers. This
* method is used to add those markers to the page.
*
* @param name the marker class name
* @param start true if the formatting object is starting false is finishing
* @param isfirst a flag for is first
*/
public void addMarkerMap(Map marks, boolean start, boolean isfirst);
/**
* Retrieve a marker.
* This method is used when retrieve a marker.
*
* @param name the class name of the marker
* @param pos the retrieve position
* @param boundary the boundary for retrieving the marker
* @return the layout manaager of the retrieved marker if any
*/
public Marker retrieveMarker(String name, int pos, int boundary);
}
1.10 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Item.java 19 Feb 2003 05:49:29 -0000 1.9
+++ Item.java 4 Mar 2003 03:48:08 -0000 1.10
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -63,7 +63,7 @@
* @return the next break possibility
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
MinOptMax stackSize = new MinOptMax();
// if starting add space before
@@ -93,7 +93,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -153,7 +153,7 @@
getParentArea(null);
addID();
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.10 +8 -8 xml-fop/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ListBlockLayoutManager.java 19 Feb 2003 05:49:29 -0000 1.9
+++ ListBlockLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.10
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -41,7 +41,7 @@
private class SectionPosition extends LeafPosition {
protected List list;
- protected SectionPosition(LayoutManager lm, int pos, List l) {
+ protected SectionPosition(LayoutProcessor lm, int pos, List l) {
super(lm, pos);
list = l;
}
@@ -69,14 +69,14 @@
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
// currently active LM
- LayoutManager curLM;
+ LayoutProcessor curLM;
MinOptMax stackSize = new MinOptMax();
// if starting add space before
// stackSize.add(spaceBefore);
BreakPoss lastPos = null;
- while ((curLM = (LayoutManager)getChildLM()) != null) {
+ while ((curLM = (LayoutProcessor)getChildLM()) != null) {
// Make break positions
// Set up a LayoutContext
int ipd = context.getRefIPD();
@@ -94,7 +94,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -146,7 +146,7 @@
int listHeight = 0;
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
@@ -156,7 +156,7 @@
new BreakPossPosIter(bodyBreaks, iStartPos,
lfp.getLeafPos() + 1);
iStartPos = lfp.getLeafPos() + 1;
- while ((childLM = (LayoutManager)breakPosIter.getNextChildLM()) != null) {
+ while ((childLM = (LayoutProcessor)breakPosIter.getNextChildLM()) != null) {
childLM.addAreas(breakPosIter, lc);
}
}
1.11 +6 -6 xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ListItemLayoutManager.java 19 Feb 2003 05:49:29 -0000 1.10
+++ ListItemLayoutManager.java 4 Mar 2003 03:48:08 -0000 1.11
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -43,7 +43,7 @@
private class ItemPosition extends LeafPosition {
protected List cellBreaks;
- protected ItemPosition(LayoutManager lm, int pos, List l) {
+ protected ItemPosition(LayoutProcessor lm, int pos, List l) {
super(lm, pos);
cellBreaks = l;
}
@@ -63,12 +63,12 @@
public void setLabel(Item item) {
label = item;
- label.setParentLM(this);
+ label.setParent(this);
}
public void setBody(Item item) {
body = item;
- body.setParentLM(this);
+ body.setParent(this);
}
/**
@@ -124,7 +124,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
1.12 +3 -3 xml-fop/src/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Body.java 19 Feb 2003 05:49:29 -0000 1.11
+++ Body.java 4 Mar 2003 03:48:09 -0000 1.12
@@ -8,7 +8,7 @@
package org.apache.fop.layoutmgr.table;
import org.apache.fop.fo.PropertyManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
@@ -112,7 +112,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
1.8 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/table/Caption.java
Index: Caption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Caption.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Caption.java 19 Feb 2003 05:49:29 -0000 1.7
+++ Caption.java 4 Mar 2003 03:48:09 -0000 1.8
@@ -8,7 +8,7 @@
package org.apache.fop.layoutmgr.table;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -47,7 +47,7 @@
* @return the next break possibility
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
MinOptMax stackSize = new MinOptMax();
// if starting add space before
@@ -78,7 +78,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -125,7 +125,7 @@
getParentArea(null);
addID();
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.12 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Cell.java 19 Feb 2003 05:49:29 -0000 1.11
+++ Cell.java 4 Mar 2003 03:48:09 -0000 1.12
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -64,7 +64,7 @@
* @return the next break possibility
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
MinOptMax stackSize = new MinOptMax();
// if starting add space before
@@ -95,7 +95,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -173,7 +173,7 @@
getParentArea(null);
addID();
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.13 +8 -8 xml-fop/src/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Row.java 19 Feb 2003 05:49:29 -0000 1.12
+++ Row.java 4 Mar 2003 03:48:09 -0000 1.13
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -45,7 +45,7 @@
private class RowPosition extends LeafPosition {
protected List cellBreaks;
- protected RowPosition(LayoutManager lm, int pos, List l) {
+ protected RowPosition(LayoutProcessor lm, int pos, List l) {
super(lm, pos);
cellBreaks = l;
}
@@ -81,9 +81,9 @@
cellList = new ArrayList();
// add cells to list
while (childLMiter.hasNext()) {
- curChildLM = (LayoutManager) childLMiter.next();
+ curChildLM = (LayoutProcessor) childLMiter.next();
curChildLM.setUserAgent(getUserAgent());
- curChildLM.setParentLM(this);
+ curChildLM.setParent(this);
curChildLM.init();
cellList.add(curChildLM);
}
@@ -114,7 +114,7 @@
* @return the next break possibility
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
BreakPoss lastPos = null;
List breakList = new ArrayList();
@@ -155,7 +155,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -226,7 +226,7 @@
* If pos is null, then back up to the first child LM.
*/
protected void reset(Position pos) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
int cellcount = 0;
if (pos == null) {
1.8 +5 -5 xml-fop/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
Index: TableAndCaptionLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableAndCaptionLayoutManager.java 19 Feb 2003 05:49:29 -0000 1.7
+++ TableAndCaptionLayoutManager.java 4 Mar 2003 03:48:09 -0000 1.8
@@ -8,7 +8,7 @@
package org.apache.fop.layoutmgr.table;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -49,7 +49,7 @@
* @return the next break possibility
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- LayoutManager curLM; // currently active LM
+ LayoutProcessor curLM; // currently active LM
MinOptMax stackSize = new MinOptMax();
// if starting add space before
@@ -79,7 +79,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
@@ -126,7 +126,7 @@
getParentArea(null);
addID();
- LayoutManager childLM;
+ LayoutProcessor childLM;
int iStartPos = 0;
LayoutContext lc = new LayoutContext(0);
while (parentIter.hasNext()) {
1.12 +6 -6 xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TableLayoutManager.java 19 Feb 2003 05:49:29 -0000 1.11
+++ TableLayoutManager.java 4 Mar 2003 03:48:09 -0000 1.12
@@ -9,7 +9,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
@@ -50,7 +50,7 @@
private class SectionPosition extends LeafPosition {
protected List list;
- protected SectionPosition(LayoutManager lm, int pos, List l) {
+ protected SectionPosition(LayoutProcessor lm, int pos, List l) {
super(lm, pos);
list = l;
}
@@ -84,7 +84,7 @@
*/
public void setTableHeader(Body th) {
tableHeader = th;
- tableHeader.setParentLM(this);
+ tableHeader.setParent(this);
}
/**
@@ -94,7 +94,7 @@
*/
public void setTableFooter(Body tf) {
tableFooter = tf;
- tableFooter.setParentLM(this);
+ tableFooter.setParent(this);
}
/**
@@ -159,7 +159,7 @@
if (stackSize.opt + bp.getStackingSize().opt > context.getStackLimit().max) {
// reset to last break
if (lastPos != null) {
- LayoutManager lm = lastPos.getLayoutManager();
+ LayoutProcessor lm = lastPos.getLayoutManager();
lm.resetPosition(lastPos.getPosition());
if (lm != curLM) {
curLM.resetPosition(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org