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 2005/09/19 23:20:45 UTC
svn commit: r290272 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table:
ColumnSetup.java TableContentLayoutManager.java TableLayoutManager.java
Author: adelmelle
Date: Mon Sep 19 14:20:41 2005
New Revision: 290272
URL: http://svn.apache.org/viewcvs?rev=290272&view=rev
Log:
Correction of style violations
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=290272&r1=290271&r2=290272&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Mon Sep 19 14:20:41 2005
@@ -60,7 +60,7 @@
ListIterator iter = rawCols.listIterator();
while (iter.hasNext()) {
TableColumn col = (TableColumn)iter.next();
- if( col != null ) {
+ if (col != null) {
colnum = col.getColumnNumber();
}
for (int i = 0; i < col.getNumberColumnsRepeated(); i++) {
@@ -101,7 +101,7 @@
+ size + " columns have been defined. "
+ "The last defined column will be reused.");
if (!table.isAutoLayout()) {
- log.warn("Please note that according XSL-FO 1.0 (4.26.9) says that "
+ log.warn("Please note that according XSL-FO 1.0 (7.26.9) says that "
+ "the 'column-width' property must be specified for every "
+ "column, unless the automatic table layout is used.");
}
@@ -151,7 +151,7 @@
public int getXOffset(int col, PercentBaseContext context) {
int xoffset = 0;
for (int i = 1; i < col; i++) {
- if( getColumn(i) != null ) {
+ if (getColumn(i) != null) {
xoffset += getColumn(i).getColumnWidth().getValue(context);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=290272&r1=290271&r2=290272&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Mon Sep 19 14:20:41 2005
@@ -439,7 +439,7 @@
i < primary.getStartCol()
+ primary.getCell().getNumberColumnsSpanned();
i++) {
- if( getTableLM().getColumns().getColumn(i + 1) != null ) {
+ if (getTableLM().getColumns().getColumn(i + 1) != null) {
spanWidth += getTableLM().getColumns().getColumn(i + 1)
.getColumnWidth().getValue(getTableLM());
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=290272&r1=290271&r2=290272&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Mon Sep 19 14:20:41 2005
@@ -156,7 +156,7 @@
float factors = 0;
for (Iterator i = columns.iterator(); i.hasNext();) {
TableColumn column = (TableColumn) i.next();
- if( column != null ) {
+ if (column != null) {
Length width = column.getColumnWidth();
sumCols += width.getValue(this);
if (width instanceof TableColLength) {
@@ -461,5 +461,4 @@
return referenceBPD;
}
-}
-
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org