diff options
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Table.java | 8 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/TableBody.java | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index b70e5ea21..e752c5fbe 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -19,6 +19,7 @@ package org.apache.fop.fo.flow; +import java.util.ArrayList; import java.util.BitSet; import java.util.List; @@ -70,7 +71,7 @@ public class Table extends TableFObj { private Length orphanContentLimit; /** collection of columns in this table */ - protected List columns = null; + protected List columns = new ArrayList(); /** helper variables for implicit column-numbering */ private int columnIndex = 1; @@ -239,9 +240,6 @@ public class Table extends TableFObj { switch (childId) { case FO_TABLE_COLUMN: - if (columns == null) { - columns = new java.util.ArrayList(); - } if (!inMarker()) { addColumnNode((TableColumn) child); } else { @@ -342,7 +340,7 @@ public class Table extends TableFObj { public List getColumns() { return columns; } - + /** @return the body for the table-header. */ public TableBody getTableHeader() { return tableHeader; diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index 3c68410f5..44369d899 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -165,12 +165,6 @@ public class TableBody extends TableCellContainer { protected void addChildNode(FONode child) throws FOPException { if (!inMarker()) { if (firstRow) { - Table t = getTable(); - - if (t.columns == null) { - t.columns = new java.util.ArrayList(); - } - switch (child.getNameId()) { case FO_TABLE_ROW: firstRow = false; |