Use PropertyConsts.pconsts singleton directly.

Property index argument added to refineParsing().

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

diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java
index 83149f9b0cd7490b8ac75935fdef4818ef7e5011..280662e6caaabebcebba20d6c4ede143398199b7 100644 (file)
--- a/src/org/apache/fop/fo/FONode.java
+++ b/src/org/apache/fop/fo/FONode.java
@@ -62,8 +62,6 @@ public class FONode extends FOTree.Node{
     protected XMLNamespaces namespaces;
     /** The FO type. */
     public final int type;
-    /** The PropertyConsts singleton. */
-    public final PropertyConsts propertyConsts;
     /** The attributes defined on this node. */
     public FOAttributes foAttributes;
     /** The unmodifiable map of properties defined on this node. */
@@ -108,7 +106,6 @@ public class FONode extends FOTree.Node{
     {
         foTree.super(parent);
         this.foTree = foTree;
-        propertyConsts = PropertyConsts.getPropertyConsts();
         this.type = type;
         this.parent = parent;
         this.event = event;
@@ -180,9 +177,9 @@ public class FONode extends FOTree.Node{
     {
         // parse the expression
         exprParser.resetParser();
-        Property prop = propertyConsts.setupProperty(property);
-        return prop.refineParsing
-                        (this, exprParser.parse(this, property, attrValue));
+        Property prop = PropertyConsts.pconsts.setupProperty(property);
+        PropertyValue pv = exprParser.parse(this, property, attrValue);
+        return prop.refineParsing(pv.getProperty(), this, pv);
     }
 
     /**
@@ -236,7 +233,7 @@ public class FONode extends FOTree.Node{
                             (parent.getNearestSpecifiedValue(sourceProperty));
         else // root
             return IndirectValue.adjustedPropertyValue
-                                    (foTree.getInitialValue(sourceProperty));
+                    (PropertyConsts.pconsts.getInitialValue(sourceProperty));
     }
 
     /**
@@ -265,7 +262,7 @@ public class FONode extends FOTree.Node{
                                 (parent.getNearestSpecifiedValue(property));
         else // root
             return IndirectValue.adjustedPropertyValue
-                                        (foTree.getInitialValue(property));
+                        (PropertyConsts.pconsts.getInitialValue(property));
     }
 
     /**
@@ -307,7 +304,7 @@ public class FONode extends FOTree.Node{
                                     (parent.getPropertyValue(sourceProperty));
         else // root
             return IndirectValue.adjustedPropertyValue
-                                    (foTree.getInitialValue(sourceProperty));
+                    (PropertyConsts.pconsts.getInitialValue(sourceProperty));
     }
 
 
@@ -340,14 +337,14 @@ public class FONode extends FOTree.Node{
         PropertyValue pval;
         if ((pval = propertySet[property]) != null) 
             return IndirectValue.adjustedPropertyValue(pval);
-        if (parent != null && propertyConsts.isInherited(property))
+        if (parent != null && PropertyConsts.pconsts.isInherited(property))
             return (propertySet[property] =
                                IndirectValue.adjustedPropertyValue
                                         (parent.getPropertyValue(property)));
         else // root
             return (propertySet[property] =
                         IndirectValue.adjustedPropertyValue
-                                        (foTree.getInitialValue(property)));
+                        (PropertyConsts.pconsts.getInitialValue(property)));
     }