diff options
Diffstat (limited to 'src/java/org')
41 files changed, 103 insertions, 101 deletions
diff --git a/src/java/org/apache/fop/fo/FOElementMapping.java b/src/java/org/apache/fop/fo/FOElementMapping.java index f316e5a8d..51ec85d21 100644 --- a/src/java/org/apache/fop/fo/FOElementMapping.java +++ b/src/java/org/apache/fop/fo/FOElementMapping.java @@ -366,55 +366,55 @@ public class FOElementMapping extends ElementMapping { static class TableAndCaptionMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableAndCaption(parent); + return new org.apache.fop.fo.flow.table.TableAndCaption(parent); } } static class TableMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.Table(parent); + return new org.apache.fop.fo.flow.table.Table(parent); } } static class TableColumnMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableColumn(parent); + return new org.apache.fop.fo.flow.table.TableColumn(parent); } } static class TableCaptionMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableCaption(parent); + return new org.apache.fop.fo.flow.table.TableCaption(parent); } } static class TableBodyMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableBody(parent); + return new org.apache.fop.fo.flow.table.TableBody(parent); } } static class TableHeaderMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableHeader(parent); + return new org.apache.fop.fo.flow.table.TableHeader(parent); } } static class TableFooterMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableFooter(parent); + return new org.apache.fop.fo.flow.table.TableFooter(parent); } } static class TableRowMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableRow(parent); + return new org.apache.fop.fo.flow.table.TableRow(parent); } } static class TableCellMaker extends ElementMapping.Maker { public FONode make(FONode parent) { - return new org.apache.fop.fo.flow.TableCell(parent); + return new org.apache.fop.fo.flow.table.TableCell(parent); } } diff --git a/src/java/org/apache/fop/fo/FOEventHandler.java b/src/java/org/apache/fop/fo/FOEventHandler.java index 28dd32ba0..b2297ae6f 100644 --- a/src/java/org/apache/fop/fo/FOEventHandler.java +++ b/src/java/org/apache/fop/fo/FOEventHandler.java @@ -39,11 +39,11 @@ import org.apache.fop.fo.flow.Leader; import org.apache.fop.fo.flow.ListBlock; import org.apache.fop.fo.flow.ListItem; import org.apache.fop.fo.flow.PageNumber; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fonts.FontInfo; diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 0d53a44b3..e0acfca7e 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -31,7 +31,7 @@ import org.apache.fop.fo.properties.BorderWidthPropertyMaker; import org.apache.fop.fo.properties.BoxPropShorthandParser; import org.apache.fop.fo.properties.CharacterProperty; import org.apache.fop.fo.properties.ColorProperty; -import org.apache.fop.fo.flow.TableFObj.ColumnNumberPropertyMaker; +import org.apache.fop.fo.flow.table.TableFObj.ColumnNumberPropertyMaker; import org.apache.fop.fo.properties.CondLengthProperty; import org.apache.fop.fo.properties.CorrespondingPropertyMaker; import org.apache.fop.fo.properties.DimensionPropertyMaker; diff --git a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java index 651f93451..66cafc2ac 100644 --- a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java +++ b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java @@ -23,11 +23,11 @@ import java.util.List; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOPropertyMapping; -import org.apache.fop.fo.flow.ColumnNumberManager; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableFObj; +import org.apache.fop.fo.flow.table.ColumnNumberManager; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableFObj; import org.apache.fop.fo.properties.Property; /** diff --git a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java index 856dd4b03..08ec34732 100644 --- a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java +++ b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java @@ -20,7 +20,7 @@ package org.apache.fop.fo.expr; import org.apache.fop.fo.PropertyList; -import org.apache.fop.fo.flow.Table; +import org.apache.fop.fo.flow.table.Table; import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.TableColLength; diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index c63e7baa9..f2679d04b 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -28,6 +28,7 @@ import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.FOText; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.ValidationException; +import org.apache.fop.fo.flow.table.Table; import org.xml.sax.Locator; /** diff --git a/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java index 038a85706..54830e318 100644 --- a/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java +++ b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java @@ -17,12 +17,13 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.BitSet; import java.util.List; -import org.apache.fop.fo.flow.TableCellContainer.PendingSpan; +import org.apache.fop.fo.flow.table.TableCellContainer.PendingSpan; + /** * Helper class maintaining a record of occupied columns and an index to the next diff --git a/src/java/org/apache/fop/fo/flow/ColumnNumberManagerHolder.java b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java index 157ca749f..5b253709b 100644 --- a/src/java/org/apache/fop/fo/flow/ColumnNumberManagerHolder.java +++ b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; /** * Marking interface for table-related classes which contain a ColumnNumberManager diff --git a/src/java/org/apache/fop/fo/flow/FixedColRowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java index 5a4bd24b2..22e5c02b8 100644 --- a/src/java/org/apache/fop/fo/flow/FixedColRowGroupBuilder.java +++ b/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; /** diff --git a/src/java/org/apache/fop/fo/flow/RowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java index 359ccd59a..faee3066f 100644 --- a/src/java/org/apache/fop/fo/flow/RowGroupBuilder.java +++ b/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.ArrayList; import java.util.List; diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/table/Table.java index ab58686fc..07fc95f7e 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/table/Table.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java index f9eb5b97f..f16931cfc 100644 --- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; // XML import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/table/TableBody.java index e8e1183b3..cd46f9dfd 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/table/TableBody.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/table/TableCaption.java index dc3188466..28174067c 100644 --- a/src/java/org/apache/fop/fo/flow/TableCaption.java +++ b/src/java/org/apache/fop/fo/flow/table/TableCaption.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; // XML import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/table/TableCell.java index 04eb904d8..34c6266a7 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/table/TableCell.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/flow/TableCellContainer.java b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java index c409e01af..97de855b2 100644 --- a/src/java/org/apache/fop/fo/flow/TableCellContainer.java +++ b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.List; diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/table/TableColumn.java index 89d967303..aa2dfcb0a 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/table/TableColumn.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; // XML import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/table/TableFObj.java index 68aaf2bf5..53995464b 100644 --- a/src/java/org/apache/fop/fo/flow/TableFObj.java +++ b/src/java/org/apache/fop/fo/flow/table/TableFObj.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.Numeric; diff --git a/src/java/org/apache/fop/fo/flow/TableFooter.java b/src/java/org/apache/fop/fo/flow/table/TableFooter.java index a16586af9..fe3521318 100644 --- a/src/java/org/apache/fop/fo/flow/TableFooter.java +++ b/src/java/org/apache/fop/fo/flow/table/TableFooter.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; // FOP import org.apache.fop.apps.FOPException; diff --git a/src/java/org/apache/fop/fo/flow/TableHeader.java b/src/java/org/apache/fop/fo/flow/table/TableHeader.java index eb3568d47..3cfb782c0 100644 --- a/src/java/org/apache/fop/fo/flow/TableHeader.java +++ b/src/java/org/apache/fop/fo/flow/table/TableHeader.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; // FOP import org.apache.fop.apps.FOPException; diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/table/TableRow.java index bbc8081a6..edc8d13df 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/table/TableRow.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.Length; diff --git a/src/java/org/apache/fop/fo/flow/VariableColRowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java index a59c98786..53b7bfca1 100644 --- a/src/java/org/apache/fop/fo/flow/VariableColRowGroupBuilder.java +++ b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java @@ -17,7 +17,7 @@ /* $Id$ */ -package org.apache.fop.fo.flow; +package org.apache.fop.fo.flow.table; import java.util.List; diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index dbc66b02a..5be2792f5 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -810,8 +810,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) { return ((org.apache.fop.fo.flow.ListItem)fobj) .getCommonBorderPaddingBackground(); - } else if (fobj instanceof org.apache.fop.fo.flow.Table) { - return ((org.apache.fop.fo.flow.Table)fobj) + } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) { + return ((org.apache.fop.fo.flow.table.Table)fobj) .getCommonBorderPaddingBackground(); } else { return null; @@ -832,8 +832,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) { return ((org.apache.fop.fo.flow.ListItem)fobj) .getCommonMarginBlock().spaceBefore; - } else if (fobj instanceof org.apache.fop.fo.flow.Table) { - return ((org.apache.fop.fo.flow.Table)fobj) + } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) { + return ((org.apache.fop.fo.flow.table.Table)fobj) .getCommonMarginBlock().spaceBefore; } else { return null; @@ -854,8 +854,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) { return ((org.apache.fop.fo.flow.ListItem)fobj) .getCommonMarginBlock().spaceAfter; - } else if (fobj instanceof org.apache.fop.fo.flow.Table) { - return ((org.apache.fop.fo.flow.Table)fobj) + } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) { + return ((org.apache.fop.fo.flow.table.Table)fobj) .getCommonMarginBlock().spaceAfter; } else { return null; @@ -933,8 +933,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager breakBefore = ((org.apache.fop.fo.flow.ListBlock) fobj).getBreakBefore(); } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) { breakBefore = ((org.apache.fop.fo.flow.ListItem) fobj).getBreakBefore(); - } else if (fobj instanceof org.apache.fop.fo.flow.Table) { - breakBefore = ((org.apache.fop.fo.flow.Table) fobj).getBreakBefore(); + } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) { + breakBefore = ((org.apache.fop.fo.flow.table.Table) fobj).getBreakBefore(); } if (breakBefore == EN_PAGE || breakBefore == EN_COLUMN @@ -966,8 +966,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager breakAfter = ((org.apache.fop.fo.flow.ListBlock) fobj).getBreakAfter(); } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) { breakAfter = ((org.apache.fop.fo.flow.ListItem) fobj).getBreakAfter(); - } else if (fobj instanceof org.apache.fop.fo.flow.Table) { - breakAfter = ((org.apache.fop.fo.flow.Table) fobj).getBreakAfter(); + } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) { + breakAfter = ((org.apache.fop.fo.flow.table.Table) fobj).getBreakAfter(); } if (breakAfter == EN_PAGE || breakAfter == EN_COLUMN diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java index a1a3c06fc..575ab9fb8 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java @@ -50,14 +50,14 @@ import org.apache.fop.fo.flow.PageNumber; import org.apache.fop.fo.flow.PageNumberCitation; import org.apache.fop.fo.flow.PageNumberCitationLast; import org.apache.fop.fo.flow.RetrieveMarker; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableFooter; -import org.apache.fop.fo.flow.TableHeader; -import org.apache.fop.fo.flow.TableRow; import org.apache.fop.fo.flow.Wrapper; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableFooter; +import org.apache.fop.fo.flow.table.TableHeader; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.SideRegion; diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java index cf57947fb..ddbb20c47 100644 --- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java +++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java @@ -20,11 +20,11 @@ package org.apache.fop.layoutmgr.table; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo; /** diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java index 05f5ea4c9..2ef2be908 100644 --- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java +++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java @@ -29,8 +29,8 @@ import org.apache.fop.datatypes.PercentBaseContext; import org.apache.fop.datatypes.Length; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableColumn; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableColumn; import org.apache.fop.fo.properties.TableColLength; /** diff --git a/src/java/org/apache/fop/layoutmgr/table/EffRow.java b/src/java/org/apache/fop/layoutmgr/table/EffRow.java index 85a9792d3..1e4924a5a 100644 --- a/src/java/org/apache/fop/layoutmgr/table/EffRow.java +++ b/src/java/org/apache/fop/layoutmgr/table/EffRow.java @@ -22,7 +22,7 @@ package org.apache.fop.layoutmgr.table; import java.util.Iterator; import java.util.List; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.traits.MinOptMax; /** diff --git a/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java index 1308b5840..5c208b84b 100644 --- a/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java @@ -19,9 +19,9 @@ package org.apache.fop.layoutmgr.table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableRow; /** * GridUnit subclass for empty grid units. diff --git a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java index b4a2d7e5d..79b2cca9e 100644 --- a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java @@ -22,11 +22,11 @@ package org.apache.fop.layoutmgr.table; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo; diff --git a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java index da6ecc627..ece022556 100644 --- a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; /** * This class represents a primary grid unit of a spanned cell. This is the "before-start" diff --git a/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java index c11c2b3ac..4dd42110f 100644 --- a/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; import org.apache.fop.fo.properties.LengthRangeProperty; import org.apache.fop.layoutmgr.BreakElement; diff --git a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java index 60f7333ef..5b5fece32 100644 --- a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java +++ b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.LengthRangeProperty; import org.apache.fop.layoutmgr.ElementListUtils; import org.apache.fop.layoutmgr.KnuthElement; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java index 1ad7c1b26..55b67053f 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java @@ -19,7 +19,7 @@ package org.apache.fop.layoutmgr.table; -import org.apache.fop.fo.flow.TableAndCaption; +import org.apache.fop.fo.flow.table.TableAndCaption; import org.apache.fop.layoutmgr.BlockStackingLayoutManager; import org.apache.fop.layoutmgr.LayoutContext; import org.apache.fop.layoutmgr.PositionIterator; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java index 04746920a..58c85e8cd 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java @@ -19,7 +19,7 @@ package org.apache.fop.layoutmgr.table; -import org.apache.fop.fo.flow.TableCaption; +import org.apache.fop.fo.flow.table.TableCaption; import org.apache.fop.layoutmgr.BlockStackingLayoutManager; import org.apache.fop.layoutmgr.LayoutContext; import org.apache.fop.layoutmgr.PositionIterator; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index 8c8cf12ec..61b7c9e65 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.datatypes.PercentBaseContext; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableCell; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableCell; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; import org.apache.fop.layoutmgr.AreaAdditionUtil; import org.apache.fop.layoutmgr.BlockLevelLayoutManager; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index a5ca6cbe2..8f3c3195c 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -31,9 +31,9 @@ import org.apache.fop.area.Trait; import org.apache.fop.datatypes.PercentBaseContext; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.layoutmgr.BreakElement; import org.apache.fop.layoutmgr.ElementListUtils; import org.apache.fop.layoutmgr.KnuthBox; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index 8500398b2..e33773695 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -21,8 +21,8 @@ package org.apache.fop.layoutmgr.table; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableColumn; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableColumn; import org.apache.fop.layoutmgr.BlockStackingLayoutManager; import org.apache.fop.layoutmgr.ConditionalElementListener; import org.apache.fop.layoutmgr.KnuthElement; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java index 0f7604f20..dfac329a8 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java @@ -26,11 +26,11 @@ import java.util.ListIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.fo.flow.Marker; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java index 639144b4c..92c62cff7 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.layoutmgr.BreakElement; import org.apache.fop.layoutmgr.KnuthBox; import org.apache.fop.layoutmgr.KnuthGlue; diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 985e6dfd4..36fbc235a 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -65,12 +65,12 @@ import org.apache.fop.fo.flow.ListItem; import org.apache.fop.fo.flow.ListItemBody; import org.apache.fop.fo.flow.ListItemLabel; import org.apache.fop.fo.flow.PageNumber; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.flow.TableHeader; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableColumn; +import org.apache.fop.fo.flow.table.TableHeader; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.PageSequenceMaster; diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index 1a42fa269..4c8865598 100644 --- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java @@ -23,11 +23,11 @@ import java.awt.Color; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.flow.Table; -import org.apache.fop.fo.flow.TableBody; -import org.apache.fop.fo.flow.TableCell; -import org.apache.fop.fo.flow.TableHeader; -import org.apache.fop.fo.flow.TableRow; +import org.apache.fop.fo.flow.table.Table; +import org.apache.fop.fo.flow.table.TableBody; +import org.apache.fop.fo.flow.table.TableCell; +import org.apache.fop.fo.flow.table.TableHeader; +import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; import org.apache.fop.render.rtf.rtflib.rtfdoc.ITableAttributes; import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; |