gmazza 2004/07/24 18:00:36
Modified: src/java/org/apache/fop/fo PropertySets.java
Log:
reverted change in PropertySets; unnecessary.
Revision Changes Path
1.7 +11 -11 xml-fop/src/java/org/apache/fop/fo/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertySets.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PropertySets.java 24 Jul 2004 22:56:30 -0000 1.6
+++ PropertySets.java 25 Jul 2004 01:00:35 -0000 1.7
@@ -969,7 +969,7 @@
- // Merge the attributes from the child nodes into the parent.
+ // Merge the attributes from the children into the parent.
for (boolean dirty = true; dirty; ) {
dirty = false;
for (int i = 1; i < elements.length; i++) {
@@ -1017,7 +1017,7 @@
BitSet relevant = new BitSet();
BitSet valid = new BitSet();
int elementId;
- ArrayList childNodes;
+ ArrayList children;
Element(int elementId) {
this.elementId = elementId;
@@ -1043,14 +1043,14 @@
* Add a single fo element as a content child.
*/
public void addContent(int elementId) {
- if (childNodes == null) {
- childNodes = new ArrayList();
+ if (children == null) {
+ children = new ArrayList();
}
- childNodes.add(elements[elementId]);
+ children.add(elements[elementId]);
}
/**
- * Add a set of fo elements as content child nodes.
+ * Add a set of fo elements as content children.
*/
public void addContent(BitSet elements) {
for (int i = 0; i < elements.size(); i++) {
@@ -1061,16 +1061,16 @@
}
/**
- * Merge the properties from the child nodes into the set of valid
+ * Merge the properties from the children into the set of valid
* properties. Return true if at least one property could be added.
*/
public boolean merge() {
- if (childNodes == null) {
+ if (children == null) {
return false;
}
boolean dirty = false;
- for (int i = 0; i < childNodes.size(); i++) {
- Element child = (Element) childNodes.get(i);
+ for (int i = 0; i < children.size(); i++) {
+ Element child = (Element) children.get(i);
BitSet childValid = child.valid;
int n = childValid.length();
for (int j = 0; j < n; j++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
