FONode arg added to getMappedLength calls.

FONode arg added, FOTree arg removed from MappedNumeric constructor.

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

diff --git a/src/org/apache/fop/fo/properties/Property.java b/src/org/apache/fop/fo/properties/Property.java
index c85e0c91db364a6b601bd03d70829c5bf398d5fe..28067e4a4ea7fdefbe342ec87e040711c0be63f3 100644 (file)
--- a/src/org/apache/fop/fo/properties/Property.java
+++ b/src/org/apache/fop/fo/properties/Property.java
@@ -393,8 +393,7 @@ public /*abstract*/ class Property {
                 return new EnumType(property, ncname);
             if ((dataTypes & MAPPED_LENGTH) != 0)
                 return (new MappedNumeric
-                            (property, ncname, foNode.getFOTree()))
-                                                        .getMappedNumValue();
+                            (foNode, property, ncname)).getMappedNumValue();
             throw new PropertyException
                             ("NCName value invalid  for " + propName);
         case PropertyValue.LITERAL:
@@ -618,7 +617,7 @@ public /*abstract*/ class Property {
      * @return a <tt>Numeric</tt>.  This implementation never returns.
      * @throws <tt>PropertyException</tt>.
      */
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
             throws PropertyException
     {
         throw new PropertyException
@@ -640,12 +639,13 @@ public /*abstract*/ class Property {
     {
         int initialValueType =
                     PropertyConsts.pconsts.getInitialValueType(property);
-        //System.out.println("In Property getInitialValue property "
-                            //+ property);
+        System.out.println("In Property getInitialValue property "
+                            + property);
         if ((initialValueType & Property.USE_GET_IT_FUNCTION) != 0)
              throw new PropertyException
                  ("Property.getInitialValue() called for property with "
                  + "initial value type in USE_GET_IT_FUNCTION : "
+                 + property + " "
                  + PropNames.getPropertyName(property));
         switch (initialValueType) {
         case NOTYPE_IT:
@@ -787,8 +787,7 @@ public /*abstract*/ class Property {
                 try {
                     widthFound =
                         (new MappedNumeric
-                                (widthProp, ncname, foNode.getFOTree()))
-                                                        .getMappedNumValue();
+                            (foNode, widthProp, ncname)).getMappedNumValue();
                 } catch (PropertyException e) {}
                 if (widthFound != null) {
                     if (width != null) MessageHandler.log(propName +