diff options
| author | Keiron Liddle <keiron@apache.org> | 2002-06-20 09:14:16 +0000 |
|---|---|---|
| committer | Keiron Liddle <keiron@apache.org> | 2002-06-20 09:14:16 +0000 |
| commit | 7043c9829a66de30102b9a4ea839cc1633aa1db1 (patch) | |
| tree | 24f214834a225c5b33e385391b306c0cc17c96dc /src/org/apache/fop/fo/flow/BlockContainer.java | |
| parent | 64c1fb1421bb717edda576a916dc7a566967169c (diff) | |
| download | xmlgraphics-fop-7043c9829a66de30102b9a4ea839cc1633aa1db1.tar.gz xmlgraphics-fop-7043c9829a66de30102b9a4ea839cc1633aa1db1.zip | |
removed old area tree
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194902 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org/apache/fop/fo/flow/BlockContainer.java')
| -rw-r--r-- | src/org/apache/fop/fo/flow/BlockContainer.java | 79 |
1 files changed, 2 insertions, 77 deletions
diff --git a/src/org/apache/fop/fo/flow/BlockContainer.java b/src/org/apache/fop/fo/flow/BlockContainer.java index 054f848da..6bd81f1e0 100644 --- a/src/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/org/apache/fop/fo/flow/BlockContainer.java @@ -32,10 +32,6 @@ public class BlockContainer extends FObj { int span; - AreaContainer areaContainer; - - PageSequence pageSequence; - public BlockContainer(FONode parent) { super(parent); } @@ -46,8 +42,7 @@ public class BlockContainer extends FObj { setupID(); } - public Status layout(Area area) throws FOPException { - if (this.marker == START) { + public void setup() { // Common Accessibility Properties AbsolutePositionProps mAbsProps = propMgr.getAbsolutePositionProps(); @@ -65,7 +60,7 @@ public class BlockContainer extends FObj { // this.properties.get("clip"); // this.properties.get("display-align"); // this.properties.get("height"); - // this.properties.get("id"); + setupID(); // this.properties.get("keep-together"); // this.properties.get("keep-with-next"); // this.properties.get("keep-with-previous"); @@ -89,76 +84,6 @@ public class BlockContainer extends FObj { this.height = this.properties.get("height").getLength().mvalue(); span = this.properties.get("span").getEnum(); - // initialize id - String id = this.properties.get("id").getString(); - area.getIDReferences().initializeID(id, area); - } - - boolean prevChildMustKeepWithNext = false; - - AreaContainer container = (AreaContainer)area; - if ((this.width == 0) && (this.height == 0)) { - width = right - left; - height = bottom - top; - } - - this.areaContainer = - new AreaContainer(propMgr.getFontState(container.getFontInfo()), - container.getXPosition() + left, - container.getYPosition() - top, width, height, - position); - - areaContainer.setPage(area.getPage()); - areaContainer.setBackgroundColor(backgroundColor); - areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding()); - areaContainer.start(); - - areaContainer.setAbsoluteHeight(area.getAbsoluteHeight()); - areaContainer.setIDReferences(area.getIDReferences()); - - int numChildren = this.children.size(); - for (int i = this.marker; i < numChildren; i++) { - FObj fo = (FObj)children.get(i); - Status status; - if ((status = fo.layout(areaContainer)).isIncomplete()) { - /* - * if ((prevChildMustKeepWithNext) && (status.laidOutNone())) { - * this.marker = i - 1; - * FObj prevChild = (FObj) children.elementAt(this.marker); - * prevChild.removeAreas(); - * prevChild.resetMarker(); - * return new Status(Status.AREA_FULL_SOME); - * // should probably return AREA_FULL_NONE if first - * // or perhaps an entirely new status code - * } else { - * this.marker = i; - * return status; - * } - */ - } - if (status.getCode() == Status.KEEP_WITH_NEXT) { - prevChildMustKeepWithNext = true; - } - } - area.setAbsoluteHeight(areaContainer.getAbsoluteHeight()); - - areaContainer.end(); - if (position == Position.ABSOLUTE) - areaContainer.setHeight(height); - area.addChild(areaContainer); - - return new Status(Status.OK); - } - - /** - * Return the content width of the boxes generated by this block - * container FO. - */ - public int getContentWidth() { - if (areaContainer != null) - return areaContainer.getContentWidth(); // getAllocationWidth()?? - else - return 0; // not laid out yet } public boolean generatesReferenceAreas() { |