You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2006/08/22 03:43:29 UTC
svn commit: r433459 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/flow/Table.java
src/java/org/apache/fop/fo/flow/TableFObj.java
test/fotree/testcases/column-number_non-integer.fo
Author: adelmelle
Date: Mon Aug 21 18:43:29 2006
New Revision: 433459
URL: http://svn.apache.org/viewvc?rev=433459&view=rev
Log:
Minor enhancement of column-number property code / removal of unused method
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java?rev=433459&r1=433458&r2=433459&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java Mon Aug 21 18:43:29 2006
@@ -339,12 +339,7 @@
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java?rev=433459&r1=433458&r2=433459&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java Mon Aug 21 18:43:29 2006
@@ -378,7 +378,14 @@
+ 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,
Added: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo?rev=433459&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo Mon Aug 21 18:43:29 2006
@@ -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>
+
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_non-integer.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org