Moved FObjects to FOPropertySets.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195271 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java
index ed6830982069c3340943bc139752cee396320029..662abaa7998338827ea9c1b80769baa7002a3f64 100644 (file)
--- a/src/org/apache/fop/fo/FONode.java
+++ b/src/org/apache/fop/fo/FONode.java
@@ -2,7 +2,7 @@ package org.apache.fop.fo;
 
 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 @@ public class FONode extends FOTree.Node{
         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 @@ public class FONode extends FOTree.Node{
                     MessageHandler.log("Ignoring property "
                                        + PropNames.getPropertyName(property)
                                        + " for attribute set "
-                                       + FObjects.getAttrSetName(attrSet)
+                                       + FOPropertySets.getAttrSetName(attrSet)
                                        + ".");
                 } else {
                     stackValue(props);
@@ -151,7 +152,7 @@ public class FONode extends FOTree.Node{
                         MessageHandler.log("Ignoring property "
                                        + PropNames.getPropertyName(property)
                                        + " for attribute set "
-                                       + FObjects.getAttrSetName(attrSet)
+                                       + FOPropertySets.getAttrSetName(attrSet)
                                            + ".");
                     } else {
                         stackValue(value);

diff --git a/src/org/apache/fop/fo/FoRoot.java b/src/org/apache/fop/fo/FoRoot.java
index 183bbd02006f36dd30642825d004ee2e2bb4f80d..ff13283ec9469a701b0e185788e9980937973fd8 100644 (file)
--- a/src/org/apache/fop/fo/FoRoot.java
+++ b/src/org/apache/fop/fo/FoRoot.java
@@ -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 @@ public class FoRoot extends FONode {
         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);
     }
 
     /**

diff --git a/src/org/apache/fop/fo/Properties.java b/src/org/apache/fop/fo/Properties.java
index bd049d4fa9d4ad09990129b78d1ad5dc67831a00..aa903510dbf718998cb045e7a8474aa19c7fbcb6 100644 (file)
--- a/src/org/apache/fop/fo/Properties.java
+++ b/src/org/apache/fop/fo/Properties.java
@@ -25,7 +25,7 @@ import org.apache.fop.messaging.MessageHandler;
 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;