Removed the FOTreeVisitor interface in favor of a more

direct connection to (the subclassable) AddLMVisitor
in the FO's.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197845 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/fo/FONode.java

@@ -34,6 +34,7 @@ import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.util.CharUtilities;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.fo.extensions.svg.SVGElementMapping;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 
 
@@ -206,13 +207,12 @@ public abstract class FONode {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFONode(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFONode(this);
     }
 
     /**

src/java/org/apache/fop/fo/FOText.java

@@ -24,6 +24,7 @@ import java.util.NoSuchElementException;
 // FOP
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.pagination.Root;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A text node in the formatting object tree.
@@ -431,13 +432,12 @@ public class FOText extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFOText(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFOText(this);
     }
 
     

src/java/org/apache/fop/fo/FOTreeVisitor.java

@@ -1,490 +0,0 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fo;
-
-import org.apache.fop.fo.flow.BlockContainer;
-import org.apache.fop.fo.flow.Character;
-import org.apache.fop.fo.pagination.ColorProfile;
-import org.apache.fop.fo.pagination.ConditionalPageMasterReference;
-import org.apache.fop.fo.pagination.Declarations;
-import org.apache.fop.fo.extensions.ExtensionObj;
-import org.apache.fop.fo.extensions.Bookmarks;
-import org.apache.fop.fo.extensions.Label;
-import org.apache.fop.fo.extensions.Outline;
-import org.apache.fop.fo.flow.ExternalGraphic;
-import org.apache.fop.fo.pagination.Flow;
-import org.apache.fop.fo.pagination.StaticContent;
-import org.apache.fop.fo.flow.BidiOverride;
-import org.apache.fop.fo.flow.Block;
-import org.apache.fop.fo.flow.Inline;
-import org.apache.fop.fo.flow.BasicLink;
-import org.apache.fop.fo.flow.Leader;
-import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.flow.RetrieveMarker;
-import org.apache.fop.fo.pagination.Title;
-import org.apache.fop.fo.flow.Wrapper;
-import org.apache.fop.fo.flow.Footnote;
-import org.apache.fop.fo.flow.FootnoteBody;
-import org.apache.fop.fo.flow.InlineContainer;
-import org.apache.fop.fo.flow.InstreamForeignObject;
-import org.apache.fop.fo.pagination.LayoutMasterSet;
-import org.apache.fop.fo.flow.ListBlock;
-import org.apache.fop.fo.flow.ListItem;
-import org.apache.fop.fo.flow.ListItemBody;
-import org.apache.fop.fo.flow.ListItemLabel;
-import org.apache.fop.fo.pagination.PageMasterReference;
-import org.apache.fop.fo.pagination.RepeatablePageMasterReference;
-import org.apache.fop.fo.pagination.SinglePageMasterReference;
-import org.apache.fop.fo.flow.PageNumber;
-import org.apache.fop.fo.flow.PageNumberCitation;
-import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.fo.pagination.PageSequenceMaster;
-import org.apache.fop.fo.pagination.Region;
-import org.apache.fop.fo.pagination.RegionBASE;
-import org.apache.fop.fo.pagination.RegionBA;
-import org.apache.fop.fo.pagination.RegionAfter;
-import org.apache.fop.fo.pagination.RegionBefore;
-import org.apache.fop.fo.pagination.RegionSE;
-import org.apache.fop.fo.pagination.RegionEnd;
-import org.apache.fop.fo.pagination.RegionStart;
-import org.apache.fop.fo.pagination.RegionBody;
-import org.apache.fop.fo.pagination.RepeatablePageMasterAlternatives;
-import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.fo.pagination.SimplePageMaster;
-import org.apache.fop.fo.flow.Table;
-import org.apache.fop.fo.flow.TableBody;
-import org.apache.fop.fo.flow.TableFooter;
-import org.apache.fop.fo.flow.TableHeader;
-import org.apache.fop.fo.flow.TableCell;
-import org.apache.fop.fo.flow.TableColumn;
-import org.apache.fop.fo.flow.TableRow;
-import org.apache.fop.fo.flow.Float;
-import org.apache.fop.fo.flow.InitialPropertySet;
-import org.apache.fop.fo.flow.MultiCase;
-import org.apache.fop.fo.flow.MultiProperties;
-import org.apache.fop.fo.flow.MultiPropertySet;
-import org.apache.fop.fo.flow.MultiSwitch;
-import org.apache.fop.fo.flow.MultiToggle;
-import org.apache.fop.fo.flow.TableAndCaption;
-import org.apache.fop.fo.flow.TableCaption;
-import org.apache.fop.fo.extensions.svg.SVGObj;
-import org.apache.fop.fo.extensions.svg.SVGElement;
-
-/**
- * <p>Implements the GoF Visitor design pattern to allow access to the FOTree
- * hierarchy without knowing what subclass of FONode is being accessed.
- * To preserve inheritance, and simulate the polymorphism that would exist if
- * the subclass methods were embedded in the visited hierarchy, the default for
- * each method (except serveFONode(FONode)) is to run the the serveXXXX method
- * that corresponds to the superclass of the FOTree child element. Thus, any
- * method that is overridden in a subclass of FOTreeVisitor will affect not only
- * FOTree elements of the class that method was written for, but also all
- * subclasses of that class.</p>
- * <p>Caveat: Because there appears to be no way for one
- * object to cast objects from another class to their superclass, this
- * superclass logic has been hard-coded into FOTreeVisitor. So, for example,
- * serveFObj(FObj) runs the following:</p>
- * <pre><code>    serveFONode((FONode)node);</code></pre>
- * <p>If FObj ceases to be a direct subclass of FONode, then the above may cause
- * problems.</p>
- */
-public interface FOTreeVisitor {
-
-    /**
-     * @param node FONode object to process
-     */
-    public void serveFONode(FONode node);
-
-    /**
-     * @param node FObj object to process
-     */
-    public void serveFObj(FObj node);
-
-    /**
-     * @param node BlockContainer object to process
-     */
-    public void serveBlockContainer(BlockContainer node);
-
-    /**
-     * @param node Character object to process
-     */
-    public void serveCharacter(Character node);
-
-    /**
-     * @param node ColorProfile object to process
-     */
-    public void serveColorProfile(ColorProfile node);
-
-    /**
-     * @param node ConditionalPageMasterReference object to process
-     */
-    public void serveConditionalPageMasterReference(ConditionalPageMasterReference node);
-
-    /**
-     * @param node Declarations object to process
-     */
-    public void serveDeclarations(Declarations node);
-
-    /**
-     * @param node ExtensionObj object to process
-     */
-    public void serveExtensionObj(ExtensionObj node);
-
-    /**
-     * @param node Bookmarks object to process
-     */
-    public void serveBookmarks(Bookmarks node);
-
-    /**
-     * @param node Label object to process
-     */
-    public void serveLabel(Label node);
-
-    /**
-     * @param node Outline object to process
-     */
-    public void serveOutline(Outline node);
-
-    /**
-     * @param node ExternalGraphic object to process
-     */
-    public void serveExternalGraphic(ExternalGraphic node);
-
-    /**
-     * @param node Flow object to process
-     */
-    public void serveFlow(Flow node);
-
-    /**
-     * @param node StaticContent object to process
-     */
-    public void serveStaticContent(StaticContent node);
-
-    /**
-     * @param node FObjMixed object to process
-     */
-    public void serveFObjMixed(FObjMixed node);
-
-    /**
-     * @param node BidiOverride object to process
-     */
-    public void serveBidiOverride(BidiOverride node);
-
-    /**
-     * @param node Block object to process
-     */
-    public void serveBlock(Block node);
-
-    /**
-     * @param node Inline object to process
-     */
-    public void serveInline(Inline node);
-
-    /**
-     * @param node BasicLink object to process
-     */
-    public void serveBasicLink(BasicLink node);
-
-    /**
-     * @param node Leader object to process
-     */
-    public void serveLeader(Leader node);
-
-    /**
-     * @param node Marker object to process
-     */
-    public void serveMarker(Marker node);
-
-    /**
-     * @param node RetrieveMarker object to process
-     */
-    public void serveRetrieveMarker(RetrieveMarker node);
-
-    /**
-     * @param node Title object to process
-     */
-    public void serveTitle(Title node);
-
-    /**
-     * @param node Wrapper object to process
-     */
-    public void serveWrapper(Wrapper node);
-
-    /**
-     * @param node Footnote object to process
-     */
-    public void serveFootnote(Footnote node);
-
-    /**
-     * @param node FootnoteBody object to process
-     */
-    public void serveFootnoteBody(FootnoteBody node);
-
-    /**
-     * @param node FOText object to process
-     */
-    public void serveFOText(FOText node);
-
-    /**
-     * @param node InlineContainer object to process
-     */
-    public void serveInlineContainer(InlineContainer node);
-
-    /**
-     * @param node InstreamForeignObject object to process
-     */
-    public void serveInstreamForeignObject(InstreamForeignObject node);
-
-    /**
-     * @param node LayoutMasterSet object to process
-     */
-    public void serveLayoutMasterSet(LayoutMasterSet node);
-
-    /**
-     * @param node ListBlock object to process
-     */
-    public void serveListBlock(ListBlock node);
-
-    /**
-     * @param node ListItem object to process
-     */
-    public void serveListItem(ListItem node);
-
-    /**
-     * @param node ListItemBody object to process
-     */
-    public void serveListItemBody(ListItemBody node);
-
-    /**
-     * @param node ListItemLabel object to process
-     */
-    public void serveListItemLabel(ListItemLabel node);
-
-    /**
-     * @param node PageMasterReference object to process
-     */
-    public void servePageMasterReference(PageMasterReference node);
-
-    /**
-     * @param node RepeatablePageMasterReference object to process
-     */
-    public void serveRepeatablePageMasterReference(RepeatablePageMasterReference node);
-
-    /**
-     * @param node SinglePageMasterReference object to process
-     */
-    public void serveSinglePageMasterReference(SinglePageMasterReference node);
-
-    /**
-     * @param node PageNumber object to process
-     */
-    public void servePageNumber(PageNumber node);
-
-    /**
-     * @param node PageNumberCitation object to process
-     */
-    public void servePageNumberCitation(PageNumberCitation node);
-
-    /**
-     * @param node PageSequence object to process
-     */
-    public void servePageSequence(PageSequence node);
-
-    /**
-     * @param node PageSequenceMaster object to process
-     */
-    public void servePageSequenceMaster(PageSequenceMaster node);
-
-    /**
-     * @param node Region object to process
-     */
-    public void serveRegion(Region node);
-
-    /**
-     * @param node RegionBASE object to process
-     */
-    public void serveRegionBASE(RegionBASE node);
-
-    /**
-     * @param node RegionBA object to process
-     */
-    public void serveRegionBA(RegionBA node);
-
-    /**
-     * @param node RegionAfter object to process
-     */
-    public void serveRegionAfter(RegionAfter node);
-
-    /**
-     * @param node RegionBefore object to process
-     */
-    public void serveRegionBefore(RegionBefore node);
-
-    /**
-     * @param node RegionSE object to process
-     */
-    public void serveRegionSE(RegionSE node);
-
-    /**
-     * @param node RegionEnd object to process
-     */
-    public void serveRegionEnd(RegionEnd node);
-
-    /**
-     * @param node RegionStart object to process
-     */
-    public void serveRegionStart(RegionStart node);
-
-    /**
-     * @param node RegionBody object to process
-     */
-    public void serveRegionBody(RegionBody node);
-
-    /**
-     * @param node RepeatablePageMasterAlternatives object to process
-     */
-    public void serveRepeatablePageMasterAlternatives(RepeatablePageMasterAlternatives node);
-
-    /**
-     * @param node Root object to process
-     */
-    public void serveRoot(Root node);
-
-    /**
-     * @param node SimplePageMaster object to process
-     */
-    public void serveSimplePageMaster(SimplePageMaster node);
-
-    /**
-     * @param node Table object to process
-     */
-    public void serveTable(Table node);
-
-    /**
-     * @param node TableBody object to process
-     */
-    public void serveTableBody(TableBody node);
-
-    /**
-     * @param node TableFooter object to process
-     */
-    public void serveTableFooter(TableFooter node);
-
-    /**
-     * @param node TableHeader object to process
-     */
-    public void serveTableHeader(TableHeader node);
-
-    /**
-     * @param node TableCell object to process
-     */
-    public void serveTableCell(TableCell node);
-
-    /**
-     * @param node TableColumn object to process
-     */
-    public void serveTableColumn(TableColumn node);
-
-    /**
-     * @param node TableRow object to process
-     */
-    public void serveTableRow(TableRow node);
-
-    /**
-     * @param node ToBeImplementedElement object to process
-     */
-    public void serveToBeImplementedElement(ToBeImplementedElement node);
-
-    /**
-     * @param node Float object to process
-     */
-    public void serveFloat(Float node);
-
-    /**
-     * @param node InitialPropertySet object to process
-     */
-    public void serveInitialPropertySet(InitialPropertySet node);
-
-    /**
-     * @param node MultiCase object to process
-     */
-    public void serveMultiCase(MultiCase node);
-
-    /**
-     * @param node MultiProperties object to process
-     */
-    public void serveMultiProperties(MultiProperties node);
-
-    /**
-     * @param node MultiPropertySet object to process
-     */
-    public void serveMultiPropertySet(MultiPropertySet node);
-
-    /**
-     * @param node MultiSwitch object to process
-     */
-    public void serveMultiSwitch(MultiSwitch node);
-
-    /**
-     * @param node MultiToggle object to process
-     */
-    public void serveMultiToggle(MultiToggle node);
-
-    /**
-     * @param node TableAndCaption object to process
-     */
-    public void serveTableAndCaption(TableAndCaption node);
-
-    /**
-     * @param node TableCaption object to process
-     */
-    public void serveTableCaption(TableCaption node);
-
-    /**
-     * @param node Unknown object to process
-     */
-    public void serveUnknown(Unknown node);
-
-    /**
-     * @param node XMLObj object to process
-     */
-    public void serveXMLObj(XMLObj node);
-
-    /**
-     * @param node SVGObj object to process
-     */
-    public void serveSVGObj(SVGObj node);
-
-    /**
-     * @param node SVGElement object to process
-     */
-    public void serveSVGElement(SVGElement node);
-
-    /**
-     * @param node UnknownXMLObj object to process
-     */
-    public void serveUnknownXMLObj(UnknownXMLObj node);
-
-    /**
-     * @param node XMLElement object to process
-     */
-    public void serveXMLElement(XMLElement node);
-
-}
-

src/java/org/apache/fop/fo/FObj.java

@@ -29,6 +29,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.properties.PropertyMaker;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
@@ -443,13 +444,12 @@ public class FObj extends FONode implements Constants {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFObj(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFObj(this);
     }
     
 

src/java/org/apache/fop/fo/FObjMixed.java

@@ -19,6 +19,7 @@
 package org.apache.fop.fo;
 
 import org.xml.sax.Locator;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Base class for representation of mixed content formatting objects
@@ -74,13 +75,12 @@ public class FObjMixed extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFObjMixed(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFObjMixed(this);
     }
 }
 

src/java/org/apache/fop/fo/ToBeImplementedElement.java

@@ -18,6 +18,8 @@
 
 package org.apache.fop.fo;
 
+import org.apache.fop.layoutmgr.AddLMVisitor;
+
 /**
  * This class is a placeholder for elements that have not been implemented.
  */
@@ -36,13 +38,12 @@ public class ToBeImplementedElement extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveToBeImplementedElement(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveToBeImplementedElement(this);
     }
 
 }

src/java/org/apache/fop/fo/Unknown.java

@@ -18,6 +18,8 @@
 
 package org.apache.fop.fo;
 
+import org.apache.fop.layoutmgr.AddLMVisitor;
+
 /**
  * Class for handling an unknown element, for example one from an unsupported
  * namespace.
@@ -53,13 +55,12 @@ public class Unknown extends FONode {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveUnknown(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveUnknown(this);
     }
 
 }

src/java/org/apache/fop/fo/UnknownXMLObj.java

@@ -19,6 +19,7 @@
 package org.apache.fop.fo;
 
 import org.xml.sax.Locator;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class for handling generic XML from a namespace not recognized by FOP
@@ -90,13 +91,12 @@ public class UnknownXMLObj extends XMLObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveUnknownXMLObj(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveUnknownXMLObj(this);
     }
 
 }

src/java/org/apache/fop/fo/XMLElement.java

@@ -24,6 +24,7 @@ import org.xml.sax.Locator;
 
 // FOP
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * class representing svg:svg pseudo flow object.
@@ -63,13 +64,12 @@ public class XMLElement extends XMLObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveXMLElement(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveXMLElement(this);
     }
 
 }

src/java/org/apache/fop/fo/XMLObj.java

@@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 
 // FOP
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Abstract class modelling generic, non-XSL-FO XML objects. Such objects are
@@ -198,13 +199,12 @@ public abstract class XMLObj extends FONode {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveXMLObj(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveXMLObj(this);
     }
 
 }

src/java/org/apache/fop/fo/extensions/Bookmarks.java

@@ -26,7 +26,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.pagination.Root;
 
 /**
@@ -64,8 +64,8 @@ public class Bookmarks extends ExtensionObj {
         ((Root) parent).setBookmarks(this);
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveBookmarks(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveBookmarks(this);
     }
 
     public ArrayList getOutlines() {

src/java/org/apache/fop/fo/extensions/ExtensionObj.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.extensions;
 
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Base class for pdf bookmark extension objects.
@@ -36,8 +36,8 @@ public abstract class ExtensionObj extends FObj {
         super(parent);
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveExtensionObj(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveExtensionObj(this);
     }
 
 }

src/java/org/apache/fop/fo/extensions/Label.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.extensions;
 import org.xml.sax.Locator;
 
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 
 /**
@@ -63,8 +63,8 @@ public class Label extends ExtensionObj {
         return label;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveLabel(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveLabel(this);
     }
     
     public String getName() {

src/java/org/apache/fop/fo/extensions/Outline.java

@@ -19,7 +19,7 @@
 package org.apache.fop.fo.extensions;
 
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 import java.util.ArrayList;
@@ -89,8 +89,8 @@ public class Outline extends ExtensionObj {
         return label == null ? "" : label.toString();
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveOutline(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveOutline(this);
     }
 
     public String getInternalDestination() {

src/java/org/apache/fop/fo/extensions/svg/SVGElement.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.extensions.svg;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 import org.apache.batik.dom.svg.SVGOMDocument;
@@ -280,8 +280,8 @@ public class SVGElement extends SVGObj {
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveSVGElement(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveSVGElement(this);
     }
 
 }

src/java/org/apache/fop/fo/extensions/svg/SVGObj.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.extensions.svg;
 
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.XMLObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class for SVG element objects.
@@ -44,8 +44,8 @@ public class SVGObj extends XMLObj {
         return "http://www.w3.org/2000/svg";
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveSVGObj(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveSVGObj(this);
     }
 
 }

src/java/org/apache/fop/fo/flow/BasicLink.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -129,13 +129,12 @@ public class BasicLink extends Inline {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveBasicLink(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveBasicLink(this);
     }
 
     /**

src/java/org/apache/fop/fo/flow/BidiOverride.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonRelativePosition;
 
@@ -70,13 +70,12 @@ public class BidiOverride extends FObjMixed {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveBidiOverride(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveBidiOverride(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Block.java

@@ -31,7 +31,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.RecursiveCharIterator;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -394,13 +394,12 @@ public class Block extends FObjMixed {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveBlock(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveBlock(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/BlockContainer.java

@@ -23,7 +23,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAbsolutePosition;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -131,13 +131,12 @@ public class BlockContainer extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveBlockContainer(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveBlockContainer(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Character.java

@@ -28,7 +28,7 @@ import org.apache.fop.fo.CharIterator;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.OneCharIterator;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -131,13 +131,12 @@ public class Character extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveCharacter(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveCharacter(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/ExternalGraphic.java

@@ -29,7 +29,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.image.FopImage;
 import org.apache.fop.image.ImageFactory;
@@ -231,13 +231,12 @@ public class ExternalGraphic extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveExternalGraphic(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveExternalGraphic(this);
     }
 
     public String getURL() {

src/java/org/apache/fop/fo/flow/Float.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * fo:float element.
@@ -43,8 +43,8 @@ public class Float extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFloat(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFloat(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Footnote.java

@@ -26,7 +26,7 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 
 /**
@@ -75,8 +75,8 @@ public class Footnote extends FObj {
         return inlineFO;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFootnote(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFootnote(this);
     }
     
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/FootnoteBody.java

@@ -27,7 +27,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class modelling the fo:footnote-body object. See Sec. 6.10.4 of the XSL-FO
@@ -57,8 +57,8 @@ public class FootnoteBody extends FObj {
         getFOInputHandler().startFootnoteBody(this);
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFootnoteBody(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFootnoteBody(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/InitialPropertySet.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -86,8 +86,8 @@ public class InitialPropertySet extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveInitialPropertySet(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveInitialPropertySet(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Inline.java

@@ -28,7 +28,7 @@ import org.apache.fop.fo.CharIterator;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.InlineCharIterator;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -132,8 +132,8 @@ public class Inline extends FObjMixed {
         return new InlineCharIterator(this, propMgr.getBorderAndPadding());
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveInline(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveInline(this);
     }
 
     /**

src/java/org/apache/fop/fo/flow/InlineContainer.java

@@ -24,7 +24,7 @@ import org.xml.sax.Attributes;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -89,13 +89,12 @@ public class InlineContainer extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveInlineContainer(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveInlineContainer(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/InstreamForeignObject.java

@@ -19,7 +19,7 @@
 package org.apache.fop.fo.flow;
 
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 
 /**
@@ -158,14 +158,13 @@ public class InstreamForeignObject extends FObj {
 
 */
 
-/**
- * This is a hook for an FOTreeVisitor subclass to be able to access
- * this object.
- * @param fotv the FOTreeVisitor subclass that can access this object.
- * @see org.apache.fop.fo.FOTreeVisitor
- */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveInstreamForeignObject(this);
+    /**
+     * This is a hook for the AddLMVisitor class to be able to access
+     * this object.
+     * @param aLMV the AddLMVisitor object that can access this object.
+     */
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveInstreamForeignObject(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Leader.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -163,13 +163,12 @@ public class Leader extends FObjMixed {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveLeader(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveLeader(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/ListBlock.java

@@ -27,7 +27,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -128,13 +128,12 @@ public class ListBlock extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveListBlock(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveListBlock(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/ListItem.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -142,8 +142,8 @@ public class ListItem extends FObj {
         return body;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveListItem(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveListItem(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/ListItemBody.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
 /**
@@ -62,13 +62,12 @@ public class ListItemBody extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveListItemBody(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveListItemBody(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/ListItemLabel.java

@@ -26,7 +26,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
 /**
@@ -75,13 +75,12 @@ public class ListItemLabel extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveListItemLabel(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveListItemLabel(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/Marker.java

@@ -25,7 +25,7 @@ import org.xml.sax.Attributes;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Marker formatting object.
@@ -63,8 +63,8 @@ public class Marker extends FObjMixed {
         return markerClassName;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMarker(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMarker(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/MultiCase.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
@@ -49,8 +49,8 @@ public class MultiCase extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMultiCase(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMultiCase(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/MultiProperties.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
@@ -46,8 +46,8 @@ public class MultiProperties extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMultiProperties(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMultiProperties(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/MultiPropertySet.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 
 /**
@@ -55,8 +55,8 @@ public class MultiPropertySet extends ToBeImplementedElement {
         // this.propertyList.get("active-state");
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMultiPropertySet(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMultiPropertySet(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/MultiSwitch.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
@@ -47,8 +47,8 @@ public class MultiSwitch extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMultiSwitch(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMultiSwitch(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/MultiToggle.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
@@ -47,8 +47,8 @@ public class MultiToggle extends ToBeImplementedElement {
 
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveMultiToggle(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveMultiToggle(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/PageNumber.java

@@ -27,7 +27,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -130,13 +130,12 @@ public class PageNumber extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.servePageNumber(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.servePageNumber(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/PageNumberCitation.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -148,8 +148,8 @@ public class PageNumberCitation extends FObj {
         unresolved = isUnresolved;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.servePageNumberCitation(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.servePageNumberCitation(this);
     }
 
     public Font getFontState() {

src/java/org/apache/fop/fo/flow/RetrieveMarker.java

@@ -27,7 +27,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * The retrieve-marker formatting object.
@@ -84,13 +84,12 @@ public class RetrieveMarker extends FObjMixed {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRetrieveMarker(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRetrieveMarker(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/Table.java

@@ -30,7 +30,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -193,13 +193,12 @@ public class Table extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTable(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTable(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/TableAndCaption.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -82,8 +82,8 @@ public class TableAndCaption extends ToBeImplementedElement {
         return true;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableAndCaption(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableAndCaption(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/TableBody.java

@@ -28,7 +28,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -96,13 +96,12 @@ public class TableBody extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableBody(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableBody(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/TableCaption.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.ToBeImplementedElement;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -75,8 +75,8 @@ public class TableCaption extends ToBeImplementedElement {
         return true;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableCaption(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableCaption(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/TableCell.java

@@ -28,7 +28,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -340,13 +340,12 @@ public class TableCell extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableCell(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableCell(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/TableColumn.java

@@ -29,7 +29,7 @@ import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -125,13 +125,12 @@ public class TableColumn extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableColumn(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableColumn(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/TableFooter.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class modelling the fo:table-footer object. See Sec. 6.7.7 of the XSL-FO
@@ -35,8 +35,8 @@ public class TableFooter extends TableBody {
         super(parent);
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableFooter(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableFooter(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/TableHeader.java

@@ -20,7 +20,7 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class modelling the fo:table-header object. See Sec. 6.7.6 of the XSL-FO
@@ -35,8 +35,8 @@ public class TableHeader extends TableBody {
         super(parent);
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableHeader(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableHeader(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/flow/TableRow.java

@@ -28,7 +28,7 @@ import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.KeepValue;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.Constants;
 
 import org.apache.fop.fo.properties.CommonAccessibility;
@@ -136,13 +136,12 @@ public class TableRow extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTableRow(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTableRow(this);
     }
 
     protected void endOfNode() throws SAXParseException {

src/java/org/apache/fop/fo/flow/Wrapper.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Implementation for fo:wrapper formatting object.
@@ -47,8 +47,8 @@ public class Wrapper extends FObjMixed {
         return true;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveWrapper(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveWrapper(this);
     }
     
     public String getName() {

src/java/org/apache/fop/fo/pagination/ColorProfile.java

@@ -33,7 +33,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * The fo:color-profile formatting object.
@@ -112,8 +112,8 @@ public class ColorProfile extends FObj {
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveColorProfile(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveColorProfile(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java

@@ -26,7 +26,7 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -174,8 +174,8 @@ public class ConditionalPageMasterReference extends FObj {
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveConditionalPageMasterReference(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveConditionalPageMasterReference(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/Declarations.java

@@ -32,7 +32,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.XMLObj;
 
 
@@ -106,8 +106,8 @@ public class Declarations extends FObj {
         childNodes = null;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveDeclarations(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveDeclarations(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/Flow.java

@@ -30,7 +30,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -174,13 +174,12 @@ public class Flow extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveFlow(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveFlow(this);
     }
     
     public String getName() {

src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java

@@ -31,7 +31,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -217,8 +217,8 @@ public class LayoutMasterSet extends FObj {
         return false;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveLayoutMasterSet(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveLayoutMasterSet(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/PageMasterReference.java

@@ -25,7 +25,7 @@ import org.xml.sax.Attributes;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Base PageMasterReference class. Provides implementation for handling the
@@ -86,8 +86,8 @@ public abstract class PageMasterReference extends FObj
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.servePageMasterReference(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.servePageMasterReference(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/PageSequence.java

@@ -30,7 +30,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -693,10 +693,10 @@ public class PageSequence extends FObj {
 
     /**
      * Hook for Visitor objects accessing the FO Tree.
-     * @param fotv the FOTreeVisitor object accessing this node of the FO Tree
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.servePageSequence(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.servePageSequence(this);
     }
 
     /**

src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java

@@ -31,7 +31,7 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -195,8 +195,8 @@ public class PageSequenceMaster extends FObj {
         return pageMaster;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.servePageSequenceMaster(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.servePageSequenceMaster(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/Region.java

@@ -29,7 +29,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 
 /**
@@ -195,13 +195,12 @@ public abstract class Region extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegion(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegion(this);
     }
 
 }

src/java/org/apache/fop/fo/pagination/RegionAfter.java

@@ -23,7 +23,7 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -70,13 +70,12 @@ public class RegionAfter extends RegionBA {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionAfter(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionAfter(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RegionBA.java

@@ -26,7 +26,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 
 /**
@@ -88,8 +88,8 @@ public abstract class RegionBA extends RegionBASE {
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionBA(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionBA(this);
     }
 
 }

src/java/org/apache/fop/fo/pagination/RegionBASE.java

@@ -24,7 +24,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 
 /**
@@ -57,8 +57,8 @@ public abstract class RegionBASE extends Region {
         return this.extent;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionBASE(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionBASE(this);
     }
 
 }

src/java/org/apache/fop/fo/pagination/RegionBefore.java

@@ -21,7 +21,7 @@ package org.apache.fop.fo.pagination;
 // FOP
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 // Java
 import java.awt.Rectangle;
@@ -75,13 +75,12 @@ public class RegionBefore extends RegionBA {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionBefore(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionBefore(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RegionBody.java

@@ -28,7 +28,7 @@ import org.xml.sax.Attributes;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.properties.CommonMarginBlock;
@@ -108,13 +108,12 @@ public class RegionBody extends Region {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionBody(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionBody(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RegionEnd.java

@@ -23,7 +23,7 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -71,13 +71,12 @@ public class RegionEnd extends RegionSE {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionEnd(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionEnd(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RegionSE.java

@@ -23,7 +23,7 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Abstract base class for fo:region-start and fo:region-end.
@@ -67,8 +67,8 @@ public abstract class RegionSE extends RegionBASE {
         }
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionSE(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionSE(this);
     }
 
 }

src/java/org/apache/fop/fo/pagination/RegionStart.java

@@ -23,7 +23,7 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -70,13 +70,12 @@ public class RegionStart extends RegionSE {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRegionStart(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRegionStart(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java

@@ -30,7 +30,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -157,8 +157,8 @@ public class RepeatablePageMasterAlternatives extends FObj
         this.numberConsumed = 0;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRepeatablePageMasterAlternatives(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRepeatablePageMasterAlternatives(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -105,8 +105,8 @@ public class RepeatablePageMasterReference extends PageMasterReference
         this.numberConsumed = 0;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRepeatablePageMasterReference(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRepeatablePageMasterReference(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/Root.java

@@ -32,7 +32,7 @@ import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.fo.extensions.Bookmarks;
 import org.apache.fop.fo.FOInputHandler;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * The fo:root formatting object. Contains page masters, page-sequences.
@@ -226,10 +226,10 @@ public class Root extends FObj {
 
     /**
      * Hook for Visitor objects accessing the FO Tree.
-     * @param fotv the FOTreeVisitor object accessing this node of the FO Tree
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveRoot(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveRoot(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/SimplePageMaster.java

@@ -29,7 +29,7 @@ import org.xml.sax.Attributes;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -153,13 +153,12 @@ public class SimplePageMaster extends FObj {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveSimplePageMaster(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveSimplePageMaster(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java

@@ -25,7 +25,7 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A single-page-master-reference formatting object.
@@ -78,8 +78,8 @@ public class SinglePageMasterReference extends PageMasterReference
         this.state = FIRST;
     }
 
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveSinglePageMasterReference(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveSinglePageMasterReference(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/StaticContent.java

@@ -27,7 +27,7 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class modelling the fo:static-content object. See Sec. 6.4.19 of the XSL-FO
@@ -84,13 +84,12 @@ public class StaticContent extends Flow {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveStaticContent(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveStaticContent(this);
     }
 
     public String getName() {

src/java/org/apache/fop/fo/pagination/Title.java

@@ -28,7 +28,7 @@ import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOTreeVisitor;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -97,13 +97,12 @@ public class Title extends FObjMixed {
     }
 
     /**
-     * This is a hook for an FOTreeVisitor subclass to be able to access
+     * This is a hook for the AddLMVisitor class to be able to access
      * this object.
-     * @param fotv the FOTreeVisitor subclass that can access this object.
-     * @see org.apache.fop.fo.FOTreeVisitor
+     * @param aLMV the AddLMVisitor object that can access this object.
      */
-    public void acceptVisitor(FOTreeVisitor fotv) {
-        fotv.serveTitle(this);
+    public void acceptVisitor(AddLMVisitor aLMV) {
+        aLMV.serveTitle(this);
     }
 
     public String getName() {

src/java/org/apache/fop/layoutmgr/AddLMVisitor.java

@@ -43,7 +43,6 @@ import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOText;
-import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.TextInfo;
@@ -132,14 +131,12 @@ import org.apache.fop.layoutmgr.table.TableLayoutManager;
 import org.apache.fop.traits.MinOptMax;
 
 /**
- * Concrete implementation of FOTreeVisitor for the purpose of adding
- * Layout Managers for nodes in the FOTree.
- * Each method is responsible to return a LayoutManager responsible for laying
- * out this FObj's content.
- * @see org.apache.fop.fo.FOTreeVisitor
+ * Visitor pattern for the purpose of adding
+ * Layout Managers to nodes in the FOTree.
+ * Each method is responsible to return a LayoutManager 
+ * responsible for laying out this FObj's content.
  */
-
-public class AddLMVisitor implements FOTreeVisitor {
+public class AddLMVisitor {
 
     /** The List object to which methods in this class should add Layout
      *  Managers */