Moved the contents of TableBody into a new abstract base class TablePart, which is now subclassed by TableBody, TableHeader and TableFooter.

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

2 files changed, 8 insertions, 8 deletions

diff --git a/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java b/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
index 3abc2f73b..d26426513 100644
--- a/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
+++ b/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
@@ -108,7 +108,7 @@ public class CollapsedConditionalBorderTestCase extends AbstractTableTestCase {
         super();
     }
 
-    private static GridUnit getGridUnit(TableBody part) {
+    private static GridUnit getGridUnit(TablePart part) {
         return (GridUnit) ((List) ((List) part.getRowGroups().get(0)).get(0)).get(0);
     }
 
@@ -137,8 +137,8 @@ public class CollapsedConditionalBorderTestCase extends AbstractTableTestCase {
         do {
             String baseErrorMsge = "table " + Integer.toString(tableNum) + " (0-based), ";
             Table table = (Table) tableIterator.next();
-            TableBody body = (TableBody) table.getChildNodes().nextNode();
-            GridUnit gu = getGridUnit(body);
+            TablePart part = (TablePart) table.getChildNodes().nextNode();
+            GridUnit gu = getGridUnit(part);
 
             String errorMsge = baseErrorMsge + "border-before";
             checkBorder(errorMsge, gu.borderBefore.normal, 8000, Color.black);
@@ -163,14 +163,14 @@ public class CollapsedConditionalBorderTestCase extends AbstractTableTestCase {
             int borderNum = 0;
             Table table = (Table) tableIterator.next();
 
-            TableBody header = table.getTableHeader();
+            TableHeader header = table.getTableHeader();
             GridUnit gu = getGridUnit(header);
             checkBorder(errorMsge, gu.borderBefore.normal,
                     resolvedBordersHF[tableNum][borderNum++]);
             checkBorder(errorMsge, gu.borderBefore.rest,
                     resolvedBordersHF[tableNum][borderNum++]);
 
-            TableBody footer = table.getTableFooter();
+            TableFooter footer = table.getTableFooter();
             gu = getGridUnit(footer);
             checkBorder(errorMsge, gu.borderAfter.normal,
                     resolvedBordersHF[tableNum][borderNum++]);
diff --git a/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java b/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
index a89ff2eea..498df92b4 100644
--- a/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
+++ b/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
@@ -38,12 +38,12 @@ public class RowGroupBuilderTestCase extends AbstractTableTestCase {
      * given array, and that the number of rows inside each row group is equal to the
      * corresponding integer in the array.
      * 
-     * @param body a body whose row groups are to be checked
+     * @param part a table part whose row groups are to be checked
      * @param expectedRowLengths expected lengths of all the row groups of this part of
      * the table
      */
-    private void checkTablePartRowGroups(TableBody body, int[] expectedRowLengths) {
-        Iterator rowGroupIter = body.getRowGroups().iterator();
+    private void checkTablePartRowGroups(TablePart part, int[] expectedRowLengths) {
+        Iterator rowGroupIter = part.getRowGroups().iterator();
         for (int i = 0; i < expectedRowLengths.length; i++) {
             assertTrue(rowGroupIter.hasNext());
             List rowGroup = (List) rowGroupIter.next();