Minor enhancement of column-number property code / removal of unused method

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

diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 5ea294064f5eb0ef5de898ad9e6286c0a6758bfb..ac3fc95ee3f8a29cb8ec69cd8451a1caa326c91d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -339,12 +339,7 @@ public class Table extends TableFObj {
     public boolean isAutoLayout() {
         return (tableLayout == EN_AUTO);
     }
-    
-    /** @return the default table column */
-    public TableColumn getDefaultColumn() {
-        return (TableColumn) this.columns.get(0);
-    }
-    
+
     /** @return the list of table-column elements. */
     public List getColumns() {
         return columns;

diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/TableFObj.java
index a5370a36ddf0fdb2ffd569082a8a4f397e690caf..c72e4da9d48669db8b3ad0cdcabf0aad15164322 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableFObj.java
+++ b/src/java/org/apache/fop/fo/flow/TableFObj.java
@@ -378,7 +378,14 @@ public abstract class TableFObj extends FObj {
                             + parent.getCurrentColumnIndex());
                     return new NumberProperty(parent.getCurrentColumnIndex());
                 }
-                //TODO: check for non-integer value and round
+                
+                double tmpIndex = p.getNumeric().getNumericValue();
+                if (tmpIndex - columnIndex > 0.0) {
+                    columnIndex = (int) Math.round(tmpIndex);
+                    fo.getLogger().warn("Rounding specified column-number of "
+                            + tmpIndex + " to " + columnIndex);
+                    return new NumberProperty(columnIndex);
+                }
                         
                 /* if column-number was explicitly specified, force the 
                  * parent's current column index to the specified value, 

diff --git a/test/fotree/testcases/column-number_non-integer.fo b/test/fotree/testcases/column-number_non-integer.fo
new file mode 100644 (file)
index 0000000..ee69d7e
--- /dev/null
+++ b/test/fotree/testcases/column-number_non-integer.fo
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" 
+          margin="20pt">
+      <fo:region-body />
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <!-- testcase for specified non-integer, negative and zero values -->
+      <fo:table border-collapse="separate" table-layout="fixed" width="7.5in">
+        <fo:table-column column-width="60pt" column-number="0.5">
+          <test:assert property="column-number" expected="1" />
+        </fo:table-column>
+        <fo:table-column column-width="7in" column-number="-1">
+          <test:assert property="column-number" expected="2" />
+        </fo:table-column>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell column-number="-3.03">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>Cell1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell column-number="1.567">
+              <test:assert property="column-number" expected="2" />
+              <fo:block>Cell2
+              </fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+