From 68cbeb606fa092a90d23cdc466c1a32106ea8dc3 Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Tue, 16 Sep 2003 05:21:07 +0000 Subject: [PATCH] 1. convert fo/FOTreeVisitor to an interface 2. give all FOTreeVisitor methods a unique name (instead of overloading) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196913 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FONode.java | 2 +- src/java/org/apache/fop/fo/FOText.java | 2 +- src/java/org/apache/fop/fo/FOTreeVisitor.java | 311 +++------- src/java/org/apache/fop/fo/FObj.java | 2 +- src/java/org/apache/fop/fo/FObjMixed.java | 2 +- .../apache/fop/fo/ToBeImplementedElement.java | 2 +- src/java/org/apache/fop/fo/Unknown.java | 2 +- src/java/org/apache/fop/fo/UnknownXMLObj.java | 2 +- src/java/org/apache/fop/fo/XMLElement.java | 2 +- src/java/org/apache/fop/fo/XMLObj.java | 2 +- .../apache/fop/fo/extensions/Bookmarks.java | 2 +- .../fop/fo/extensions/ExtensionObj.java | 2 +- .../org/apache/fop/fo/extensions/Label.java | 2 +- .../org/apache/fop/fo/extensions/Outline.java | 2 +- .../fop/fo/extensions/svg/SVGElement.java | 2 +- .../apache/fop/fo/extensions/svg/SVGObj.java | 2 +- .../org/apache/fop/fo/flow/BasicLink.java | 2 +- .../org/apache/fop/fo/flow/BidiOverride.java | 2 +- src/java/org/apache/fop/fo/flow/Block.java | 2 +- .../apache/fop/fo/flow/BlockContainer.java | 2 +- .../org/apache/fop/fo/flow/Character.java | 2 +- .../apache/fop/fo/flow/ExternalGraphic.java | 2 +- src/java/org/apache/fop/fo/flow/Float.java | 2 +- src/java/org/apache/fop/fo/flow/Footnote.java | 2 +- .../org/apache/fop/fo/flow/FootnoteBody.java | 2 +- .../fop/fo/flow/InitialPropertySet.java | 2 +- src/java/org/apache/fop/fo/flow/Inline.java | 2 +- .../apache/fop/fo/flow/InlineContainer.java | 2 +- .../fop/fo/flow/InstreamForeignObject.java | 2 +- src/java/org/apache/fop/fo/flow/Leader.java | 2 +- .../org/apache/fop/fo/flow/ListBlock.java | 2 +- src/java/org/apache/fop/fo/flow/ListItem.java | 2 +- .../org/apache/fop/fo/flow/ListItemBody.java | 2 +- .../org/apache/fop/fo/flow/ListItemLabel.java | 2 +- src/java/org/apache/fop/fo/flow/Marker.java | 2 +- .../org/apache/fop/fo/flow/MultiCase.java | 2 +- .../apache/fop/fo/flow/MultiProperties.java | 2 +- .../apache/fop/fo/flow/MultiPropertySet.java | 2 +- .../org/apache/fop/fo/flow/MultiSwitch.java | 2 +- .../org/apache/fop/fo/flow/MultiToggle.java | 2 +- .../org/apache/fop/fo/flow/PageNumber.java | 2 +- .../fop/fo/flow/PageNumberCitation.java | 2 +- .../apache/fop/fo/flow/RetrieveMarker.java | 2 +- src/java/org/apache/fop/fo/flow/Table.java | 2 +- .../apache/fop/fo/flow/TableAndCaption.java | 2 +- .../org/apache/fop/fo/flow/TableBody.java | 2 +- .../org/apache/fop/fo/flow/TableCaption.java | 2 +- .../org/apache/fop/fo/flow/TableCell.java | 2 +- .../org/apache/fop/fo/flow/TableColumn.java | 2 +- .../org/apache/fop/fo/flow/TableFooter.java | 2 +- .../org/apache/fop/fo/flow/TableHeader.java | 2 +- src/java/org/apache/fop/fo/flow/TableRow.java | 2 +- src/java/org/apache/fop/fo/flow/Wrapper.java | 2 +- .../fop/fo/pagination/ColorProfile.java | 2 +- .../ConditionalPageMasterReference.java | 2 +- .../fop/fo/pagination/Declarations.java | 2 +- .../org/apache/fop/fo/pagination/Flow.java | 2 +- .../fop/fo/pagination/LayoutMasterSet.java | 2 +- .../fo/pagination/PageMasterReference.java | 2 +- .../fop/fo/pagination/PageSequence.java | 2 +- .../fop/fo/pagination/PageSequenceMaster.java | 2 +- .../org/apache/fop/fo/pagination/Region.java | 2 +- .../apache/fop/fo/pagination/RegionAfter.java | 2 +- .../apache/fop/fo/pagination/RegionBA.java | 2 +- .../apache/fop/fo/pagination/RegionBASE.java | 2 +- .../fop/fo/pagination/RegionBefore.java | 2 +- .../apache/fop/fo/pagination/RegionBody.java | 2 +- .../apache/fop/fo/pagination/RegionEnd.java | 2 +- .../apache/fop/fo/pagination/RegionSE.java | 2 +- .../apache/fop/fo/pagination/RegionStart.java | 2 +- .../RepeatablePageMasterAlternatives.java | 2 +- .../RepeatablePageMasterReference.java | 2 +- .../org/apache/fop/fo/pagination/Root.java | 2 +- .../fop/fo/pagination/SimplePageMaster.java | 2 +- .../pagination/SinglePageMasterReference.java | 2 +- .../fop/fo/pagination/StaticContent.java | 2 +- .../org/apache/fop/fo/pagination/Title.java | 2 +- .../apache/fop/layoutmgr/AddLMVisitor.java | 537 +++++++++++++++--- 78 files changed, 629 insertions(+), 371 deletions(-) diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index a7d63904c..fd118c1e1 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -212,7 +212,7 @@ public abstract class FONode { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFONode(this); } } diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java index 20c03b476..91a346e58 100644 --- a/src/java/org/apache/fop/fo/FOText.java +++ b/src/java/org/apache/fop/fo/FOText.java @@ -495,6 +495,6 @@ public class FOText extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFOText(this); } } diff --git a/src/java/org/apache/fop/fo/FOTreeVisitor.java b/src/java/org/apache/fop/fo/FOTreeVisitor.java index 112a2753a..56c4fd773 100644 --- a/src/java/org/apache/fop/fo/FOTreeVisitor.java +++ b/src/java/org/apache/fop/fo/FOTreeVisitor.java @@ -123,7 +123,7 @@ import org.apache.fop.fo.extensions.svg.SVGElement; * 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 serveVisitor(FONode)) is to run the the visitXXXX method + * 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 @@ -131,543 +131,392 @@ import org.apache.fop.fo.extensions.svg.SVGElement; *

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, - * serveVisitor(FObj) runs the following:

- * 
    serveVisitor((FONode)node);
+ * serveFObj(FObj) runs the following:

+ * 
    serveFONode((FONode)node);
*

If FObj ceases to be a direct subclass of FONode, then the above may cause * problems.

*/ -public abstract class FOTreeVisitor { +public interface FOTreeVisitor { /** * @param node FONode object to process */ - public void serveVisitor(FONode node) { - } + public void serveFONode(FONode node); /** * @param node FObj object to process */ - public void serveVisitor(FObj node) { - serveVisitor((FONode)node); - } + public void serveFObj(FObj node); /** * @param node BlockContainer object to process */ - public void serveVisitor(BlockContainer node) { - serveVisitor((FObj)node); - } + public void serveBlockContainer(BlockContainer node); /** * @param node Character object to process */ - public void serveVisitor(Character node) { - serveVisitor((FObj)node); - } + public void serveCharacter(Character node); /** * @param node ColorProfile object to process */ - public void serveVisitor(ColorProfile node) { - serveVisitor((FObj)node); - } + public void serveColorProfile(ColorProfile node); /** * @param node ConditionalPageMasterReference object to process */ - public void serveVisitor(ConditionalPageMasterReference node) { - serveVisitor((FObj)node); - } + public void serveConditionalPageMasterReference(ConditionalPageMasterReference node); /** * @param node Declarations object to process */ - public void serveVisitor(Declarations node) { - serveVisitor((FObj)node); - } + public void serveDeclarations(Declarations node); /** * @param node ExtensionObj object to process */ - public void serveVisitor(ExtensionObj node) { - serveVisitor((FObj)node); - } + public void serveExtensionObj(ExtensionObj node); /** * @param node Bookmarks object to process */ - public void serveVisitor(Bookmarks node) { - serveVisitor((ExtensionObj)node); - } + public void serveBookmarks(Bookmarks node); /** * @param node Label object to process */ - public void serveVisitor(Label node) { - serveVisitor((ExtensionObj)node); - } + public void serveLabel(Label node); /** * @param node Outline object to process */ - public void serveVisitor(Outline node) { - serveVisitor((ExtensionObj)node); - } + public void serveOutline(Outline node); /** * @param node ExternalGraphic object to process */ - public void serveVisitor(ExternalGraphic node) { - serveVisitor((FObj)node); - } + public void serveExternalGraphic(ExternalGraphic node); /** * @param node Flow object to process */ - public void serveVisitor(Flow node) { - serveVisitor((FObj)node); - } + public void serveFlow(Flow node); /** * @param node StaticContent object to process */ - public void serveVisitor(StaticContent node) { - serveVisitor((Flow)node); - } + public void serveStaticContent(StaticContent node); /** * @param node FObjMixed object to process */ - public void serveVisitor(FObjMixed node) { - serveVisitor((FObj)node); - } + public void serveFObjMixed(FObjMixed node); /** * @param node BidiOverride object to process */ - public void serveVisitor(BidiOverride node) { - serveVisitor((FObjMixed)node); - } + public void serveBidiOverride(BidiOverride node); /** * @param node Block object to process */ - public void serveVisitor(Block node) { - serveVisitor((FObjMixed)node); - } + public void serveBlock(Block node); /** * @param node Inline object to process */ - public void serveVisitor(Inline node) { - serveVisitor((FObjMixed)node); - } + public void serveInline(Inline node); /** * @param node BasicLink object to process */ - public void serveVisitor(BasicLink node) { - serveVisitor((Inline)node); - } + public void serveBasicLink(BasicLink node); /** * @param node Leader object to process */ - public void serveVisitor(Leader node) { - serveVisitor((FObjMixed)node); - } + public void serveLeader(Leader node); /** * @param node Marker object to process */ - public void serveVisitor(Marker node) { - serveVisitor((FObjMixed)node); - } + public void serveMarker(Marker node); /** * @param node RetrieveMarker object to process */ - public void serveVisitor(RetrieveMarker node) { - serveVisitor((FObjMixed)node); - } + public void serveRetrieveMarker(RetrieveMarker node); /** * @param node Title object to process */ - public void serveVisitor(Title node) { - serveVisitor((FObjMixed)node); - } + public void serveTitle(Title node); /** * @param node Wrapper object to process */ - public void serveVisitor(Wrapper node) { - serveVisitor((FObjMixed)node); - } + public void serveWrapper(Wrapper node); /** * @param node Footnote object to process */ - public void serveVisitor(Footnote node) { - serveVisitor((FObj)node); - } + public void serveFootnote(Footnote node); /** * @param node FootnoteBody object to process */ - public void serveVisitor(FootnoteBody node) { - serveVisitor((FObj)node); - } + public void serveFootnoteBody(FootnoteBody node); /** * @param node FOText object to process */ - public void serveVisitor(FOText node) { - serveVisitor((FObj)node); - } + public void serveFOText(FOText node); /** * @param node InlineContainer object to process */ - public void serveVisitor(InlineContainer node) { - serveVisitor((FObj)node); - } + public void serveInlineContainer(InlineContainer node); /** * @param node InstreamForeignObject object to process */ - public void serveVisitor(InstreamForeignObject node) { - serveVisitor((FObj)node); - } + public void serveInstreamForeignObject(InstreamForeignObject node); /** * @param node LayoutMasterSet object to process */ - public void serveVisitor(LayoutMasterSet node) { - serveVisitor((FObj)node); - } + public void serveLayoutMasterSet(LayoutMasterSet node); /** * @param node ListBlock object to process */ - public void serveVisitor(ListBlock node) { - serveVisitor((FObj)node); - } + public void serveListBlock(ListBlock node); /** * @param node ListItem object to process */ - public void serveVisitor(ListItem node) { - serveVisitor((FObj)node); - } + public void serveListItem(ListItem node); /** * @param node ListItemBody object to process */ - public void serveVisitor(ListItemBody node) { - serveVisitor((FObj)node); - } + public void serveListItemBody(ListItemBody node); /** * @param node ListItemLabel object to process */ - public void serveVisitor(ListItemLabel node) { - serveVisitor((FObj)node); - } + public void serveListItemLabel(ListItemLabel node); /** * @param node PageMasterReference object to process */ - public void serveVisitor(PageMasterReference node) { - serveVisitor((FObj)node); - } + public void servePageMasterReference(PageMasterReference node); /** * @param node RepeatablePageMasterReference object to process */ - public void serveVisitor(RepeatablePageMasterReference node) { - serveVisitor((PageMasterReference)node); - } + public void serveRepeatablePageMasterReference(RepeatablePageMasterReference node); /** * @param node SinglePageMasterReference object to process */ - public void serveVisitor(SinglePageMasterReference node) { - serveVisitor((PageMasterReference)node); - } + public void serveSinglePageMasterReference(SinglePageMasterReference node); /** * @param node PageNumber object to process */ - public void serveVisitor(PageNumber node) { - serveVisitor((FObj)node); - } + public void servePageNumber(PageNumber node); /** * @param node PageNumberCitation object to process */ - public void serveVisitor(PageNumberCitation node) { - serveVisitor((FObj)node); - } + public void servePageNumberCitation(PageNumberCitation node); /** * @param node PageSequence object to process */ - public void serveVisitor(PageSequence node) { - serveVisitor((FObj)node); - } + public void servePageSequence(PageSequence node); /** * @param node PageSequenceMaster object to process */ - public void serveVisitor(PageSequenceMaster node) { - serveVisitor((FObj)node); - } + public void servePageSequenceMaster(PageSequenceMaster node); /** * @param node Region object to process */ - public void serveVisitor(Region node) { - serveVisitor((FObj)node); - } + public void serveRegion(Region node); /** * @param node RegionBASE object to process */ - public void serveVisitor(RegionBASE node) { - serveVisitor((Region)node); - } + public void serveRegionBASE(RegionBASE node); /** * @param node RegionBA object to process */ - public void serveVisitor(RegionBA node) { - serveVisitor((RegionBASE)node); - } + public void serveRegionBA(RegionBA node); /** * @param node RegionAfter object to process */ - public void serveVisitor(RegionAfter node) { - serveVisitor((RegionBA)node); - } + public void serveRegionAfter(RegionAfter node); /** * @param node RegionBefore object to process */ - public void serveVisitor(RegionBefore node) { - serveVisitor((RegionBA)node); - } + public void serveRegionBefore(RegionBefore node); /** * @param node RegionSE object to process */ - public void serveVisitor(RegionSE node) { - serveVisitor((RegionBASE)node); - } + public void serveRegionSE(RegionSE node); /** * @param node RegionEnd object to process */ - public void serveVisitor(RegionEnd node) { - serveVisitor((RegionSE)node); - } + public void serveRegionEnd(RegionEnd node); /** * @param node RegionStart object to process */ - public void serveVisitor(RegionStart node) { - serveVisitor((RegionSE)node); - } + public void serveRegionStart(RegionStart node); /** * @param node RegionBody object to process */ - public void serveVisitor(RegionBody node) { - serveVisitor((Region)node); - } + public void serveRegionBody(RegionBody node); /** * @param node RepeatablePageMasterAlternatives object to process */ - public void serveVisitor(RepeatablePageMasterAlternatives node) { - serveVisitor((FObj)node); - } + public void serveRepeatablePageMasterAlternatives(RepeatablePageMasterAlternatives node); /** * @param node Root object to process */ - public void serveVisitor(Root node) { - serveVisitor((FObj)node); - } + public void serveRoot(Root node); /** * @param node SimplePageMaster object to process */ - public void serveVisitor(SimplePageMaster node) { - serveVisitor((FObj)node); - } + public void serveSimplePageMaster(SimplePageMaster node); /** * @param node Table object to process */ - public void serveVisitor(Table node) { - serveVisitor((FObj)node); - } + public void serveTable(Table node); /** * @param node TableBody object to process */ - public void serveVisitor(TableBody node) { - serveVisitor((FObj)node); - } + public void serveTableBody(TableBody node); /** * @param node TableFooter object to process */ - public void serveVisitor(TableFooter node) { - serveVisitor((TableBody)node); - } + public void serveTableFooter(TableFooter node); /** * @param node TableHeader object to process */ - public void serveVisitor(TableHeader node) { - serveVisitor((TableBody)node); - } + public void serveTableHeader(TableHeader node); /** * @param node TableCell object to process */ - public void serveVisitor(TableCell node) { - serveVisitor((FObj)node); - } + public void serveTableCell(TableCell node); /** * @param node TableColumn object to process */ - public void serveVisitor(TableColumn node) { - serveVisitor((FObj)node); - } + public void serveTableColumn(TableColumn node); /** * @param node TableRow object to process */ - public void serveVisitor(TableRow node) { - serveVisitor((FObj)node); - } + public void serveTableRow(TableRow node); /** * @param node ToBeImplementedElement object to process */ - public void serveVisitor(ToBeImplementedElement node) { - serveVisitor((FObj)node); - } + public void serveToBeImplementedElement(ToBeImplementedElement node); /** * @param node Float object to process */ - public void serveVisitor(Float node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveFloat(Float node); /** * @param node InitialPropertySet object to process */ - public void serveVisitor(InitialPropertySet node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveInitialPropertySet(InitialPropertySet node); /** * @param node MultiCase object to process */ - public void serveVisitor(MultiCase node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveMultiCase(MultiCase node); /** * @param node MultiProperties object to process */ - public void serveVisitor(MultiProperties node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveMultiProperties(MultiProperties node); /** * @param node MultiPropertySet object to process */ - public void serveVisitor(MultiPropertySet node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveMultiPropertySet(MultiPropertySet node); /** * @param node MultiSwitch object to process */ - public void serveVisitor(MultiSwitch node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveMultiSwitch(MultiSwitch node); /** * @param node MultiToggle object to process */ - public void serveVisitor(MultiToggle node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveMultiToggle(MultiToggle node); /** * @param node TableAndCaption object to process */ - public void serveVisitor(TableAndCaption node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveTableAndCaption(TableAndCaption node); /** * @param node TableCaption object to process */ - public void serveVisitor(TableCaption node) { - serveVisitor((ToBeImplementedElement)node); - } + public void serveTableCaption(TableCaption node); /** * @param node Unknown object to process */ - public void serveVisitor(Unknown node) { - serveVisitor((FONode)node); - } + public void serveUnknown(Unknown node); /** * @param node XMLObj object to process */ - public void serveVisitor(XMLObj node) { - serveVisitor((FONode)node); - } + public void serveXMLObj(XMLObj node); /** * @param node SVGObj object to process */ - public void serveVisitor(SVGObj node) { - serveVisitor((XMLObj)node); - } + public void serveSVGObj(SVGObj node); /** * @param node SVGElement object to process */ - public void serveVisitor(SVGElement node) { - serveVisitor((SVGObj)node); - } + public void serveSVGElement(SVGElement node); /** * @param node UnknownXMLObj object to process */ - public void serveVisitor(UnknownXMLObj node) { - serveVisitor((XMLObj)node); - } + public void serveUnknownXMLObj(UnknownXMLObj node); /** * @param node XMLElement object to process */ - public void serveVisitor(XMLElement node) { - serveVisitor((XMLObj)node); - } + 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 84ff3b8b3..ecf5b60fc 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -420,7 +420,7 @@ public class FObj extends FONode { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFObj(this); } } diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index aca9803f2..dc2142f2e 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -103,7 +103,7 @@ public class FObjMixed extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFObjMixed(this); } } diff --git a/src/java/org/apache/fop/fo/ToBeImplementedElement.java b/src/java/org/apache/fop/fo/ToBeImplementedElement.java index 9e655b954..0214c1cf8 100644 --- a/src/java/org/apache/fop/fo/ToBeImplementedElement.java +++ b/src/java/org/apache/fop/fo/ToBeImplementedElement.java @@ -74,7 +74,7 @@ public class ToBeImplementedElement extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveToBeImplementedElement(this); } } diff --git a/src/java/org/apache/fop/fo/Unknown.java b/src/java/org/apache/fop/fo/Unknown.java index 218f4e18d..389a68492 100644 --- a/src/java/org/apache/fop/fo/Unknown.java +++ b/src/java/org/apache/fop/fo/Unknown.java @@ -91,7 +91,7 @@ public class Unknown extends FONode { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveUnknown(this); } } diff --git a/src/java/org/apache/fop/fo/UnknownXMLObj.java b/src/java/org/apache/fop/fo/UnknownXMLObj.java index 457cbdb72..fb353f181 100644 --- a/src/java/org/apache/fop/fo/UnknownXMLObj.java +++ b/src/java/org/apache/fop/fo/UnknownXMLObj.java @@ -125,7 +125,7 @@ public class UnknownXMLObj extends XMLObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveUnknownXMLObj(this); } } diff --git a/src/java/org/apache/fop/fo/XMLElement.java b/src/java/org/apache/fop/fo/XMLElement.java index 726c542d9..72a0f2a25 100644 --- a/src/java/org/apache/fop/fo/XMLElement.java +++ b/src/java/org/apache/fop/fo/XMLElement.java @@ -102,7 +102,7 @@ public class XMLElement extends XMLObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveXMLElement(this); } } diff --git a/src/java/org/apache/fop/fo/XMLObj.java b/src/java/org/apache/fop/fo/XMLObj.java index e82db2712..613fca806 100644 --- a/src/java/org/apache/fop/fo/XMLObj.java +++ b/src/java/org/apache/fop/fo/XMLObj.java @@ -238,7 +238,7 @@ public abstract class XMLObj extends FONode { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 5e7534417..ef14ff18d 100644 --- a/src/java/org/apache/fop/fo/extensions/Bookmarks.java +++ b/src/java/org/apache/fop/fo/extensions/Bookmarks.java @@ -94,7 +94,7 @@ public class Bookmarks extends ExtensionObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 f55728e59..a7dc57dae 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java @@ -69,7 +69,7 @@ public abstract class ExtensionObj extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 f0ac4a3f3..914309203 100644 --- a/src/java/org/apache/fop/fo/extensions/Label.java +++ b/src/java/org/apache/fop/fo/extensions/Label.java @@ -92,7 +92,7 @@ public class Label extends ExtensionObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveLabel(this); } } diff --git a/src/java/org/apache/fop/fo/extensions/Outline.java b/src/java/org/apache/fop/fo/extensions/Outline.java index 087ad562c..f0b0cb0d5 100644 --- a/src/java/org/apache/fop/fo/extensions/Outline.java +++ b/src/java/org/apache/fop/fo/extensions/Outline.java @@ -126,7 +126,7 @@ public class Outline extends ExtensionObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 9ecb69170..41d0b7a1f 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java @@ -313,7 +313,7 @@ public class SVGElement extends SVGObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 8ec55fd2b..ca3b733a3 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java @@ -77,7 +77,7 @@ public class SVGObj extends XMLObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 319ef6f52..52aec130c 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -154,7 +154,7 @@ public class BasicLink extends Inline { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 202e34bc6..661eb9be1 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java @@ -108,7 +108,7 @@ public class BidiOverride extends FObjMixed { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveBidiOverride(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index b40bda32a..9636496b1 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -400,7 +400,7 @@ public class Block extends FObjMixed { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveBlock(this); } } diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index 0bc317910..3d4bc11cc 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -169,7 +169,7 @@ public class BlockContainer extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveBlockContainer(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index 720249dbe..d19ba8580 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/src/java/org/apache/fop/fo/flow/Character.java @@ -155,7 +155,7 @@ public class Character extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveCharacter(this); } } diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index 8dff84d92..83d603b78 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -248,7 +248,7 @@ public class ExternalGraphic extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 0087b78e7..c07f34f8a 100644 --- a/src/java/org/apache/fop/fo/flow/Float.java +++ b/src/java/org/apache/fop/fo/flow/Float.java @@ -76,7 +76,7 @@ public class Float extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFloat(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index 494e927a8..8eefecdac 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/src/java/org/apache/fop/fo/flow/Footnote.java @@ -97,7 +97,7 @@ public class Footnote extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFootnote(this); } } diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java index 6d7acd359..dec8cde43 100644 --- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java +++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java @@ -76,7 +76,7 @@ public class FootnoteBody extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFootnoteBody(this); } } diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java index 46892e91b..40fc5f2bf 100644 --- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java @@ -105,7 +105,7 @@ public class InitialPropertySet extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveInitialPropertySet(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index c8e9517bc..05d3b3f35 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -163,7 +163,7 @@ public class Inline extends FObjMixed { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 9bb2356f7..80468970d 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java @@ -127,7 +127,7 @@ public class InlineContainer extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveInlineContainer(this); } } diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index a7e14cf32..325d95985 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -200,7 +200,7 @@ public class InstreamForeignObject extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveInstreamForeignObject(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 6d9c65333..7f02f9aca 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -205,7 +205,7 @@ public class Leader extends FObjMixed { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveLeader(this); } } diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index af495be98..4cecd3da4 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -154,7 +154,7 @@ public class ListBlock extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveListBlock(this); } } diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index a9aa7d57c..049518566 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/src/java/org/apache/fop/fo/flow/ListItem.java @@ -166,7 +166,7 @@ public class ListItem extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveListItem(this); } } diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index 960f6a610..073b55dab 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java @@ -100,7 +100,7 @@ public class ListItemBody extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveListItemBody(this); } } diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index a27caedf9..baa712be8 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -100,7 +100,7 @@ public class ListItemLabel extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveListItemLabel(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index 253491d69..3198085f0 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -109,7 +109,7 @@ public class Marker extends FObjMixed { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMarker(this); } } diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java index ee415953b..a69da4adc 100644 --- a/src/java/org/apache/fop/fo/flow/MultiCase.java +++ b/src/java/org/apache/fop/fo/flow/MultiCase.java @@ -82,7 +82,7 @@ public class MultiCase extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMultiCase(this); } } diff --git a/src/java/org/apache/fop/fo/flow/MultiProperties.java b/src/java/org/apache/fop/fo/flow/MultiProperties.java index dcb9666ee..49892dcdd 100644 --- a/src/java/org/apache/fop/fo/flow/MultiProperties.java +++ b/src/java/org/apache/fop/fo/flow/MultiProperties.java @@ -79,7 +79,7 @@ public class MultiProperties extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMultiProperties(this); } } diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java index 0c08a64f9..2411bb94e 100644 --- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java @@ -76,7 +76,7 @@ public class MultiPropertySet extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMultiPropertySet(this); } } diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java index 18a8714db..9e32b0895 100644 --- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java +++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java @@ -80,7 +80,7 @@ public class MultiSwitch extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMultiSwitch(this); } } diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java index 942c3642e..a06f78b37 100644 --- a/src/java/org/apache/fop/fo/flow/MultiToggle.java +++ b/src/java/org/apache/fop/fo/flow/MultiToggle.java @@ -80,7 +80,7 @@ public class MultiToggle extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveMultiToggle(this); } } diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index bd7bd05bb..8f34ae9fd 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -147,7 +147,7 @@ public class PageNumber extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.servePageNumber(this); } } diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index ec72a4e40..5c13e15f6 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java @@ -171,7 +171,7 @@ public class PageNumberCitation extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 93e102143..242b4d565 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -111,7 +111,7 @@ public class RetrieveMarker extends FObjMixed { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRetrieveMarker(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index feec07d25..26c82f540 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -221,7 +221,7 @@ public class Table extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTable(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java index b94ca9a1b..7fec0e3ab 100644 --- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableAndCaption.java @@ -115,7 +115,7 @@ public class TableAndCaption extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableAndCaption(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index a1588c249..71cd68b85 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -120,7 +120,7 @@ public class TableBody extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableBody(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java index 105202c65..1e702426b 100644 --- a/src/java/org/apache/fop/fo/flow/TableCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableCaption.java @@ -108,7 +108,7 @@ public class TableCaption extends ToBeImplementedElement { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableCaption(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index fb568967e..f9961788f 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -383,7 +383,7 @@ public class TableCell extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableCell(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index d8bd8c742..18a832e7e 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -165,7 +165,7 @@ public class TableColumn extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableColumn(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableFooter.java b/src/java/org/apache/fop/fo/flow/TableFooter.java index 0d5076699..87ad000b7 100644 --- a/src/java/org/apache/fop/fo/flow/TableFooter.java +++ b/src/java/org/apache/fop/fo/flow/TableFooter.java @@ -68,7 +68,7 @@ public class TableFooter extends TableBody { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableFooter(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableHeader.java b/src/java/org/apache/fop/fo/flow/TableHeader.java index 28345e8d6..835949dcd 100644 --- a/src/java/org/apache/fop/fo/flow/TableHeader.java +++ b/src/java/org/apache/fop/fo/flow/TableHeader.java @@ -68,7 +68,7 @@ public class TableHeader extends TableBody { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableHeader(this); } } diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index ddb91afce..f39b56c38 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -159,7 +159,7 @@ public class TableRow extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTableRow(this); } } diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java index 1d6d88902..5567f6718 100644 --- a/src/java/org/apache/fop/fo/flow/Wrapper.java +++ b/src/java/org/apache/fop/fo/flow/Wrapper.java @@ -80,7 +80,7 @@ public class Wrapper extends FObjMixed { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveWrapper(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java index c315f20b8..a700bd027 100644 --- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java +++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java @@ -132,7 +132,7 @@ public class ColorProfile extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveColorProfile(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java index 37db54438..e0b69a42e 100644 --- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java @@ -199,7 +199,7 @@ public class ConditionalPageMasterReference extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveConditionalPageMasterReference(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java index 397609f83..680b4ccc9 100644 --- a/src/java/org/apache/fop/fo/pagination/Declarations.java +++ b/src/java/org/apache/fop/fo/pagination/Declarations.java @@ -116,7 +116,7 @@ public class Declarations extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveDeclarations(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index 5a6e2ee8d..4f89ec739 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -184,6 +184,6 @@ public class Flow extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveFlow(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java index 0c819b484..3f61d658c 100644 --- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java +++ b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java @@ -221,7 +221,7 @@ public class LayoutMasterSet extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveLayoutMasterSet(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java b/src/java/org/apache/fop/fo/pagination/PageMasterReference.java index 30150b3fb..aa12108cf 100644 --- a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/PageMasterReference.java @@ -119,7 +119,7 @@ public abstract class PageMasterReference extends FObj } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.servePageMasterReference(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index d783b6510..c5615322f 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -718,7 +718,7 @@ public class PageSequence extends FObj { * @param fotv the FOTreeVisitor object accessing this node of the FO Tree */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 1d1cc004b..98d654fcf 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java @@ -198,7 +198,7 @@ public class PageSequenceMaster extends FObj { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.servePageSequenceMaster(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java index 3913cc782..cc8e3578d 100644 --- a/src/java/org/apache/fop/fo/pagination/Region.java +++ b/src/java/org/apache/fop/fo/pagination/Region.java @@ -242,7 +242,7 @@ public abstract class Region extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 ce1d94da1..ef8a4a07c 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java +++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java @@ -116,7 +116,7 @@ public class RegionAfter extends RegionBA { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRegionAfter(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java index 891efa594..c2e236cf4 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBA.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java @@ -119,7 +119,7 @@ public abstract class RegionBA extends RegionBASE { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 bd25148d6..0fbc87b43 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBASE.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBASE.java @@ -85,7 +85,7 @@ public abstract class RegionBASE extends Region { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 c55d83bb9..f8df4b06c 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java @@ -121,7 +121,7 @@ public class RegionBefore extends RegionBA { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRegionBefore(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index 965f180af..e11301685 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -150,7 +150,7 @@ public class RegionBody extends Region { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRegionBody(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java index a76ce40db..32106899c 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java +++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java @@ -117,7 +117,7 @@ public class RegionEnd extends RegionSE { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRegionEnd(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java index 98bdcc870..63af9e1ea 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionSE.java +++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java @@ -101,7 +101,7 @@ public abstract class RegionSE extends RegionBASE { } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.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 8f69905bc..45158c3cd 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionStart.java +++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java @@ -116,7 +116,7 @@ public class RegionStart extends RegionSE { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRegionStart(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java index 51cee83f8..dfd3f8b6f 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java @@ -167,7 +167,7 @@ public class RepeatablePageMasterAlternatives extends FObj } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRepeatablePageMasterAlternatives(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java index ffe0ba7e6..48ab82c88 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java @@ -128,7 +128,7 @@ public class RepeatablePageMasterReference extends PageMasterReference } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRepeatablePageMasterReference(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java index fa3491ac4..9eec1bd43 100644 --- a/src/java/org/apache/fop/fo/pagination/Root.java +++ b/src/java/org/apache/fop/fo/pagination/Root.java @@ -168,7 +168,7 @@ public class Root extends FObj { * @param fotv the FOTreeVisitor object accessing this node of the FO Tree */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveRoot(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java index a9c4b3e95..29c279c23 100644 --- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java @@ -191,7 +191,7 @@ public class SimplePageMaster extends FObj { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveSimplePageMaster(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java index 203a32ba8..a5ad80e1f 100644 --- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java @@ -96,7 +96,7 @@ public class SinglePageMasterReference extends PageMasterReference } public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveSinglePageMasterReference(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index a996e2e5d..265ef5942 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -93,7 +93,7 @@ public class StaticContent extends Flow { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveStaticContent(this); } } diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index a2b758404..059377b0d 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -119,7 +119,7 @@ public class Title extends FObjMixed { * @see org.apache.fop.fo.FOTreeVisitor */ public void acceptVisitor(FOTreeVisitor fotv) { - fotv.serveVisitor(this); + fotv.serveTitle(this); } } diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java index c9106e7ac..0537c3ec8 100644 --- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java +++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java @@ -51,83 +51,122 @@ package org.apache.fop.layoutmgr; -import org.apache.fop.apps.Document; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; + +import org.apache.fop.apps.Document; import org.apache.fop.area.LinkResolver; import org.apache.fop.area.PageViewport; import org.apache.fop.area.Resolveable; import org.apache.fop.area.Trait; -import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.area.inline.InlineParent; import org.apache.fop.area.inline.FilledArea; import org.apache.fop.area.inline.ForeignObject; +import org.apache.fop.area.inline.Image; +import org.apache.fop.area.inline.InlineArea; +import org.apache.fop.area.inline.InlineParent; import org.apache.fop.area.inline.Space; import org.apache.fop.area.inline.UnresolvedPageNumber; -import org.apache.fop.area.inline.Word; -import org.apache.fop.area.inline.Image; import org.apache.fop.area.inline.Viewport; - +import org.apache.fop.area.inline.Word; import org.apache.fop.datatypes.Length; - +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.FONode; -import org.apache.fop.fo.FOText; import org.apache.fop.fo.TextInfo; +import org.apache.fop.fo.ToBeImplementedElement; +import org.apache.fop.fo.Unknown; +import org.apache.fop.fo.UnknownXMLObj; +import org.apache.fop.fo.XMLElement; import org.apache.fop.fo.XMLObj; -import org.apache.fop.fo.flow.BidiOverride; -import org.apache.fop.fo.flow.Inline; +import org.apache.fop.fo.extensions.Bookmarks; +import org.apache.fop.fo.extensions.ExtensionObj; +import org.apache.fop.fo.extensions.Label; +import org.apache.fop.fo.extensions.Outline; +import org.apache.fop.fo.extensions.svg.SVGElement; +import org.apache.fop.fo.extensions.svg.SVGObj; import org.apache.fop.fo.flow.BasicLink; +import org.apache.fop.fo.flow.BidiOverride; import org.apache.fop.fo.flow.Block; -import org.apache.fop.fo.flow.Leader; -import org.apache.fop.fo.flow.RetrieveMarker; +import org.apache.fop.fo.flow.BlockContainer; import org.apache.fop.fo.flow.Character; import org.apache.fop.fo.flow.ExternalGraphic; -import org.apache.fop.fo.flow.BlockContainer; +import org.apache.fop.fo.flow.Float; import org.apache.fop.fo.flow.Footnote; +import org.apache.fop.fo.flow.FootnoteBody; +import org.apache.fop.fo.flow.InitialPropertySet; +import org.apache.fop.fo.flow.Inline; +import org.apache.fop.fo.flow.InlineContainer; +import org.apache.fop.fo.flow.InstreamForeignObject; +import org.apache.fop.fo.flow.Leader; 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.flow.InstreamForeignObject; -import org.apache.fop.fo.flow.InlineContainer; -import org.apache.fop.fo.flow.ListItem; +import org.apache.fop.fo.flow.Marker; +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.PageNumber; import org.apache.fop.fo.flow.PageNumberCitation; +import org.apache.fop.fo.flow.RetrieveMarker; import org.apache.fop.fo.flow.Table; +import org.apache.fop.fo.flow.TableAndCaption; import org.apache.fop.fo.flow.TableBody; +import org.apache.fop.fo.flow.TableCaption; import org.apache.fop.fo.flow.TableCell; import org.apache.fop.fo.flow.TableColumn; +import org.apache.fop.fo.flow.TableFooter; +import org.apache.fop.fo.flow.TableHeader; import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.Wrapper; +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.pagination.Flow; - -import org.apache.fop.fo.properties.LeaderPattern; -import org.apache.fop.fo.properties.CommonBorderAndPadding; +import org.apache.fop.fo.pagination.LayoutMasterSet; +import org.apache.fop.fo.pagination.PageMasterReference; +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.RegionAfter; +import org.apache.fop.fo.pagination.RegionBA; +import org.apache.fop.fo.pagination.RegionBASE; +import org.apache.fop.fo.pagination.RegionBefore; +import org.apache.fop.fo.pagination.RegionBody; +import org.apache.fop.fo.pagination.RegionEnd; +import org.apache.fop.fo.pagination.RegionSE; +import org.apache.fop.fo.pagination.RegionStart; +import org.apache.fop.fo.pagination.RepeatablePageMasterAlternatives; +import org.apache.fop.fo.pagination.RepeatablePageMasterReference; +import org.apache.fop.fo.pagination.Root; +import org.apache.fop.fo.pagination.SimplePageMaster; +import org.apache.fop.fo.pagination.SinglePageMasterReference; +import org.apache.fop.fo.pagination.StaticContent; +import org.apache.fop.fo.pagination.Title; import org.apache.fop.fo.properties.CommonBackground; +import org.apache.fop.fo.properties.CommonBorderAndPadding; +import org.apache.fop.fo.properties.LeaderPattern; import org.apache.fop.fo.properties.Overflow; import org.apache.fop.fo.properties.Scaling; - -import org.apache.fop.layoutmgr.BidiLayoutManager; -import org.apache.fop.layoutmgr.LayoutProcessor; -import org.apache.fop.layoutmgr.LMiter; +import org.apache.fop.layoutmgr.list.Item; +import org.apache.fop.layoutmgr.list.ListBlockLayoutManager; +import org.apache.fop.layoutmgr.list.ListItemLayoutManager; +import org.apache.fop.layoutmgr.table.Body; import org.apache.fop.layoutmgr.table.Cell; import org.apache.fop.layoutmgr.table.Column; -import org.apache.fop.layoutmgr.table.Body; import org.apache.fop.layoutmgr.table.Row; import org.apache.fop.layoutmgr.table.TableLayoutManager; -import org.apache.fop.layoutmgr.list.Item; -import org.apache.fop.layoutmgr.list.ListBlockLayoutManager; -import org.apache.fop.layoutmgr.list.ListItemLayoutManager; - import org.apache.fop.traits.MinOptMax; import org.apache.fop.util.CharUtilities; -import java.util.List; -import java.util.ListIterator; -import java.util.ArrayList; -import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; - /** * Concrete implementation of FOTreeVisitor for the purpose of adding * Layout Managers for nodes in the FOTree. @@ -136,7 +175,7 @@ import java.awt.geom.Rectangle2D; * @see org.apache.fop.fo.FOTreeVisitor */ -public class AddLMVisitor extends FOTreeVisitor { +public class AddLMVisitor implements FOTreeVisitor { /** The List object to which methods in this class should add Layout * Managers */ @@ -175,7 +214,7 @@ public class AddLMVisitor extends FOTreeVisitor { return saveLMList; } - public void serveVisitor(FOText node) { + public void serveFOText(FOText node) { if (node.length == 0) { return; } @@ -189,7 +228,7 @@ public class AddLMVisitor extends FOTreeVisitor { currentLMList.add(lm); } - public void serveVisitor(FObjMixed node) { + public void serveFObjMixed(FObjMixed node) { if (node.getChildren() != null) { InlineStackingLayoutManager lm; lm = new InlineStackingLayoutManager(); @@ -201,14 +240,14 @@ public class AddLMVisitor extends FOTreeVisitor { } } - public void serveVisitor(BidiOverride node) { + public void serveBidiOverride(BidiOverride node) { if (false) { - serveVisitor((FObjMixed)node); + serveFObjMixed((FObjMixed)node); } else { ArrayList childList = new ArrayList(); saveLMList = currentLMList; currentLMList = childList; - serveVisitor((FObjMixed)node); + serveFObjMixed((FObjMixed)node); currentLMList = saveLMList; for (int count = childList.size() - 1; count >= 0; count--) { LayoutProcessor lm = (LayoutProcessor) childList.get(count); @@ -226,23 +265,23 @@ public class AddLMVisitor extends FOTreeVisitor { /** * @param node Inline object to process */ - public void serveVisitor(Inline node) { - serveVisitor((FObjMixed)node); + public void serveInline(Inline node) { + serveFObjMixed((FObjMixed)node); } - public void serveVisitor(Footnote node) { + public void serveFootnote(Footnote node) { if (node.getInlineFO() == null) { node.getLogger().error("inline required in footnote"); return; } - serveVisitor(node.getInlineFO()); + serveInline(node.getInlineFO()); } - public void serveVisitor(InlineContainer node) { + public void serveInlineContainer(InlineContainer node) { ArrayList childList = new ArrayList(); saveLMList = currentLMList; currentLMList = childList; - serveVisitor((FObj)node); + serveFObj((FObj)node); currentLMList = saveLMList; LayoutManager lm = new ICLayoutManager(childList); lm.setUserAgent(node.getUserAgent()); @@ -253,7 +292,7 @@ public class AddLMVisitor extends FOTreeVisitor { /** * Add start and end properties for the link */ - public void serveVisitor(BasicLink node) { + public void serveBasicLink(BasicLink node) { node.setup(); InlineStackingLayoutManager lm; lm = new InlineStackingLayoutManager() { @@ -287,7 +326,7 @@ public class AddLMVisitor extends FOTreeVisitor { } } - public void serveVisitor(Block node) { + public void serveBlock(Block node) { BlockLayoutManager blm = new BlockLayoutManager(); blm.setUserAgent(node.getUserAgent()); blm.setFObj(node); @@ -296,7 +335,7 @@ public class AddLMVisitor extends FOTreeVisitor { currentLMList.add(blm); } - public void serveVisitor(final Leader node) { + public void serveLeader(final Leader node) { LeafNodeLayoutManager lm = new LeafNodeLayoutManager() { public InlineArea get(LayoutContext context) { return getLeaderInlineArea(node); @@ -400,7 +439,7 @@ public class AddLMVisitor extends FOTreeVisitor { return leaderArea; } - public void serveVisitor(RetrieveMarker node) { + public void serveRetrieveMarker(RetrieveMarker node) { RetrieveMarkerLayoutManager rmlm; rmlm = new RetrieveMarkerLayoutManager(node.getRetrieveClassName(), node.getRetrievePosition(), @@ -410,7 +449,7 @@ public class AddLMVisitor extends FOTreeVisitor { currentLMList.add(rmlm); } - public void serveVisitor(Character node) { + public void serveCharacter(Character node) { InlineArea inline = getCharacterInlineArea(node); if (inline != null) { LeafNodeLayoutManager lm = new LeafNodeLayoutManager(); @@ -436,7 +475,7 @@ public class AddLMVisitor extends FOTreeVisitor { * This adds a leafnode layout manager that deals with the * created viewport/image area. */ - public void serveVisitor(ExternalGraphic node) { + public void serveExternalGraphic(ExternalGraphic node) { InlineArea area = getExternalGraphicInlineArea(node); if (area != null) { node.setupID(); @@ -478,7 +517,7 @@ public class AddLMVisitor extends FOTreeVisitor { return vp; } - public void serveVisitor(BlockContainer node) { + public void serveBlockContainer(BlockContainer node) { BlockContainerLayoutManager blm = new BlockContainerLayoutManager(); blm.setUserAgent(node.getUserAgent()); blm.setFObj(node); @@ -486,14 +525,14 @@ public class AddLMVisitor extends FOTreeVisitor { currentLMList.add(blm); } - public void serveVisitor(ListBlock node) { + public void serveListBlock(ListBlock node) { ListBlockLayoutManager blm = new ListBlockLayoutManager(); blm.setUserAgent(node.getUserAgent()); blm.setFObj(node); currentLMList.add(blm); } - public void serveVisitor(InstreamForeignObject node) { + public void serveInstreamForeignObject(InstreamForeignObject node) { Viewport areaCurrent = getInstreamForeignObjectInlineArea(node); if (areaCurrent != null) { LeafNodeLayoutManager lm = new LeafNodeLayoutManager(); @@ -656,7 +695,7 @@ public class AddLMVisitor extends FOTreeVisitor { return areaCurrent; } - public void serveVisitor(ListItem node) { + public void serveListItem(ListItem node) { if (node.getLabel() != null && node.getBody() != null) { ListItemLayoutManager blm = new ListItemLayoutManager(); blm.setUserAgent(node.getUserAgent()); @@ -693,7 +732,7 @@ public class AddLMVisitor extends FOTreeVisitor { * Overridden from FObj * @param lms the list to which the layout manager(s) should be added */ - public void serveVisitor(final PageNumber node) { + public void servePageNumber(final PageNumber node) { node.setup(); LayoutManager lm; lm = new LeafNodeLayoutManager() { @@ -729,7 +768,7 @@ public class AddLMVisitor extends FOTreeVisitor { currentLMList.add(lm); } - public void serveVisitor(final PageNumberCitation node) { + public void servePageNumberCitation(final PageNumberCitation node) { node.setup(); LayoutManager lm; lm = new LeafNodeLayoutManager() { @@ -799,7 +838,7 @@ public class AddLMVisitor extends FOTreeVisitor { return inline; } - public void serveVisitor(Table node) { + public void serveTable(Table node) { TableLayoutManager tlm = new TableLayoutManager(); tlm.setUserAgent(node.getUserAgent()); tlm.setFObj(node); @@ -826,7 +865,7 @@ public class AddLMVisitor extends FOTreeVisitor { return clm; } - public void serveVisitor(TableBody node) { + public void serveTableBody(TableBody node) { currentLMList.add(getTableBodyLayoutManager(node)); } @@ -837,25 +876,395 @@ public class AddLMVisitor extends FOTreeVisitor { return blm; } - public void serveVisitor(TableCell node) { + public void serveTableCell(TableCell node) { Cell clm = new Cell(); clm.setUserAgent(node.getUserAgent()); clm.setFObj(node); currentLMList.add(clm); } - public void serveVisitor(TableRow node) { + public void serveTableRow(TableRow node) { Row rlm = new Row(); rlm.setUserAgent(node.getUserAgent()); rlm.setFObj(node); currentLMList.add(rlm); } - public void serveVisitor(Flow node) { + public void serveFlow(Flow node) { FlowLayoutManager lm = new FlowLayoutManager(); lm.setUserAgent(node.getUserAgent()); lm.setFObj(node); currentLMList.add(lm); } + /** + * @param node FONode object to process + */ + public void serveFONode(FONode node) { + } + + /** + * @param node FObj object to process + */ + public void serveFObj(FObj node) { + serveFONode((FONode)node); + } + + /** + * @param node ColorProfile object to process + */ + public void serveColorProfile(ColorProfile node) { + serveFObj((FObj)node); + } + + /** + * @param node ConditionalPageMasterReference object to process + */ + public void serveConditionalPageMasterReference(ConditionalPageMasterReference node) { + serveFObj((FObj)node); + } + + /** + * @param node Declarations object to process + */ + public void serveDeclarations(Declarations node) { + serveFObj((FObj)node); + } + + /** + * @param node ExtensionObj object to process + */ + public void serveExtensionObj(ExtensionObj node) { + serveFObj((FObj)node); + } + + /** + * @param node Bookmarks object to process + */ + public void serveBookmarks(Bookmarks node) { + serveExtensionObj((ExtensionObj)node); + } + + /** + * @param node Label object to process + */ + public void serveLabel(Label node) { + serveExtensionObj((ExtensionObj)node); + } + + /** + * @param node Outline object to process + */ + public void serveOutline(Outline node) { + serveExtensionObj((ExtensionObj)node); + } + + /** + * @param node StaticContent object to process + */ + public void serveStaticContent(StaticContent node) { + serveFlow((Flow)node); + } + + /** + * @param node Marker object to process + */ + public void serveMarker(Marker node) { + serveFObjMixed((FObjMixed)node); + } + + /** + * @param node Title object to process + */ + public void serveTitle(Title node) { + serveFObjMixed((FObjMixed)node); + } + + /** + * @param node Wrapper object to process + */ + public void serveWrapper(Wrapper node) { + serveFObjMixed((FObjMixed)node); + } + + /** + * @param node FootnoteBody object to process + */ + public void serveFootnoteBody(FootnoteBody node) { + serveFObj((FObj)node); + } + + /** + * @param node LayoutMasterSet object to process + */ + public void serveLayoutMasterSet(LayoutMasterSet node) { + serveFObj((FObj)node); + } + + /** + * @param node ListItemBody object to process + */ + public void serveListItemBody(ListItemBody node) { + serveFObj((FObj)node); + } + + /** + * @param node ListItemLabel object to process + */ + public void serveListItemLabel(ListItemLabel node) { + serveFObj((FObj)node); + } + + /** + * @param node PageMasterReference object to process + */ + public void servePageMasterReference(PageMasterReference node) { + serveFObj((FObj)node); + } + + /** + * @param node RepeatablePageMasterReference object to process + */ + public void serveRepeatablePageMasterReference(RepeatablePageMasterReference node) { + servePageMasterReference((PageMasterReference)node); + } + + /** + * @param node SinglePageMasterReference object to process + */ + public void serveSinglePageMasterReference(SinglePageMasterReference node) { + servePageMasterReference((PageMasterReference)node); + } + + /** + * @param node PageSequence object to process + */ + public void servePageSequence(PageSequence node) { + serveFObj((FObj)node); + } + + /** + * @param node PageSequenceMaster object to process + */ + public void servePageSequenceMaster(PageSequenceMaster node) { + serveFObj((FObj)node); + } + + /** + * @param node Region object to process + */ + public void serveRegion(Region node) { + serveFObj((FObj)node); + } + + /** + * @param node RegionBASE object to process + */ + public void serveRegionBASE(RegionBASE node) { + serveRegion((Region)node); + } + + /** + * @param node RegionBA object to process + */ + public void serveRegionBA(RegionBA node) { + serveRegionBASE((RegionBASE)node); + } + + /** + * @param node RegionAfter object to process + */ + public void serveRegionAfter(RegionAfter node) { + serveRegionBA((RegionBA)node); + } + + /** + * @param node RegionBefore object to process + */ + public void serveRegionBefore(RegionBefore node) { + serveRegionBA((RegionBA)node); + } + + /** + * @param node RegionSE object to process + */ + public void serveRegionSE(RegionSE node) { + serveRegionBASE((RegionBASE)node); + } + + /** + * @param node RegionEnd object to process + */ + public void serveRegionEnd(RegionEnd node) { + serveRegionSE((RegionSE)node); + } + + /** + * @param node RegionStart object to process + */ + public void serveRegionStart(RegionStart node) { + serveRegionSE((RegionSE)node); + } + + /** + * @param node RegionBody object to process + */ + public void serveRegionBody(RegionBody node) { + serveRegion((Region)node); + } + + /** + * @param node RepeatablePageMasterAlternatives object to process + */ + public void serveRepeatablePageMasterAlternatives(RepeatablePageMasterAlternatives node) { + serveFObj((FObj)node); + } + + /** + * @param node Root object to process + */ + public void serveRoot(Root node) { + serveFObj((FObj)node); + } + + /** + * @param node SimplePageMaster object to process + */ + public void serveSimplePageMaster(SimplePageMaster node) { + serveFObj((FObj)node); + } + + /** + * @param node TableFooter object to process + */ + public void serveTableFooter(TableFooter node) { + serveTableBody((TableBody)node); + } + + /** + * @param node TableHeader object to process + */ + public void serveTableHeader(TableHeader node) { + serveTableBody((TableBody)node); + } + + /** + * @param node TableColumn object to process + */ + public void serveTableColumn(TableColumn node) { + serveFObj((FObj)node); + } + + /** + * @param node ToBeImplementedElement object to process + */ + public void serveToBeImplementedElement(ToBeImplementedElement node) { + serveFObj((FObj)node); + } + + /** + * @param node Float object to process + */ + public void serveFloat(Float node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node InitialPropertySet object to process + */ + public void serveInitialPropertySet(InitialPropertySet node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node MultiCase object to process + */ + public void serveMultiCase(MultiCase node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node MultiProperties object to process + */ + public void serveMultiProperties(MultiProperties node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node MultiPropertySet object to process + */ + public void serveMultiPropertySet(MultiPropertySet node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node MultiSwitch object to process + */ + public void serveMultiSwitch(MultiSwitch node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node MultiToggle object to process + */ + public void serveMultiToggle(MultiToggle node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node TableAndCaption object to process + */ + public void serveTableAndCaption(TableAndCaption node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node TableCaption object to process + */ + public void serveTableCaption(TableCaption node) { + serveToBeImplementedElement((ToBeImplementedElement)node); + } + + /** + * @param node Unknown object to process + */ + public void serveUnknown(Unknown node) { + serveFONode((FONode)node); + } + + /** + * @param node XMLObj object to process + */ + public void serveXMLObj(XMLObj node) { + serveFONode((FONode)node); + } + + /** + * @param node SVGObj object to process + */ + public void serveSVGObj(SVGObj node) { + serveXMLObj((XMLObj)node); + } + + /** + * @param node SVGElement object to process + */ + public void serveSVGElement(SVGElement node) { + serveSVGObj((SVGObj)node); + } + + /** + * @param node UnknownXMLObj object to process + */ + public void serveUnknownXMLObj(UnknownXMLObj node) { + serveXMLObj((XMLObj)node); + } + + /** + * @param node XMLElement object to process + */ + public void serveXMLElement(XMLElement node) { + serveXMLObj((XMLObj)node); + } + } -- 2.39.5