Use the new property expressions. Clients must use Length when retrieving

a length and must delay the call to Length.getValue() until the
baselength has been assigned by the LayoutManagers.

PR: 26778 (second half)


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

1 files changed, 3 insertions, 29 deletions

diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index 76a960771..39a19c61d 100644
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -63,7 +63,6 @@ import org.apache.fop.fo.FOTreeVisitor;
 
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.Property;
 
 /**
  * Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO
@@ -73,8 +72,7 @@ public class TableColumn extends FObj {
 
     private ColorType backgroundColor;
 
-    private Length columnWidthPropVal;
-    private int columnWidth;
+    private Length columnWidth;
     private int columnOffset;
     private int numColumnsRepeated;
     private int iColumnNumber;
@@ -91,27 +89,11 @@ public class TableColumn extends FObj {
     /**
      * @return Length object containing column width
      */
-    public Length getColumnWidthAsLength() {
-        return columnWidthPropVal;
-    }
-
-    /**
-     * @return the column width (in millipoints ??)
-     */
-    public int getColumnWidth() {
+    public Length getColumnWidth() {
         return columnWidth;
     }
 
     /**
-     * Set the column width value, overriding the value from the column-width
-     * Property.
-     * @param columnWidth the column width value in base units (millipoints ??)
-     */
-    public void setColumnWidth(int columnWidth) {
-        this.columnWidth = columnWidth;
-    }
-
-    /**
      * @return column number
      */
     public int getColumnNumber() {
@@ -146,15 +128,7 @@ public class TableColumn extends FObj {
         this.backgroundColor =
             this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
 
-        Property prop = this.propertyList.get(PR_COLUMN_WIDTH);
-        if (prop != null) {
-            columnWidthPropVal = propertyList.get(PR_COLUMN_WIDTH).getLength();
-
-            // This won't include resolved table-units or % values yet.
-            columnWidth = columnWidthPropVal.getValue();
-        } else {
-            columnWidth = 300000;
-        }
+        columnWidth = this.propertyList.get(PR_COLUMN_WIDTH).getLength();
 
         // initialize id
         setupID();