aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2007-12-13 18:57:25 +0000
committerVincent Hennebert <vhennebert@apache.org>2007-12-13 18:57:25 +0000
commit4090cb592401b107f4a560fede22b27ffc41667d (patch)
tree99e51f83f76b9e0a39bcbfd4bb196224605f758e
parent757fdc23d3f01bd940dc13cb1920ac2daf40a56c (diff)
downloadxmlgraphics-fop-4090cb592401b107f4a560fede22b27ffc41667d.tar.gz
xmlgraphics-fop-4090cb592401b107f4a560fede22b27ffc41667d.zip
Removed parameter from the endTablePart method, as the part is already passed as as a parameter of the previously called startTablePart method
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@603979 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java2
-rw-r--r--src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java3
-rw-r--r--src/java/org/apache/fop/fo/flow/table/TableBody.java2
-rw-r--r--src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java4
4 files changed, 5 insertions, 6 deletions
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 f87ed47f3..7df071191 100644
--- 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 220eff85b..f25886581 100644
--- 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 dced3c062..7df1ed0a7 100644
--- 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 66322b1b7..47c96dcca 100644
--- 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();
}
});
}