gmazza 2004/07/26 20:38:13
Modified: src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java
src/java/org/apache/fop/fo/extensions Bookmarks.java
src/java/org/apache/fop/fo/flow BasicLink.java Block.java
Footnote.java FootnoteBody.java Inline.java
ListBlock.java ListItem.java ListItemLabel.java
PageNumber.java Table.java TableBody.java
TableCell.java TableColumn.java TableRow.java
src/java/org/apache/fop/fo/pagination ColorProfile.java
Declarations.java Flow.java LayoutMasterSet.java
PageSequence.java PageSequenceMaster.java
RegionBA.java RegionBASE.java
RepeatablePageMasterAlternatives.java
StaticContent.java
Log:
Renamed end() method to somewhat clearer endOfNode().
Revision Changes Path
1.31 +1 -1 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FONode.java 24 Jul 2004 22:56:30 -0000 1.30
+++ FONode.java 27 Jul 2004 03:38:11 -0000 1.31
@@ -160,7 +160,7 @@
/**
*
*/
- protected void end() {
+ protected void endOfNode() {
// do nothing by default
}
1.43 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- FOTreeBuilder.java 24 Jul 2004 04:46:33 -0000 1.42
+++ FOTreeBuilder.java 27 Jul 2004 03:38:11 -0000 1.43
@@ -289,7 +289,7 @@
public void endElement(String uri, String localName, String rawName)
throws SAXException {
try {
- currentFObj.end();
+ currentFObj.endOfNode();
} catch (IllegalArgumentException e) {
throw new SAXException(e);
}
1.8 +2 -2 xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java
Index: Bookmarks.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Bookmarks.java 24 Jul 2004 04:46:34 -0000 1.7
+++ Bookmarks.java 27 Jul 2004 03:38:11 -0000 1.8
@@ -57,7 +57,7 @@
* 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);
}
1.16 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BasicLink.java 16 Jun 2004 23:40:58 -0000 1.15
+++ BasicLink.java 27 Jul 2004 03:38:11 -0000 1.16
@@ -140,8 +140,8 @@
/**
* @see org.apache.fop.fo.FONode#end
*/
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endLink();
}
1.23 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Block.java 24 Jul 2004 22:56:30 -0000 1.22
+++ Block.java 27 Jul 2004 03:38:11 -0000 1.23
@@ -237,7 +237,7 @@
/**
* @see org.apache.fop.fo.FONode#end
*/
- protected void end() {
+ protected void endOfNode() {
handleWhiteSpace();
getFOInputHandler().endBlock(this);
}
1.14 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Footnote.java 24 Jul 2004 04:46:34 -0000 1.13
+++ Footnote.java 27 Jul 2004 03:38:11 -0000 1.14
@@ -78,8 +78,8 @@
fotv.serveFootnote(this);
}
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endFootnote(this);
}
1.12 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FootnoteBody.java 16 Jun 2004 23:40:58 -0000 1.11
+++ FootnoteBody.java 27 Jul 2004 03:38:11 -0000 1.12
@@ -60,8 +60,8 @@
fotv.serveFootnoteBody(this);
}
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endFootnoteBody(this);
}
1.16 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Inline.java 16 Jun 2004 23:40:58 -0000 1.15
+++ Inline.java 27 Jul 2004 03:38:11 -0000 1.16
@@ -138,7 +138,7 @@
/**
* @see org.apache.fop.fo.FONode#end
*/
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endInline(this);
}
1.15 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ListBlock.java 16 Jun 2004 00:27:26 -0000 1.14
+++ ListBlock.java 27 Jul 2004 03:38:11 -0000 1.15
@@ -136,8 +136,8 @@
fotv.serveListBlock(this);
}
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endList(this);
}
1.17 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ListItem.java 24 Jul 2004 04:46:34 -0000 1.16
+++ ListItem.java 27 Jul 2004 03:38:11 -0000 1.17
@@ -145,8 +145,8 @@
fotv.serveListItem(this);
}
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endListItem(this);
}
1.18 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ListItemLabel.java 24 Jul 2004 22:56:30 -0000 1.17
+++ ListItemLabel.java 27 Jul 2004 03:38:11 -0000 1.18
@@ -83,8 +83,8 @@
fotv.serveListItemLabel(this);
}
- protected void end() {
- super.end();
+ protected void endOfNode() {
+ super.endOfNode();
getFOInputHandler().endListLabel();
}
1.25 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PageNumber.java 18 Jun 2004 04:13:53 -0000 1.24
+++ PageNumber.java 27 Jul 2004 03:38:12 -0000 1.25
@@ -128,7 +128,7 @@
fotv.servePageNumber(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endPageNumber(this);
}
1.20 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Table.java 24 Jul 2004 04:46:34 -0000 1.19
+++ Table.java 27 Jul 2004 03:38:12 -0000 1.20
@@ -201,7 +201,7 @@
fotv.serveTable(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endTable(this);
}
1.16 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TableBody.java 16 Jun 2004 23:40:58 -0000 1.15
+++ TableBody.java 27 Jul 2004 03:38:12 -0000 1.16
@@ -104,7 +104,7 @@
fotv.serveTableBody(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endBody(this);
}
1.18 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TableCell.java 16 Jun 2004 23:40:58 -0000 1.17
+++ TableCell.java 27 Jul 2004 03:38:12 -0000 1.18
@@ -348,7 +348,7 @@
fotv.serveTableCell(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endCell(this);
}
1.20 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TableColumn.java 16 Jun 2004 00:27:26 -0000 1.19
+++ TableColumn.java 27 Jul 2004 03:38:12 -0000 1.20
@@ -123,7 +123,7 @@
fotv.serveTableColumn(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endColumn(this);
}
1.20 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TableRow.java 16 Jun 2004 00:27:26 -0000 1.19
+++ TableRow.java 27 Jul 2004 03:38:12 -0000 1.20
@@ -144,7 +144,7 @@
fotv.serveTableRow(this);
}
- protected void end() {
+ protected void endOfNode() {
getFOInputHandler().endRow(this);
}
1.11 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ColorProfile.java 16 Jun 2004 23:40:58 -0000 1.10
+++ ColorProfile.java 27 Jul 2004 03:38:13 -0000 1.11
@@ -65,7 +65,7 @@
* 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();
1.12 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Declarations.java 24 Jul 2004 22:56:31 -0000 1.11
+++ Declarations.java 27 Jul 2004 03:38:13 -0000 1.12
@@ -72,7 +72,7 @@
* 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();
1.18 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Flow.java 5 Jul 2004 23:47:56 -0000 1.17
+++ Flow.java 27 Jul 2004 03:38:13 -0000 1.18
@@ -90,7 +90,7 @@
* 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;)+");
}
1.15 +1 -1
xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LayoutMasterSet.java 24 Jul 2004 22:56:31 -0000 1.14
+++ LayoutMasterSet.java 27 Jul 2004 03:38:13 -0000 1.15
@@ -72,7 +72,7 @@
/**
* @see org.apache.fop.fo.FONode#end
*/
- protected void end() {
+ protected void endOfNode() {
if (childNodes == null) {
missingChildElementError("(simple-page-master|page-sequence-master)+");
}
1.29 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PageSequence.java 24 Jul 2004 04:46:34 -0000 1.28
+++ PageSequence.java 27 Jul 2004 03:38:13 -0000 1.29
@@ -167,14 +167,14 @@
* 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);
}
}
1.12 +1 -1
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageSequenceMaster.java 24 Jul 2004 22:56:31 -0000 1.11
+++ PageSequenceMaster.java 27 Jul 2004 03:38:13 -0000 1.12
@@ -79,7 +79,7 @@
}
}
- protected void end() {
+ protected void endOfNode() {
if (childNodes == null) {
missingChildElementError("(single-page-master-reference|" +
"repeatable-page-master-reference|repeatable-page-master-alternatives)+");
1.10 +3 -3 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
Index: RegionBA.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RegionBA.java 16 Jun 2004 23:40:58 -0000 1.9
+++ RegionBA.java 27 Jul 2004 03:38:13 -0000 1.10
@@ -48,10 +48,10 @@
}
/**
- * @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);
}
1.9 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBASE.java
Index: RegionBASE.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBASE.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RegionBASE.java 16 Jun 2004 23:40:58 -0000 1.8
+++ RegionBASE.java 27 Jul 2004 03:38:13 -0000 1.9
@@ -41,9 +41,9 @@
}
/**
- * @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();
1.10 +1 -1
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RepeatablePageMasterAlternatives.java 24 Jul 2004 22:56:31 -0000 1.9
+++ RepeatablePageMasterAlternatives.java 27 Jul 2004 03:38:13 -0000 1.10
@@ -73,7 +73,7 @@
/**
* @see org.apache.fop.fo.FONode#end
*/
- protected void end() {
+ protected void endOfNode() {
if (childNodes == null) {
missingChildElementError("(conditional-page-master-reference+)");
}
1.13 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StaticContent.java 24 Jul 2004 22:56:31 -0000 1.12
+++ StaticContent.java 27 Jul 2004 03:38:13 -0000 1.13
@@ -59,7 +59,7 @@
* 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;)+");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
