|
From: <vic...@us...> - 2006-05-08 17:14:53
|
Revision: 7172 Author: victormote Date: 2006-05-07 11:03:14 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7172&view=rev Log Message: ----------- Remove extraneous methods in favor of standards. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 17:56:15 UTC (rev 7171) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 18:03:14 UTC (rev 7172) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FOrayFOLinkage; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; @@ -129,10 +128,6 @@ return proxy; } - protected FOrayFOLinkage getFONodeResult(FONode node) { - return (FOrayFOLinkage) node.getResult(); - } - public abstract int layout(Area area) throws AreaWException; public Log getLogger() { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 17:56:15 UTC (rev 7171) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 18:03:14 UTC (rev 7172) @@ -27,6 +27,7 @@ import org.foray.area.Area; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.FOLinkage; import org.axsl.foR.FONode; import org.axsl.foR.FObj; @@ -108,8 +109,11 @@ return null; } // Find the last Area generated by that FO - org.axsl.areaW.AreaNode lastGenerated = getFONodeResult(previousSibling) - .getLastGeneratedBy(); + FOLinkage linkage = (FOLinkage) previousSibling.getResult(); + if (linkage == null) { + return null; + } + org.axsl.areaW.AreaNode lastGenerated = linkage.getLastGeneratedBy(); if (lastGenerated == null) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:51:12
|
Revision: 7174 Author: victormote Date: 2006-05-07 11:36:02 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7174&view=rev Log Message: ----------- 1. Standardize methods some more. 2. Clean up some NPEs. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -117,7 +117,7 @@ ArrayList())); } - set_status(getFObjProxy(fo).layout(currentArea)); + set_status(getLayoutProxy(fo).layout(currentArea)); if (Status.isIncomplete(get_status())) { if ((prevChildMustKeepWithNext) @@ -125,7 +125,7 @@ setProgress(i - 1); FObj prevChild = (FObj) getFO().getChildren().get(getProgress()); - FObjPL prevChildPL = (FObjPL) getFObjProxy(prevChild); + FObjPL prevChildPL = (FObjPL) getLayoutProxy(prevChild); prevChildPL.resetProgress(); set_status(Status.AREA_FULL_SOME); return get_status(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -166,7 +166,7 @@ for (int i = getProgress(); i < numChildren; i++) { Object child = node.childrenFO().get(i); if (child instanceof Marker) { - MarkerPL markerPL = (MarkerPL) getFObjProxy((FONode) child); + MarkerPL markerPL = (MarkerPL) getLayoutProxy((FONode) child); markerPL.layout(area); continue; } @@ -175,7 +175,7 @@ + "supported in table body, header and footer"); } TableRow row = (TableRow)child; - TableRowPL rowPL = (TableRowPL) getFObjProxy(row); + TableRowPL rowPL = (TableRowPL) getLayoutProxy(row); rowPL.setRowSpanMgr(rowSpanMgr); if (row.traitKeepWithPreviousWithinColumn() > 0 @@ -277,7 +277,7 @@ } public void removeTableRowLayout(TableRow tr, Area area) { - TableRowPL rowPL = (TableRowPL) this.getFObjProxy(tr); + TableRowPL rowPL = (TableRowPL) this.getLayoutProxy(tr); rowPL.resetProgress(); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -101,7 +101,7 @@ int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { FONode fo = (FONode)node.childrenFO().get(i); - FONodePL nodePL = this.getFObjProxy(fo); + FONodePL nodePL = this.getLayoutProxy(fo); int status = nodePL.layout(blockArea); if (Status.isIncomplete(status)) { setProgress(i); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -68,7 +68,7 @@ FONode fo = (FONode)label.getChildren().get(i); int status; if (Status.isIncomplete(status - = getFObjProxy(fo).layout(area))) { + = getLayoutProxy(fo).layout(area))) { setProgress(i); return status; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -117,15 +117,8 @@ this.progress = progress; } - protected FONodePL getFObjProxy(FONode node) { - if (node == null) { - return null; - } - FONodePL proxy = (FONodePL) node.getProxy(); - if (proxy == null) { - proxy = (FONodePL) this.layout.makeFObjProxy(node); - } - return proxy; + protected FONodePL getLayoutProxy(FONode node) { + return this.layout.getLayoutProxy(node); } public abstract int layout(Area area) throws AreaWException; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -51,7 +51,7 @@ } for (int i = getProgress(); i < node.childrenFO().size(); i++) { FONode fo = (FONode) node.childrenFO().get(i); - int status = getFObjProxy(fo).layout(area); + int status = getLayoutProxy(fo).layout(area); if (Status.isIncomplete((status))) { setProgress(i); return status; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -52,7 +52,7 @@ List children = getChildren(); for (int i = 0; i < children.size(); i++) { FONode node = ((FONode)children.get(i)); - FONodePL nodePL = getFObjProxy(node); + FONodePL nodePL = getLayoutProxy(node); nodePL.resetProgress(); } } @@ -68,7 +68,7 @@ return snapshot; } FONode node = ((FONode)children.get(this.progress)); - FONodePL proxy = getFObjProxy(node); + FONodePL proxy = getLayoutProxy(node); return proxy.getProgressSnapshot(snapshot); } @@ -82,10 +82,10 @@ } for (int i = this.progress + 1; i < children.size(); i++) { FONode fo = (FONode)children.get(i); - getFObjProxy(fo).resetProgress(); + getLayoutProxy(fo).resetProgress(); } FONode node = ((FONode)children.get(this.progress)); - getFObjProxy(node).rollback(snapshot); + getLayoutProxy(node).rollback(snapshot); } List getChildren() { @@ -129,7 +129,7 @@ } for (int i = start; i < node.childrenFO().size(); i++) { FONode fo = (FONode)node.childrenFO().get(i); - FONodePL nodePL = this.getFObjProxy(fo); + FONodePL nodePL = this.getLayoutProxy(fo); int status = nodePL.layout(area); if (Status.isIncomplete(status)) { return status; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -50,7 +50,7 @@ FObj nextFObj = (FObj) children.get(i); SpanRA span = pc.startingReferenceArea(lastFObj, nextFObj); NormalFlowRA nf = span.normalFlowForNextFO(nextFObj); - this.getFObjProxy(nextFObj).layout(nf); + this.getLayoutProxy(nextFObj).layout(nf); } return 0; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -62,7 +62,7 @@ int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { FONode fo = (FONode)node.childrenFO().get(i); - int status = getFObjProxy(fo).layout(blockArea); + int status = getLayoutProxy(fo).layout(blockArea); if (Status.isIncomplete((status))) { resetProgress(); return status; @@ -84,7 +84,7 @@ StaticContent separator = pageSeq.getFootnoteSeparator(); if (separator != null) { StaticContentPL staticPL - = (StaticContentPL) getFObjProxy(separator); + = (StaticContentPL) getLayoutProxy(separator); staticPL.layout(footArea); int diff = footArea.crBPD() - oldHeight; if (bac.getFootnoteState() == 0) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -59,7 +59,7 @@ FONode fo = (FONode)node.childrenFO().get(i); if (fo instanceof Inline) { inline = (Inline) fo; - FObjMixedPL inlinePL = (FObjMixedPL) inline.getProxy(); + FObjMixedPL inlinePL = (FObjMixedPL) getLayoutProxy(inline); int status = inlinePL.layout(area); if (Status.isIncomplete(status)) { return status; @@ -71,7 +71,7 @@ ((NormalBlockArea)area).addFootnote(fbody); } else { FootnoteBodyPL fbPL - = ((FootnoteBodyPL) getFObjProxy(fbody)); + = ((FootnoteBodyPL) getLayoutProxy(fbody)); PageRA page = area.getPage(); fbPL.layoutFootnote(page, area); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -46,7 +46,7 @@ public int layout(Area area) throws AreaWException { ListBlock node = getFO(); - ListBlockPL listBlockPL = (ListBlockPL) getFObjProxy(node); + ListBlockPL listBlockPL = (ListBlockPL) getLayoutProxy(node); if (listBlockPL.getProgress() == FONodePL.START) { listBlockPL.setProgress(0); @@ -65,7 +65,7 @@ return Status.OK; } ListItem listItem = (ListItem)node.childrenFO().get(i); - ListItemPL listItemPL = (ListItemPL) getFObjProxy(listItem); + ListItemPL listItemPL = (ListItemPL) getLayoutProxy(listItem); int status = listItemPL.layout(blockArea); if (Status.isIncomplete(status)) { if (status == Status.AREA_FULL_NONE && i > 0) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -60,7 +60,7 @@ for (int i = getProgress(); i < numChildren; i++) { FObj fo = (FObj)node.childrenFO().get(i); - int status = getFObjProxy(fo).layout(area); + int status = getLayoutProxy(fo).layout(area); if (Status.isIncomplete((status))) { setProgress(i); if ((i == 0) && (status == Status.AREA_FULL_NONE)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -64,7 +64,7 @@ */ int status; - BlockPL blockPL = (BlockPL) getFObjProxy(block); + BlockPL blockPL = (BlockPL) getLayoutProxy(block); status = blockPL.layout(area); /* * I guess this code allows list-item-label and list-item-body to Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -70,7 +70,7 @@ // body failed completely or only got some text in if (getProgress() == 0) { ListItemLabelPL labelPL - = (ListItemLabelPL) this.getFObjProxy(label); + = (ListItemLabelPL) this.getLayoutProxy(label); status = labelPL.layout(group); if (Status.isIncomplete(status)) { return status; @@ -80,7 +80,7 @@ /* Now create a BlockArea to contain the list-item-body. */ ListItemBody body = (ListItemBody)node.childrenFO().get(1); - ListItemBodyPL bodyPL = (ListItemBodyPL) getFObjProxy(body); + ListItemBodyPL bodyPL = (ListItemBodyPL) getLayoutProxy(body); status = bodyPL.layout(group); if (Status.isIncomplete(status)) { layout.completeCurrentLineInBlock(group); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -108,7 +108,7 @@ if (area.pendingFootnotes != null) { for (int i = 0; i < area.pendingFootnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)area.pendingFootnotes.get(i); - FootnoteBodyPL fbPL = ((FootnoteBodyPL) fb.getProxy()); + FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fb)); PageRA page = area.getPage(); if (! fbPL.layoutFootnote(page, area)) { page.addPendingFootnote(fb); @@ -591,4 +591,15 @@ this.currentLineBreaker = lineBreaker; } + protected FONodePL getLayoutProxy(FONode node) { + if (node == null) { + return null; + } + FONodePL proxy = (FONodePL) node.getProxy(); + if (proxy == null) { + proxy = (FONodePL) makeFObjProxy(node); + } + return proxy; + } + } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -55,13 +55,13 @@ if (bestMarker == null) { return Status.OK; } - MarkerPL markerPL = (MarkerPL) this.getFObjProxy(bestMarker); + MarkerPL markerPL = (MarkerPL) this.getLayoutProxy(bestMarker); // Necessary because the marker may get used multiple times. markerPL.resetProgress(); markerPL.setProgress(0); for (int i = 0; i < bestMarker.getChildren().size(); i++) { FONode fo = (FONode) bestMarker.getChildren().get(i); - getFObjProxy(fo).layout(area); + getLayoutProxy(fo).layout(area); } return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -43,7 +43,7 @@ for (int i = 0; i < numChildren; i++) { FObj fo = (FObj)node.childrenFO().get(i); - int status = getFObjProxy(fo).layout(area); + int status = getLayoutProxy(fo).layout(area); if (Status.isIncomplete((status))) { /* in fact all should be laid out and clip, error etc depending * on 'overflow' */ Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -133,7 +133,7 @@ // need to pass already processed content. setProgress(i); - int status = getFObjProxy(fo).layout(cellArea); + int status = getLayoutProxy(fo).layout(cellArea); if (Status.isIncomplete(status)) { if ((i == 0) && (status == Status.AREA_FULL_NONE)) { return Status.AREA_FULL_NONE; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -108,7 +108,7 @@ for (int i = getProgress(); i < node.childrenFO().size(); i++) { FONode fo = (FONode)node.childrenFO().get(i); if (fo instanceof Marker) { - MarkerPL markerPL = (MarkerPL) getFObjProxy(fo); + MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo); markerPL.layout(area); continue; } @@ -121,13 +121,13 @@ return Status.OK; } } else if (fo instanceof TableBody) { - TableBodyPL tableBodyPL = (TableBodyPL) getFObjProxy(fo); + TableBodyPL tableBodyPL = (TableBodyPL) getLayoutProxy(fo); TableHeader th = node.getTableHeader(); TableHeaderPL tableHeaderPL = (TableHeaderPL) - getFObjProxy(th); + getLayoutProxy(th); TableFooter tf = node.getTableFooter(); TableFooterPL tableFooterPL = (TableFooterPL) - getFObjProxy(tf); + getLayoutProxy(tf); if (node.numberOfColumns() == 0) { return Status.OK; } @@ -138,11 +138,11 @@ */ th = node.getTableHeader(); TableHeaderPL thPL = (TableHeaderPL) - this.getFObjProxy(th); + this.getLayoutProxy(th); status = thPL.layout(areaContainer); th = node.getTableHeader(); TableHeaderPL headerPL = (TableHeaderPL) - this.getFObjProxy(th); + this.getLayoutProxy(th); if (Status.isIncomplete(status)) { headerPL.resetProgress(); return Status.AREA_FULL_NONE; @@ -155,11 +155,11 @@ &&!addedFooter) { tf = node.getTableFooter(); TableFooterPL tfPL = (TableFooterPL) - this.getFObjProxy(tf); + this.getLayoutProxy(tf); status = tfPL.layout(areaContainer); tf = node.getTableFooter(); TableFooterPL footerPL = (TableFooterPL) - this.getFObjProxy(tf); + this.getLayoutProxy(tf); if (Status.isIncomplete(status)) { return Status.AREA_FULL_NONE; } @@ -167,7 +167,7 @@ footerPL.resetProgress(); } - status = getFObjProxy(fo).layout(areaContainer); + status = getLayoutProxy(fo).layout(areaContainer); if (Status.isIncomplete((status))) { setProgress(i); if (this.bodyCount == 0 @@ -214,7 +214,7 @@ if (node.getTableFooter() != null && node.traitTableOmitFooterAtBreak()) { TableFooter tf = node.getTableFooter(); - TableFooterPL tfPL = (TableFooterPL) getFObjProxy(tf); + TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tf); int status = tfPL.layout(areaContainer); if (Status.isIncomplete(status)) { // this is a problem since we need to remove a row @@ -225,7 +225,7 @@ + "last body row to next page"); area.incrementProgressionDimension(areaContainer.crBPD()); TableFooterPL tableFooterPL - = (TableFooterPL) this.getFObjProxy(tf); + = (TableFooterPL) this.getLayoutProxy(tf); tableFooterPL.removeLayout(areaContainer); tableFooterPL.resetProgress(); return Status.AREA_FULL_SOME; @@ -265,7 +265,7 @@ for (int i = 0; i < node.getTableColumns().size(); i++) { TableColumn c = (TableColumn) node.getTableColumns().get(i); if (c != null) { - TableColumnPL tcPL = (TableColumnPL) getFObjProxy(c); + TableColumnPL tcPL = (TableColumnPL) getLayoutProxy(c); tcPL.layout(tableArea); } } @@ -273,14 +273,14 @@ // FIXME: this seems odd. public int getTableFooterYPosition(TableFooter tFooter) { - TableFooterPL tfPL = (TableFooterPL) getFObjProxy(tFooter); + TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter); return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(); } public void setupColumnHeights(Table table, TableRA areaContainer) { for (int i = 0; i < table.getTableColumns().size(); i++) { TableColumn c = (TableColumn) table.getTableColumns().get(i); - TableColumnPL tablecolumnPL = (TableColumnPL) getFObjProxy(c); + TableColumnPL tablecolumnPL = (TableColumnPL) getLayoutProxy(c); if (c != null) { tablecolumnPL.setHeight(areaContainer.crBPD()); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-07 18:13:51 UTC (rev 7173) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-07 18:36:02 UTC (rev 7174) @@ -197,7 +197,7 @@ offset += colWidth; continue; } - cellPL = (TableCellPL) this.getFObjProxy(cell); + cellPL = (TableCellPL) this.getLayoutProxy(cell); offset += colWidth; @@ -240,7 +240,7 @@ if (cellArray.getCellType(iCol) == RowCellArray.CELLSTART && rowSpanMgr.isSpanned(iCol) == false) { TableCell cell = cellArray.getCell(iCol); - TableCellPL cellPL = (TableCellPL) getFObjProxy(cell); + TableCellPL cellPL = (TableCellPL) getLayoutProxy(cell); cellPL.setRowHeight(largestCellHeight); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 23:47:08
|
Revision: 7331 Author: victormote Date: 2006-05-30 16:46:58 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7331&view=rev Log Message: ----------- Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-30 23:10:18 UTC (rev 7330) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-30 23:46:58 UTC (rev 7331) @@ -73,8 +73,7 @@ return Status.OK; } - public boolean layoutFootnote(PageArea p, Area area) { -// FootnoteBody fb = getFO(); + public boolean layoutFootnote(PageArea p) { try { RegionRABody bac = p.getWritableRegionBody(); FootnoteRA footArea = bac.getWritableFootnoteRA(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-30 23:10:18 UTC (rev 7330) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-30 23:46:58 UTC (rev 7331) @@ -69,7 +69,7 @@ FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fbody)); PageArea page = area.getWritablePage(); - fbPL.layoutFootnote(page, area); + fbPL.layoutFootnote(page); } return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 23:10:18 UTC (rev 7330) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 23:46:58 UTC (rev 7331) @@ -153,7 +153,7 @@ for (int i = 0; i < this.pendingFootnotes.size(); i++) { FootnoteBody fb = (FootnoteBody) this.pendingFootnotes.get(i); FootnoteBodyPL fbPL = ((FootnoteBodyPL) fb.getProxy()); - if (! fbPL.layoutFootnote(pageArea, null)) { + if (! fbPL.layoutFootnote(pageArea)) { // footnotes are too large to fit on empty page } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-31 20:21:59
|
Revision: 7346 Author: victormote Date: 2006-05-31 13:21:49 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7346&view=rev Log Message: ----------- Conform to axsl changes: Move creation of the table sub-areas (header, body, footer) to the Table area interface. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-31 19:42:17 UTC (rev 7345) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-31 20:21:49 UTC (rev 7346) @@ -25,12 +25,12 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; import org.axsl.areaW.BlockContainerRA; import org.axsl.areaW.ContainerRA; import org.axsl.areaW.GenericContainer; import org.axsl.areaW.NormalBlockArea; - -import org.axsl.areaW.AreaWException; +import org.axsl.areaW.TableArea; import org.axsl.common.Constants; import org.axsl.foR.FONode; import org.axsl.foR.fo.AbstractTableBody; @@ -112,6 +112,7 @@ public int layout(Area area) throws AreaWException { AbstractTableBody node = getReal(); + TableArea tableArea = (TableArea) area; Table table = node.getNearestTable(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; @@ -148,11 +149,14 @@ */ ContainerRA areaContainer = null; if (node instanceof TableBody) { - areaContainer = area.makeTableBodyContainer((TableBody) node); + areaContainer = tableArea.makeTableBodyContainer( + (TableBody) node); } else if (node instanceof TableHeader) { - areaContainer = area.makeTableHeaderContainer((TableHeader) node); + areaContainer = tableArea.makeTableHeaderContainer( + (TableHeader) node); } else if (node instanceof TableFooter) { - areaContainer = area.makeTableFooterContainer((TableFooter) node); + areaContainer = tableArea.makeTableFooterContainer( + (TableFooter) node); } areaContainerRef = new WeakReference(areaContainer); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-31 19:42:17 UTC (rev 7345) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-31 20:21:49 UTC (rev 7346) @@ -41,7 +41,7 @@ /** * */ -public class TablePL extends FObjPL { +public class TablePL extends BlockPL { private static final int MINCOLWIDTH = 10000; // 10pt @@ -58,12 +58,12 @@ super(table, layout); } - public Table getFO() { + public Table getTableFO() { return (Table) this.getFONode(); } public int layout(Area area) throws AreaWException { - Table node = getFO(); + Table node = getTableFO(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -262,7 +262,7 @@ } private void layoutColumns(Area tableArea) throws AreaWException { - Table node = getFO(); + Table node = getTableFO(); for (int i = 0; i < node.getTableColumns().size(); i++) { TableColumn c = (TableColumn) node.getTableColumns().get(i); if (c != null) { @@ -290,7 +290,7 @@ public int calcFixedColumnWidths(TableArea tableArea, int maxAllocationWidth) { - Table node = getFO(); + Table node = getTableFO(); int tableWidth = node.getWidth(maxAllocationWidth); /* Accumulates the total table units used in columns in this table. */ double totalTableUnits = 0.0; @@ -418,7 +418,7 @@ * be factored into methods that override (but use) the FObj methods. */ private void setIPD(boolean bHasProportionalUnits, int maxAllocIPD) { - Table node = getFO(); + Table node = getTableFO(); if (node.traitIPDimensionMax(maxAllocIPD) >= 0) { this.maxIPD = node.traitIPDimensionMax(maxAllocIPD); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-31 21:35:27
|
Revision: 7349 Author: victormote Date: 2006-05-31 14:35:14 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7349&view=rev Log Message: ----------- Implement and use new axsl interfaces for Lists. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-31 21:35:03 UTC (rev 7348) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-31 21:35:14 UTC (rev 7349) @@ -25,9 +25,9 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; +import org.axsl.areaW.ListBlockArea; import org.axsl.areaW.NormalBlockArea; - -import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ListBlock; import org.axsl.foR.fo.ListItem; @@ -55,7 +55,7 @@ } } - NormalBlockArea blockArea = area.makeNormalBlockArea(node); + ListBlockArea blockArea = area.makeListBlockArea(node); int numChildren = node.childrenFO().size(); for (int i = listBlockPL.getProgress(); i < numChildren; i++) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-31 21:35:03 UTC (rev 7348) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-31 21:35:14 UTC (rev 7349) @@ -25,9 +25,10 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; +import org.axsl.areaW.ListBlockArea; +import org.axsl.areaW.ListItemArea; import org.axsl.areaW.NormalBlockArea; - -import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; import org.axsl.foR.fo.ListItemLabel; @@ -55,13 +56,14 @@ public int layout(NormalBlockArea area) throws AreaWException { ListItem node = getFO(); + ListBlockArea listBlockArea = (ListBlockArea) area; if (getProgress() == FONodePL.START) { setProgress(0); } layout.completeCurrentLineInBlock(area); - NormalBlockArea group = area.makeNormalBlockArea(node); + ListItemArea group = listBlockArea.makeListItemArea(node); /* Now lay out the list-item-label inside the new block-area. */ ListItemLabel label = (ListItemLabel)node.childrenFO().get(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-07 18:08:24
|
Revision: 7438 Author: victormote Date: 2006-06-07 11:08:03 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7438&view=rev Log Message: ----------- Conform to axsl changes: Use new FOContext interface to provide information to the FOTree. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -32,6 +32,7 @@ import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.TableArea; import org.axsl.common.Constants; +import org.axsl.foR.FOContext; import org.axsl.foR.FONode; import org.axsl.foR.fo.AbstractTableBody; import org.axsl.foR.fo.Marker; @@ -64,23 +65,23 @@ return ((GenericContainer)areaContainerRef.get()).getYPosition(); } - public int getHeight() { - return ((GenericContainer)areaContainerRef.get()).crBPD() - + getReal().traitSpaceBeforeOptimum() - + getReal().traitSpaceAfterOptimum(); + public int getHeight(FOContext context) { + return ((GenericContainer)areaContainerRef.get()).crBPD() + + getReal().traitSpaceBeforeOptimum(context) + + getReal().traitSpaceAfterOptimum(context); } public void removeLayout(Area area) { if (areaContainerRef != null) { area.removeChild((GenericContainer)areaContainerRef.get()); } - if (getReal().traitSpaceBeforeOptimum() != 0) { + if (getReal().traitSpaceBeforeOptimum(area) != 0) { area.incrementProgressionDimension(-getReal() - .traitSpaceBeforeOptimum()); + .traitSpaceBeforeOptimum(area)); } - if (getReal().traitSpaceAfterOptimum() != 0) { + if (getReal().traitSpaceAfterOptimum(area) != 0) { area.incrementProgressionDimension(-getReal() - .traitSpaceAfterOptimum()); + .traitSpaceAfterOptimum(area)); } resetProgress(); } @@ -113,7 +114,7 @@ public int layout(Area area) throws AreaWException { AbstractTableBody node = getReal(); TableArea tableArea = (TableArea) area; - Table table = node.getNearestTable(); + Table table = node.getNearestTable(area); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -135,9 +136,10 @@ } - if ((node.traitSpaceBeforeOptimum() != 0) && (getProgress() == 0)) { + if ((node.traitSpaceBeforeOptimum(area) != 0) + && (getProgress() == 0)) { area.incrementProgressionDimension(node - .traitSpaceBeforeOptimum()); + .traitSpaceBeforeOptimum(area)); } /* @@ -179,7 +181,7 @@ TableRowPL rowPL = (TableRowPL) getLayoutProxy(row); rowPL.setRowSpanMgr(rowSpanMgr); - if (row.traitKeepWithPreviousWithinColumn() > 0 + if (row.traitKeepWithPreviousWithinColumn(area) > 0 && lastRow != null && keepWith.indexOf(lastRow) == -1) { keepWith.add(lastRow); @@ -219,9 +221,9 @@ area.incrementProgressionDimension(areaContainer.crBPD()); if (i == numChildren - 1) { setProgress(FONodePL.BREAK_AFTER); - if (node.traitSpaceAfterOptimum() != 0) { + if (node.traitSpaceAfterOptimum(area) != 0) { area.incrementProgressionDimension( - node.traitSpaceAfterOptimum()); + node.traitSpaceAfterOptimum(area)); } } return status; @@ -270,8 +272,9 @@ } area.incrementProgressionDimension(areaContainer.crBPD()); - if (node.traitSpaceAfterOptimum() != 0) { - area.incrementProgressionDimension(node.traitSpaceAfterOptimum()); + if (node.traitSpaceAfterOptimum(area) != 0) { + area.incrementProgressionDimension( + node.traitSpaceAfterOptimum(area)); } return Status.OK; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -128,14 +128,15 @@ // no break if last in area tree, or trailing in context // area - int breakAfterStatus = Status.checkBreakAfter(node.traitBreakAfter()); + int breakAfterStatus = Status.checkBreakAfter( + node.traitBreakAfter(area)); if (breakAfterStatus != Status.OK) { setProgress(FONodePL.BREAK_AFTER); blockArea = null; return breakAfterStatus; } - if (node.traitKeepWithNextWithinColumn() > 0 - || node.traitKeepWithNextWithinPage() > 0) { + if (node.traitKeepWithNextWithinColumn(area) > 0 + || node.traitKeepWithNextWithinPage(area) > 0) { return Status.KEEP_WITH_NEXT; } return Status.OK; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -60,7 +60,7 @@ } // See if ancestor table has generated any areas yet. - Table table = label.getNearestTable(); + Table table = label.getNearestTable(area); FOLinkage linkage = (FOLinkage) table.getResult(); if (linkage != null && linkage.qtyAreasGenerated() > 0) { int numChildren = label.getChildren().size(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -51,9 +51,9 @@ org.axsl.areaW.Area parentForDimensions = area.nearestGeneratedByBlockLevelFO(); - int height = node.viewportBPD(parentForDimensions.crBPD()); + int height = node.viewportBPD(area, parentForDimensions.crBPD()); if (area.progressionDimensionAvailable() - < (height + node.traitSpaceBeforeOptimum())) { + < (height + node.traitSpaceBeforeOptimum(area))) { return Status.AREA_FULL_NONE; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -68,6 +68,9 @@ protected PioneerLS layout; public FONodePL(FONode realFObj, PioneerLS layout) { + if (realFObj == null) { + return; + } this.realFONode = realFObj; realFObj.setProxy(this); this.layout = layout; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -126,7 +126,7 @@ public void processPageSequence(PageCollection pageCollection) throws AreaWException { PageSequence pageSeq = pageCollection.getPageSequence(); - org.axsl.foR.fo.Flow flow = pageSeq.getFlow(); + org.axsl.foR.fo.Flow flow = pageSeq.getFlow(pageCollection); flow.setProxy(new FlowPL(flow, this)); pageCollection.padPagesAtBeginning(); @@ -202,7 +202,7 @@ public int checkBreakBefore(FObj node, Area area) { if (!(area instanceof NormalFlowRA)) { - switch (node.traitBreakBefore()) { + switch (node.traitBreakBefore(area)) { case Constants.FOVAL_PAGE: return Status.FORCE_PAGE_BREAK; case Constants.FOVAL_ODD_PAGE: @@ -216,7 +216,7 @@ } } NormalFlowRA colArea = (NormalFlowRA)area; - switch (node.traitBreakBefore()) { + switch (node.traitBreakBefore(area)) { case Constants.FOVAL_PAGE: { // if first ColumnArea, and empty, return OK if (!colArea.hasChildren() && (colArea.siblingIndex() == 0)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -60,7 +60,8 @@ totalRowHeight += rowHeight; if (--rowsRemaining == 0) { if (cell != null) { - getTableCellPL().setRowHeight(totalRowHeight); + /* TODO: Fix FOContext item below. */ + getTableCellPL().setRowHeight(null, totalRowHeight); } return true; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -25,11 +25,11 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; import org.axsl.areaW.TableCellArea; import org.axsl.areaW.TableRowContainer; - -import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.foR.FOContext; import org.axsl.foR.FObj; import org.axsl.foR.fo.TableCell; @@ -54,11 +54,11 @@ * adjustment for collapse style (because current scheme makes cell * overestimate the allocation height). */ - public int getHeight() { + public int getHeight(FOContext context) { return areaContainer.crBPD() - + getReal().traitBorderSeparationBPD() - - (getReal().traitBorderTopWidth() - + getReal().traitBorderBottomWidth()) + + getReal().traitBorderSeparationBPD(context) + - (getReal().traitBorderTopWidth(context) + + getReal().traitBorderBottomWidth(context)) / 2; } @@ -69,10 +69,10 @@ * the allocation height of all the cells in the row, including any * border separation values. */ - public void setRowHeight(int h) { - int delta = h - getHeight(); + public void setRowHeight(FOContext context, int h) { + int delta = h - getHeight(context); // cellArea.increaseHeight(h + borderHeight/2 - cellArea.getHeight()); - if (getReal().traitDisplayAlign() == Constants.FOVAL_AUTO) { + if (getReal().traitDisplayAlign(context) == Constants.FOVAL_AUTO) { // Must get info for all cells starting in row! // verticalAlign can be BEFORE or BASELINE // For now just treat like "before" @@ -83,10 +83,10 @@ return; } // Vertical cell alignment - short verticalAlign = getReal().traitDisplayAlign(); + short verticalAlign = getReal().traitDisplayAlign(context); if (verticalAlign == Constants.FOVAL_AUTO) { // Depends on all cells starting in row - verticalAlign = getReal().traitAlignmentBaseline(); + verticalAlign = getReal().traitAlignmentBaseline(context); } switch (verticalAlign) { case Constants.FOVAL_CENTER: @@ -145,7 +145,7 @@ bDone = true; // Adjust for minimum cell content height - int minCellHeight = node.traitBPDimensionMin(area.crBPD()); + int minCellHeight = node.traitBPDimensionMin(area, area.crBPD()); if (minCellHeight > cellArea.crBPD()) { cellArea.setProgressionDimension(minCellHeight); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -59,7 +59,7 @@ public int layout(Area area) throws AreaWException { TableColumn node = getFO(); TableArea tableArea = (TableArea) area; - Table table = node.getNearestTable(); + Table table = node.getNearestTable(area); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -30,6 +30,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.foR.FOContext; import org.axsl.foR.FONode; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.Table; @@ -78,15 +79,15 @@ } setProgress(0); - if (node.traitBreakBefore() == Constants.FOVAL_PAGE) { + if (node.traitBreakBefore(area) == Constants.FOVAL_PAGE) { return Status.FORCE_PAGE_BREAK; } - if (node.traitBreakBefore() == Constants.FOVAL_ODD_PAGE) { + if (node.traitBreakBefore(area) == Constants.FOVAL_ODD_PAGE) { return Status.FORCE_PAGE_BREAK_ODD; } - if (node.traitBreakBefore() == Constants.FOVAL_EVEN_PAGE) { + if (node.traitBreakBefore(area) == Constants.FOVAL_EVEN_PAGE) { return Status.FORCE_PAGE_BREAK_EVEN; } @@ -151,7 +152,7 @@ headerPL.resetProgress(); } if (node.getTableFooter() != null - && ! node.traitTableOmitFooterAtBreak() + && ! node.traitTableOmitFooterAtBreak(area) &&!addedFooter) { tf = node.getTableFooter(); TableFooterPL tfPL = (TableFooterPL) @@ -186,12 +187,12 @@ area.incrementProgressionDimension( areaContainer.crBPD()); if (node.getTableFooter() != null - && ! node.traitTableOmitFooterAtBreak()) { + && ! node.traitTableOmitFooterAtBreak(area)) { // move footer to bottom of area and move up body - int yPosition = getTableFooterYPosition(tf); + int yPosition = getTableFooterYPosition(area, tf); tableBodyPL.setYPosition(yPosition); tableFooterPL.setYPosition(yPosition - + tableBodyPL.getHeight()); + + tableBodyPL.getHeight(area)); } setupColumnHeights(node, areaContainer); status = Status.AREA_FULL_SOME; @@ -200,19 +201,19 @@ } this.bodyCount++; if (node.getTableFooter() != null - && ! node.traitTableOmitFooterAtBreak()) { + && ! node.traitTableOmitFooterAtBreak(area)) { // move footer to bottom of area and move up body // space before and after footer will make this wrong - int yPosition = getTableFooterYPosition(tf); + int yPosition = getTableFooterYPosition(area, tf); tableBodyPL.setYPosition(yPosition); tableFooterPL.setYPosition(yPosition - + tableBodyPL.getHeight()); + + tableBodyPL.getHeight(area)); } } } if (node.getTableFooter() != null - && node.traitTableOmitFooterAtBreak()) { + && node.traitTableOmitFooterAtBreak(area)) { TableFooter tf = node.getTableFooter(); TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tf); int status = tfPL.layout(areaContainer); @@ -232,7 +233,7 @@ } } - int height = node.traitBPDimensionOpt(area.crBPD()); + int height = node.traitBPDimensionOpt(area, area.crBPD()); if (height != 0) { areaContainer.setProgressionDimension(height); } @@ -242,17 +243,17 @@ /* should this be combined into above? */ area.incrementProgressionDimension(areaContainer.crBPD()); - if (node.traitBreakAfter() == Constants.FOVAL_PAGE) { + if (node.traitBreakAfter(area) == Constants.FOVAL_PAGE) { setProgress(FONodePL.BREAK_AFTER); return Status.FORCE_PAGE_BREAK; } - if (node.traitBreakAfter() == Constants.FOVAL_ODD_PAGE) { + if (node.traitBreakAfter(area) == Constants.FOVAL_ODD_PAGE) { setProgress(FONodePL.BREAK_AFTER); return Status.FORCE_PAGE_BREAK_ODD; } - if (node.traitBreakAfter() == Constants.FOVAL_EVEN_PAGE) { + if (node.traitBreakAfter(area) == Constants.FOVAL_EVEN_PAGE) { setProgress(FONodePL.BREAK_AFTER); return Status.FORCE_PAGE_BREAK_EVEN; } @@ -272,9 +273,9 @@ } // FIXME: this seems odd. - public int getTableFooterYPosition(TableFooter tFooter) { + public int getTableFooterYPosition(FOContext context, TableFooter tFooter) { TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter); - return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(); + return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(context); } public void setupColumnHeights(Table table, TableArea areaContainer) { @@ -290,7 +291,7 @@ public int calcFixedColumnWidths(TableArea tableArea, int maxAllocationWidth) { Table node = getTableFO(); - int tableWidth = node.traitIPDimensionOpt(tableArea.crIPD()); + int tableWidth = node.traitIPDimensionOpt(tableArea, tableArea.crIPD()); /* Accumulates the total table units used in columns in this table. */ double totalTableUnits = 0.0; /* @@ -315,17 +316,19 @@ * in any column which has only proportional units. */ if (tu > 0 && tu < tuMin - && column.traitColumnWidth(tableWidth) == 0) { + && column.traitColumnWidth(tableArea, + tableWidth) == 0) { tuMin = tu; } totalTableUnits += tu; - totalFixedWidth += column.traitColumnWidth(tableWidth); + totalFixedWidth += column.traitColumnWidth(tableArea, + tableWidth); } } double dWidthFactor = 0.0; double dUnitLength = 0.0; - setIPD((totalTableUnits > 0.0), maxAllocationWidth); + setIPD(tableArea, (totalTableUnits > 0.0), maxAllocationWidth); if (totalTableUnits > 0.0) { int iProportionalWidth = 0; if (this.optIPD > totalFixedWidth) { @@ -391,7 +394,7 @@ * dUnitLength)); } else { //Fixed width - colWidth = column.traitColumnWidth(tableWidth); + colWidth = column.traitColumnWidth(tableArea, tableWidth); } // Check minimum values and adjust if necessary @@ -416,37 +419,38 @@ * standard getIPD... methods in FObj. Whatever is different should probably * be factored into methods that override (but use) the FObj methods. */ - private void setIPD(boolean bHasProportionalUnits, int maxAllocIPD) { + private void setIPD(FOContext context, boolean bHasProportionalUnits, + int maxAllocIPD) { Table node = getTableFO(); - if (node.traitIPDimensionMax(maxAllocIPD) >= 0) { - this.maxIPD = node.traitIPDimensionMax(maxAllocIPD); + if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { + this.maxIPD = node.traitIPDimensionMax(context, maxAllocIPD); } else { this.maxIPD = maxAllocIPD; } - if (node.traitIPDimensionOpt(maxAllocIPD) < 0) { + if (node.traitIPDimensionOpt(context, maxAllocIPD) < 0) { this.optIPD = -1; } else { /* TODO: This looks like a bug. Should be getIPDOptimum()? */ - this.optIPD = node.traitIPDimensionMax(maxAllocIPD); + this.optIPD = node.traitIPDimensionMax(context, maxAllocIPD); } - if (node.traitIPDimensionMin(maxAllocIPD) < 0) { + if (node.traitIPDimensionMin(context, maxAllocIPD) < 0) { this.minIPD = -1; } else { - this.minIPD = node.traitIPDimensionMin(maxAllocIPD); + this.minIPD = node.traitIPDimensionMin(context, maxAllocIPD); } if (bHasProportionalUnits && this.optIPD < 0) { if (this.minIPD > 0) { - if (node.traitIPDimensionMax(maxAllocIPD) >= 0) { + if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { this.optIPD = (minIPD + maxIPD)/2; } else { this.optIPD = this.minIPD; } } - else if (node.traitIPDimensionMax(maxAllocIPD) >= 0) { + else if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { this.optIPD = this.maxIPD; } else { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-07 18:05:55 UTC (rev 7437) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-07 18:08:03 UTC (rev 7438) @@ -26,11 +26,11 @@ import org.axsl.areaW.AbstractTableContainer; import org.axsl.areaW.Area; -import org.axsl.areaW.TableRowContainer; - import org.axsl.areaW.AreaWException; import org.axsl.areaW.TableArea; +import org.axsl.areaW.TableRowContainer; import org.axsl.common.Constants; +import org.axsl.foR.FOContext; import org.axsl.foR.Keep; import org.axsl.foR.fo.TableCell; import org.axsl.foR.fo.TableRow; @@ -63,9 +63,9 @@ * Before starting layout for the first time, initialize information * about spanning rows, empty cells and spanning columns. */ - private void initCellArray() throws AreaWException { + private void initCellArray(FOContext context) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable().getTableColumns(); + List columns = node.getNearestTable(context).getTableColumns(); cellArray = new RowCellArray(rowSpanMgr, columns.size()); int colNum = 1; for (int i = 0; i < getReal().getChildren().size(); i++) { @@ -75,7 +75,7 @@ TableCell cell = (TableCell)getReal().getChildren().get(i); int numCols = cell.traitNumberColumnsSpanned(); - int cellColNum = cell.traitColumnNumber(); + int cellColNum = cell.traitColumnNumber(context); if (cellColNum == 0) { // Not explicitly specified, so put in next available colummn @@ -131,7 +131,7 @@ public int layout(Area area) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable().getTableColumns(); + List columns = node.getNearestTable(area).getTableColumns(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -141,7 +141,7 @@ // Only do this once. If the row is "thrown" and we start // layout over again, we can skip this. if (cellArray == null) { - initCellArray(); + initCellArray(area); // check to make sure this row hasn't been partially // laid out yet (with an id created already) } @@ -156,7 +156,7 @@ TableRowContainer areaContainer = container.makeTableRowContainer(node); /* Set a reasonable starting BPD for this row. */ - this.largestCellHeight = node.traitBPDimensionMin(area.crBPD()); + this.largestCellHeight = node.traitBPDimensionMin(area, area.crBPD()); // Flag indicaing whether any cell didn't fit in available space boolean someCellDidNotLayoutCompletely = false; @@ -206,7 +206,7 @@ int rowSpan = cell.traitNumberRowsSpanned(); int status = cellPL.layout(areaContainer); if (Status.isIncomplete(status)) { - if ((node.traitKeepTogetherWithinColumn() == Keep.ALWAYS + if ((node.traitKeepTogetherWithinColumn(area) == Keep.ALWAYS && bIgnoreKeepTogether == false) || (status == Status.AREA_FULL_NONE) || rowSpan > 1) { @@ -226,7 +226,7 @@ } } // else { // layout was complete for a particular cell - int h = cellPL.getHeight(); // allocation height of cell + int h = cellPL.getHeight(area); // allocation height of cell if (rowSpan > 1) { // pass cell fo or area??? rowSpanMgr.addRowSpan(cell, iColIndex, cell.traitNumberColumnsSpanned(), h, rowSpan, layout); @@ -243,7 +243,7 @@ && rowSpanMgr.isSpanned(iCol) == false) { TableCell cell = cellArray.getCell(iCol); TableCellPL cellPL = (TableCellPL) getLayoutProxy(cell); - cellPL.setRowHeight(largestCellHeight); + cellPL.setRowHeight(area, largestCellHeight); } } @@ -260,7 +260,7 @@ // Ignore break after if row span! return Status.KEEP_WITH_NEXT; } - short breakAfter = node.traitBreakAfter(); + short breakAfter = node.traitBreakAfter(area); if (breakAfter == Constants.FOVAL_PAGE) { setProgress(FONodePL.BREAK_AFTER); return Status.FORCE_PAGE_BREAK; @@ -280,7 +280,7 @@ setProgress(FONodePL.BREAK_AFTER); return Status.FORCE_COLUMN_BREAK; } - if (node.traitKeepWithNextWithinColumn() > Keep.AUTO) { + if (node.traitKeepWithNextWithinColumn(area) > Keep.AUTO) { return Status.KEEP_WITH_NEXT; } return Status.OK; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 17:46:48
|
Revision: 7480 Author: victormote Date: 2006-06-09 10:46:41 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7480&view=rev Log Message: ----------- 1. Remove unused and unneeded methods. 2. Remove no-longer-needed class. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Removed Paths: ------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-09 17:35:37 UTC (rev 7479) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-09 17:46:41 UTC (rev 7480) @@ -27,7 +27,6 @@ import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; -import org.axsl.areaW.FOLinkage; import org.axsl.foR.FONode; import org.axsl.foR.FObj; @@ -92,35 +91,6 @@ return ((FObj) this.getFONode()).getChildren(); } - /** - * Find the parent Area into which this FO should start generating the - * Areas that it needs to generate. - * If RealFObj is a block, this does not necessarily return a BlockArea, - * but rather the Area which should be the parent of the BlockAreas that - * RealFObj generates. - * @return The Area into which this should start generating Areas. - */ - org.axsl.areaW.Area findStartingLayoutArea() { - // Find the previous sibling FO - // The cast to FObj below s/b OK because FONodes won't be running this. - FObj realFObj = (FObj) this.getFONode(); - FObj previousSibling = realFObj.getPreviousSiblingFObj(); - if (previousSibling == null) { - return null; - } - // Find the last Area generated by that FO - FOLinkage linkage = (FOLinkage) previousSibling.getResult(); - if (linkage == null) { - return null; - } - org.axsl.areaW.AreaNode lastGenerated = linkage.getLastGeneratedBy(); - if (lastGenerated == null) { - return null; - } - // Find the parent of that node - return lastGenerated.getWritableParentArea(); - } - protected int layoutChildren(Area area) throws AreaWException { FONode node = this.getFONode(); int start = getProgress(); Deleted: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-06-09 17:35:37 UTC (rev 7479) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-06-09 17:46:41 UTC (rev 7480) @@ -1,44 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.pioneer; - -import org.axsl.areaW.Area; -import org.axsl.areaW.PageArea; -import org.axsl.areaW.PageCollection; - -import org.axsl.foR.fo.PageSequence; - -public class PageSequencePL extends FObjPL { - - public PageSequencePL(PageSequence realFObj, PioneerLS layout) { - super(realFObj, layout); - } - - Area findStartingLayoutArea() { - PageCollection pc = (PageCollection) this.getLastGeneratedBy(); - PageArea page = (PageArea) pc.getLastChild(); - return page.getWritableRegionBody().getWritableMainRA(); - } -} Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 17:35:37 UTC (rev 7479) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 17:46:41 UTC (rev 7480) @@ -264,7 +264,7 @@ return new ContinuedLabelPL((ContinuedLabel) node, this); } case FONode.NODE_PAGE_SEQUENCE: { - return new PageSequencePL((PageSequence) node, this); + return new NoLayoutPL((PageSequence) node, this); } case FONode.NODE_DESTINATION: { return new NoLayoutPL((FObj) node, this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:55:57
|
Revision: 7492 Author: victormote Date: 2006-06-09 16:55:48 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7492&view=rev Log Message: ----------- Remove unneeded class. There is no layout work to do on a column. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Removed Paths: ------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -404,7 +404,7 @@ return new TableCellPL((TableCell) node, this); } case FONode.NODE_TABLE_COLUMN: { - return new TableColumnPL((TableColumn) node, this); + return new NoLayoutPL((TableColumn) node, this); } case FONode.NODE_TABLE_FOOTER: { return new TableFooterPL((TableFooter) node, this); Deleted: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -1,78 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.pioneer; - -import org.axsl.areaW.Area; -import org.axsl.areaW.TableColumnArea; -import org.axsl.areaW.TableArea; - -import org.axsl.areaW.AreaWException; -import org.axsl.foR.fo.Table; -import org.axsl.foR.fo.TableColumn; - - -public class TableColumnPL extends FObjPL { - public TableColumnArea areaContainer; - - /** - * The offset, in millipoints, for this column, relative to the start - * of the table, in the column-progression-direction. - */ - public int columnOffset; - - public TableColumnPL(TableColumn parent, PioneerLS layout) { - super(parent, layout); - } - - public void setHeight(int height) { - if (areaContainer != null) { - areaContainer.setProgressionDimension(height); - } - } - - public TableColumn getFO() { - return (TableColumn) this.getFONode(); - } - - public int layout(Area area) throws AreaWException { - TableColumn node = getFO(); - TableArea tableArea = (TableArea) area; - Table table = node.getNearestTable(area); - if (getProgress() == FONodePL.BREAK_AFTER) { - return Status.OK; - } - int columnNumber = table.getTableColumnIndex(node); - if (tableArea.getResolvedColumnWidth(columnNumber) > 0) { - TableColumnArea areaContainer = tableArea.makeTableColumnArea(node); - areaContainer.setProgressionDimension(area.crBPD()); - } - return Status.OK; - } - - public void setColumnOffset(int columnOffset) { - this.columnOffset = columnOffset; - } - -} Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -35,7 +35,6 @@ import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableBody; -import org.axsl.foR.fo.TableColumn; import org.axsl.foR.fo.TableFooter; import org.axsl.foR.fo.TableHeader; @@ -90,7 +89,6 @@ boolean addedHeader = false; boolean addedFooter = false; - layoutColumns(areaContainer); if (node.numberOfColumns() == 0) { layout.getLogger().warn("current implementation of tables " + "requires a table-column for each column, " @@ -249,17 +247,6 @@ return Status.OK; } - private void layoutColumns(Area tableArea) throws AreaWException { - Table node = getTableFO(); - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn c = (TableColumn) node.getTableColumns().get(i); - if (c != null) { - TableColumnPL tcPL = (TableColumnPL) getLayoutProxy(c); - tcPL.layout(tableArea); - } - } - } - // FIXME: this seems odd. public int getTableFooterYPosition(FOContext context, TableFooter tFooter) { TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-12 22:55:58
|
Revision: 7544 Author: victormote Date: 2006-06-12 15:55:53 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7544&view=rev Log Message: ----------- Force FObjPL subclasses to implement layout(Area area). Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-12 22:54:05 UTC (rev 7543) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-12 22:55:53 UTC (rev 7544) @@ -42,10 +42,6 @@ super(realFObj, layout); } - public int layout(Area area) throws AreaWException { - return Status.OK; - } - public void resetProgress() { super.resetProgress(); List children = getChildren(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-12 22:54:05 UTC (rev 7543) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-12 22:55:53 UTC (rev 7544) @@ -24,6 +24,8 @@ package org.foray.pioneer; +import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; /** @@ -35,4 +37,8 @@ super(realFObj, layout); } + public int layout(Area area) throws AreaWException { + return Status.OK; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 00:13:17
|
Revision: 7548 Author: victormote Date: 2006-06-12 17:13:05 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7548&view=rev Log Message: ----------- 1. Change AreaNode constructors to take a RetrieveMarker as a parameter. 2. Conform to axsl changes regarding the same in factory methods. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -154,13 +154,13 @@ ContainerRA areaContainer = null; if (node instanceof TableBody) { areaContainer = tableArea.makeTableBodyContainer( - (TableBody) node); + (TableBody) node, retrieveMarker); } else if (node instanceof TableHeader) { areaContainer = tableArea.makeTableHeaderContainer( - (TableHeader) node); + (TableHeader) node, retrieveMarker); } else if (node instanceof TableFooter) { areaContainer = tableArea.makeTableFooterContainer( - (TableFooter) node); + (TableFooter) node, retrieveMarker); } areaContainerRef = new WeakReference(areaContainer); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -51,7 +51,8 @@ setProgress(0); } - BlockContainerRA blockContainer = area.makeBlockContainerArea(node); + BlockContainerRA blockContainer = area.makeBlockContainerArea(node, + retrieveMarker); for (int i = this.getProgress(); i < node.getChildCount(); i++) { FONode fo = node.getFONodeChildAt(i); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -100,7 +100,7 @@ setProgress(0); } - blockArea = area.makeNormalBlockArea(node); + blockArea = area.makeNormalBlockArea(node, retrieveMarker); for (int i = getProgress(); i < node.getChildCount(); i++) { FONode fo = node.getFONodeChildAt(i); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -57,7 +57,7 @@ } } - ListBlockArea blockArea = area.makeListBlockArea(node); + ListBlockArea blockArea = area.makeListBlockArea(node, retrieveMarker); int numChildren = node.childrenFO().size(); for (int i = listBlockPL.getProgress(); i < numChildren; i++) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -66,7 +66,8 @@ layout.completeCurrentLineInBlock(area); - ListItemArea group = listBlockArea.makeListItemArea(node); + ListItemArea group = listBlockArea.makeListItemArea(node, + retrieveMarker); /* Now lay out the list-item-label inside the new block-area. */ ListItemLabel label = (ListItemLabel)node.childrenFO().get(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -124,7 +124,8 @@ } TableRowContainer tableRow = (TableRowContainer) area; - TableCellArea cellArea = tableRow.makeTableCellArea(node); + TableCellArea cellArea = tableRow.makeTableCellArea(node, + retrieveMarker); areaContainer = cellArea; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -86,7 +86,7 @@ } // Hack alert! - TableArea areaContainer = area.makeTableArea(node); + TableArea areaContainer = area.makeTableArea(node, retrieveMarker); boolean addedHeader = false; boolean addedFooter = false; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-13 00:12:23 UTC (rev 7547) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-13 00:13:05 UTC (rev 7548) @@ -148,7 +148,8 @@ } AbstractTableContainer container = (AbstractTableContainer) area; - TableRowContainer areaContainer = container.makeTableRowContainer(node); + TableRowContainer areaContainer = container.makeTableRowContainer(node, + retrieveMarker); /* Set a reasonable starting BPD for this row. */ this.largestCellHeight = node.traitBPDimensionMin(area, area.crBPD()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-12 23:23:56
|
Revision: 7545 Author: victormote Date: 2006-06-12 16:23:29 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7545&view=rev Log Message: ----------- Get the layout system to pass around the needed RetrieveMarker instance. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -33,6 +33,7 @@ import org.axsl.foR.FObj; import org.axsl.foR.fo.AbstractFlow; import org.axsl.foR.fo.Region; +import org.axsl.foR.fo.RetrieveMarker; import java.util.ArrayList; @@ -78,15 +79,17 @@ this.progressSnapshot = progressSnapshot; } - public int layout(Area area) throws AreaWException { - return layout(area, null); + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { + return layout(area, null, retrieveMarker); } public AbstractFlow getFO() { return (AbstractFlow) this.getFONode(); } - public int layout(Area area, Region region) throws AreaWException { + public int layout(Area area, Region region, RetrieveMarker retrieveMarker) + throws AreaWException { if (getProgress() == FONodePL.START) { setProgress(0); } @@ -117,7 +120,7 @@ ArrayList())); } - set_status(getLayoutProxy(fo).layout(currentArea)); + set_status(getLayoutProxy(fo).layout(currentArea, retrieveMarker)); if (Status.isIncomplete(get_status())) { if ((prevChildMustKeepWithNext) Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -36,6 +36,7 @@ import org.axsl.foR.FONode; import org.axsl.foR.fo.AbstractTableBody; import org.axsl.foR.fo.Marker; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableBody; import org.axsl.foR.fo.TableFooter; @@ -111,7 +112,8 @@ return (AbstractTableBody) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { AbstractTableBody node = getReal(); TableArea tableArea = (TableArea) area; Table table = node.getNearestTable(area); @@ -170,7 +172,7 @@ Object child = node.childrenFO().get(i); if (child instanceof Marker) { MarkerPL markerPL = (MarkerPL) getLayoutProxy((FONode) child); - markerPL.layout(area); + markerPL.layout(area, retrieveMarker); continue; } if (!(child instanceof TableRow)) { @@ -211,7 +213,7 @@ } } rowPL.bIgnoreKeepTogether = (bRowStartsArea && startsAC(area)); - int status = rowPL.layout(areaContainer); + int status = rowPL.layout(areaContainer, retrieveMarker); if (Status.isIncomplete(status)) { // BUG!!! don't distinguish between break-before and after! if (Status.isPageBreak(status)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.BlockContainerRA; import org.axsl.foR.FONode; import org.axsl.foR.fo.BlockContainer; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -43,7 +44,8 @@ return (BlockContainer) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { BlockContainer node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); @@ -54,7 +56,7 @@ for (int i = this.getProgress(); i < node.getChildCount(); i++) { FONode fo = node.getFONodeChildAt(i); FObjPL fobjPL = (FObjPL) getLayoutProxy(fo); - fobjPL.layout(blockContainer); + fobjPL.layout(blockContainer, retrieveMarker); } return Status.OK; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -31,6 +31,7 @@ import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.fontR.FontConsumer; /** @@ -61,7 +62,8 @@ return (Block) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { Block node = this.getFO(); if (! breakStatusBeforeChecked) { breakStatusBeforeChecked = true; @@ -103,7 +105,7 @@ for (int i = getProgress(); i < node.getChildCount(); i++) { FONode fo = node.getFONodeChildAt(i); FONodePL nodePL = this.getLayoutProxy(fo); - int status = nodePL.layout(blockArea); + int status = nodePL.layout(blockArea, retrieveMarker); if (Status.isIncomplete(status)) { setProgress(i); if (status == Status.AREA_FULL_NONE) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -28,6 +28,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Character; +import org.axsl.foR.fo.RetrieveMarker; /** * Concrete class for FObj instances that do not need layout. @@ -42,8 +43,9 @@ return (Character) this.getFONode(); } - public int layout(Area area) throws AreaWException { - return layoutChildren(area); + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { + return layoutChildren(area, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.TableArea; import org.axsl.foR.FONode; import org.axsl.foR.extension.ContinuedLabel; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -51,7 +52,8 @@ * @return Value indicating where all, some or none of the content * was placed in the current parent area. */ - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { ContinuedLabel label = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); @@ -65,7 +67,7 @@ FONode fo = (FONode)label.getChildren().get(i); int status; if (Status.isIncomplete(status - = getLayoutProxy(fo).layout(area))) { + = getLayoutProxy(fo).layout(area, retrieveMarker))) { setProgress(i); return status; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ExternalGraphic; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -43,7 +44,8 @@ return (ExternalGraphic) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { ExternalGraphic node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -32,6 +32,7 @@ import org.axsl.areaW.TableRowContainer; import org.axsl.foR.FONode; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableCell; import org.axsl.text.TextException; import org.axsl.text.line.LineBreaker; @@ -131,6 +132,7 @@ * During the layout process, at least one {@link TableCellArea} should be * created, which is then passed to layout for the children of the * {@link TableCell} now being laid out. + * @param retrieveMarker TODO * @return An integer representing the status of this layout. * When laying out FOText, this marks the index to the last character that * was successfully laid out plus one, that is, it marks the next character @@ -140,7 +142,8 @@ * should be laid out. * @throws AreaWException */ - public abstract int layout(Area area) throws AreaWException; + public abstract int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException; public Log getLogger() { return layout.getLogger(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -30,6 +30,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.FOText; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.text.line.LineText; /** @@ -45,7 +46,8 @@ return (FOText) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { FOText node = this.getFO(); if (getProgress() == FONodePL.START) { setProgress(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -30,6 +30,7 @@ import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.foR.FObjMixed; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -44,14 +45,15 @@ return (FObjMixed) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { FObjMixed node = getFObjMixed(); if (getProgress() == FONodePL.START) { setProgress(0); } for (int i = getProgress(); i < node.childrenFO().size(); i++) { FONode fo = (FONode) node.childrenFO().get(i); - int status = getLayoutProxy(fo).layout(area); + int status = getLayoutProxy(fo).layout(area, retrieveMarker); if (Status.isIncomplete((status))) { setProgress(i); return status; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -25,10 +25,10 @@ package org.foray.pioneer; import org.axsl.areaW.Area; - import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; import java.util.ArrayList; import java.util.List; @@ -87,7 +87,8 @@ return ((FObj) this.getFONode()).getChildren(); } - protected int layoutChildren(Area area) throws AreaWException { + protected int layoutChildren(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { FONode node = this.getFONode(); int start = getProgress(); if (start == FONodePL.START) { @@ -96,7 +97,7 @@ for (int i = start; i < node.childrenFO().size(); i++) { FONode fo = (FONode)node.childrenFO().get(i); FONodePL nodePL = this.getLayoutProxy(fo); - int status = nodePL.layout(area); + int status = nodePL.layout(area, retrieveMarker); if (Status.isIncomplete(status)) { return status; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -24,12 +24,12 @@ package org.foray.pioneer; +import org.axsl.areaW.AreaWException; import org.axsl.areaW.NormalFlowRA; import org.axsl.areaW.PageCollection; - -import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.fo.Flow; +import org.axsl.foR.fo.RetrieveMarker; import java.util.List; @@ -39,7 +39,8 @@ super(flow, layout); } - public int layout(PageCollection pc) throws AreaWException { + public int layout(PageCollection pc, RetrieveMarker retrieveMarker) + throws AreaWException { List children = getChildren(); for (int i = 0; i < children.size(); i++) { FObj lastFObj = null; @@ -50,7 +51,7 @@ org.axsl.areaW.SpanRA span = pc.startingReferenceArea(lastFObj, nextFObj); NormalFlowRA nf = span.normalFlowForNextFO(nextFObj); - this.getLayoutProxy(nextFObj).layout(nf); + this.getLayoutProxy(nextFObj).layout(nf, retrieveMarker); } return 0; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -33,6 +33,7 @@ import org.axsl.foR.FONode; import org.axsl.foR.fo.FootnoteBody; import org.axsl.foR.fo.PageSequence; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.StaticContent; /** @@ -48,7 +49,8 @@ return (FootnoteBody) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { FootnoteBody node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); @@ -59,7 +61,7 @@ for (int i = getProgress(); i < numChildren; i++) { FONode fo = node.getFONodeChildAt(i); FONodePL foNodePL = getLayoutProxy(fo); - int status = foNodePL.layout(referenceArea); + int status = foNodePL.layout(referenceArea, retrieveMarker); if (Status.isIncomplete((status))) { resetProgress(); return status; @@ -68,12 +70,12 @@ return Status.OK; } - public boolean layoutFootnote(PageArea p) { + public boolean layoutFootnote(PageArea p, RetrieveMarker retrieveMarker) { RegionRABody bac = p.getWritableRegionBody(); FootnoteRA footArea = bac.getWritableFootnoteRA(); try { - layoutFootnoteSeparator(bac, footArea); - int status = layout(footArea); + layoutFootnoteSeparator(bac, footArea, retrieveMarker); + int status = layout(footArea, retrieveMarker); if (Status.isIncomplete(status)) { // add as a pending footnote return false; @@ -84,8 +86,8 @@ return true; } - private void layoutFootnoteSeparator(RegionRABody bac, FootnoteRA footArea) - throws AreaWException { + private void layoutFootnoteSeparator(RegionRABody bac, FootnoteRA footArea, + RetrieveMarker retrieveMarker) throws AreaWException { /* TODO: It seems like this logic should be done once when the * PageCollection is first started, and cached there for reuse. */ if (footArea.hasChildren()) { @@ -98,7 +100,7 @@ } StaticContentPL staticPL = (StaticContentPL) getLayoutProxy(separator); - staticPL.layout(footArea); + staticPL.layout(footArea, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -31,6 +31,7 @@ import org.axsl.foR.fo.Footnote; import org.axsl.foR.fo.FootnoteBody; import org.axsl.foR.fo.Inline; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -45,7 +46,8 @@ return (Footnote) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { Footnote node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); @@ -54,7 +56,7 @@ /* Layout the Inline. */ Inline inline = node.getInline(); FObjMixedPL inlinePL = (FObjMixedPL) getLayoutProxy(inline); - int status = inlinePL.layout(area); + int status = inlinePL.layout(area, retrieveMarker); if (Status.isIncomplete(status)) { return status; } @@ -65,7 +67,7 @@ PageArea page = area.getWritablePage(); /* If the footnote cannot be entirely laid out on the current page, * it will be added to the list of pending footnotes. */ - fbPL.layoutFootnote(page); + fbPL.layoutFootnote(page, retrieveMarker); return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -30,6 +30,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.InstreamForeignObject; +import org.axsl.foR.fo.RetrieveMarker; public class InstreamForeignObjectPL extends FObjPL { @@ -44,7 +45,8 @@ return (InstreamForeignObject) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { InstreamForeignObject node = getFO(); LineArea lineArea = activeLineArea(area); if (lineArea == null) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Leader; +import org.axsl.foR.fo.RetrieveMarker; /** * Concrete class for FObj instances that do not need layout. @@ -43,7 +44,8 @@ return (Leader) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { Leader node = getFO(); LineArea lineArea = activeLineArea(area); if (lineArea == null) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -30,6 +30,7 @@ import org.axsl.areaW.NormalBlockArea; import org.axsl.foR.fo.ListBlock; import org.axsl.foR.fo.ListItem; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -44,7 +45,8 @@ return (ListBlock) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { ListBlock node = getFO(); ListBlockPL listBlockPL = (ListBlockPL) getLayoutProxy(node); if (listBlockPL.getProgress() == FONodePL.START) { @@ -61,7 +63,7 @@ for (int i = listBlockPL.getProgress(); i < numChildren; i++) { ListItem listItem = (ListItem)node.childrenFO().get(i); ListItemPL listItemPL = (ListItemPL) getLayoutProxy(listItem); - int status = listItemPL.layout(blockArea); + int status = listItemPL.layout(blockArea, retrieveMarker); if (Status.isIncomplete(status)) { if (status == Status.AREA_FULL_NONE && i > 0) { status = Status.AREA_FULL_SOME; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.fo.ListItemBody; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -43,7 +44,8 @@ return (ListItemBody) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { ListItemBody node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); @@ -60,7 +62,7 @@ for (int i = getProgress(); i < numChildren; i++) { FObj fo = (FObj)node.childrenFO().get(i); - int status = getLayoutProxy(fo).layout(area); + int status = getLayoutProxy(fo).layout(area, retrieveMarker); if (Status.isIncomplete((status))) { setProgress(i); if ((i == 0) && (status == Status.AREA_FULL_NONE)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -29,6 +29,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.ListItemLabel; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -43,7 +44,8 @@ return (ListItemLabel) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { ListItemLabel node = getFO(); int numChildren = node.childrenFO().size(); @@ -64,7 +66,7 @@ int status; BlockPL blockPL = (BlockPL) getLayoutProxy(block); - status = blockPL.layout(area); + status = blockPL.layout(area, retrieveMarker); return status; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-12 22:55:53 UTC (rev 7544) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-12 23:23:29 UTC (rev 7545) @@ -32,6 +32,7 @@ import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; import org.axsl.foR.fo.ListItemLabel; +import org.axsl.foR.fo.RetrieveMarker; /** * @@ -46,15 +47,17 @@ return (ListItem) this.getFONode(); } - public int layout(Area area) throws AreaWException { + public int layout(Area area, RetrieveMarker retrieveMarker) + throws AreaWException { if (! (area instanceof NormalBlockArea)) { throw new AreaWException("Illegal parent area for fo:list-item"); } NormalBlockArea blockArea = (NormalBlockArea) area; - return layout(blockArea); + return layout(blockArea, retrieveMarker); } - public int layout(NormalBlockArea area) throws AreaWException { + public int layout(NormalBlockArea area, RetrieveMarker retrieveMarker) + throws AreaWException { ListItem node = getFO(); ListBlockArea listBlockArea = (ListBlockArea) area; if (getProgress() == FONodePL.START) { @@ -73,7 +76,7 @@ if (getProgress() == 0) { ListItemLabelPL labelPL = (ListItemLabelPL) this.getLayoutProxy(label); - status = labelPL.layout(group); + status = labelPL.layout(group, retrieveMarker); if (Status.isIncomplete(status)) { return status; } @@ -83,7 +86,7 @@ /* Now create a BlockArea to contain the list-item-body. */ ListItemBody body = (ListItemBody)node.childrenFO().get(1); ListItemBodyPL bodyPL = (ListItem... [truncated message content] |
|
From: <vic...@us...> - 2006-06-13 04:22:07
|
Revision: 7554 Author: victormote Date: 2006-06-12 21:21:50 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7554&view=rev Log Message: ----------- 1. Push RetrieveMarker instance through the line-breaking system. 2. Conform to axsl changes regarding the same. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -64,7 +64,7 @@ // Not enough room on the page for this. return Status.AREA_FULL_NONE; } - return layoutInlineContent(node, lineArea); + return layoutInlineContent(node, lineArea, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -154,7 +154,8 @@ * was <em>not</em> successfully added to the line. */ protected int addTextItemToLine(LineArea lineArea, LineText lineText, - int start, int end) throws AreaWException { + int start, int end, RetrieveMarker retrieveMarker) + throws AreaWException { LineBreaker lb = layout.getLineBreaker(); if (lb == null) { lb = lineArea.getTextServer().provideLineBreaker(null, layout, @@ -163,7 +164,7 @@ int status = 0; try { status = lb.processLineContent(lineText, start, end, - lineArea.asLineOutput()); + lineArea.asLineOutput(), retrieveMarker); } catch (TextException e) { FObj generatedBy = lineArea.traitGeneratedBy(); throw new AreaWException("Error in text layout:\n" @@ -180,7 +181,8 @@ * @return For non-text items, returns 1 for success or 0 if the item did * not fit onto the current line. */ - protected int addNonTextItemToLine(LineArea lineArea, LineNonText nonText) + protected int addNonTextItemToLine(LineArea lineArea, LineNonText nonText, + RetrieveMarker retrieveMarker) throws AreaWException { LineBreaker lb = layout.getLineBreaker(); if (lb == null) { @@ -190,7 +192,7 @@ int status = 0; try { status = lb.processLineContent(nonText, -1, -1, - lineArea.asLineOutput()); + lineArea.asLineOutput(), retrieveMarker); } catch (TextException e) { FObj generatedBy = lineArea.traitGeneratedBy(); throw new AreaWException("Error in non-text layout:\n" @@ -200,7 +202,8 @@ return status; } - protected int layoutInlineContent(FObj node, LineArea lineArea) + protected int layoutInlineContent(FObj node, LineArea lineArea, + RetrieveMarker retrieveMarker) throws AreaWException { if (! (node instanceof LineNonText)) { return -1000; @@ -210,7 +213,7 @@ if (lineArea == null) { return Status.AREA_FULL_SOME; } - if (addNonTextItemToLine(lineArea, nonText) == 1) { + if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) { // It fit on the line. return Status.OK; } @@ -224,7 +227,7 @@ if (lineArea == null) { return Status.AREA_FULL_SOME; } - if (addNonTextItemToLine(lineArea, nonText) == 1) { + if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) { return Status.OK; } getLogger().error(node.getName() + " does not fit on line:\n" Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -53,7 +53,8 @@ setProgress(0); } int progressAtStart = getProgress(); - int progressAtEnd = addText(node, area, progressAtStart); + int progressAtEnd = addText(node, area, progressAtStart, + retrieveMarker); setProgress(progressAtEnd); if (progressAtEnd == -1) { return Status.OK; @@ -70,15 +71,15 @@ * laid out. If the first six characters have been laid out (indices 0-5), * then 6 should be returned. */ - private int addText(LineText lineText, Area area, int start) - throws AreaWException { + private int addText(LineText lineText, Area area, int start, + RetrieveMarker retrieveMarker) throws AreaWException { int end = lineText.inlineText().length; LineArea la = this.activeLineArea(area); if (la == null) { return start; } NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); - start = addTextItemToLine(la, lineText, start, end); + start = addTextItemToLine(la, lineText, start, end, retrieveMarker); while (start != -1) { BlockPL blockPL = this.layout.getBlockPL(ba); blockPL.getCurrentLineArea(ba).verticalAlign(); @@ -88,7 +89,7 @@ if (la == null) { return start; } - start = addTextItemToLine(la, lineText, start, end); + start = addTextItemToLine(la, lineText, start, end, retrieveMarker); } return -1; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -53,7 +53,7 @@ // Not enough room on the page for this. return Status.AREA_FULL_NONE; } - return layoutInlineContent(node, lineArea); + return layoutInlineContent(node, lineArea, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -52,7 +52,7 @@ // Not enough room on the page for this. return Status.AREA_FULL_NONE; } - return layoutInlineContent(node, lineArea); + return layoutInlineContent(node, lineArea, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -52,7 +52,7 @@ // Not enough room on the page for this. return Status.AREA_FULL_NONE; } - return layoutInlineContent(node, lineArea); + return layoutInlineContent(node, lineArea, retrieveMarker); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-06-13 04:21:37 UTC (rev 7553) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-06-13 04:21:50 UTC (rev 7554) @@ -52,7 +52,7 @@ // Not enough room on the page for this. return Status.AREA_FULL_NONE; } - return layoutInlineContent(node, lineArea); + return layoutInlineContent(node, lineArea, retrieveMarker); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 21:35:36
|
Revision: 7568 Author: victormote Date: 2006-06-13 14:35:29 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7568&view=rev Log Message: ----------- Implement axsl changes: Add EagerLineBreaker interface and clean up the type hierarchy a bit. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 21:13:31 UTC (rev 7567) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 21:35:29 UTC (rev 7568) @@ -37,7 +37,7 @@ import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableCell; import org.axsl.text.TextException; -import org.axsl.text.line.LineBreaker; +import org.axsl.text.line.EagerLineBreaker; import org.apache.commons.logging.Log; @@ -156,9 +156,9 @@ protected int addTextItemToLine(LineArea lineArea, FOLineText lineText, int start, int end, RetrieveMarker retrieveMarker) throws AreaWException { - LineBreaker lb = layout.getLineBreaker(); + EagerLineBreaker lb = layout.getLineBreaker(); if (lb == null) { - lb = lineArea.getTextServer().provideLineBreaker(null, layout, + lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout, lineArea.getFontConsumer()); } int status = 0; @@ -185,9 +185,9 @@ protected int addNonTextItemToLine(LineArea lineArea, FOLineNonText nonText, RetrieveMarker retrieveMarker) throws AreaWException { - LineBreaker lb = layout.getLineBreaker(); + EagerLineBreaker lb = layout.getLineBreaker(); if (lb == null) { - lb = lineArea.getTextServer().provideLineBreaker(null, layout, + lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout, lineArea.getFontConsumer()); } int status = 0; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-13 21:13:31 UTC (rev 7567) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-13 21:35:29 UTC (rev 7568) @@ -95,7 +95,7 @@ import org.axsl.foR.fo.Title; import org.axsl.foR.fo.Wrapper; import org.axsl.foR.svg.SVGElement; -import org.axsl.text.line.LineBreaker; +import org.axsl.text.line.EagerLineBreaker; import org.apache.commons.logging.Log; @@ -123,7 +123,7 @@ */ public class PioneerLS extends LayoutStrategy implements ProxyFactory { - private LineBreaker currentLineBreaker; + private EagerLineBreaker currentLineBreaker; /* A FIFO queue of footnotes yet to be laid out. */ private ArrayList pendingFootnotes = new ArrayList(); @@ -593,11 +593,11 @@ }; } - public LineBreaker getLineBreaker() { + public EagerLineBreaker getLineBreaker() { return this.currentLineBreaker; } - public void setLineBreaker(LineBreaker lineBreaker) { + public void setLineBreaker(EagerLineBreaker lineBreaker) { this.currentLineBreaker = lineBreaker; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 20:15:59
|
Revision: 7622 Author: victormote Date: 2006-06-15 13:15:47 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7622&view=rev Log Message: ----------- Let the no-layout subclass extend FONodePL instead of FObjPL. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-15 20:10:14 UTC (rev 7621) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-15 20:15:47 UTC (rev 7622) @@ -26,15 +26,15 @@ import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; -import org.axsl.foR.FObj; +import org.axsl.foR.FONode; import org.axsl.foR.fo.RetrieveMarker; /** * Concrete class for FObj instances that do not need layout. */ -public class NoLayoutPL extends FObjPL { +public class NoLayoutPL extends FONodePL { - public NoLayoutPL(FObj realFObj, PioneerLS layout) { + public NoLayoutPL(FONode realFObj, PioneerLS layout) { super(realFObj, layout); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-15 20:10:14 UTC (rev 7621) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-15 20:15:47 UTC (rev 7622) @@ -284,9 +284,7 @@ } public FONodeProxy makeProxy(FONode node) { - /* TODO: Remove this cast. NoLayoutPL should probably take an FONode - * instead of FObj. */ - return new NoLayoutPL((FObj) node, this); + return new NoLayoutPL(node, this); } public FONodeProxy makeProxy(ContinuedLabel node) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:33:38
|
Revision: 7692 Author: victormote Date: 2006-06-17 14:33:11 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7692&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -93,20 +93,20 @@ if (getProgress() == FONodePL.START) { setProgress(0); } - + // flow is *always* laid out into a BodyAreaContainer RegionRABody bac = (RegionRABody)area; - + boolean prevChildMustKeepWithNext = false; int numChildren = getFO().getChildren().size(); for (int i = getProgress(); i < numChildren; i++) { FObj fo = (FObj) getFO().getChildren().get(i); - + if (bac.getWritableMainRA().isBalancingRequired(fo)) { // reset the the just-done span area in preparation // for a backtrack for balancing bac.getWritableMainRA().resetSpanArea(); - + rollback(getProgressSnapshot()); // one less because of the "continue" i = getProgress() - 1; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -120,7 +120,7 @@ if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } - + if (getProgress() == FONodePL.START) { if (area instanceof NormalBlockArea) { layout.completeCurrentLineInBlock((NormalBlockArea) area); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -50,7 +50,7 @@ if (getProgress() == FONodePL.START) { setProgress(0); } - + BlockContainerRA blockContainer = area.makeBlockContainerArea(node, retrieveMarker); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -226,7 +226,7 @@ lineArea = blockArea.createNextLineArea(false); BlockPL blockPL = this.layout.getBlockPL(blockArea); blockPL.currentLineArea = lineArea; - + if (lineArea == null) { return Status.AREA_FULL_SOME; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -56,7 +56,7 @@ setProgress(0); } FootnoteRA referenceArea = (FootnoteRA) area; - + int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { FONode fo = node.getFONodeChildAt(i); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -51,14 +51,14 @@ ListBlockPL listBlockPL = (ListBlockPL) getLayoutProxy(node); if (listBlockPL.getProgress() == FONodePL.START) { listBlockPL.setProgress(0); - + if (area instanceof NormalBlockArea) { layout.completeCurrentLineInBlock((NormalBlockArea) area); } } - + ListBlockArea blockArea = area.makeListBlockArea(node, retrieveMarker); - + int numChildren = node.childrenFO().size(); for (int i = listBlockPL.getProgress(); i < numChildren; i++) { ListItem listItem = (ListItem)node.childrenFO().get(i); @@ -73,9 +73,9 @@ return status; } } - + area.incrementProgressionDimension(blockArea.crBPD()); - + return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -50,18 +50,18 @@ if (getProgress() == FONodePL.START) { setProgress(0); } - + /* * For calculating the lineage - The fo:list-item-body formatting object * does not generate any areas. The fo:list-item-body formatting object * returns the sequence of areas created by concatenating the sequences * of areas returned by each of the children of the fo:list-item-body. */ - + int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { FObj fo = (FObj)node.childrenFO().get(i); - + int status = getLayoutProxy(fo).layout(area, retrieveMarker); if (Status.isIncomplete((status))) { setProgress(i); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -48,14 +48,14 @@ throws AreaWException { ListItemLabel node = getFO(); int numChildren = node.childrenFO().size(); - + if (numChildren != 1) { throw new AreaWException("Non-standard restriction: " + "list-item-label must have exactly one block."); } Block block = (Block)node.childrenFO().get(0); - + /* * For calculating the lineage - The fo:list-item-label formatting * object does not generate any areas. @@ -63,7 +63,7 @@ * areas created by concatenating the sequences of areas returned by * each of the children of the fo:list-item-label. */ - + int status; BlockPL blockPL = (BlockPL) getLayoutProxy(block); status = blockPL.layout(area, retrieveMarker); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-06-17 21:32:52 UTC (rev 7691) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-06-17 21:33:11 UTC (rev 7692) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the ... [truncated message content] |
|
From: <vic...@us...> - 2006-07-23 21:15:43
|
Revision: 7825 Author: victormote Date: 2006-07-23 14:15:10 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7825&view=rev Log Message: ----------- Implement standard use of final modifier on local variable and method parameters. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableFooterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableHeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -44,7 +44,8 @@ /** ArrayList to store snapshot. */ private ArrayList progressSnapshot; - public AbstractFlowPL(AbstractFlow abstractFlow, PioneerLS layout) { + public AbstractFlowPL(final AbstractFlow abstractFlow, + final PioneerLS layout) { super(abstractFlow, layout); } @@ -61,7 +62,7 @@ /** * @param _status The _status to set. */ - public void set_status(int _status) { + public void set_status(final int _status) { this._status = _status; } @@ -75,11 +76,11 @@ /** * @param progressSnapshot The progressSnapshot to be saved. */ - public void setProgressSnapshot(ArrayList progressSnapshot) { + public void setProgressSnapshot(final ArrayList progressSnapshot) { this.progressSnapshot = progressSnapshot; } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { return layout(area, null, retrieveMarker); } @@ -88,19 +89,19 @@ return (AbstractFlow) this.getFONode(); } - public int layout(Area area, Region region, RetrieveMarker retrieveMarker) - throws AreaWException { + public int layout(final Area area, final Region region, + final RetrieveMarker retrieveMarker) throws AreaWException { if (getProgress() == FONodePL.START) { setProgress(0); } // flow is *always* laid out into a BodyAreaContainer - RegionRABody bac = (RegionRABody)area; + final RegionRABody bac = (RegionRABody)area; boolean prevChildMustKeepWithNext = false; - int numChildren = getFO().getChildren().size(); + final int numChildren = getFO().getChildren().size(); for (int i = getProgress(); i < numChildren; i++) { - FObj fo = (FObj) getFO().getChildren().get(i); + final FObj fo = (FObj) getFO().getChildren().get(i); if (bac.getWritableMainRA().isBalancingRequired(fo)) { // reset the the just-done span area in preparation @@ -113,7 +114,8 @@ continue; } // current column area - Area currentArea = bac.getWritableMainRA().getNextWritableArea(fo); + final Area currentArea = bac.getWritableMainRA() + .getNextWritableArea(fo); if (bac.getWritableMainRA().isNewSpanArea()) { setProgress(i); setProgressSnapshot(getProgressSnapshot(new @@ -126,9 +128,10 @@ if ((prevChildMustKeepWithNext) && (Status.laidOutNone(get_status()))) { setProgress(i - 1); - FObj prevChild = + final FObj prevChild = (FObj) getFO().getChildren().get(getProgress()); - FObjPL prevChildPL = (FObjPL) getLayoutProxy(prevChild); + final FObjPL prevChildPL = (FObjPL) getLayoutProxy( + prevChild); prevChildPL.resetProgress(); set_status(Status.AREA_FULL_SOME); return get_status(); @@ -151,9 +154,9 @@ return get_status(); } // I don't much like exposing this. (AHS 001217) - NormalFlowRA column = (NormalFlowRA)currentArea; + final NormalFlowRA column = (NormalFlowRA)currentArea; // Cast verified at construction. - SpanRA span = (SpanRA) column.getWritableParent(); + final SpanRA span = (SpanRA) column.getWritableParent(); span.setCurrentColumn(span.getCurrentColumn() + 1); i--; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -54,11 +54,12 @@ // manage information about spanning rows public RowSpanMgr rowSpanMgr; - public AbstractTableBodyPL(AbstractTableBody tableBody, PioneerLS layout) { + public AbstractTableBodyPL(final AbstractTableBody tableBody, + final PioneerLS layout) { super(tableBody, layout); } - public void setYPosition(int value) { + public void setYPosition(final int value) { ((GenericContainer)areaContainerRef.get()).setYPosition(value); } @@ -66,13 +67,13 @@ return ((GenericContainer)areaContainerRef.get()).getYPosition(); } - public int getHeight(FOContext context) { + public int getHeight(final FOContext context) { return ((GenericContainer)areaContainerRef.get()).crBPD() + getReal().traitSpaceBeforeOptimum(context) + getReal().traitSpaceAfterOptimum(context); } - public void removeLayout(Area area) { + public void removeLayout(final Area area) { if (areaContainerRef != null) { area.removeChild((GenericContainer)areaContainerRef.get()); } @@ -112,11 +113,11 @@ return (AbstractTableBody) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - AbstractTableBody node = getReal(); - TableArea tableArea = (TableArea) area; - Table table = node.getNearestTable(area); + final AbstractTableBody node = getReal(); + final TableArea tableArea = (TableArea) area; + final Table table = node.getNearestTable(area); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -164,13 +165,14 @@ areaContainerRef = new WeakReference(areaContainer); ArrayList keepWith = new ArrayList(); - int numChildren = node.childrenFO().size(); + final int numChildren = node.childrenFO().size(); TableRow lastRow = null; boolean endKeepGroup = true; for (int i = getProgress(); i < numChildren; i++) { - Object child = node.childrenFO().get(i); + final Object child = node.childrenFO().get(i); if (child instanceof Marker) { - MarkerPL markerPL = (MarkerPL) getLayoutProxy((FONode) child); + final MarkerPL markerPL = (MarkerPL) getLayoutProxy( + (FONode) child); markerPL.layout(area, retrieveMarker); continue; } @@ -178,8 +180,8 @@ throw new AreaWException("Currently only Table Rows are " + "supported in table body, header and footer"); } - TableRow row = (TableRow)child; - TableRowPL rowPL = (TableRowPL) getLayoutProxy(row); + final TableRow row = (TableRow)child; + final TableRowPL rowPL = (TableRowPL) getLayoutProxy(row); rowPL.setRowSpanMgr(rowSpanMgr); if (row.traitKeepWithPreviousWithinColumn(area) > 0 @@ -235,7 +237,7 @@ // FIXME!!! Handle rows spans!!! removeTableRowLayout(row, areaContainer); for (int j = 0; j < keepWith.size(); j++) { - TableRow tr = (TableRow)keepWith.get(j); + final TableRow tr = (TableRow)keepWith.get(j); removeTableRowLayout(tr, areaContainer); i--; } @@ -281,8 +283,8 @@ return Status.OK; } - public void removeTableRowLayout(TableRow tr, Area area) { - TableRowPL rowPL = (TableRowPL) this.getLayoutProxy(tr); + public void removeTableRowLayout(final TableRow tr, final Area area) { + final TableRowPL rowPL = (TableRowPL) this.getLayoutProxy(tr); rowPL.resetProgress(); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -36,7 +36,8 @@ */ public class BlockContainerPL extends FObjPL { - public BlockContainerPL(BlockContainer container, PioneerLS layout) { + public BlockContainerPL(final BlockContainer container, + final PioneerLS layout) { super(container, layout); } @@ -44,19 +45,19 @@ return (BlockContainer) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - BlockContainer node = getFO(); + final BlockContainer node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); } - BlockContainerRA blockContainer = area.makeBlockContainerArea(node, - retrieveMarker); + final BlockContainerRA blockContainer = area.makeBlockContainerArea( + node, retrieveMarker); for (int i = this.getProgress(); i < node.getChildCount(); i++) { - FONode fo = node.getFONodeChildAt(i); - FObjPL fobjPL = (FObjPL) getLayoutProxy(fo); + final FONode fo = node.getFONodeChildAt(i); + final FObjPL fobjPL = (FObjPL) getLayoutProxy(fo); fobjPL.layout(blockContainer, retrieveMarker); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -49,7 +49,7 @@ public LineArea currentLineArea; - public BlockPL(FObj realFObj, PioneerLS layout) { + public BlockPL(final FObj realFObj, final PioneerLS layout) { super(realFObj, layout); } @@ -62,14 +62,14 @@ return (Block) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - Block node = this.getFO(); + final Block node = this.getFO(); if (! breakStatusBeforeChecked) { breakStatusBeforeChecked = true; // no break if first in area tree, or leading in context // area - int breakBeforeStatus = layout.checkBreakBefore(node, area); + final int breakBeforeStatus = layout.checkBreakBefore(node, area); if (breakBeforeStatus != Status.OK) { return breakBeforeStatus; } @@ -103,9 +103,9 @@ blockArea = area.makeNormalBlockArea(node, retrieveMarker); for (int i = getProgress(); i < node.getChildCount(); i++) { - FONode fo = node.getFONodeChildAt(i); - FONodePL nodePL = this.getLayoutProxy(fo); - int status = nodePL.layout(blockArea, retrieveMarker); + final FONode fo = node.getFONodeChildAt(i); + final FONodePL nodePL = this.getLayoutProxy(fo); + final int status = nodePL.layout(blockArea, retrieveMarker); if (Status.isIncomplete(status)) { setProgress(i); if (status == Status.AREA_FULL_NONE) { @@ -130,7 +130,7 @@ // no break if last in area tree, or trailing in context // area - int breakAfterStatus = Status.checkBreakAfter( + final int breakAfterStatus = Status.checkBreakAfter( node.traitBreakAfter(area)); if (breakAfterStatus != Status.OK) { setProgress(FONodePL.BREAK_AFTER); @@ -157,7 +157,7 @@ * * @return the line area to be used to add inline objects */ - public LineArea getCurrentLineArea(NormalBlockArea blockArea) + public LineArea getCurrentLineArea(final NormalBlockArea blockArea) throws AreaWException { if (this.currentLineArea == null) { this.currentLineArea = blockArea.createNextLineArea(false); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -35,7 +35,7 @@ */ public class CharacterPL extends FObjPL { - public CharacterPL(Character realFObj, PioneerLS layout) { + public CharacterPL(final Character realFObj, final PioneerLS layout) { super(realFObj, layout); } @@ -43,7 +43,7 @@ return (Character) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { return layoutChildren(area, retrieveMarker); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -36,7 +36,8 @@ */ public class ContinuedLabelPL extends FObjPL { - public ContinuedLabelPL(ContinuedLabel inline, PioneerLS layout) { + public ContinuedLabelPL(final ContinuedLabel inline, + final PioneerLS layout) { super(inline, layout); } @@ -52,19 +53,19 @@ * @return Value indicating where all, some or none of the content * was placed in the current parent area. */ - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - ContinuedLabel label = getFO(); + final ContinuedLabel label = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); } // See if ancestor table has generated any areas yet. - TableArea tableArea = area.ancestorTableArea(); + final TableArea tableArea = area.ancestorTableArea(); if (tableArea != null && tableArea.getPreviousSibling() != null) { - int numChildren = label.getChildren().size(); + final int numChildren = label.getChildren().size(); for (int i = getProgress(); i < numChildren; i++) { - FONode fo = (FONode)label.getChildren().get(i); + final FONode fo = (FONode)label.getChildren().get(i); int status; if (Status.isIncomplete(status = getLayoutProxy(fo).layout(area, retrieveMarker))) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -36,7 +36,8 @@ */ public class ExternalGraphicPL extends FObjPL { - public ExternalGraphicPL(ExternalGraphic graphic, PioneerLS layout) { + public ExternalGraphicPL(final ExternalGraphic graphic, + final PioneerLS layout) { super(graphic, layout); } @@ -44,22 +45,22 @@ return (ExternalGraphic) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - ExternalGraphic node = getFO(); + final ExternalGraphic node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); } - org.axsl.areaW.Area parentForDimensions = + final org.axsl.areaW.Area parentForDimensions = area.nearestGeneratedByBlockLevelFO(); - int height = node.viewportBPD(area, parentForDimensions.crBPD()); + final int height = node.viewportBPD(area, parentForDimensions.crBPD()); if (area.progressionDimensionAvailable() < (height + node.traitSpaceBeforeOptimum(area))) { return Status.AREA_FULL_NONE; } - LineArea lineArea = activeLineArea(area); + final LineArea lineArea = activeLineArea(area); if (lineArea == null) { // Not enough room on the page for this. return Status.AREA_FULL_NONE; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -66,7 +66,7 @@ protected PioneerLS layout; - public FONodePL(FONode realFObj, PioneerLS layout) { + public FONodePL(final FONode realFObj, final PioneerLS layout) { this.realFONode = realFObj; realFObj.setProxy(this); this.layout = layout; @@ -83,7 +83,7 @@ * @param snapshot a ArrayList of progress indicators (Integer) * @return the updated ArrayList of progress indicators (Integers) */ - public ArrayList getProgressSnapshot(ArrayList snapshot) { + public ArrayList getProgressSnapshot(final ArrayList snapshot) { snapshot.add(new Integer(this.progress)); return snapshot; } @@ -94,7 +94,7 @@ * and restored using this method. * @param snapshot the ArrayList of saved progress indicators (Integers) */ - public void rollback(ArrayList snapshot) { + public void rollback(final ArrayList snapshot) { this.progress = ((Integer)snapshot.get(0)).intValue(); snapshot.remove(0); if (this.progress == START) { @@ -114,11 +114,11 @@ * Sets the progress indicator. * @param progress The progress indicator to be stored. */ - public void setProgress(int progress) { + public void setProgress(final int progress) { this.progress = progress; } - protected FONodePL getLayoutProxy(FONode node) { + protected FONodePL getLayoutProxy(final FONode node) { return this.layout.getLayoutProxy(node); } @@ -154,21 +154,22 @@ * @return The index into the text (char []) to the first character that * was <em>not</em> successfully added to the line. */ - protected int addTextItemToLine(LineArea lineArea, FOLineText lineText, - int start, int end, RetrieveMarker retrieveMarker) - throws AreaWException { + protected int addTextItemToLine(final LineArea lineArea, + final FOLineText lineText, final int start, final int end, + final RetrieveMarker retrieveMarker) throws AreaWException { EagerLineBreaker lb = layout.getLineBreaker(); if (lb == null) { lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout, lineArea.getFontConsumer()); } int status = 0; - FOLineText contextAware = lineText.getContextWrapper(retrieveMarker); + final FOLineText contextAware = lineText.getContextWrapper( + retrieveMarker); try { status = lb.processLineContent(contextAware, start, end, lineArea.asLineOutput()); - } catch (TextException e) { - FObj generatedBy = lineArea.traitGeneratedBy(); + } catch (final TextException e) { + final FObj generatedBy = lineArea.traitGeneratedBy(); throw new AreaWException("Error in text layout:\n" + generatedBy.getContextMessage(), e); } @@ -183,8 +184,8 @@ * @return For non-text items, returns 1 for success or 0 if the item did * not fit onto the current line. */ - protected int addNonTextItemToLine(LineArea lineArea, FOLineNonText nonText, - RetrieveMarker retrieveMarker) + protected int addNonTextItemToLine(final LineArea lineArea, + final FOLineNonText nonText, final RetrieveMarker retrieveMarker) throws AreaWException { EagerLineBreaker lb = layout.getLineBreaker(); if (lb == null) { @@ -192,12 +193,13 @@ lineArea.getFontConsumer()); } int status = 0; - FOLineNonText contextAware = nonText.getContextWrapper(retrieveMarker); + final FOLineNonText contextAware = nonText.getContextWrapper( + retrieveMarker); try { status = lb.processLineContent(contextAware, -1, -1, lineArea.asLineOutput()); - } catch (TextException e) { - FObj generatedBy = lineArea.traitGeneratedBy(); + } catch (final TextException e) { + final FObj generatedBy = lineArea.traitGeneratedBy(); throw new AreaWException("Error in non-text layout:\n" + generatedBy.getContextMessage()); } @@ -205,13 +207,12 @@ return status; } - protected int layoutInlineContent(FObj node, LineArea lineArea, - RetrieveMarker retrieveMarker) - throws AreaWException { + protected int layoutInlineContent(final FObj node, LineArea lineArea, + final RetrieveMarker retrieveMarker) throws AreaWException { if (! (node instanceof FOLineNonText)) { return -1000; } - FOLineNonText nonText = (FOLineNonText) node; + final FOLineNonText nonText = (FOLineNonText) node; // this should start a new page if (lineArea == null) { return Status.AREA_FULL_SOME; @@ -221,10 +222,10 @@ return Status.OK; } // It did not fit on the line. Create new line & try again. - NormalBlockArea blockArea + final NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); lineArea = blockArea.createNextLineArea(false); - BlockPL blockPL = this.layout.getBlockPL(blockArea); + final BlockPL blockPL = this.layout.getBlockPL(blockArea); blockPL.currentLineArea = lineArea; if (lineArea == null) { @@ -244,7 +245,7 @@ * @param area The area whose LineArea is being sought. * @return The current LineArea of the block that area is in. */ - protected LineArea activeLineArea(Area area) throws AreaWException { + protected LineArea activeLineArea(final Area area) throws AreaWException { if (area instanceof LineArea) { return (LineArea) area; } @@ -255,11 +256,11 @@ blockArea = area.ancestorWritableNormalBlockArea(); } if (blockArea == null) { - FONode foNode = this.realFONode; + final FONode foNode = this.realFONode; throw new AreaWException("Layout of inline objects must be inside " + "a block:\n" + foNode.getContextMessage()); } - BlockPL blockPL = this.layout.getBlockPL(blockArea); + final BlockPL blockPL = this.layout.getBlockPL(blockArea); return blockPL.getCurrentLineArea(blockArea); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-07-23 20:51:25 UTC (rev 7824) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-07-23 21:15:10 UTC (rev 7825) @@ -37,7 +37,7 @@ */ public class FOTextPL extends FONodePL { - public FOTextPL(FOText text, PioneerLS layout) { + public FOTextPL(final FOText text, final PioneerLS layout) { super(text, layout); } @@ -45,14 +45,14 @@ return (FOText) this.getFONode(); } - public int layout(Area area, RetrieveMarker retrieveMarker) + public int layout(final Area area, final RetrieveMarker retrieveMarker) throws AreaWException { - FOText node = this.getFO(); + final FOText node = this.getFO(); if (getProgress() == FONodePL.START) { setProgress(0); } - int progressAtStart = getProgress(); - int progressAtEnd = addText(node, area, progressAtStart, + final int progressAtStart = getProgress(); + final int progressAtEnd = addText(node, area, progressAtStart, retrieveMarker); setProgress(progressAtEnd); if (progressAtEnd == -1) { @@ -70,17 +70,18 @@ * laid out. If the first six characters have been laid out (indices 0-5), * then 6 should be returned. */ - private int addText(FOLineText lineText, Area area, int start, - RetrieveMarker retrieveMarker) throws AreaWException { - int end = lineText.inlineText().length; + private int addText(final FOLineText lineText, final Area area, + int start, final RetrieveMarker retrieveMarker) + throws AreaWException { + final int end = lineText.inlineText().length; LineArea la = this.activeLineArea(area); if (la == null) { return start; } - NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); + final NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end, retrieveMarker); while (start != -1) { - BlockPL blockPL = this.layout.getBlockPL(ba); + final BlockPL blockPL = this.layout.getBlockPL(ba); la = ba.createNextLineArea(false); blockPL.currentLineArea = la; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer... [truncated message content] |
|
From: <vic...@us...> - 2006-05-08 21:45:32
|
Revision: 7219 Author: victormote Date: 2006-05-08 14:45:08 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7219&view=rev Log Message: ----------- Run conversion script to convert from using FOray Area Tree to axsl Area Tree. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,10 +24,10 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.NormalFlowRA; -import org.foray.area.RegionRABody; -import org.foray.area.SpanRA; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalFlowRA; +import org.axsl.areaW.RegionRABody; +import org.axsl.areaW.SpanRA; import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; @@ -99,10 +99,10 @@ for (int i = getProgress(); i < numChildren; i++) { FObj fo = (FObj) getFO().getChildren().get(i); - if (bac.getMainRA().isBalancingRequired(fo)) { + if (bac.getWritableMainRA().isBalancingRequired(fo)) { // reset the the just-done span area in preparation // for a backtrack for balancing - bac.getMainRA().resetSpanArea(); + bac.getWritableMainRA().resetSpanArea(); rollback(getProgressSnapshot()); // one less because of the "continue" @@ -110,8 +110,8 @@ continue; } // current column area - Area currentArea = bac.getMainRA().getNextArea(fo); - if (bac.getMainRA().isNewSpanArea()) { + Area currentArea = bac.getWritableMainRA().getNextWritableArea(fo); + if (bac.getWritableMainRA().isNewSpanArea()) { setProgress(i); setProgressSnapshot(getProgressSnapshot(new ArrayList())); @@ -132,7 +132,7 @@ // should probably return AREA_FULL_NONE if first // or perhaps an entirely new status code } - if (bac.getMainRA().isLastColumn()) { + if (bac.getWritableMainRA().isLastColumn()) { if (get_status() == Status.FORCE_COLUMN_BREAK) { setProgress(i); // same thing @@ -150,7 +150,7 @@ // I don't much like exposing this. (AHS 001217) NormalFlowRA column = (NormalFlowRA)currentArea; // Cast verified at construction. - SpanRA span = (SpanRA) column.getParent(); + SpanRA span = (SpanRA) column.getWritableParent(); span.setCurrentColumn(span.getCurrentColumn() + 1); i--; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,14 +24,14 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.BlockContainerRA; -import org.foray.area.ContainerRA; -import org.foray.area.GenericContainer; -import org.foray.area.NormalBlockArea; -import org.foray.area.TableBodyContainer; -import org.foray.area.TableFooterContainer; -import org.foray.area.TableHeaderContainer; +import org.axsl.areaW.Area; +import org.axsl.areaW.BlockContainerRA; +import org.axsl.areaW.ContainerRA; +import org.axsl.areaW.GenericContainer; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.TableBodyContainer; +import org.axsl.areaW.TableFooterContainer; +import org.axsl.areaW.TableHeaderContainer; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; @@ -95,7 +95,7 @@ public boolean startsAC(Area area) { Area parent=null; - while ((parent = area.getAreaParent()) != null && + while ((parent = area.getWritableParentArea()) != null && parent.hasChildren() == false) { // The area will be the first non-space child in its parent // Note: it's not added yet! @@ -151,11 +151,11 @@ */ ContainerRA areaContainer = null; if (node instanceof TableBody) { - areaContainer = new TableBodyContainer((TableBody) node, area); + areaContainer = area.makeTableBodyContainer((TableBody) node); } else if (node instanceof TableHeader) { - areaContainer = new TableHeaderContainer((TableHeader) node, area); + areaContainer = area.makeTableHeaderContainer((TableHeader) node); } else if (node instanceof TableFooter) { - areaContainer = new TableFooterContainer((TableFooter) node, area); + areaContainer = area.makeTableFooterContainer((TableFooter) node); } areaContainerRef = new WeakReference(areaContainer); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.BlockContainer; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.NormalBlockArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; @@ -96,7 +96,7 @@ setProgress(0); } - blockArea = new NormalBlockArea(node, area); + blockArea = area.makeNormalBlockArea(node); int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Character; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.areaW.FOLinkage; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ExternalGraphic; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,9 +24,9 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; -import org.foray.area.NormalBlockArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.AreaNode; import org.axsl.areaW.AreaWException; @@ -193,7 +193,7 @@ return Status.OK; } // It did not fit on the line. Create new line & try again. - NormalBlockArea blockArea = (NormalBlockArea) lineArea.getParentArea(); + NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); lineArea = (LineArea) blockArea.createNextLineArea(); if (lineArea == null) { return Status.AREA_FULL_SOME; @@ -220,14 +220,14 @@ if (area instanceof NormalBlockArea) { blockArea = (NormalBlockArea) area; } else { - blockArea = area.ancestorNormalBlockArea(); + blockArea = area.ancestorWritableNormalBlockArea(); } if (blockArea == null) { FObj fobj = area.traitGeneratedBy(); throw new AreaWException("Layout of inline objects must be inside " + "a block:\n" + fobj.getContextMessage()); } - return blockArea.getCurrentLineArea(); + return blockArea.getWritableCurrentLineArea(); } public FONode getFONode() { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,9 +24,9 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; -import org.foray.area.NormalBlockArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.FOText; @@ -75,7 +75,7 @@ if (la == null) { return start; } - NormalBlockArea ba = la.ancestorNormalBlockArea(); + NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end); while (start != -1) { la = layout.createNextLineArea(ba); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.areaW.FOLinkage; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.NormalFlowRA; -import org.foray.area.PageCollection; +import org.axsl.areaW.NormalFlowRA; +import org.axsl.areaW.PageCollection; import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,11 +24,11 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.FootnoteRA; -import org.foray.area.NormalBlockArea; -import org.foray.area.PageRA; -import org.foray.area.RegionRABody; +import org.axsl.areaW.Area; +import org.axsl.areaW.FootnoteRA; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.PageArea; +import org.axsl.areaW.RegionRABody; import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; @@ -57,7 +57,7 @@ setProgress(0); } NormalBlockArea blockArea = - new NormalBlockArea(node, area); + area.makeNormalBlockArea(node); int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { @@ -73,14 +73,14 @@ return Status.OK; } - public boolean layoutFootnote(PageRA p, Area area) { + public boolean layoutFootnote(PageArea p, Area area) { // FootnoteBody fb = getFO(); try { - RegionRABody bac = p.getRegionRABody(); - FootnoteRA footArea = bac.getFootnoteReferenceArea(); + RegionRABody bac = p.getWritableRegionBody(); + FootnoteRA footArea = bac.getWritableFootnoteReferenceArea(); int oldHeight = footArea.crBPD(); if (!footArea.hasChildren()) { - PageSequence pageSeq = bac.getPage().getPageSequence(); + PageSequence pageSeq = bac.getWritablePage().getPageSequence(); StaticContent separator = pageSeq.getFootnoteSeparator(); if (separator != null) { StaticContentPL staticPL @@ -88,7 +88,7 @@ staticPL.layout(footArea); int diff = footArea.crBPD() - oldHeight; if (bac.getFootnoteState() == 0) { - Area ar = bac.getMainRA(); + Area ar = bac.getWritableMainRA(); decreaseMaxHeight(ar, diff); } oldHeight = footArea.crBPD(); @@ -100,7 +100,7 @@ return false; } if (bac.getFootnoteState() == 0) { - Area ar = bac.getMainRA(); + Area ar = bac.getWritableMainRA(); decreaseMaxHeight(ar, footArea.crBPD() - oldHeight); } } catch (AreaWException exception) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,9 +24,9 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.NormalBlockArea; -import org.foray.area.PageRA; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.PageArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; @@ -72,7 +72,7 @@ } else { FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fbody)); - PageRA page = area.getPage(); + PageArea page = area.getWritablePage(); fbPL.layoutFootnote(page, area); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,9 +24,9 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.ForeignObjectArea; -import org.foray.area.LineArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.ForeignObjectArea; +import org.axsl.areaW.LineArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.InstreamForeignObject; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Leader; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.NormalBlockArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ListBlock; @@ -55,7 +55,7 @@ } } - NormalBlockArea blockArea = new NormalBlockArea(node, area); + NormalBlockArea blockArea = area.makeNormalBlockArea(node); int numChildren = node.childrenFO().size(); for (int i = listBlockPL.getProgress(); i < numChildren; i++) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.AreaFlexible; +import org.axsl.areaW.Area; +import org.axsl.areaW.AreaFlexible; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.Block; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.NormalBlockArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.ListItem; @@ -61,7 +61,7 @@ layout.completeCurrentLineInBlock(area); - NormalBlockArea group = new NormalBlockArea(node, area); + NormalBlockArea group = area.makeNormalBlockArea(node); /* Now lay out the list-item-label inside the new block-area. */ ListItemLabel label = (ListItemLabel)node.childrenFO().get(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -26,7 +26,7 @@ import org.axsl.foR.fo.Marker; -import org.foray.area.Area; +import org.axsl.areaW.Area; public class MarkerPL extends FObjMixedPL { @@ -41,7 +41,7 @@ public int layout(Area area) { Marker node = getReal(); // no layout action desired - area.getPage().registerMarker(node); + area.getWritablePage().registerMarker(node); return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.PageNumberCitation; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,8 +24,8 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.PageNumber; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -25,8 +25,8 @@ package org.foray.pioneer; import org.axsl.areaW.Area; -import org.foray.area.PageRA; -import org.foray.area.PageCollection; +import org.axsl.areaW.PageArea; +import org.axsl.areaW.PageCollection; import org.axsl.foR.fo.PageSequence; @@ -38,7 +38,7 @@ Area findStartingLayoutArea() { PageCollection pc = (PageCollection) this.getLastGeneratedBy(); - PageRA page = (PageRA) pc.getLastChild(); - return page.getRegionRABody().getMainRA(); + PageArea page = (PageArea) pc.getLastChild(); + return page.getWritableRegionBody().getWritableMainRA(); } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,12 +24,12 @@ package org.foray.pioneer; -import org.foray.area.Area; -import org.foray.area.LineArea; -import org.foray.area.NormalBlockArea; -import org.foray.area.NormalFlowRA; -import org.foray.area.PageRA; -import org.foray.area.RegionRABody; +import org.axsl.areaW.Area; +import org.axsl.areaW.LineArea; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.NormalFlowRA; +import org.axsl.areaW.PageArea; +import org.axsl.areaW.RegionRABody; import org.foray.layout.LayoutStrategy; import org.axsl.areaW.AreaWException; @@ -98,7 +98,7 @@ public LineArea createNextLineArea(NormalBlockArea blockArea) throws AreaWException { - blockArea.addLineArea(blockArea.getCurrentLineArea()); + blockArea.addLineArea(blockArea.getWritableCurrentLineArea()); addPendingFootnotes(blockArea); return (LineArea) blockArea.createNextLineArea(); } @@ -112,7 +112,7 @@ for (int i = 0; i < pendingFootnotes.size(); i++) { FootnoteBody fb = (FootnoteBody) pendingFootnotes.get(i); FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fb)); - PageRA page = area.getPage(); + PageArea page = area.getWritablePage(); if (! fbPL.layoutFootnote(page, area)) { page.addPendingFootnote(fb); } @@ -132,7 +132,7 @@ // make pages and layout content int status = Status.UNKNOWN; - PageRA currentPage = null; + PageArea currentPage = null; while (Status.isIncomplete(status)) { boolean isBlankPage = false; @@ -148,7 +148,7 @@ } } /* TODO: Remove cast from following line. */ - PageRA newPage = (PageRA) pageCollection.getNextPage(false, false, + PageArea newPage = (PageArea) pageCollection.getNextPage(false, false, isBlankPage); if (currentPage != null) { List foots = currentPage.getPendingFootnotes(); @@ -161,7 +161,7 @@ * Because of markers, lay out the fo:flow first, then the * static content. This is likely also justifiable because of spec. */ - RegionRABody bodyArea = currentPage.getRegionRABody(); + RegionRABody bodyArea = currentPage.getWritableRegionBody(); FlowPL flowPL = (FlowPL) flow.getProxy(); flowPL.layout(bodyArea); this.formatStaticContent(currentPage); @@ -171,7 +171,7 @@ pageCollection.padPagesAtEnd(); } - public void setPendingFootnotes(PageRA pageArea, List footnotes) { + public void setPendingFootnotes(PageArea pageArea, List footnotes) { pageArea.setPendingFootnotes(footnotes); if (footnotes != null) { for (int i = 0; i < footnotes.size(); i++) { @@ -236,7 +236,7 @@ // if first ColumnArea, empty, _and_ in odd page, // return OK if (!colArea.hasChildren() && (colArea.siblingIndex() == 0) - && (colArea.getPage().getNumber() % 2 != 0)) { + ... [truncated message content] |
|
From: <vic...@us...> - 2006-05-08 21:47:09
|
Revision: 7220 Author: victormote Date: 2006-05-08 14:47:03 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7220&view=rev Log Message: ----------- Clean up style issues. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-08 21:45:08 UTC (rev 7219) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-08 21:47:03 UTC (rev 7220) @@ -29,9 +29,6 @@ import org.axsl.areaW.ContainerRA; import org.axsl.areaW.GenericContainer; import org.axsl.areaW.NormalBlockArea; -import org.axsl.areaW.TableBodyContainer; -import org.axsl.areaW.TableFooterContainer; -import org.axsl.areaW.TableHeaderContainer; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 21:45:08 UTC (rev 7219) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 21:47:03 UTC (rev 7220) @@ -193,7 +193,8 @@ return Status.OK; } // It did not fit on the line. Create new line & try again. - NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); + NormalBlockArea blockArea + = (NormalBlockArea) lineArea.getWritableParentArea(); lineArea = (LineArea) blockArea.createNextLineArea(); if (lineArea == null) { return Status.AREA_FULL_SOME; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 21:45:08 UTC (rev 7219) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 21:47:03 UTC (rev 7220) @@ -148,8 +148,8 @@ } } /* TODO: Remove cast from following line. */ - PageArea newPage = (PageArea) pageCollection.getNextPage(false, false, - isBlankPage); + PageArea newPage = (PageArea) pageCollection.getNextPage(false, + false, isBlankPage); if (currentPage != null) { List foots = currentPage.getPendingFootnotes(); if (foots != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-25 22:13:41
|
Revision: 7257 Author: victormote Date: 2006-05-25 15:13:32 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7257&view=rev Log Message: ----------- Use new axsl methods for bpd computations. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-25 22:13:23 UTC (rev 7256) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-25 22:13:32 UTC (rev 7257) @@ -145,11 +145,7 @@ bDone = true; // Adjust for minimum cell content height - org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); - int minCellHeight = Constants.DIMENSION_AUTO; - if (nearest != null) { - minCellHeight = nearest.crBPD(); - } + int minCellHeight = area.crBPDNearestGeneratedByBlockLevelFO(); minCellHeight = node.getHeight(minCellHeight); if (minCellHeight > cellArea.crBPD()) { cellArea.setProgressionDimension(minCellHeight); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-25 22:13:23 UTC (rev 7256) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-25 22:13:32 UTC (rev 7257) @@ -232,11 +232,7 @@ } } - org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); - int height = Constants.DIMENSION_AUTO; - if (nearest != null) { - height = nearest.crBPD(); - } + int height = area.crBPDNearestGeneratedByBlockLevelFO(); height = node.getHeight(height); if (height != 0) { areaContainer.setProgressionDimension(height); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-25 22:13:23 UTC (rev 7256) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-25 22:13:32 UTC (rev 7257) @@ -155,11 +155,7 @@ AbstractTableContainer container = (AbstractTableContainer) area; TableRowContainer areaContainer = container.makeTableRowContainer(node); - org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); - int height = Constants.DIMENSION_AUTO; - if (nearest != null) { - height = nearest.crBPD(); - } + int height = area.crBPDNearestGeneratedByBlockLevelFO(); height = node.getHeight(height); largestCellHeight = height; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 21:14:36
|
Revision: 7325 Author: victormote Date: 2006-05-30 14:14:30 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7325&view=rev Log Message: ----------- Roll up an unnecessary method. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 20:10:49 UTC (rev 7324) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 21:14:30 UTC (rev 7325) @@ -78,7 +78,9 @@ NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end); while (start != -1) { - la = layout.createNextLineArea(ba); + ba.getWritableCurrentLineArea().verticalAlign(); + la = ba.createNextLineArea(); + if (la == null) { return start; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 20:10:49 UTC (rev 7324) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 21:14:30 UTC (rev 7325) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.axsl.areaW.Area; -import org.axsl.areaW.LineArea; import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.NormalFlowRA; import org.axsl.areaW.PageArea; @@ -98,12 +97,6 @@ area.completeCurrentLine(); } - public LineArea createNextLineArea(NormalBlockArea blockArea) - throws AreaWException { - blockArea.getWritableCurrentLineArea().verticalAlign(); - return (LineArea) blockArea.createNextLineArea(); - } - /** * Runs the formatting of this page sequence into the given area tree */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 22:30:05
|
Revision: 7327 Author: victormote Date: 2006-05-30 15:29:58 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7327&view=rev Log Message: ----------- Conform to axsl changes: Remove layout-related items from interface. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-30 22:15:38 UTC (rev 7326) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-30 22:29:58 UTC (rev 7327) @@ -25,9 +25,9 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; +import org.axsl.areaW.LineArea; import org.axsl.areaW.NormalBlockArea; - -import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; @@ -46,6 +46,8 @@ public int infLoopThreshhold = 50; public boolean breakStatusBeforeChecked = false; + public LineArea currentLineArea; + public BlockPL(FObj realFObj, PioneerLS layout) { super(realFObj, layout); } @@ -144,4 +146,33 @@ return getFO().getFontConsumer(); } + /** + * Get the current line area in this block area. + * This is used to get the current line area for adding + * inline objects. + * This will return null if there is not enough room left + * in the block area to accomodate the line area. + * + * @return the line area to be used to add inline objects + */ + public LineArea getCurrentLineArea(NormalBlockArea blockArea) { + if (this.currentLineArea == null) { + this.currentLineArea = blockArea.createNextLineArea(); + } + return this.currentLineArea; + } + + /** + * Notify this block that the area has completed layout. + * Indicates the the block has been fully laid out, this will + * add (if any) the current line area. + */ + public void completeCurrentLine() { + if (this.currentLineArea == null) { + return; + } + this.currentLineArea.verticalAlign(); + this.currentLineArea = null; + } + } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-30 22:15:38 UTC (rev 7326) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-30 22:29:58 UTC (rev 7327) @@ -196,6 +196,9 @@ NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); lineArea = (LineArea) blockArea.createNextLineArea(); + BlockPL blockPL = this.layout.getBlockPL(blockArea); + blockPL.currentLineArea = lineArea; + if (lineArea == null) { return Status.AREA_FULL_SOME; } @@ -228,7 +231,8 @@ throw new AreaWException("Layout of inline objects must be inside " + "a block:\n" + fobj.getContextMessage()); } - return blockArea.getWritableCurrentLineArea(); + BlockPL blockPL = this.layout.getBlockPL(blockArea); + return blockPL.getCurrentLineArea(blockArea); } public FONode getFONode() { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 22:15:38 UTC (rev 7326) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 22:29:58 UTC (rev 7327) @@ -78,8 +78,10 @@ NormalBlockArea ba = la.ancestorWritableNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end); while (start != -1) { - ba.getWritableCurrentLineArea().verticalAlign(); + BlockPL blockPL = this.layout.getBlockPL(ba); + blockPL.getCurrentLineArea(ba).verticalAlign(); la = ba.createNextLineArea(); + blockPL.currentLineArea = la; if (la == null) { return start; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 22:15:38 UTC (rev 7326) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-30 22:29:58 UTC (rev 7327) @@ -98,8 +98,9 @@ return (BlockPL) block.getProxy(); } - public void completeCurrentLineInBlock(NormalBlockArea area) { - area.completeCurrentLine(); + public void completeCurrentLineInBlock(NormalBlockArea blockArea) { + BlockPL blockPL = getBlockPL(blockArea); + blockPL.completeCurrentLine(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 23:10:15
|
Revision: 7329 Author: victormote Date: 2006-05-30 16:10:09 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7329&view=rev Log Message: ----------- Conform to axsl changes: Allow the AreaTree to overflow to a new page if the client app wants it to. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-30 22:30:09 UTC (rev 7328) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-30 23:10:09 UTC (rev 7329) @@ -155,9 +155,10 @@ * * @return the line area to be used to add inline objects */ - public LineArea getCurrentLineArea(NormalBlockArea blockArea) { + public LineArea getCurrentLineArea(NormalBlockArea blockArea) + throws AreaWException { if (this.currentLineArea == null) { - this.currentLineArea = blockArea.createNextLineArea(); + this.currentLineArea = blockArea.createNextLineArea(false); } return this.currentLineArea; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-30 22:30:09 UTC (rev 7328) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-30 23:10:09 UTC (rev 7329) @@ -195,7 +195,7 @@ // It did not fit on the line. Create new line & try again. NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); - lineArea = (LineArea) blockArea.createNextLineArea(); + lineArea = (LineArea) blockArea.createNextLineArea(false); BlockPL blockPL = this.layout.getBlockPL(blockArea); blockPL.currentLineArea = lineArea; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 22:30:09 UTC (rev 7328) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-30 23:10:09 UTC (rev 7329) @@ -80,7 +80,7 @@ while (start != -1) { BlockPL blockPL = this.layout.getBlockPL(ba); blockPL.getCurrentLineArea(ba).verticalAlign(); - la = ba.createNextLineArea(); + la = ba.createNextLineArea(false); blockPL.currentLineArea = la; if (la == null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-31 16:38:10
|
Revision: 7334 Author: victormote Date: 2006-05-31 09:37:48 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7334&view=rev Log Message: ----------- Add some documentation. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Added Paths: ----------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/package.html Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-31 00:17:29 UTC (rev 7333) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-31 16:37:48 UTC (rev 7334) @@ -25,14 +25,16 @@ package org.foray.pioneer; import org.axsl.areaW.Area; -import org.axsl.areaW.LineArea; -import org.axsl.areaW.NormalBlockArea; - import org.axsl.areaW.AreaNode; import org.axsl.areaW.AreaWException; import org.axsl.areaW.FOLinkage; +import org.axsl.areaW.LineArea; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.TableCellArea; +import org.axsl.areaW.TableRowContainer; import org.axsl.foR.FONode; import org.axsl.foR.FObj; +import org.axsl.foR.fo.TableCell; import org.axsl.text.TextException; import org.axsl.text.line.LineBreaker; import org.axsl.text.line.LineNonText; @@ -121,6 +123,25 @@ return this.layout.getLayoutProxy(node); } + /** + * Each FONodePL subclass implements this method on a manner appropriate + * for its content. + * @param area The Area in which the contents to be laid out by this should + * be placed. + * For example, for {@link TableCellPL} layout method, <code>area</code> + * should be a {@link TableRowContainer}. + * During the layout process, at least one {@link TableCellArea} should be + * created, which is then passed to layout for the children of the + * {@link TableCell} now being laid out. + * @return An integer representing the status of this layout. + * When laying out FOText, this marks the index to the last character that + * was successfully laid out plus one, that is, it marks the next character + * to be laid out. + * For FObj subclasses, this indicates the index to the last child that was + * successfully laid out plus one, that is, it marks the next child that + * should be laid out. + * @throws AreaWException + */ public abstract int layout(Area area) throws AreaWException; public Log getLogger() { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-31 00:17:29 UTC (rev 7333) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-31 16:37:48 UTC (rev 7334) @@ -77,7 +77,24 @@ import java.util.ArrayList; /** - * Class to manage the layout logic. + * <p>The LayoutStrategy implementation for the Pioneer layout strategy. + * The Pioneer layout strategy is an "eager" layout strategy, which is to + * say that it is built more for speed and simplicity than for full + * conformance with the XSL-FO standard. + * The general flow of the Pioneer layout strategy is as follows:</p> + * + * <ul> + * <li>Each parent FO lays its children FOs out within Areas that it creates + * for them, successively traversing deeper into the FOTree until the leaves + * are reached.</li> + * <li>The process of creating new LineAreas is managed by the layout system + * (as opposed to the AreaTree).</li> + * <li>When LineAreas can no longer be created, the status of the item being + * laid out is recorded and control is returned back up the FOTree until the + * PageSequence is reached.</li> + * <li>A new page is created.</li> + * <li>Using the status markers as guides, layout control is returned to the + * place where it previously left off.</li> */ public class PioneerLS extends LayoutStrategy { Added: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/package.html =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/package.html (rev 0) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/package.html 2006-05-31 16:37:48 UTC (rev 7334) @@ -0,0 +1,8 @@ +<html> +<title>Package org.foray.pioneer</title> +<body> +<p>Classes for the Pioneer layout strategy. Pioneer is an "eager" layout +strategy, that is, it generally lays content out immediately and then +presses forward.</p> +</body> +</html> Property changes on: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-31 17:39:33
|
Revision: 7337 Author: victormote Date: 2006-05-31 10:39:26 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7337&view=rev Log Message: ----------- Changes to footnote logic. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-31 17:27:05 UTC (rev 7336) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-31 17:39:26 UTC (rev 7337) @@ -100,9 +100,8 @@ blockArea = area.makeNormalBlockArea(node); - int numChildren = node.childrenFO().size(); - for (int i = getProgress(); i < numChildren; i++) { - FONode fo = (FONode)node.childrenFO().get(i); + for (int i = getProgress(); i < node.getChildCount(); i++) { + FONode fo = node.getFONodeChildAt(i); FONodePL nodePL = this.getLayoutProxy(fo); int status = nodePL.layout(blockArea); if (Status.isIncomplete(status)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-31 17:27:05 UTC (rev 7336) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-31 17:39:26 UTC (rev 7337) @@ -51,7 +51,7 @@ setProgress(0); } int progressAtStart = getProgress(); - int progressAtEnd = addText(node, area, getProgress()); + int progressAtEnd = addText(node, area, progressAtStart); setProgress(progressAtEnd); if (progressAtEnd == -1) { return Status.OK; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-31 17:27:05 UTC (rev 7336) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-31 17:39:26 UTC (rev 7337) @@ -26,7 +26,6 @@ import org.axsl.areaW.Area; import org.axsl.areaW.FootnoteRA; -import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.PageArea; import org.axsl.areaW.RegionRABody; @@ -54,20 +53,18 @@ if (getProgress() == FONodePL.START) { setProgress(0); } - NormalBlockArea blockArea = - area.makeNormalBlockArea(node); + FootnoteRA referenceArea = (FootnoteRA) area; int numChildren = node.childrenFO().size(); for (int i = getProgress(); i < numChildren; i++) { - FONode fo = (FONode)node.childrenFO().get(i); - int status = getLayoutProxy(fo).layout(blockArea); + FONode fo = node.getFONodeChildAt(i); + FONodePL foNodePL = getLayoutProxy(fo); + int status = foNodePL.layout(referenceArea); if (Status.isIncomplete((status))) { resetProgress(); return status; } } - layout.completeCurrentLineInBlock(blockArea); - area.incrementProgressionDimension(blockArea.crBPD()); return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-31 17:27:05 UTC (rev 7336) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-31 17:39:26 UTC (rev 7337) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.axsl.areaW.Area; -import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.PageArea; import org.axsl.areaW.AreaWException; @@ -62,15 +61,11 @@ /* Layout the FootnoteBody. */ FootnoteBody fbody = node.getFootnoteBody(); - // add footnote to current page or next if it can't fit - if (area instanceof NormalBlockArea) { - this.layout.addPendingFootnote(fbody); - } else { - FootnoteBodyPL fbPL - = ((FootnoteBodyPL) getLayoutProxy(fbody)); - PageArea page = area.getWritablePage(); - fbPL.layoutFootnote(page); - } + FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fbody)); + PageArea page = area.getWritablePage(); + /* If the footnote cannot be entirely laid out on the current page, + * it will be added to the list of pending footnotes. */ + fbPL.layoutFootnote(page); return Status.OK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-06 02:57:19
|
Revision: 7404 Author: victormote Date: 2006-06-05 08:47:35 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7404&view=rev Log Message: ----------- Remove dependencies on getHeight() method. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-05 15:36:36 UTC (rev 7403) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-06-05 15:47:35 UTC (rev 7404) @@ -145,8 +145,7 @@ bDone = true; // Adjust for minimum cell content height - int minCellHeight = area.crBPDNearestGeneratedByBlockLevelFO(); - minCellHeight = node.getHeight(minCellHeight); + int minCellHeight = node.traitBPDimensionMin(area.crBPD()); if (minCellHeight > cellArea.crBPD()) { cellArea.setProgressionDimension(minCellHeight); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-05 15:36:36 UTC (rev 7403) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-05 15:47:35 UTC (rev 7404) @@ -232,8 +232,7 @@ } } - int height = area.crBPDNearestGeneratedByBlockLevelFO(); - height = node.getHeight(height); + int height = node.traitBPDimensionOpt(area.crBPD()); if (height != 0) { areaContainer.setProgressionDimension(height); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-05 15:36:36 UTC (rev 7403) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-05 15:47:35 UTC (rev 7404) @@ -155,9 +155,8 @@ AbstractTableContainer container = (AbstractTableContainer) area; TableRowContainer areaContainer = container.makeTableRowContainer(node); - int height = area.crBPDNearestGeneratedByBlockLevelFO(); - height = node.getHeight(height); - largestCellHeight = height; + /* Set a reasonable starting BPD for this row. */ + this.largestCellHeight = node.traitBPDimensionMin(area.crBPD()); // Flag indicaing whether any cell didn't fit in available space boolean someCellDidNotLayoutCompletely = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
