Phase 2 of bug 26434.

- Roll the datatypes logic into the property classes.

PR: 26434.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197312 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 13 deletions

diff --git a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
index 36fae49ef..637a62845 100644
--- a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
@@ -55,7 +55,6 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.LengthProperty.Maker;
 
 /**
  * This subclass of LengthProperty.Maker handles the special treatment of 
diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
index 6f6420fd9..aa72ad6de 100644
--- a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
@@ -50,9 +50,9 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.Constants;
 import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.CondLength;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.CondLengthProperty;
 
 /**
  * Stores all common border and padding properties.
@@ -78,7 +78,7 @@ public class CommonBorderAndPadding implements Cloneable {
         private int iLength; // Resolved length value
         private boolean bDiscard;
 
-        public ResolvedCondLength(CondLength length) {
+        public ResolvedCondLength(CondLengthProperty length) {
             bDiscard = length.isDiscard();
             iLength = length.getLengthValue();
         }
@@ -114,7 +114,7 @@ public class CommonBorderAndPadding implements Cloneable {
         private ColorType mColor; // Border color
         private ResolvedCondLength mWidth;
 
-        BorderInfo(int style, CondLength width, ColorType color) {
+        BorderInfo(int style, CondLengthProperty width, ColorType color) {
             mStyle = style;
             mWidth = new ResolvedCondLength(width);
             mColor = color;
@@ -131,12 +131,12 @@ public class CommonBorderAndPadding implements Cloneable {
     private BorderInfo[] borderInfo = new BorderInfo[4];
     private ResolvedCondLength[] padding = new ResolvedCondLength[4];
 
-    public void setBorder(int side, int style, CondLength width,
+    public void setBorder(int side, int style, CondLengthProperty width,
                           ColorType color) {
         borderInfo[side] = new BorderInfo(style, width, color);
     }
 
-    public void setPadding(int side, CondLength width) {
+    public void setPadding(int side, CondLengthProperty width) {
         padding[side] = new ResolvedCondLength(width);
     }
 
diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
index e2927a687..7a19e784e 100644
--- a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
@@ -53,10 +53,9 @@ package org.apache.fop.fo.properties;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.FixedLength;
 import org.apache.fop.fo.FOPropertyMapping;
-import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.expr.Numeric;
+import org.apache.fop.fo.expr.NumericProperty;
 
 /**
  * This property maker handles the calculations described in 5.3.2 which
@@ -109,7 +108,7 @@ public class IndentPropertyMaker extends CorrespondingPropertyMaker {
         }
         // Calculate the values as described in 5.3.2.
         try {
-            Numeric v = new Numeric(new FixedLength(0));
+            NumericProperty v = new NumericProperty(new FixedLength(0));
             /*
             if (!propertyList.getFObj().generatesInlineAreas()) {
                 String propName = FOPropertyMapping.getPropertyName(this.propId);
@@ -119,7 +118,7 @@ public class IndentPropertyMaker extends CorrespondingPropertyMaker {
             v = v.add(propertyList.get(propertyList.wmMap(lr_tb, rl_tb, tb_rl)).getNumeric());
             v = v.add(getCorresponding(paddingCorresponding, propertyList).getNumeric());
             v = v.add(getCorresponding(borderWidthCorresponding, propertyList).getNumeric());
-            return new LengthProperty(v.asLength());
+            return v.asLength();
         } catch (org.apache.fop.fo.expr.PropertyException propEx) {
            String propName = FOPropertyMapping.getPropertyName(baseMaker.getPropId());
            throw new FOPException("Error in " + propName 
diff --git a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
index c2dbb51f8..b5bf98a76 100644
--- a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
@@ -117,8 +117,7 @@ public class LineHeightPropertyMaker extends LengthProperty.Maker {
                                                FObj fo) {
         Number numval = p.getNumber();
         if (numval != null) {
-            return new LengthProperty(
-                    new PercentLength(numval.doubleValue(), getPercentBase(fo,propertyList)));
+            return new PercentLength(numval.doubleValue(), getPercentBase(fo,propertyList));
         }
         return super.convertPropertyDatatype(p, propertyList, fo);
     }