Browse Source

Correction of style violations

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@290272 13f79535-47bb-0310-9956-ffa450edef68
pull/31/head
Andreas L. Delmelle 19 years ago
parent
commit
49b917adbf

+ 3
- 3
src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java View File

@@ -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);
}
}

+ 1
- 1
src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java View File

@@ -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());
}

+ 2
- 3
src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java View File

@@ -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;
}
}

}

Loading…
Cancel
Save