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

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index e507021f005bc8db2f792497ad502f80fc5c0daa..33173df46486a81ac742d370e045e6945f768a3d 100644 (file)
--- 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 faef21b62b56bc703ce246e46626a2842d97d127..c45f1048ad1a9426729cb82b0d613fdfb5c406d2 100644 (file)
--- 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 8405f4b29acd166f3749efe89b1f264549c11be9..a9cac572b258cb6d3724c793343d3e2c35803097 100644 (file)
--- 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 61edb839f414eb12b8e81ea865bb3a2e2d1fc3b3..b3db135350dcba0489dd7cbc44a51d11df760840 100644 (file)
--- 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 e57dacd982884c336d58968701ad999c8615f19f..b01fb3b53a742cb97a29179d97884517e69664f8 100644 (file)
--- 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 612668bb431aca397790bdfdab4c9e4b19f28a21..f72ddd40317b67fd16eaf73d3de1b837b3c55c70 100644 (file)
--- 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 c0319d86a53b36541cbf56add30739a14670c6c8..34504e4e4dff772c668e8e9ab36876b0130d5131 100644 (file)
--- 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 6de4dd77a10d60c9f455ba81341c1d08f5f8aeb1..64819ad467abec647e30e8b82a55fdbfe95ff0bd 100644 (file)
--- 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 550262498db8177ff21b9b9fbdd1785e97fd7e1d..f90ef87591532b7af93ecc2654c09970bf3e4345 100644 (file)
--- 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 ae994c1a884aee66118e4373d7f52f630ac01043..35862bd7da01e38edebc23cf6908c7b48de4f6ed 100644 (file)
--- 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 dca922db40f703fc6e22381497ea9b5a3ebc8e19..938f91b110311ca88760af59ca44e98c5e3a18b1 100644 (file)
--- 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 c9b60f3d5cc6df8ccf4896411eaed7fb4696f40a..16929732ed655164a89326184d4ae06451730fc3 100644 (file)
--- 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 5f09d8539418e770da20c799cd2409bd990bce08..42000aa3ea5f168c49d6997b15f937bb54c32504 100644 (file)
--- 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 90825dc18408a78f68909f822b9c94b21f882f8e..8444617f593e538c90f486a5fe58d2bd04d454c8 100644 (file)
--- 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 b03d2c40801175514b01b89b0775a7f62bbdb10e..55631475bb636f21ef0145c6cf62a93fe116d582 100644 (file)
--- 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 30fc4d4fca2d48270175d87c9b0406bdcadbfb36..a8f7d4fc68bc0f11d682d4371c7d90f18027d21a 100644 (file)
--- 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 7bb3eda5ddf0aca07d6088267bac081e00c1c34f..39c34b51248e227a3793becccac9e261eda6d251 100644 (file)
--- 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 f47654f6c57cf0b7f62fd67e0a231ec903be0617..0be5c49d24f664f118393f948380e10527e345e0 100644 (file)
--- 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 9893d6262d91911fb05b9670e0e67d9964f21df7..b5506cefc1a5d23a9b6716f5c8e44717d107e6fa 100644 (file)
--- 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 d4aa1f1f53b50fd63f84436424aaade407240cca..ccfab4363a0c93a2d45a9f8091655794854e1762 100644 (file)
--- 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 ed910bdc162cd35b059ae9c6b676feb526c41e30..ce46c30b1f0457b03804d7ea1c1965733a6a84ae 100644 (file)
--- 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 5dd7c981503c540800dc825f6916e51ff9054758..61b48a0f125bd9c6c96275ba0f68593a5fa026af 100644 (file)
--- 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 405cb30e579213d66edcf973d8b3a28cc569d266..5157ae0b910cffeb1ca3606eb5f6b90b40b20051 100644 (file)
--- 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 64ef93b92e85f9715a0af973c4108876096017b4..6498b3cc2c59ab2a5bbd5cefc8829ae01120e3a5 100644 (file)
--- 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 4a960c864bcd4191275737327a8fba2252b909b6..c98741d0483d6443f1cd6914774a08af21cd85a8 100644 (file)
--- 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 0846f428680f73b3c7833f68e44e3534162992ef..0dc9b1268a3797a2f70f769cf00ed6c1f68544a3 100644 (file)
--- 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 134da935cb19c0db30811ab666d5f251d64fd696..83a87026677ac1794e20f23f5a439115024a6d90 100644 (file)
--- 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;)+");
         }