diff options
| author | William Victor Mote <vmote@apache.org> | 2003-08-26 19:51:20 +0000 |
|---|---|---|
| committer | William Victor Mote <vmote@apache.org> | 2003-08-26 19:51:20 +0000 |
| commit | 3a3765cc5bf1972db666c136021579bdb9038406 (patch) | |
| tree | 44970ba4b82d468b8a815e119d967e0029d231db /src/java/org/apache/fop/fo | |
| parent | 0fad1c60e96988add49177b62ee26a3ccf27a2d6 (diff) | |
| download | xmlgraphics-fop-3a3765cc5bf1972db666c136021579bdb9038406.tar.gz xmlgraphics-fop-3a3765cc5bf1972db666c136021579bdb9038406.zip | |
1. make fo/flow/Table.columns store fo columns instead of column layout managers
2. move fo/flow/TableColumn.getLayoutManager() to layoutmgr/AddLMVisitor.getTableColumnLayoutManager()
3. have layoutmgr/AddLMVisitor.serveVisitor(Table node) loop through the fo/flow/Table.columns collection and build its layout manager collection from it
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196849 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo')
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Table.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/TableColumn.java | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 12be61d95..feec07d25 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -115,7 +115,7 @@ public class Table extends FObj { if (columns == null) { columns = new ArrayList(); } - columns.add(((TableColumn)child).getLayoutManager()); + columns.add(((TableColumn)child)); } else if (child.getName().equals("fo:table-footer")) { tableFooter = (TableBody)child; } else if (child.getName().equals("fo:table-header")) { diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index b7bd579bd..d8bd8c742 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -60,9 +60,6 @@ import org.apache.fop.fo.Property; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; -import org.apache.fop.layoutmgr.LayoutManager; -import org.apache.fop.layoutmgr.table.Column; -import org.apache.fop.apps.*; /** * Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO @@ -87,14 +84,6 @@ public class TableColumn extends FObj { super(parent); } - public LayoutManager getLayoutManager() { - doSetup(); - Column clm = new Column(); - clm.setUserAgent(getUserAgent()); - clm.setFObj(this); - return clm; - } - /** * @return Length object containing column width */ @@ -132,7 +121,7 @@ public class TableColumn extends FObj { return numColumnsRepeated; } - private void doSetup() { + public void doSetup() { // Common Border, Padding, and Background Properties // only background apply, border apply if border-collapse |