Removed parameter from the endTablePart method, as the part is already passed as...

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

diff --git a/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
index f87ed47f3d18b1b3ca755f87b4cfa2604881be53..7df071191100054a52958dacbc036adae7b7f72d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
+++ b/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
@@ -164,7 +164,7 @@ class FixedColRowGroupBuilder extends RowGroupBuilder {
     }
 
     /** {@inheritDoc} */
-    void endTablePart(TableBody tableBody) throws ValidationException {
+    void endTablePart() throws ValidationException {
         if (rows.size() > 0) {
             throw new ValidationException(
                     "A table-cell is spanning more rows than available in its parent element.");

diff --git a/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
index 220eff85b66571350d71a2387784453d330076af..f258865819de84a3c0aec425c12bb53fce381779 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
+++ b/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
@@ -77,10 +77,9 @@ abstract class RowGroupBuilder {
      * row-group is checked for emptiness. This row group builder is reset for handling
      * further possible table parts.
      * 
-     * @param tableBody the table part being ended
      * @throws ValidationException if a row-spanning cell overflows the given table part
      */
-    abstract void endTablePart(TableBody tableBody) throws ValidationException;
+    abstract void endTablePart() throws ValidationException;
 
     /**
      * Receives notification of the end of the table.

diff --git a/src/java/org/apache/fop/fo/flow/table/TableBody.java b/src/java/org/apache/fop/fo/flow/table/TableBody.java
index dced3c0624cb3d86b24624b08af4c367aac74ce9..7df1ed0a7dde19d6a78b0130b6f721c57b62052f 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/table/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableBody.java
@@ -145,7 +145,7 @@ public class TableBody extends TableCellContainer {
                 rowGroupBuilder.endRow(this);
             }
             try {
-                rowGroupBuilder.endTablePart(this);
+                rowGroupBuilder.endTablePart();
             } catch (ValidationException e) {
                 e.setLocator(locator);
                 throw e;

diff --git a/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
index 66322b1b7d119f9c2306e3b96b4eff6a3385848b..47c96dccaaa598ee8e08c9f782efff77892bf215 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
+++ b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
@@ -91,11 +91,11 @@ class VariableColRowGroupBuilder extends RowGroupBuilder {
     }
 
     /** {@inheritDoc} */
-    void endTablePart(final TableBody tableBody) throws ValidationException {
+    void endTablePart() throws ValidationException {
         // TODO catch the ValidationException sooner?
         events.add(new Event() {
             public void play(RowGroupBuilder rowGroupBuilder) throws ValidationException {
-                rowGroupBuilder.endTablePart(tableBody);
+                rowGroupBuilder.endTablePart();
             }
         });
     }