From dbefd55bda61baaac9c6c068e94166ec740f9eea Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Tue, 27 Jul 2004 03:38:13 +0000 Subject: [PATCH] Renamed end() method to somewhat clearer endOfNode(). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197842 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FONode.java | 2 +- src/java/org/apache/fop/fo/FOTreeBuilder.java | 2 +- src/java/org/apache/fop/fo/extensions/Bookmarks.java | 2 +- src/java/org/apache/fop/fo/flow/BasicLink.java | 4 ++-- src/java/org/apache/fop/fo/flow/Block.java | 2 +- src/java/org/apache/fop/fo/flow/Footnote.java | 4 ++-- src/java/org/apache/fop/fo/flow/FootnoteBody.java | 4 ++-- src/java/org/apache/fop/fo/flow/Inline.java | 2 +- src/java/org/apache/fop/fo/flow/ListBlock.java | 4 ++-- src/java/org/apache/fop/fo/flow/ListItem.java | 4 ++-- src/java/org/apache/fop/fo/flow/ListItemLabel.java | 4 ++-- src/java/org/apache/fop/fo/flow/PageNumber.java | 2 +- src/java/org/apache/fop/fo/flow/Table.java | 2 +- src/java/org/apache/fop/fo/flow/TableBody.java | 2 +- src/java/org/apache/fop/fo/flow/TableCell.java | 2 +- src/java/org/apache/fop/fo/flow/TableColumn.java | 2 +- src/java/org/apache/fop/fo/flow/TableRow.java | 2 +- src/java/org/apache/fop/fo/pagination/ColorProfile.java | 2 +- src/java/org/apache/fop/fo/pagination/Declarations.java | 2 +- src/java/org/apache/fop/fo/pagination/Flow.java | 2 +- src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java | 2 +- src/java/org/apache/fop/fo/pagination/PageSequence.java | 4 ++-- .../org/apache/fop/fo/pagination/PageSequenceMaster.java | 2 +- src/java/org/apache/fop/fo/pagination/RegionBA.java | 6 +++--- src/java/org/apache/fop/fo/pagination/RegionBASE.java | 4 ++-- .../fop/fo/pagination/RepeatablePageMasterAlternatives.java | 2 +- src/java/org/apache/fop/fo/pagination/StaticContent.java | 2 +- 27 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index e507021f0..33173df46 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -160,7 +160,7 @@ public abstract class FONode { /** * */ - protected void end() { + protected void endOfNode() { // do nothing by default } diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java index faef21b62..c45f1048a 100644 --- a/src/java/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java @@ -289,7 +289,7 @@ public class FOTreeBuilder extends DefaultHandler { public void endElement(String uri, String localName, String rawName) throws SAXException { try { - currentFObj.end(); + currentFObj.endOfNode(); } catch (IllegalArgumentException e) { throw new SAXException(e); } diff --git a/src/java/org/apache/fop/fo/extensions/Bookmarks.java b/src/java/org/apache/fop/fo/extensions/Bookmarks.java index 8405f4b29..a9cac572b 100644 --- a/src/java/org/apache/fop/fo/extensions/Bookmarks.java +++ b/src/java/org/apache/fop/fo/extensions/Bookmarks.java @@ -57,7 +57,7 @@ public class Bookmarks extends ExtensionObj { * the bookmark data from the child elements and add * the extension to the area tree. */ - protected void end() { + protected void endOfNode() { ((Root) parent).setBookmarks(this); } diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 61edb839f..b3db13535 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -140,8 +140,8 @@ public class BasicLink extends Inline { /** * @see org.apache.fop.fo.FONode#end */ - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endLink(); } diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index e57dacd98..b01fb3b53 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -237,7 +237,7 @@ public class Block extends FObjMixed { /** * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { handleWhiteSpace(); getFOInputHandler().endBlock(this); } diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index 612668bb4..f72ddd403 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/src/java/org/apache/fop/fo/flow/Footnote.java @@ -78,8 +78,8 @@ public class Footnote extends FObj { fotv.serveFootnote(this); } - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endFootnote(this); } diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java index c0319d86a..34504e4e4 100644 --- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java +++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java @@ -60,8 +60,8 @@ public class FootnoteBody extends FObj { fotv.serveFootnoteBody(this); } - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endFootnoteBody(this); } diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index 6de4dd77a..64819ad46 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -138,7 +138,7 @@ public class Inline extends FObjMixed { /** * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { getFOInputHandler().endInline(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index 550262498..f90ef8759 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -136,8 +136,8 @@ public class ListBlock extends FObj { fotv.serveListBlock(this); } - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endList(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index ae994c1a8..35862bd7d 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/src/java/org/apache/fop/fo/flow/ListItem.java @@ -145,8 +145,8 @@ public class ListItem extends FObj { fotv.serveListItem(this); } - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endListItem(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index dca922db4..938f91b11 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -83,8 +83,8 @@ public class ListItemLabel extends FObj { fotv.serveListItemLabel(this); } - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); getFOInputHandler().endListLabel(); } diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index c9b60f3d5..16929732e 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -128,7 +128,7 @@ public class PageNumber extends FObj { fotv.servePageNumber(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endPageNumber(this); } diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 5f09d8539..42000aa3e 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -201,7 +201,7 @@ public class Table extends FObj { fotv.serveTable(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endTable(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index 90825dc18..8444617f5 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -104,7 +104,7 @@ public class TableBody extends FObj { fotv.serveTableBody(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endBody(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index b03d2c408..55631475b 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -348,7 +348,7 @@ public class TableCell extends FObj { fotv.serveTableCell(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endCell(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index 30fc4d4fc..a8f7d4fc6 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -123,7 +123,7 @@ public class TableColumn extends FObj { fotv.serveTableColumn(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endColumn(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 7bb3eda5d..39c34b512 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -144,7 +144,7 @@ public class TableRow extends FObj { fotv.serveTableRow(this); } - protected void end() { + protected void endOfNode() { getFOInputHandler().endRow(this); } diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java index f47654f6c..0be5c49d2 100644 --- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java +++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java @@ -65,7 +65,7 @@ public class ColorProfile extends FObj { * Extract instance variables from the collection of properties for this * object. */ - protected void end() { + protected void endOfNode() { src = this.propertyList.get(PR_SRC).getString(); profileName = this.propertyList.get(PR_COLOR_PROFILE_NAME).getString(); intent = this.propertyList.get(PR_RENDERING_INTENT).getEnum(); diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java index 9893d6262..b5506cefc 100644 --- a/src/java/org/apache/fop/fo/pagination/Declarations.java +++ b/src/java/org/apache/fop/fo/pagination/Declarations.java @@ -72,7 +72,7 @@ public class Declarations extends FObj { * At the end of this element sort out the child into * a hashmap of color profiles and a list of external xml. */ - protected void end() { + protected void endOfNode() { if (childNodes != null) { for (Iterator iter = childNodes.iterator(); iter.hasNext();) { FONode node = (FONode)iter.next(); diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index d4aa1f1f5..ccfab4363 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -90,7 +90,7 @@ public class Flow extends FObj { * StructureRenderer that we are at the end of the flow. * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { if (!blockItemFound) { missingChildElementError("marker* (%block;)+"); } diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java index ed910bdc1..ce46c30b1 100644 --- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java +++ b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java @@ -72,7 +72,7 @@ public class LayoutMasterSet extends FObj { /** * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { if (childNodes == null) { missingChildElementError("(simple-page-master|page-sequence-master)+"); } diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index 5dd7c9815..61b48a0f1 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -167,14 +167,14 @@ public class PageSequence extends FObj { * This passes the end page sequence to the structure handler * so it can act upon that. */ - protected void end() { + protected void endOfNode() { if (mainFlow == null) { missingChildElementError("(title?,static-content*,flow)"); } try { getFOInputHandler().endPageSequence(this); } catch (FOPException fopex) { - getLogger().error("Error in PageSequence.end(): " + getLogger().error("Error in PageSequence.endOfNode(): " + fopex.getMessage(), fopex); } } diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java index 405cb30e5..5157ae0b9 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java @@ -79,7 +79,7 @@ public class PageSequenceMaster extends FObj { } } - protected void end() { + protected void endOfNode() { if (childNodes == null) { missingChildElementError("(single-page-master-reference|" + "repeatable-page-master-reference|repeatable-page-master-alternatives)+"); diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java index 64ef93b92..6498b3cc2 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBA.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java @@ -48,10 +48,10 @@ public abstract class RegionBA extends RegionBASE { } /** - * @see org.apache.fop.fo.FONode#end() + * @see org.apache.fop.fo.FONode#endOfNode() */ - protected void end() { - super.end(); + protected void endOfNode() { + super.endOfNode(); bPrecedence = (this.propertyList.get(PR_PRECEDENCE).getEnum() == Precedence.TRUE); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBASE.java b/src/java/org/apache/fop/fo/pagination/RegionBASE.java index 4a960c864..c98741d04 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBASE.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBASE.java @@ -41,9 +41,9 @@ public abstract class RegionBASE extends Region { } /** - * @see org.apache.fop.fo.FONode#end() + * @see org.apache.fop.fo.FONode#endOfNode() */ - protected void end() { + protected void endOfNode() { // The problem with this is that it might not be known yet.... // Supposing extent is calculated in terms of percentage this.extent = this.propertyList.get(PR_EXTENT).getLength().getValue(); diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java index 0846f4286..0dc9b1268 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java @@ -73,7 +73,7 @@ public class RepeatablePageMasterAlternatives extends FObj /** * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { if (childNodes == null) { missingChildElementError("(conditional-page-master-reference+)"); } diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index 134da935c..83a870266 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -59,7 +59,7 @@ public class StaticContent extends Flow { * StructureRenderer that we are at the end of the flow. * @see org.apache.fop.fo.FONode#end */ - protected void end() { + protected void endOfNode() { if (childNodes == null) { missingChildElementError("(%block;)+"); } -- 2.39.5