diff options
author | jtauber <jtauber@unknown> | 1999-11-25 17:33:16 +0000 |
---|---|---|
committer | jtauber <jtauber@unknown> | 1999-11-25 17:33:16 +0000 |
commit | 5273e66a656c4e769d0820fabc3dfbc9b35a6c50 (patch) | |
tree | 8c4b6a292f1ad503b961295492ffaf25b5ce83e8 /src/org/apache/fop/fo/flow/TableBody.java | |
parent | fcc0954359c3dca5843a9c2ba24d3f0628fd717f (diff) | |
download | xmlgraphics-fop-5273e66a656c4e769d0820fabc3dfbc9b35a6c50.tar.gz xmlgraphics-fop-5273e66a656c4e769d0820fabc3dfbc9b35a6c50.zip |
Partial implementation of keep-with-next (doesn't yet remove area from previous page when fo is moved to next page to ensure keep). The layout method on each FO now returns a Status object rather than an int to allow for more information to be passed back in the future.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193240 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org/apache/fop/fo/flow/TableBody.java')
-rw-r--r-- | src/org/apache/fop/fo/flow/TableBody.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/org/apache/fop/fo/flow/TableBody.java b/src/org/apache/fop/fo/flow/TableBody.java index c3d5a8c5d..82d72f3c7 100644 --- a/src/org/apache/fop/fo/flow/TableBody.java +++ b/src/org/apache/fop/fo/flow/TableBody.java @@ -22,7 +22,7 @@ Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. - 4. The names "Fop" and "Apache Software Foundation" must not be used to + 4. The names "FOP" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. @@ -48,6 +48,7 @@ Software Foundation, please see <http://www.apache.org/>. */ + package org.apache.fop.fo.flow; // FOP @@ -91,9 +92,9 @@ public class TableBody extends FObj { this.columns = columns; } - public int layout(Area area) throws FOPException { + public Status layout(Area area) throws FOPException { if (this.marker == BREAK_AFTER) { - return OK; + return new Status(Status.OK); } if (this.marker == START) { @@ -151,11 +152,11 @@ public class TableBody extends FObj { row.setColumns(columns); - int status; - if ((status = row.layout(blockArea)) != OK) { + Status status; + if ((status = row.layout(blockArea)).isIncomplete()) { this.marker = i; - if ((i != 0) && (status == AREA_FULL_NONE)) { - status = AREA_FULL_SOME; + if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) { + status = new Status(Status.AREA_FULL_SOME); } //blockArea.end(); area.addChild(blockArea); @@ -178,7 +179,7 @@ public class TableBody extends FObj { area.start(); } - return OK; + return new Status(Status.OK); } public int getAreaHeight() { |