gmazza      2004/03/21 04:03:08

  Modified:    src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
                        AddLMVisitor.java BlockContainerLayoutManager.java
                        BlockLayoutManager.java
                        BlockStackingLayoutManager.java BreakPoss.java
                        BreakPossPosIter.java ContentLayoutManager.java
                        FlowLayoutManager.java
                        InlineStackingLayoutManager.java LMiter.java
                        LayoutManager.java LeafPosition.java
                        LineLayoutManager.java NonLeafPosition.java
                        PageLayoutManager.java Position.java
                        PositionIterator.java
                        RetrieveMarkerLayoutManager.java
                        StaticContentLayoutManager.java
               src/java/org/apache/fop/layoutmgr/list Item.java
                        ListBlockLayoutManager.java
                        ListItemLayoutManager.java
               src/java/org/apache/fop/layoutmgr/table Body.java
                        Caption.java Cell.java Row.java
                        TableAndCaptionLayoutManager.java
                        TableLayoutManager.java
  Removed:     src/java/org/apache/fop/layoutmgr LayoutProcessor.java
  Log:
  Merged LayoutProcessor into LayoutManager interface.
  
  Revision  Changes    Path
  1.9       +8 -8      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractLayoutManager.java        18 Mar 2004 00:22:40 -0000      1.8
  +++ AbstractLayoutManager.java        21 Mar 2004 12:03:07 -0000      1.9
  @@ -35,16 +35,16 @@
   /**
    * The base class for all LayoutManagers.
    */
  -public abstract class AbstractLayoutManager implements LayoutProcessor, Constants {
  +public abstract class AbstractLayoutManager implements LayoutManager, Constants {
       protected FOUserAgent userAgent;
  -    protected LayoutProcessor parentLM = null;
  +    protected LayoutManager 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 LayoutProcessor curChildLM = null;
  +    protected LayoutManager curChildLM = null;
       protected ListIterator childLMiter;
       protected boolean bInited = false;
   
  @@ -97,11 +97,11 @@
           return userAgent.getLogger();
       }
   
  -    public void setParent(LayoutProcessor lm) {
  +    public void setParent(LayoutManager lm) {
           this.parentLM = lm;
       }
   
  -    public LayoutProcessor getParent() {
  +    public LayoutManager getParent() {
           return this.parentLM;
       }
   
  @@ -157,12 +157,12 @@
        * Note: child must implement LayoutManager! If it doesn't, skip it
        * and print a warning.
        */
  -    protected LayoutProcessor getChildLM() {
  +    protected LayoutManager getChildLM() {
           if (curChildLM != null && !curChildLM.isFinished()) {
               return curChildLM;
           }
           while (childLMiter.hasNext()) {
  -            curChildLM = (LayoutProcessor) childLMiter.next();
  +            curChildLM = (LayoutManager) childLMiter.next();
               curChildLM.setUserAgent(getUserAgent());
               curChildLM.setParent(this);
               curChildLM.initialize();
  @@ -201,7 +201,7 @@
               }
               while (curChildLM != lm && childLMiter.hasPrevious()) {
                   curChildLM.resetPosition(null);
  -                curChildLM = (LayoutProcessor) childLMiter.previous();
  +                curChildLM = (LayoutManager) childLMiter.previous();
               }
               // Otherwise next returns same object
               childLMiter.next();
  
  
  
  1.35      +5 -5      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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- AddLMVisitor.java 18 Mar 2004 00:22:40 -0000      1.34
  +++ AddLMVisitor.java 21 Mar 2004 12:03:07 -0000      1.35
  @@ -206,9 +206,9 @@
               serveFObjMixed((FObjMixed)node);
               currentLMList = saveLMList;
               for (int count = childList.size() - 1; count >= 0; count--) {
  -                LayoutProcessor lm = (LayoutProcessor) childList.get(count);
  +                LayoutManager lm = (LayoutManager) childList.get(count);
                   if (lm.generatesInlineAreas()) {
  -                    LayoutProcessor blm = new 
BidiLayoutManager((InlineStackingLayoutManager) lm);
  +                    LayoutManager blm = new 
BidiLayoutManager((InlineStackingLayoutManager) lm);
                       blm.setFObj(node);
                       currentLMList.add(blm);
                   } else {
  @@ -264,7 +264,7 @@
           currentLMList.add(lm);
       }
   
  -    protected void setupBasicLinkArea(BasicLink node, LayoutProcessor parentLM,
  +    protected void setupBasicLinkArea(BasicLink node, LayoutManager parentLM,
                                         InlineParent area) {
            if (node.getLink() == null) {
                return;
  @@ -754,7 +754,7 @@
        // if id can be resolved then simply return a word, otherwise
        // return a resolveable area
        public InlineArea getPageNumberCitationInlineArea(PageNumberCitation node,
  -             LayoutProcessor parentLM) {
  +             LayoutManager parentLM) {
            if (node.getRefId().equals("")) {
                node.getLogger().error("page-number-citation must contain \"ref-id\"");
                return null;
  
  
  
  1.16      +5 -5      
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- BlockContainerLayoutManager.java  27 Feb 2004 17:49:25 -0000      1.15
  +++ BlockContainerLayoutManager.java  21 Mar 2004 12:03:07 -0000      1.16
  @@ -139,7 +139,7 @@
               stackLimit = context.getStackLimit();
           }
   
  -        LayoutProcessor curLM ; // currently active LM
  +        LayoutManager curLM ; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
  @@ -212,7 +212,7 @@
   
       public BreakPoss getAbsoluteBreakPoss(LayoutContext context) {
   
  -        LayoutProcessor curLM ; // currently active LM
  +        LayoutManager curLM ; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
   
  @@ -260,7 +260,7 @@
           addID();
           addMarkers(true, true);
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  @@ -288,7 +288,7 @@
        * This returns the current block container area
        * and creates it if required.
        *
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getParentArea(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
        */
       public Area getParentArea(Area childArea) {
           if (curBlockArea == null) {
  @@ -355,7 +355,7 @@
       /**
        * Add the child to the block container.
        *
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#addChild(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#addChild(Area)
        */
       public void addChild(Area childArea) {
           if (curBlockArea != null) {
  
  
  
  1.15      +7 -7      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BlockLayoutManager.java   27 Feb 2004 17:49:25 -0000      1.14
  +++ BlockLayoutManager.java   21 Mar 2004 12:03:07 -0000      1.15
  @@ -78,14 +78,14 @@
   
           private ListIterator proxy;
   
  -        public BlockLMiter(LayoutProcessor lp, ListIterator pr) {
  +        public BlockLMiter(LayoutManager lp, ListIterator pr) {
               super(lp, null);
               proxy = pr;
           }
   
           protected boolean preLoadNext() {
               while (proxy.hasNext()) {
  -                LayoutProcessor lm = (LayoutProcessor) proxy.next();
  +                LayoutManager lm = (LayoutManager) proxy.next();
                   lm.setParent(BlockLayoutManager.this);
                   if (lm.generatesInlineAreas()) {
                       LineLayoutManager lineLM = createLineManager(lm);
  @@ -102,11 +102,11 @@
   
           protected LineLayoutManager createLineManager(
             LayoutManager firstlm) {
  -            LayoutProcessor lm;
  +            LayoutManager lm;
               List inlines = new ArrayList();
               inlines.add(firstlm);
               while (proxy.hasNext()) {
  -                lm = (LayoutProcessor) proxy.next();
  +                lm = (LayoutManager) proxy.next();
                   lm.setParent(BlockLayoutManager.this);
                   if (lm.generatesInlineAreas()) {
                       inlines.add(lm);
  @@ -159,7 +159,7 @@
       }
   
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           int ipd = context.getRefIPD();
           int iIndents = marginProps.startIndent + marginProps.endIndent; 
  @@ -209,7 +209,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -270,7 +270,7 @@
           addID();
           addMarkers(true, true);
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
               LeafPosition lfp = (LeafPosition) parentIter.next();
  
  
  
  1.6       +1 -1      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BlockStackingLayoutManager.java   27 Feb 2004 17:49:25 -0000      1.5
  +++ BlockStackingLayoutManager.java   21 Mar 2004 12:03:08 -0000      1.6
  @@ -32,7 +32,7 @@
        * Reference to FO whose areas it's managing or to the traits
        * of the FO.
        */
  -    protected LayoutProcessor curChildLM = null;
  +    protected LayoutManager curChildLM = null;
       protected BlockParent parentArea = null;
   
       public BlockStackingLayoutManager() {
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/layoutmgr/BreakPoss.java
  
  Index: BreakPoss.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BreakPoss.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BreakPoss.java    27 Feb 2004 17:49:25 -0000      1.4
  +++ BreakPoss.java    21 Mar 2004 12:03:08 -0000      1.5
  @@ -104,7 +104,7 @@
       /**
        * The top-level layout manager responsible for this break
        */
  -    public LayoutProcessor getLayoutManager() {
  +    public LayoutManager getLayoutManager() {
           return position.getLM();
       }
   
  
  
  
  1.3       +1 -1      xml-fop/src/java/org/apache/fop/layoutmgr/BreakPossPosIter.java
  
  Index: BreakPossPosIter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BreakPossPosIter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BreakPossPosIter.java     27 Feb 2004 17:49:25 -0000      1.2
  +++ BreakPossPosIter.java     21 Mar 2004 12:03:08 -0000      1.3
  @@ -64,7 +64,7 @@
           return (BreakPoss) peekNext();
       }
   
  -    protected LayoutProcessor getLM(Object nextObj) {
  +    protected LayoutManager getLM(Object nextObj) {
           return ((BreakPoss) nextObj).getLayoutManager();
       }
   
  
  
  
  1.8       +5 -5      
xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
  
  Index: ContentLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContentLayoutManager.java 18 Mar 2004 00:22:40 -0000      1.7
  +++ ContentLayoutManager.java 21 Mar 2004 12:03:08 -0000      1.8
  @@ -35,11 +35,11 @@
    * For use with objects that contain inline areas such as
    * leader use-content and title.
    */
  -public class ContentLayoutManager implements LayoutProcessor {
  +public class ContentLayoutManager implements LayoutManager {
       private FOUserAgent userAgent;
       private Area holder;
       private int stackSize;
  -    private LayoutProcessor parentLM;
  +    private LayoutManager parentLM;
   
       /**
        * Constructs a new ContentLayoutManager
  @@ -58,7 +58,7 @@
       public void setFObj(FObj fo) {
       }
   
  -    public void fillArea(LayoutProcessor curLM) {
  +    public void fillArea(LayoutManager curLM) {
   
           List childBreaks = new ArrayList();
           MinOptMax stack = new MinOptMax();
  @@ -162,11 +162,11 @@
       }
   
       /** @see org.apache.fop.layoutmgr.LayoutManager */
  -    public void setParent(LayoutProcessor lm) {
  +    public void setParent(LayoutManager lm) {
           parentLM = lm;
       }
   
  -    public LayoutProcessor getParent() {
  +    public LayoutManager getParent() {
           return this.parentLM;
       }
   
  
  
  
  1.5       +6 -6      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FlowLayoutManager.java    27 Feb 2004 17:49:25 -0000      1.4
  +++ FlowLayoutManager.java    21 Mar 2004 12:03:08 -0000      1.5
  @@ -50,12 +50,12 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getNextBreakPoss(LayoutContext)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getNextBreakPoss(LayoutContext)
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
   
           // currently active LM
  -        LayoutProcessor curLM;
  +        LayoutManager curLM;
           MinOptMax stackSize = new MinOptMax();
   
           while ((curLM = getChildLM()) != null) {
  @@ -108,11 +108,11 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#addAreas(PositionIterator, 
LayoutContext)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(PositionIterator, 
LayoutContext)
        */
       public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
               LeafPosition lfp = (LeafPosition) parentIter.next();
  @@ -141,7 +141,7 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getParentArea(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
        */
       public Area getParentArea(Area childArea) {
           // Get an area from the Page
  @@ -153,7 +153,7 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#resetPosition(Position)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position)
        */
       public void resetPosition(Position resetPos) {
           if (resetPos == null) {
  
  
  
  1.6       +5 -5      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InlineStackingLayoutManager.java  27 Feb 2004 17:49:25 -0000      1.5
  +++ InlineStackingLayoutManager.java  21 Mar 2004 12:03:08 -0000      1.6
  @@ -46,7 +46,7 @@
               super(parentIter);
           }
   
  -        protected LayoutProcessor getLM(Object nextObj) {
  +        protected LayoutManager getLM(Object nextObj) {
               return ((Position) nextObj).getPosition().getLM();
           }
   
  @@ -213,7 +213,7 @@
           if (inlineProps.spaceStart.getSpace().min > 0 || hasLeadingFence(false)) {
               return true;
           }
  -        LayoutProcessor lm = getChildLM();
  +        LayoutManager lm = getChildLM();
           if (lm != null) {
               return lm.canBreakBefore(context);
           } else {
  @@ -243,7 +243,7 @@
       public BreakPoss getNextBreakPoss(LayoutContext lc) {
           // Get a break from currently active child LM
           BreakPoss bp = null;
  -        LayoutProcessor curLM;
  +        LayoutManager curLM;
           SpaceSpecifier leadingSpace = lc.getLeadingSpace();
   
           if (lc.startsNewArea()) {
  @@ -481,8 +481,8 @@
   
           // posIter iterates over positions returned by this LM
           StackingIter childPosIter = new StackingIter(parentIter);
  -        LayoutProcessor prevLM = null;
  -        LayoutProcessor childLM ;
  +        LayoutManager prevLM = null;
  +        LayoutManager childLM ;
           while ((childLM = childPosIter.getNextChildLM()) != null) {
               //getContext().setTrailingSpace(new SpaceSpecifier(false));
               childLM.addAreas(childPosIter, getContext());
  
  
  
  1.5       +3 -3      xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java
  
  Index: LMiter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LMiter.java       27 Feb 2004 17:49:25 -0000      1.4
  +++ LMiter.java       21 Mar 2004 12:03:08 -0000      1.5
  @@ -32,10 +32,10 @@
       private FObj curFO;
       protected List listLMs;
       protected int curPos = 0;
  -    /** The LayoutProcessor to which this LMiter is attached **/
  -    private LayoutProcessor lp;
  +    /** The LayoutManager to which this LMiter is attached **/
  +    private LayoutManager lp;
   
  -    public LMiter(LayoutProcessor lp, ListIterator bIter) {
  +    public LMiter(LayoutManager lp, ListIterator bIter) {
           this.lp = lp;
           baseIter = bIter;
           listLMs = new ArrayList(10);
  
  
  
  1.4       +182 -0    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LayoutManager.java        27 Feb 2004 17:49:25 -0000      1.3
  +++ LayoutManager.java        21 Mar 2004 12:03:08 -0000      1.4
  @@ -18,6 +18,13 @@
    
   package org.apache.fop.layoutmgr;
   
  +import java.util.Map;
  +
  +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 org.apache.fop.apps.FOUserAgent;
   import org.apache.fop.fo.FObj;
   
  @@ -49,5 +56,180 @@
        * @return the user agent
        */
       FOUserAgent getUserAgent();
  +    
  +    /**
  +     * Set the parent layout manager.
  +     * The parent layout manager is required for adding areas.
  +     *
  +     * @param lm the parent layout manager
  +     */
  +    void setParent(LayoutManager lm);
  +
  +    /**
  +     * Get the parent layout manager.
  +     * @return the parent layout manager.
  +     */
  +    LayoutManager getParent();
  +
  +    /**
  +     * Get the LayoutManagerLS object that is at the top of the LM Tree
  +     * @return the LayoutManagerLS object that is at the top of the LM Tree
  +     */
  +    LayoutManagerLS getLayoutManagerLS();
  +
  +    /**
  +     * Initialize this layout manager.
  +     */
  +    void initialize();
  +
  +    /**
  +     * Generates inline areas.
  +     * This is used to check if the layout manager generates inline
  +     * areas.
  +     *
  +     * @return true if the layout manager generates inline areas
  +     */
  +    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
  +     */
  +    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
  +     */
  +    BreakPoss getNextBreakPoss(LayoutContext context);
  +
  +    /**
  +     * Reset to the position.
  +     *
  +     * @param position
  +     */
  +    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
  +     */
  +    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
  +     */
  +    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
  +     */
  +    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
  +     */
  +    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
  +     */
  +    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
  +     */
  +    void addAreas(PositionIterator posIter, LayoutContext context);
  +
  +    /**
  +     * Get the string of the current page number.
  +     *
  +     * @return the string for the current page number
  +     */
  +    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
  +     */
  +    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.
  +     */
  +    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
  +     */
  +    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
  +     */
  +    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
  +     */
  +    Marker retrieveMarker(String name, int pos, int boundary);
   
   }
  
  
  
  1.3       +1 -1      xml-fop/src/java/org/apache/fop/layoutmgr/LeafPosition.java
  
  Index: LeafPosition.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafPosition.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LeafPosition.java 27 Feb 2004 17:49:25 -0000      1.2
  +++ LeafPosition.java 21 Mar 2004 12:03:08 -0000      1.3
  @@ -22,7 +22,7 @@
   
       private int iLeafPos;
   
  -    public LeafPosition(LayoutProcessor lm, int pos) {
  +    public LeafPosition(LayoutManager lm, int pos) {
           super(lm);
           iLeafPos = pos;
       }
  
  
  
  1.16      +4 -4      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- LineLayoutManager.java    18 Mar 2004 00:22:40 -0000      1.15
  +++ LineLayoutManager.java    21 Mar 2004 12:03:08 -0000      1.16
  @@ -60,7 +60,7 @@
           int lineHeight;
           int baseline;
   
  -        LineBreakPosition(LayoutProcessor lm, int iBreakIndex,
  +        LineBreakPosition(LayoutManager lm, int iBreakIndex,
                             double ipdA, double adjust, int ind, int lh, int bl) {
               super(lm, iBreakIndex);
               // iPos = iBreakIndex;
  @@ -130,7 +130,7 @@
           // Get a break from currently active child LM
           // Set up constraints for inline level managers
   
  -        LayoutProcessor curLM ; // currently active LM
  +        LayoutManager curLM ; // currently active LM
           BreakPoss prev = null;
           BreakPoss bp = null; // proposed BreakPoss
   
  @@ -353,7 +353,7 @@
               // See if could break before next area
               // TODO: do we need to set anything on the layout context?
               LayoutContext lc = new LayoutContext(0);
  -            LayoutProcessor nextLM = getChildLM();
  +            LayoutManager nextLM = getChildLM();
               return (nextLM == null || nextLM.canBreakBefore(lc));
           }
       }
  @@ -658,7 +658,7 @@
        * @param dSpaceAdjust the space adjustment
        */
       public void addAreas(PositionIterator parentIter, double dSpaceAdjust) {
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
               LineBreakPosition lbp = (LineBreakPosition) parentIter.next();
  
  
  
  1.3       +1 -1      xml-fop/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java
  
  Index: NonLeafPosition.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NonLeafPosition.java      27 Feb 2004 17:49:25 -0000      1.2
  +++ NonLeafPosition.java      21 Mar 2004 12:03:08 -0000      1.3
  @@ -22,7 +22,7 @@
   
       private Position subPos;
   
  -    public NonLeafPosition(LayoutProcessor lm, Position sub) {
  +    public NonLeafPosition(LayoutManager lm, Position sub) {
           super(lm);
           subPos = sub;
       }
  
  
  
  1.33      +2 -2      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- PageLayoutManager.java    18 Mar 2004 00:22:40 -0000      1.32
  +++ PageLayoutManager.java    21 Mar 2004 12:03:08 -0000      1.33
  @@ -69,7 +69,7 @@
       private static class BlockBreakPosition extends LeafPosition {
           protected BreakPoss breakps;
   
  -        protected BlockBreakPosition(LayoutProcessor lm, BreakPoss bp) {
  +        protected BlockBreakPosition(LayoutManager lm, BreakPoss bp) {
               super(lm, 0);
               breakps = bp;
           }
  @@ -214,7 +214,7 @@
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
   
  -        LayoutProcessor curLM ; // currently active LM
  +        LayoutManager curLM ; // currently active LM
   
           while ((curLM = getChildLM()) != null) {
               BreakPoss bp = null;
  
  
  
  1.3       +3 -3      xml-fop/src/java/org/apache/fop/layoutmgr/Position.java
  
  Index: Position.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/Position.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Position.java     27 Feb 2004 17:49:25 -0000      1.2
  +++ Position.java     21 Mar 2004 12:03:08 -0000      1.3
  @@ -20,13 +20,13 @@
   
   public class Position {
       
  -    private LayoutProcessor layoutManager;
  +    private LayoutManager layoutManager;
   
  -    public Position(LayoutProcessor lm) {
  +    public Position(LayoutManager lm) {
           layoutManager = lm;
       }
   
  -    public LayoutProcessor getLM() {
  +    public LayoutManager getLM() {
           return layoutManager;
       }
   
  
  
  
  1.3       +4 -4      xml-fop/src/java/org/apache/fop/layoutmgr/PositionIterator.java
  
  Index: PositionIterator.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PositionIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PositionIterator.java     27 Feb 2004 17:49:25 -0000      1.2
  +++ PositionIterator.java     21 Mar 2004 12:03:08 -0000      1.3
  @@ -25,7 +25,7 @@
       
       private Iterator parentIter;
       private Object nextObj;
  -    private LayoutProcessor childLM;
  +    private LayoutManager childLM;
       private boolean bHasNext;
   
       PositionIterator(Iterator pIter) {
  @@ -34,7 +34,7 @@
           //checkNext();
       }
   
  -    public LayoutProcessor getNextChildLM() {
  +    public LayoutManager getNextChildLM() {
           // Move to next "segment" of iterator, ie: new childLM
           if (childLM == null && nextObj != null) {
               childLM = getLM(nextObj);
  @@ -43,7 +43,7 @@
           return childLM;
       }
   
  -    protected abstract LayoutProcessor getLM(Object nextObj);
  +    protected abstract LayoutManager getLM(Object nextObj);
   
       protected abstract Position getPos(Object nextObj);
   
  @@ -57,7 +57,7 @@
       }
   
       protected boolean checkNext() {
  -        LayoutProcessor lm = getLM(nextObj);
  +        LayoutManager lm = getLM(nextObj);
           if (childLM == null) {
               childLM = lm;
           } else if (childLM != lm) {
  
  
  
  1.6       +5 -5      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RetrieveMarkerLayoutManager.java  18 Mar 2004 00:22:40 -0000      1.5
  +++ RetrieveMarkerLayoutManager.java  21 Mar 2004 12:03:08 -0000      1.6
  @@ -28,7 +28,7 @@
    * LayoutManager for a block FO.
    */
   public class RetrieveMarkerLayoutManager extends AbstractLayoutManager {
  -    private LayoutProcessor replaceLM = null;
  +    private LayoutManager replaceLM = null;
       private boolean loaded = false;
       private String name;
       private int position;
  @@ -94,7 +94,7 @@
               if (marker != null) {
                   addLMVisitor.addLayoutManager(marker, list);
                   if (list.size() > 0) {
  -                    replaceLM =  (LayoutProcessor)list.get(0);
  +                    replaceLM =  (LayoutManager)list.get(0);
                       replaceLM.setParent(this);
                       replaceLM.initialize();
                       getLogger().debug("retrieved: " + replaceLM + ":" + 
list.size());
  @@ -110,7 +110,7 @@
        * This returns the current block container area
        * and creates it if required.
        *
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getParentArea(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
        */
       public Area getParentArea(Area childArea) {
           return parentLM.getParentArea(childArea);
  @@ -119,14 +119,14 @@
       /**
        * Add the child to the block container.
        *
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#addChild(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#addChild(Area)
        */
       public void addChild(Area childArea) {
           parentLM.addChild(childArea);
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#resetPosition(Position)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position)
        */
       public void resetPosition(Position resetPos) {
           loadLM();
  
  
  
  1.3       +5 -5      
xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
  
  Index: StaticContentLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StaticContentLayoutManager.java   27 Feb 2004 17:49:25 -0000      1.2
  +++ StaticContentLayoutManager.java   21 Mar 2004 12:03:08 -0000      1.3
  @@ -46,12 +46,12 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getNextBreakPoss(LayoutContext)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getNextBreakPoss(LayoutContext)
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
   
           // currently active LM
  -        LayoutProcessor curLM;
  +        LayoutManager curLM;
   
           while ((curLM = getChildLM()) != null) {
               // Make break positions and return page break
  @@ -78,11 +78,11 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#addAreas(PositionIterator, 
LayoutContext)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(PositionIterator, 
LayoutContext)
        */
       public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  @@ -114,7 +114,7 @@
       }
   
       /**
  -     * @see org.apache.fop.layoutmgr.LayoutProcessor#getParentArea(Area)
  +     * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
        */
       public Area getParentArea(Area childArea) {
           return region;
  
  
  
  1.5       +4 -4      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Item.java 27 Feb 2004 17:48:50 -0000      1.4
  +++ Item.java 21 Mar 2004 12:03:08 -0000      1.5
  @@ -20,7 +20,7 @@
   
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -76,7 +76,7 @@
        * @return the next break possibility
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
  @@ -106,7 +106,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -166,7 +166,7 @@
           getParentArea(null);
           addID();
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  
  
  
  1.5       +7 -7      
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ListBlockLayoutManager.java       27 Feb 2004 17:48:50 -0000      1.4
  +++ ListBlockLayoutManager.java       21 Mar 2004 12:03:08 -0000      1.5
  @@ -20,7 +20,7 @@
   
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -52,7 +52,7 @@
   
       private class SectionPosition extends LeafPosition {
           protected List list;
  -        protected SectionPosition(LayoutProcessor lm, int pos, List l) {
  +        protected SectionPosition(LayoutManager lm, int pos, List l) {
               super(lm, pos);
               list = l;
           }
  @@ -83,14 +83,14 @@
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
           // currently active LM
  -        LayoutProcessor curLM;
  +        LayoutManager curLM;
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
           // stackSize.add(spaceBefore);
           BreakPoss lastPos = null;
   
  -        while ((curLM = (LayoutProcessor)getChildLM()) != null) {
  +        while ((curLM = (LayoutManager)getChildLM()) != null) {
               // Make break positions
               // Set up a LayoutContext
               int ipd = context.getRefIPD();
  @@ -108,7 +108,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -160,7 +160,7 @@
   
           int listHeight = 0;
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  @@ -170,7 +170,7 @@
                 new BreakPossPosIter(bodyBreaks, iStartPos,
                                      lfp.getLeafPos() + 1);
               iStartPos = lfp.getLeafPos() + 1;
  -            while ((childLM = (LayoutProcessor)breakPosIter.getNextChildLM()) != 
null) {
  +            while ((childLM = (LayoutManager)breakPosIter.getNextChildLM()) != 
null) {
                   childLM.addAreas(breakPosIter, lc);
               }
           }
  
  
  
  1.8       +3 -3      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ListItemLayoutManager.java        27 Feb 2004 17:48:50 -0000      1.7
  +++ ListItemLayoutManager.java        21 Mar 2004 12:03:08 -0000      1.8
  @@ -20,7 +20,7 @@
   
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -54,7 +54,7 @@
   
       private class ItemPosition extends LeafPosition {
           protected List cellBreaks;
  -        protected ItemPosition(LayoutProcessor lm, int pos, List l) {
  +        protected ItemPosition(LayoutManager lm, int pos, List l) {
               super(lm, pos);
               cellBreaks = l;
           }
  @@ -146,7 +146,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Body.java 27 Feb 2004 17:48:35 -0000      1.5
  +++ Body.java 21 Mar 2004 12:03:08 -0000      1.6
  @@ -19,7 +19,7 @@
   package org.apache.fop.layoutmgr.table;
   
   import org.apache.fop.fo.PropertyManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
  @@ -121,7 +121,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  
  
  
  1.4       +4 -4      xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java
  
  Index: Caption.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Caption.java      27 Feb 2004 17:48:35 -0000      1.3
  +++ Caption.java      21 Mar 2004 12:03:08 -0000      1.4
  @@ -19,7 +19,7 @@
   package org.apache.fop.layoutmgr.table;
   
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -58,7 +58,7 @@
        * @return the next break possibility
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
  @@ -89,7 +89,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -136,7 +136,7 @@
           getParentArea(null);
           addID();
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  
  
  
  1.6       +4 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Cell.java 27 Feb 2004 17:48:35 -0000      1.5
  +++ Cell.java 21 Mar 2004 12:03:08 -0000      1.6
  @@ -20,7 +20,7 @@
   
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -78,7 +78,7 @@
        * @return the next break possibility
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
  @@ -108,7 +108,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -186,7 +186,7 @@
           getParentArea(null);
           addID();
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  
  
  
  1.10      +6 -6      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Row.java  18 Mar 2004 00:22:40 -0000      1.9
  +++ Row.java  21 Mar 2004 12:03:08 -0000      1.10
  @@ -20,7 +20,7 @@
   
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -56,7 +56,7 @@
   
       private class RowPosition extends LeafPosition {
           protected List cellBreaks;
  -        protected RowPosition(LayoutProcessor lm, int pos, List l) {
  +        protected RowPosition(LayoutManager lm, int pos, List l) {
               super(lm, pos);
               cellBreaks = l;
           }
  @@ -92,7 +92,7 @@
           cellList = new ArrayList();
           // add cells to list
           while (childLMiter.hasNext()) {
  -            curChildLM = (LayoutProcessor) childLMiter.next();
  +            curChildLM = (LayoutManager) childLMiter.next();
               curChildLM.setUserAgent(getUserAgent());
               curChildLM.setParent(this);
               curChildLM.initialize();
  @@ -125,7 +125,7 @@
        * @return the next break possibility
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           BreakPoss lastPos = null;
           List breakList = new ArrayList();
  @@ -166,7 +166,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -237,7 +237,7 @@
        * If pos is null, then back up to the first child LM.
        */
       protected void reset(Position pos) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
           int cellcount = 0;
   
           if (pos == null) {
  
  
  
  1.4       +4 -4      
xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
  
  Index: TableAndCaptionLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TableAndCaptionLayoutManager.java 27 Feb 2004 17:48:35 -0000      1.3
  +++ TableAndCaptionLayoutManager.java 21 Mar 2004 12:03:08 -0000      1.4
  @@ -19,7 +19,7 @@
   package org.apache.fop.layoutmgr.table;
   
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -60,7 +60,7 @@
        * @return the next break possibility
        */
       public BreakPoss getNextBreakPoss(LayoutContext context) {
  -        LayoutProcessor curLM; // currently active LM
  +        LayoutManager curLM; // currently active LM
   
           MinOptMax stackSize = new MinOptMax();
           // if starting add space before
  @@ -90,7 +90,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  @@ -137,7 +137,7 @@
           getParentArea(null);
           addID();
   
  -        LayoutProcessor childLM;
  +        LayoutManager childLM;
           int iStartPos = 0;
           LayoutContext lc = new LayoutContext(0);
           while (parentIter.hasNext()) {
  
  
  
  1.8       +3 -3      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TableLayoutManager.java   27 Feb 2004 17:48:35 -0000      1.7
  +++ TableLayoutManager.java   21 Mar 2004 12:03:08 -0000      1.8
  @@ -23,7 +23,7 @@
   import org.apache.fop.fo.PropertyManager;
   import org.apache.fop.fo.properties.TableColLength;
   import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
  +import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.LeafPosition;
   import org.apache.fop.layoutmgr.BreakPoss;
   import org.apache.fop.layoutmgr.LayoutContext;
  @@ -65,7 +65,7 @@
   
       private class SectionPosition extends LeafPosition {
           protected List list;
  -        protected SectionPosition(LayoutProcessor lm, int pos, List l) {
  +        protected SectionPosition(LayoutManager lm, int pos, List l) {
               super(lm, pos);
               list = l;
           }
  @@ -197,7 +197,7 @@
                       if (stackSize.opt + bp.getStackingSize().opt > 
context.getStackLimit().max) {
                           // reset to last break
                           if (lastPos != null) {
  -                            LayoutProcessor lm = lastPos.getLayoutManager();
  +                            LayoutManager lm = lastPos.getLayoutManager();
                               lm.resetPosition(lastPos.getPosition());
                               if (lm != curLM) {
                                   curLM.resetPosition(null);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to