FONode arg added to getMappedLength calls.

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

diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidth.java b/src/org/apache/fop/fo/properties/BorderAfterWidth.java
index c4956427b975f60779e3d6de7d4851da7b090dd7..f058d86ffbd139a0180ccfdcdd4823d062c92e72 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterWidth.java
@@ -5,6 +5,7 @@ import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderAfterWidth extends BorderCommonWidth {
@@ -21,13 +22,13 @@ public class BorderAfterWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength (PropNames.BORDER_AFTER_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_AFTER_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
index c215d3ed66074098d76c79f7c4f6795b1b2f3000..9a5442c3e2f4486d404a1ba6352167835af079b9 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
@@ -13,7 +13,7 @@ public class BorderAfterWidthLength extends BorderCommonWidth  {
         throws PropertyException
     {
         return getMappedLength
-        (PropNames.BORDER_AFTER_WIDTH_LENGTH, MEDIUM);
+                    (null, PropNames.BORDER_AFTER_WIDTH_LENGTH, MEDIUM);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
index 65b1a2f071c2d267db8d07ea25529c2a3e45670e..3e89283ff8c197a9a78f9cf51f0f9abccd821edf 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderBeforeWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@ public class BorderBeforeWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_BEFORE_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_BEFORE_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
index a828554471bc7e254ab66ed2f680243520b6d5d5..261f1c5811fc68bd48a2838c980b5d50c24d3598 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
@@ -13,7 +13,7 @@ public class BorderBeforeWidthLength extends BorderCommonWidth  {
         throws PropertyException
     {
         return getMappedLength
-        (PropNames.BORDER_BEFORE_WIDTH_LENGTH, MEDIUM);
+                    (null, PropNames.BORDER_BEFORE_WIDTH_LENGTH, MEDIUM);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderBottomWidth.java b/src/org/apache/fop/fo/properties/BorderBottomWidth.java
index a284cc021ac1c605d37982c3a49ba87b793b2cf2..5bf51c7cdd0c95c14ef3251efbe1ed14848ee73f 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBottomWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderBottomWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderBottomWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@ public class BorderBottomWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_BOTTOM_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_BOTTOM_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderCommonWidth.java b/src/org/apache/fop/fo/properties/BorderCommonWidth.java
index 76990cd9571e83ce33e38ff735a77fc80abd4523..308b4acd4eb38751ffb04d057a0c2c9c3733f075 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderCommonWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderCommonWidth.java
@@ -3,6 +3,7 @@ package org.apache.fop.fo.properties;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.expr.PropertyException;
 
 /**
@@ -37,7 +38,7 @@ public class BorderCommonWidth extends Property  {
      * @return <tt>Numeric[]</tt> containing the values corresponding
      * to the MappedNumeric enumeration constants for border width
      */
-    public Numeric getMappedLength(int property, int enum)
+    public Numeric getMappedLength(FONode node, int property, int enum)
        throws PropertyException
     {
        return 

diff --git a/src/org/apache/fop/fo/properties/BorderEndWidth.java b/src/org/apache/fop/fo/properties/BorderEndWidth.java
index bd1e3e449d2a81394f9416e3fb6d40731cf25c4b..a0ee95e79a6ed1d4d51cbcfcdb8e2ae570504fc2 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderEndWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderEndWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@ public class BorderEndWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_END_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_END_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
index dd48d03655c18da7cd626278eb7081605640c68a..fb09fa44f7df14774f616fe5713a41745959782a 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
@@ -13,7 +13,7 @@ public class BorderEndWidthLength extends BorderCommonWidth  {
         throws PropertyException
     {
         return getMappedLength
-        (PropNames.BORDER_END_WIDTH_LENGTH, MEDIUM);
+                        (null, PropNames.BORDER_END_WIDTH_LENGTH, MEDIUM);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderLeftWidth.java b/src/org/apache/fop/fo/properties/BorderLeftWidth.java
index 265fb2794eb9bf3eef49d994e3e87a3e932f51e4..c372dfce8b3d6037ecc3bf6b569df201f985e94d 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderLeftWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderLeftWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderLeftWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@ public class BorderLeftWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_LEFT_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_LEFT_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderRightWidth.java b/src/org/apache/fop/fo/properties/BorderRightWidth.java
index b8682d1cfa23d34e2a73d553c220a3133e7571ed..953cd5e6dac00a0b1749801d036da7b3a7fc3cda 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderRightWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderRightWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderRightWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@ public class BorderRightWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_RIGHT_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_RIGHT_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderStartWidth.java b/src/org/apache/fop/fo/properties/BorderStartWidth.java
index ef5082bc7efb59d403c4e15582f5e4e2f4e96998..99b5328b60466130956b5ff0ae24c31be9f42ead 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderStartWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderStartWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@ public class BorderStartWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_START_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_START_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
index 8f194c3c6f604d8280570ea82d2e05ffca711816..bcf65dc1e1a1a8f0c8850d033d762db302898bdd 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
@@ -13,7 +13,7 @@ public class BorderStartWidthLength extends BorderCommonWidth {
         throws PropertyException
     {
         return getMappedLength
-        (PropNames.BORDER_START_WIDTH_LENGTH, MEDIUM);
+        (null, PropNames.BORDER_START_WIDTH_LENGTH, MEDIUM);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/BorderTopWidth.java b/src/org/apache/fop/fo/properties/BorderTopWidth.java
index 4525b8078ef8c14985d902155cce29f2abbaf4a4..3c0630636a353e8d30dc1e8a74f8e4bffe167b0f 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderTopWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderTopWidth.java
@@ -4,6 +4,7 @@ import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.BorderCommonWidth;
 
 public class BorderTopWidth extends BorderCommonWidth {
@@ -13,13 +14,14 @@ public class BorderTopWidth extends BorderCommonWidth {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(MEDIUM);
+        System.out.println("In BorderTopWidth geInitialValue.");
+        return getMappedLength(null, MEDIUM);
     }
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
-        return getMappedLength(PropNames.BORDER_TOP_WIDTH, enum);
+        return getMappedLength(node, PropNames.BORDER_TOP_WIDTH, enum);
     }
 
     public static final int inherited = NO;

diff --git a/src/org/apache/fop/fo/properties/WordSpacing.java b/src/org/apache/fop/fo/properties/WordSpacing.java
index c104092795f20a65e55a1e905a670431abb33525..6414a4ed1b9e1e773739d76a806c9c3e0475b573 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacing.java
+++ b/src/org/apache/fop/fo/properties/WordSpacing.java
@@ -6,6 +6,7 @@ import org.apache.fop.datastructs.ROStringArray;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.properties.WordSpacingCommon;
 
 public class WordSpacing extends WordSpacingCommon  {
@@ -16,11 +17,11 @@ public class WordSpacing extends WordSpacingCommon  {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(NORMAL); //normal
+        return getMappedLength(null, NORMAL); //null imples initial value
     }
     public static final int inherited = NO;
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
         if (enum != NORMAL)

diff --git a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
index e6afe838c3afc59f3aef5b8aea8ff8eb947ec43d..cc1c3bfce27ebb0124a91ebcae268e398739153c 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
@@ -2,6 +2,7 @@ package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@ public class WordSpacingMaximum extends WordSpacingCommon  {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(NORMAL);
+        return getMappedLength(null, NORMAL); // null implies initial value
     }
     public static final int inherited = COMPUTED;
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
         if (enum != NORMAL)

diff --git a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
index dd428e73b1efce4a95b3c478ff9e0f1e117fc614..384366e21888e274605fc1abda4444fd0119d69c 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
@@ -2,6 +2,7 @@ package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@ public class WordSpacingMinimum extends WordSpacingCommon  {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(WordSpacing.NORMAL);
+        return getMappedLength(null, NORMAL); // null implies initial value
     }
     public static final int inherited = COMPUTED;
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
         if (enum != NORMAL)

diff --git a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
index 00e1fa4266098ecc5d352f542aab9878c5f88fee..9b0d60821ca55a5942956114387fb6c84a49e44a 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
@@ -2,6 +2,7 @@ package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@ public class WordSpacingOptimum extends WordSpacingCommon  {
     public PropertyValue getInitialValue(int property)
         throws PropertyException
     {
-        return getMappedLength(WordSpacing.NORMAL);
+        return getMappedLength(null, NORMAL); // null implies initial value
     }
     public static final int inherited = COMPUTED;
 
-    public Numeric getMappedLength(int enum)
+    public Numeric getMappedLength(FONode node, int enum)
         throws PropertyException
     {
         if (enum != NORMAL)