aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2005-09-19 21:20:41 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2005-09-19 21:20:41 +0000
commit1860711be91f5b20d0c83b07e42f5e02353c9316 (patch)
treebf8770b097f3b5a436a0315a836841009882589a /src/java/org
parent39f7d11ec17eb029f96b3b41b0da1828fa4f972f (diff)
downloadxmlgraphics-fop-1860711be91f5b20d0c83b07e42f5e02353c9316.tar.gz
xmlgraphics-fop-1860711be91f5b20d0c83b07e42f5e02353c9316.zip
Correction of style violations
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@290272 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org')
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java6
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java2
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java5
3 files changed, 6 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
index cf3a6af05..c49c35760 100644
--- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
@@ -60,7 +60,7 @@ public class ColumnSetup {
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 @@ public class ColumnSetup {
+ 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 class ColumnSetup {
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);
}
}
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
index cbaf1a8f3..fd4a81b58 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
@@ -439,7 +439,7 @@ public class TableContentLayoutManager implements PercentBaseContext {
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());
}
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 5b1576c97..cda906c9e 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -156,7 +156,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager
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 @@ public class TableLayoutManager extends BlockStackingLayoutManager
return referenceBPD;
}
-}
-
+} \ No newline at end of file