[prev in list] [next in list] [prev in thread] [next in thread]
List: fop-cvs
Subject: cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination PageSequence.java SimplePageMaster.java
From: gmazza () apache ! org
Date: 2004-07-24 4:46:34
Message-ID: 20040724044634.67992.qmail () minotaur ! apache ! org
[Download RAW message or body]
gmazza 2004/07/23 21:46:34
Modified: src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java
FObj.java FObjMixed.java UnknownXMLObj.java
XMLObj.java
src/java/org/apache/fop/fo/extensions Bookmarks.java
Outline.java
src/java/org/apache/fop/fo/flow Block.java Footnote.java
ListItem.java Table.java
src/java/org/apache/fop/fo/pagination PageSequence.java
SimplePageMaster.java
Log:
Renamed FONode.addChild() to somewhat clearer FONode.addChildNode().
Revision Changes Path
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FONode.java 23 Jul 2004 18:54:57 -0000 1.28
+++ FONode.java 24 Jul 2004 04:46:33 -0000 1.29
@@ -167,7 +167,7 @@
/**
* @param child child node to be added to the children of this node
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
}
/**
1.42 +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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- FOTreeBuilder.java 20 Jul 2004 23:01:42 -0000 1.41
+++ FOTreeBuilder.java 24 Jul 2004 04:46:33 -0000 1.42
@@ -276,7 +276,7 @@
rootFObj = (Root) foNode;
rootFObj.setFOInputHandler(foInputHandler);
} else {
- currentFObj.addChild(foNode);
+ currentFObj.addChildNode(foNode);
}
currentFObj = foNode;
1.50 +2 -4 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- FObj.java 7 Jul 2004 01:51:50 -0000 1.49
+++ FObj.java 24 Jul 2004 04:46:33 -0000 1.50
@@ -251,11 +251,9 @@
}
/**
- * Add the child to this object.
- *
- * @param child the child node to add
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
if (containsMarkers() && "fo:marker".equals(child.getName())) {
addMarker((Marker)child);
} else {
1.27 +1 -1 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FObjMixed.java 18 Jun 2004 04:13:53 -0000 1.26
+++ FObjMixed.java 24 Jul 2004 04:46:33 -0000 1.27
@@ -57,7 +57,7 @@
/* characters() processing empty for FOTreeHandler, not empty for RTF & MIFHandlers */
getFOInputHandler().characters(ft.ca, ft.startIndex, ft.endIndex);
- addChild(ft);
+ addChildNode(ft);
}
private void setup() {
1.8 +3 -3 xml-fop/src/java/org/apache/fop/fo/UnknownXMLObj.java
Index: UnknownXMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/UnknownXMLObj.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UnknownXMLObj.java 27 Feb 2004 17:57:40 -0000 1.7
+++ UnknownXMLObj.java 24 Jul 2004 04:46:33 -0000 1.8
@@ -69,13 +69,13 @@
}
/**
- * @see XMLObj#addChild
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
if (doc == null) {
createBasicDocument();
}
- super.addChild(child);
+ super.addChildNode(child);
}
/**
1.11 +2 -2 xml-fop/src/java/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLObj.java 16 Jun 2004 23:40:58 -0000 1.10
+++ XMLObj.java 24 Jul 2004 04:46:33 -0000 1.11
@@ -170,9 +170,9 @@
}
/**
- * @param child FONode child that should be added to this node
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
if (child instanceof XMLObj) {
((XMLObj)child).addElement(doc, element);
} else {
1.7 +3 -6 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Bookmarks.java 16 Jun 2004 23:40:58 -0000 1.6
+++ Bookmarks.java 24 Jul 2004 04:46:34 -0000 1.7
@@ -44,12 +44,9 @@
}
/**
- * Add the child to the top level.
- * This handles all Outline objects added and ignores others.
- *
- * @param obj the child to add
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode obj) {
+ protected void addChildNode(FONode obj) {
if (obj instanceof Outline) {
outlines.add(obj);
}
1.6 +3 -6 xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java
Index: Outline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Outline.java 12 Jun 2004 23:18:52 -0000 1.5
+++ Outline.java 24 Jul 2004 04:46:34 -0000 1.6
@@ -69,12 +69,9 @@
}
/**
- * Add the child to this outline.
- * This checks for the type, label or outline and handles appropriately.
- *
- * @param obj the child object
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode obj) {
+ protected void addChildNode(FONode obj) {
if (obj instanceof Label) {
label = (Label)obj;
} else if (obj instanceof Outline) {
1.21 +3 -3 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Block.java 16 Jun 2004 23:40:58 -0000 1.20
+++ Block.java 24 Jul 2004 04:46:34 -0000 1.21
@@ -216,9 +216,9 @@
}
/**
- * @see org.apache.fop.fo.FObj#addChild
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- public void addChild(FONode child) {
+ public void addChildNode(FONode child) {
// Handle whitespace based on values of properties
// Handle a sequence of inline-producing children in
// one pass
@@ -231,7 +231,7 @@
// Handle whitespace in preceeding inline areas if any
handleWhiteSpace();
}
- super.addChild(child);
+ super.addChildNode(child);
}
/**
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Footnote.java 16 Jun 2004 23:40:58 -0000 1.12
+++ Footnote.java 24 Jul 2004 04:46:34 -0000 1.13
@@ -53,9 +53,9 @@
}
/**
- * @param child child FONode to be added to this object
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- public void addChild(FONode child) {
+ public void addChildNode(FONode child) {
String name = child.getName();
if ("fo:inline".equals(name)) {
inlineFO = (Inline)child;
1.16 +2 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ListItem.java 16 Jun 2004 00:27:26 -0000 1.15
+++ ListItem.java 24 Jul 2004 04:46:34 -0000 1.16
@@ -105,10 +105,9 @@
}
/**
- * Overridden from FObj
- * @param child the child object to be added
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- public void addChild(FONode child) {
+ public void addChildNode(FONode child) {
if ("fo:list-item-label".equals(child.getName())) {
label = (ListItemLabel)child;
} else if ("fo:list-item-body".equals(child.getName())) {
1.19 +3 -4 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Table.java 16 Jun 2004 00:27:26 -0000 1.18
+++ Table.java 24 Jul 2004 04:46:34 -0000 1.19
@@ -85,10 +85,9 @@
}
/**
- * Overrides FObj.
- * @param child FONode child object to be added
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
if (child.getName().equals("fo:table-column")) {
if (columns == null) {
columns = new ArrayList();
@@ -100,7 +99,7 @@
tableHeader = (TableBody)child;
} else {
// add bodies
- super.addChild(child);
+ super.addChildNode(child);
}
}
1.28 +4 -8 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PageSequence.java 18 Jun 2004 04:13:53 -0000 1.27
+++ PageSequence.java 24 Jul 2004 04:46:34 -0000 1.28
@@ -180,13 +180,9 @@
}
/**
- * Validate the child being added and initialize internal variables.
- * XSL content model for page-sequence:
- * <pre>(title?,static-content*,flow)</pre>
- *
- * @param child The flow object child to be added to the PageSequence.
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- public void addChild(FONode child) {
+ public void addChildNode(FONode child) {
try {
String childName = child.getName();
if (childName.equals("fo:title")) {
@@ -207,7 +203,7 @@
// Don't add main flow to the flow map
// addFlow(mainFlow);
startStructuredPageSequence();
- super.addChild(child); // For getChildren
+ super.addChildNode(child); // For getChildren
} else if (childName.equals("fo:static-content")) {
String flowName = ((StaticContent)child).getFlowName();
if (flowMap.containsKey(flowName)) {
@@ -223,7 +219,7 @@
startStructuredPageSequence();
}
} catch (FOPException fopex) {
- getLogger().error("Error in PageSequence.addChild(): "
+ getLogger().error("Error in PageSequence.addChildNode(): "
+ fopex.getMessage(), fopex);
}
}
1.18 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SimplePageMaster.java 12 Jun 2004 23:18:52 -0000 1.17
+++ SimplePageMaster.java 24 Jul 2004 04:46:34 -0000 1.18
@@ -92,9 +92,9 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChild(FONode)
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
*/
- protected void addChild(FONode child) {
+ protected void addChildNode(FONode child) {
if (child instanceof Region) {
addRegion((Region)child);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic