pbwest 2002/10/02 08:14:29
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FoRoot.java Properties.java
Log:
Moved FObjects to FOPropertySets.
Revision Changes Path
No revision
No revision
1.19.2.12 +8 -7 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -r1.19.2.11 -r1.19.2.12
--- FONode.java 2 Oct 2002 07:08:26 -0000 1.19.2.11
+++ FONode.java 2 Oct 2002 15:14:21 -0000 1.19.2.12
@@ -2,7 +2,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.datatypes.PropertyValue;
@@ -100,15 +100,16 @@
this.parent = parent;
this.event = event;
this.attrSet = attrSet;
- nodeAttrBitSet = FObjects.getAttrROBitSet(attrSet);
+ nodeAttrBitSet = FOPropertySets.getAttrROBitSet(attrSet);
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
exprParser = foTree.exprParser;
propertySet = new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1];
foAttributes = new FOAttributes(event, this);
- if ( ! (attrSet == FObjects.MARKER_SET)) {
+ if ( ! (attrSet == FOPropertySets.MARKER_SET)) {
processAttributes();
}
+ // Set up the remaining properties.
}
private void processAttributes() throws FOPException, PropertyException {
@@ -133,7 +134,7 @@
MessageHandler.log("Ignoring property "
+ PropNames.getPropertyName(property)
+ " for attribute set "
- + FObjects.getAttrSetName(attrSet)
+ + FOPropertySets.getAttrSetName(attrSet)
+ ".");
} else {
stackValue(props);
@@ -151,7 +152,7 @@
MessageHandler.log("Ignoring property "
+ PropNames.getPropertyName(property)
+ " for attribute set "
- + FObjects.getAttrSetName(attrSet)
+ + FOPropertySets.getAttrSetName(attrSet)
+ ".");
} else {
stackValue(value);
1.1.2.6 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRoot.java 2 Oct 2002 01:25:21 -0000 1.1.2.5
+++ FoRoot.java 2 Oct 2002 15:14:21 -0000 1.1.2.6
@@ -11,7 +11,7 @@
package org.apache.fop.fo;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.fo.FOTree;
@@ -52,7 +52,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
- super(foTree, FObjectNames.ROOT, null, event, FObjects.ROOT_SET);
+ super(foTree, FObjectNames.ROOT, null, event, FOPropertySets.ROOT_SET);
}
/**
1.1.2.30 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- Properties.java 2 Oct 2002 07:06:25 -0000 1.1.2.29
+++ Properties.java 2 Oct 2002 15:14:21 -0000 1.1.2.30
@@ -25,7 +25,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
