Moved table-related FObj into new o.a.fop.fo.flow.table package

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@592103 13f79535-47bb-0310-9956-ffa450edef68

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

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;

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;

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;
 
 /**

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;
 

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;
 
 /**

src/java/org/apache/fop/fo/flow/ColumnNumberManager.java → 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

src/java/org/apache/fop/fo/flow/ColumnNumberManagerHolder.java → 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

src/java/org/apache/fop/fo/flow/FixedColRowGroupBuilder.java → 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;
 
 
 /**

src/java/org/apache/fop/fo/flow/RowGroupBuilder.java → 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;

src/java/org/apache/fop/fo/flow/Table.java → 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;

src/java/org/apache/fop/fo/flow/TableAndCaption.java → 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;

src/java/org/apache/fop/fo/flow/TableBody.java → 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;

src/java/org/apache/fop/fo/flow/TableCaption.java → 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;

src/java/org/apache/fop/fo/flow/TableCell.java → 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;
 

src/java/org/apache/fop/fo/flow/TableCellContainer.java → 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;
 

src/java/org/apache/fop/fo/flow/TableColumn.java → 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;

src/java/org/apache/fop/fo/flow/TableFObj.java → 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;

src/java/org/apache/fop/fo/flow/TableFooter.java → 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;

src/java/org/apache/fop/fo/flow/TableHeader.java → 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;

src/java/org/apache/fop/fo/flow/TableRow.java → 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;

src/java/org/apache/fop/fo/flow/VariableColRowGroupBuilder.java → 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;
 

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

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;

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;
 
 /**

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;
 
 /**

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;
 
 /**

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.

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;
 

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"

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;

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;

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;

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;

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;

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;

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;

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;
 
 

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;

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;

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;

src/sandbox/org/apache/fop/render/mif/MIFHandler.java

@@ -32,17 +32,17 @@ import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.flow.ExternalGraphic;
 import org.apache.fop.fo.flow.Footnote;
 import org.apache.fop.fo.flow.FootnoteBody;
-import org.apache.fop.fo.flow.InstreamForeignObject;
 import org.apache.fop.fo.flow.Inline;
+import org.apache.fop.fo.flow.InstreamForeignObject;
 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.fo.pagination.PageSequenceMaster;

test/java/org/apache/fop/fo/flow/AbstractTableTestCase.java → test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.flow.table;
 
 import java.util.Iterator;
 

test/java/org/apache/fop/fo/flow/TableColumnColumnNumberTestCase.java → test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.flow.table;
 
 import java.util.Iterator;
 

test/java/org/apache/fop/fo/flow/TableHandler.java → test/java/org/apache/fop/fo/flow/table/TableHandler.java

@@ -17,14 +17,14 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.flow.table;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.flow.Table;
+import org.apache.fop.fo.flow.table.Table;
 
 public class TableHandler extends FOEventHandler {
 

test/java/org/apache/fop/fo/flow/TableRowIteratorTestCase.java → test/java/org/apache/fop/fo/flow/table/TableRowIteratorTestCase.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.flow.table;
 
 import java.util.Iterator;
 import java.util.List;

test/java/org/apache/fop/fo/flow/TooManyColumnsTestCase.java → test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java

@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo.flow;
+package org.apache.fop.fo.flow.table;
 
 import org.apache.fop.fo.ValidationException;
 

test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java

@@ -32,7 +32,7 @@ import org.apache.commons.io.filefilter.PrefixFileFilter;
 import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.fop.DebugHelper;
-import org.apache.fop.fo.flow.TooManyColumnsTestCase;
+import org.apache.fop.fo.flow.table.TooManyColumnsTestCase;
 import org.apache.fop.layoutengine.LayoutEngineTestSuite;
 
 import junit.framework.Test;

test/java/org/apache/fop/layoutmgr/table/TableHandler.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.flow.Table;
+import org.apache.fop.fo.flow.table.Table;
 
 public class TableHandler extends FOEventHandler {