diff options
| author | Glen Mazza <gmazza@apache.org> | 2004-07-27 23:57:18 +0000 |
|---|---|---|
| committer | Glen Mazza <gmazza@apache.org> | 2004-07-27 23:57:18 +0000 |
| commit | 249622789008c4fb8509c6286809f4adbaac654f (patch) | |
| tree | c77193a66bf5b6b8957887edee27789a03ed0cb9 /src | |
| parent | a65925f0dbb1c4fe68887fe9deb9f90ba159dfbd (diff) | |
| download | xmlgraphics-fop-249622789008c4fb8509c6286809f4adbaac654f.tar.gz xmlgraphics-fop-249622789008c4fb8509c6286809f4adbaac654f.zip | |
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
Diffstat (limited to 'src')
78 files changed, 316 insertions, 836 deletions
diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index c3b012346..41a70a913 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/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); } /** diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java index 37a032d20..cba30e179 100644 --- a/src/java/org/apache/fop/fo/FOText.java +++ b/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); } diff --git a/src/java/org/apache/fop/fo/FOTreeVisitor.java b/src/java/org/apache/fop/fo/FOTreeVisitor.java deleted file mode 100644 index 2e522d2f4..000000000 --- a/src/java/org/apache/fop/fo/FOTreeVisitor.java +++ /dev/null @@ -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); - -} - diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index ac37a55b3..c77dcc9a3 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/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); } diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index e93eef37a..38cf73405 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/ToBeImplementedElement.java b/src/java/org/apache/fop/fo/ToBeImplementedElement.java index a52ea524d..80f3691a1 100644 --- a/src/java/org/apache/fop/fo/ToBeImplementedElement.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/Unknown.java b/src/java/org/apache/fop/fo/Unknown.java index 476ea834e..2a8edee8c 100644 --- a/src/java/org/apache/fop/fo/Unknown.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/UnknownXMLObj.java b/src/java/org/apache/fop/fo/UnknownXMLObj.java index 4fcd6c081..a64759b87 100644 --- a/src/java/org/apache/fop/fo/UnknownXMLObj.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/XMLElement.java b/src/java/org/apache/fop/fo/XMLElement.java index 2d5b84b00..360b5f49c 100644 --- a/src/java/org/apache/fop/fo/XMLElement.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/XMLObj.java b/src/java/org/apache/fop/fo/XMLObj.java index d6c177b22..952c0639f 100644 --- a/src/java/org/apache/fop/fo/XMLObj.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/extensions/Bookmarks.java b/src/java/org/apache/fop/fo/extensions/Bookmarks.java index e4c9f1b7a..d84066402 100644 --- a/src/java/org/apache/fop/fo/extensions/Bookmarks.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java index 2dc41d6d3..3db4c8355 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/extensions/Label.java b/src/java/org/apache/fop/fo/extensions/Label.java index a60226cb2..e8c2ed0a4 100644 --- a/src/java/org/apache/fop/fo/extensions/Label.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/extensions/Outline.java b/src/java/org/apache/fop/fo/extensions/Outline.java index 725e5ebe6..3d5e5f6b5 100644 --- a/src/java/org/apache/fop/fo/extensions/Outline.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java index 812e83a82..883c90a27 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java index 6fced945d..bf932df6d 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 08592886e..d71d73ecd 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/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); } /** diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java index ffb022206..b0cc8b0ec 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index f44d65c00..06ff3b5c6 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index d3d243db9..51bef9036 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index 670e55e7e..5aa8d9a11 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index de42915d1..579fcf649 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Float.java b/src/java/org/apache/fop/fo/flow/Float.java index 28f255ba7..f20591f29 100644 --- a/src/java/org/apache/fop/fo/flow/Float.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index 1575a81f7..df36b7724 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java index 9564350db..413a6bda4 100644 --- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java index 8b1c90fe1..9bc17ff6b 100644 --- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index a7d15f21f..b60c20141 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/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); } /** diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java index bd9607a05..a58135351 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index 5e27d6983..f2677268c 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 42837265e..27288bbee 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index 2aa9c5441..6f76e4ebc 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index 5fa73636a..75a2cd37f 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index 4f8460fb8..6044ef20c 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index 358453a8e..24146d539 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index cbc6a55fd..bfcbf7250 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java index c4945ff15..52cdb0daa 100644 --- a/src/java/org/apache/fop/fo/flow/MultiCase.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/MultiProperties.java b/src/java/org/apache/fop/fo/flow/MultiProperties.java index d35f747d5..86df3e4cf 100644 --- a/src/java/org/apache/fop/fo/flow/MultiProperties.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java index 159519f37..cc971388d 100644 --- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java index 5535327c7..0ce8d34ba 100644 --- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java index da77e7da8..f0abecde6 100644 --- a/src/java/org/apache/fop/fo/flow/MultiToggle.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index 40ed737e7..3ca50ff18 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index 7d93eb28d..a7a5d5f5e 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 5702d5412..e023f96cd 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 3a430f52b..5babb90bb 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java index 8585fb59b..a903d358d 100644 --- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index 20e392181..8f6197d17 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java index c167dabe2..c049f8f1b 100644 --- a/src/java/org/apache/fop/fo/flow/TableCaption.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index 4dcf265cf..dd06524b6 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index c6659690e..936cdddb7 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/TableFooter.java b/src/java/org/apache/fop/fo/flow/TableFooter.java index e1681f787..f3ea6f43f 100644 --- a/src/java/org/apache/fop/fo/flow/TableFooter.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/TableHeader.java b/src/java/org/apache/fop/fo/flow/TableHeader.java index 0e6b809fc..a79432890 100644 --- a/src/java/org/apache/fop/fo/flow/TableHeader.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 4b3a1b41f..71c89590d 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java index 75364dbc6..22cacb2e3 100644 --- a/src/java/org/apache/fop/fo/flow/Wrapper.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java index 320626a8b..9abccc132 100644 --- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java index 045a2a3a1..0754a7708 100644 --- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java index 02292802f..11b1ad406 100644 --- a/src/java/org/apache/fop/fo/pagination/Declarations.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index 400ff45dc..688d61fb7 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java index 1504c4201..94303e466 100644 --- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java b/src/java/org/apache/fop/fo/pagination/PageMasterReference.java index 910c31ce7..2b6426c6d 100644 --- a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index 75013e7cc..eea576a3e 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/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); } /** diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java index cdb8c86e4..ecb542ef5 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java index d06f392b3..9f226ad80 100644 --- a/src/java/org/apache/fop/fo/pagination/Region.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java index c95024629..ba44c7475 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java index 9f8bfb39f..de1866b38 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBA.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBASE.java b/src/java/org/apache/fop/fo/pagination/RegionBASE.java index 08b662d19..8bc8c8f20 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBASE.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java index 0257d2510..b87eff4c9 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index c0855abaa..aae53d863 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java index 5d32912de..818386362 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java index 98040d541..4981cdae0 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionSE.java +++ b/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); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java index 71919edcf..aa8feeef9 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionStart.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java index 5d3e4a70c..f43f3f5ae 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java index 581b54646..69c0d5cc1 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java index ca240f275..c255e1326 100644 --- a/src/java/org/apache/fop/fo/pagination/Root.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java index 5a089637e..722ee8cb6 100644 --- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java index ac9fa50d8..8233fa412 100644 --- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index a82721470..7f396f83f 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/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() { diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 5e5a8271d..3b1f6b960 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/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() { diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java index d9ebf6294..9b2abc769 100644 --- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java +++ b/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 */ |