foray-commit Mailing List for FOray (Page 268)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vic...@us...> - 2006-05-08 23:12:48
|
Revision: 7222 Author: victormote Date: 2006-05-08 14:58:50 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7222&view=rev Log Message: ----------- Remove no-longer-needed dependency. Modified Paths: -------------- trunk/foray/foray-layout/.classpath Modified: trunk/foray/foray-layout/.classpath =================================================================== --- trunk/foray/foray-layout/.classpath 2006-05-08 21:53:52 UTC (rev 7221) +++ trunk/foray/foray-layout/.classpath 2006-05-08 21:58:50 UTC (rev 7222) @@ -6,7 +6,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/axslFO-R"/> <classpathentry combineaccessrules="false" kind="src" path="/axslText"/> <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> - <classpathentry combineaccessrules="false" kind="src" path="/axslArea-R"/> <classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/> <classpathentry combineaccessrules="false" kind="src" path="/axslGraphic-R"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 23:12:47
|
Revision: 7221 Author: victormote Date: 2006-05-08 14:53:52 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7221&view=rev Log Message: ----------- Formally remove remaining dependencies on FOray AreaTree. Modified Paths: -------------- trunk/foray/foray-pioneer/.classpath trunk/foray/foray-pioneer/scripts/build.xml Modified: trunk/foray/foray-pioneer/.classpath =================================================================== --- trunk/foray/foray-pioneer/.classpath 2006-05-08 21:47:03 UTC (rev 7220) +++ trunk/foray/foray-pioneer/.classpath 2006-05-08 21:53:52 UTC (rev 7221) @@ -3,7 +3,6 @@ <classpathentry excluding=".#*" kind="src" path="src/java"/> <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/FOrayAreaTree"/> <classpathentry kind="src" path="/axslFont-R"/> <classpathentry kind="src" path="/axslGraphic-R"/> <classpathentry kind="src" path="/axslArea-R"/> Modified: trunk/foray/foray-pioneer/scripts/build.xml =================================================================== --- trunk/foray/foray-pioneer/scripts/build.xml 2006-05-08 21:47:03 UTC (rev 7220) +++ trunk/foray/foray-pioneer/scripts/build.xml 2006-05-08 21:53:52 UTC (rev 7221) @@ -45,9 +45,6 @@ <fileset dir="${foray.home}/foray-layout/build/ant"> <include name="*.jar"/> </fileset> - <fileset dir="${foray.home}/foray-areatree/build/ant"> - <include name="*.jar"/> - </fileset> </path> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 23:12:16
|
Revision: 7223 Author: victormote Date: 2006-05-08 15:42:56 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7223&view=rev Log Message: ----------- Steps toward making page queuing event-based. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-08 21:58:50 UTC (rev 7222) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-08 22:42:56 UTC (rev 7223) @@ -26,7 +26,6 @@ import org.foray.area.AreaTree; import org.foray.area.AreaTreeControl; -import org.foray.area.PageRA; import org.foray.font.FOrayFontConsumer; import org.foray.font.FOrayFontServer; import org.foray.layout.LayoutStrategy; @@ -37,6 +36,8 @@ import org.axsl.areaR.AreaRException; import org.axsl.areaR.PageArea; +import org.axsl.areaW.AreaTreeEvent; +import org.axsl.areaW.AreaTreeListener; import org.axsl.areaW.AreaWException; import org.axsl.foR.FOTreeEvent; import org.axsl.foR.FOTreeListener; @@ -66,7 +67,7 @@ FOTreeBuilder when a PageSequence is created, and AreaTree when a Page is formatted.<P> */ -public class FOrayTarget implements FOTreeListener, +public class FOrayTarget implements FOTreeListener, AreaTreeListener, AreaTreeControl, OutputControl { private static final boolean MEM_PROFILE_WITH_GC = false; @@ -305,8 +306,23 @@ return this.areaTree; } - public synchronized void queuePage(PageRA page) throws AreaWException { + public void pageComplete(AreaTreeEvent event) { + org.axsl.areaW.PageArea page = event.getPage(); + org.axsl.areaR.PageArea pageToRender = (PageArea) page; + try { + queuePage(pageToRender); + } catch (AreaWException e) { + /* TODO: Do something better with this. */ + e.printStackTrace(); + } + } + public void areaTreeComplete(AreaTreeEvent event) { + /* We currently ignore this event. */ + } + + public synchronized void queuePage(PageArea page) throws AreaWException { + /* * We run the pages through a queue because any page page that contains * an unresolved ref-id prevents subsequent pages from being rendered. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-08 21:58:50 UTC (rev 7222) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-08 22:42:56 UTC (rev 7223) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.PageArea; import org.axsl.areaW.AreaWException; /** @@ -37,6 +38,6 @@ * (presumable renders it). * @param page The PageRA instance to be processed. */ - public void queuePage(PageRA page) throws AreaWException ; + public void queuePage(PageArea page) throws AreaWException ; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 23:11:47
|
Revision: 7224 Author: victormote Date: 2006-05-08 16:06:41 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7224&view=rev Log Message: ----------- Add methods to register and unregister Listeners and to actually fire the events. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-08 22:42:56 UTC (rev 7223) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-08 23:06:41 UTC (rev 7224) @@ -25,8 +25,10 @@ package org.foray.area; import org.axsl.areaW.Area; - +import org.axsl.areaW.AreaTreeEvent; +import org.axsl.areaW.AreaTreeListener; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.PageArea; import org.axsl.foR.FObj; import org.axsl.foR.fo.Bookmark; import org.axsl.foR.fo.BookmarkTitle; @@ -47,8 +49,6 @@ public class AreaTree extends NonArea implements org.axsl.areaR.AreaTree, org.axsl.areaW.AreaTree { - /** The AreaTreeControl implementation that controls this AreaTree. */ - AreaTreeControl control; private FontConsumer fontConsumer; private TextServer textServer; private Log logger; @@ -63,10 +63,15 @@ */ public ArrayList pageCollectionsProcessed = new ArrayList(); - public AreaTree(Root root, AreaTreeControl control, - FontConsumer fontConsumer, TextServer textServer, Log logger) { + /** + * Collection of objects that have registered to be notified about + * {@link AreaTreeEvent} firings. + */ + private ArrayList areaTreeListeners = new ArrayList(); + + public AreaTree(Root root, FontConsumer fontConsumer, TextServer textServer, + Log logger) { super(root, null); - this.control = control; this.fontConsumer = fontConsumer; this.textServer = textServer; this.logger = logger; @@ -85,14 +90,6 @@ return pageCollection; } - /** - * Overrides method in Area, because this knows how to return the - * AreaTreeControl directly. - */ - public AreaTreeControl getAreaTreeControl() { - return this.control; - } - public FontConsumer getFontConsumer() { return this.fontConsumer; } @@ -187,4 +184,61 @@ return (Area) proxy.firstNormalAreaReturned(); } + /** + * Add an object to the list of listeners to be notified about + * {@link AreaTreeEvent} firings. + * @param listener The listener to be registered. + */ + public void registerListener (AreaTreeListener listener) { + if (listener == null) { + return; + } + areaTreeListeners.add(listener); + } + + /** + * Remove an object from the list of listeners to be notified about + * {@link AreaTreeEvent} firings. + * @param listener The listener to be unregistered. + */ + public void unRegisterListener (AreaTreeListener listener) { + if (listener == null) { + return; + } + areaTreeListeners.remove(listener); + } + + /** + * Notify all listeners that a "Page Complete" event has been fired. + * @param page The PageArea instance that was just completed. + */ + protected void notifyFObjComplete(PageArea page) { + /* If nobody wants these events, don't waste resources creating + * them. */ + if (areaTreeListeners.size() < 1) { + return; + } + AreaTreeEvent event = new AreaTreeEvent(this, page); + notifyListeners(event); + } + + /** + * Notify all listeners that a "Document Complete" event has been fired. + */ + protected void notifyDocumentComplete() { + AreaTreeEvent event = new AreaTreeEvent(this); + notifyListeners(event); + } + + /** + * @param event + */ + private void notifyListeners(AreaTreeEvent event) { + for (int i = 0; i < this.areaTreeListeners.size(); i++) { + AreaTreeListener listener = (AreaTreeListener) + this.areaTreeListeners.get(i); + listener.pageComplete(event); + } + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
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-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)) { + && (colArea.getWritablePage().getNumber() % 2 != 0)) { return Status.OK; } return Status.FORCE_PAGE_BREAK_ODD; @@ -245,7 +245,7 @@ // if first ColumnArea, empty, _and_ in even page, // return OK if (!colArea.hasChildren() && (colArea.siblingIndex() == 0) - && (colArea.getPage().getNumber() % 2 == 0)) { + && (colArea.getWritablePage().getNumber() % 2 == 0)) { return Status.OK; } return Status.FORCE_PAGE_BREAK_EVEN; 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-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.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.PageRA; +import org.axsl.areaW.Area; +import org.axsl.areaW.PageArea; import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; @@ -50,7 +50,7 @@ * about tracking or setting progress at all. It either fits or it * doesn't. */ RetrieveMarker node = getFO(); - PageRA containingPage = area.getPage(); + PageArea containingPage = area.getWritablePage(); Marker bestMarker = containingPage.bestMarker(node); if (bestMarker == null) { 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-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.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/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.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.TableCellRA; -import org.foray.area.TableRowContainer; +import org.axsl.areaW.Area; +import org.axsl.areaW.TableCellArea; +import org.axsl.areaW.TableRowContainer; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; @@ -35,7 +35,7 @@ public class TableCellPL extends FObjPL { - public TableCellRA areaContainer; + public TableCellArea areaContainer; /** * Set to true if all content completely laid out. @@ -122,7 +122,7 @@ } TableRowContainer tableRow = (TableRowContainer) area; - TableCellRA cellArea = new TableCellRA(node, tableRow); + TableCellArea cellArea = tableRow.makeTableCellArea(node); areaContainer = cellArea; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.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.TableColumnRA; -import org.foray.area.TableRA; +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; @@ -34,7 +34,7 @@ public class TableColumnPL extends FObjPL { - public TableColumnRA areaContainer; + public TableColumnArea areaContainer; /** * The offset, in millipoints, for this column, relative to the start @@ -58,14 +58,14 @@ public int layout(Area area) throws AreaWException { TableColumn node = getFO(); - TableRA tableArea = (TableRA) area; + TableArea tableArea = (TableArea) area; Table table = node.getNearestTable(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } int columnNumber = table.getTableColumnIndex(node); if (tableArea.getResolvedColumnWidth(columnNumber) > 0) { - TableColumnRA areaContainer = new TableColumnRA(node, tableArea); + TableColumnArea areaContainer = tableArea.makeTableColumnArea(node); areaContainer.setProgressionDimension(area.crBPD()); } 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-05-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.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.TableRA; +import org.axsl.areaW.Area; +import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.TableArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; @@ -93,7 +93,7 @@ } // Hack alert! - TableRA areaContainer = new TableRA(node, area); + TableArea areaContainer = area.makeTableArea(node); boolean addedHeader = false; boolean addedFooter = false; @@ -282,7 +282,7 @@ return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(); } - public void setupColumnHeights(Table table, TableRA areaContainer) { + public void setupColumnHeights(Table table, TableArea areaContainer) { for (int i = 0; i < table.getTableColumns().size(); i++) { TableColumn c = (TableColumn) table.getTableColumns().get(i); TableColumnPL tablecolumnPL = (TableColumnPL) getLayoutProxy(c); @@ -292,7 +292,7 @@ } } - public int calcFixedColumnWidths(TableRA tableArea, + public int calcFixedColumnWidths(TableArea tableArea, int maxAllocationWidth) { Table node = getFO(); int tableWidth = node.getWidth(maxAllocationWidth); 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-08 21:42:01 UTC (rev 7218) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-08 21:45:08 UTC (rev 7219) @@ -24,9 +24,9 @@ package org.foray.pioneer; -import org.foray.area.AbstractTableContainer; -import org.foray.area.Area; -import org.foray.area.TableRowContainer; +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; @@ -153,7 +153,7 @@ } AbstractTableContainer container = (AbstractTableContainer) area; - TableRowContainer areaContainer = new TableRowContainer(node, container); + TableRowContainer areaContainer = container.makeTableRowContainer(node); org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); int height = Constants.DIMENSION_AUTO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 21:42:11
|
Revision: 7218 Author: victormote Date: 2006-05-08 14:42:01 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7218&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-05-08 21:35:17 UTC (rev 7217) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-05-08 21:42:01 UTC (rev 7218) @@ -24,7 +24,9 @@ package org.foray.area; +import org.axsl.areaW.TableRowContainer; import org.axsl.foR.FObj; +import org.axsl.foR.fo.TableRow; public abstract class AbstractTableContainer extends GenericContainer implements org.axsl.areaW.AbstractTableContainer { @@ -33,4 +35,8 @@ super(generatedBy, parentArea); } + public TableRowContainer makeTableRowContainer(TableRow node) { + return new org.foray.area.TableRowContainer(node, this); + } + } 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-08 21:35:17 UTC (rev 7217) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-08 21:42:01 UTC (rev 7218) @@ -153,8 +153,7 @@ } AbstractTableContainer container = (AbstractTableContainer) area; - TableRowContainer areaContainer = new TableRowContainer(node, - container); + TableRowContainer areaContainer = new TableRowContainer(node, container); org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); int height = Constants.DIMENSION_AUTO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 21:35:30
|
Revision: 7217 Author: victormote Date: 2006-05-08 14:35:17 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7217&view=rev Log Message: ----------- Implement new axsl interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Added Paths: ----------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java Added: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java (rev 0) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-05-08 21:35:17 UTC (rev 7217) @@ -0,0 +1,36 @@ +/* + * 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.area; + +import org.axsl.foR.FObj; + +public abstract class AbstractTableContainer extends GenericContainer + implements org.axsl.areaW.AbstractTableContainer { + + public AbstractTableContainer(FObj generatedBy, Area parentArea) { + super(generatedBy, parentArea); + } + +} Property changes on: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-08 21:14:21 UTC (rev 7216) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-08 21:35:17 UTC (rev 7217) @@ -26,7 +26,7 @@ import org.axsl.foR.FObj; -public class TableBodyContainer extends GenericContainer +public class TableBodyContainer extends AbstractTableContainer implements org.axsl.areaR.TableBodyContainer, org.axsl.areaW.TableBodyContainer { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-08 21:14:21 UTC (rev 7216) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-08 21:35:17 UTC (rev 7217) @@ -26,7 +26,7 @@ import org.axsl.foR.FObj; -public class TableFooterContainer extends GenericContainer +public class TableFooterContainer extends AbstractTableContainer implements org.axsl.areaR.TableFooterContainer, org.axsl.areaW.TableFooterContainer { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-08 21:14:21 UTC (rev 7216) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-08 21:35:17 UTC (rev 7217) @@ -26,7 +26,7 @@ import org.axsl.foR.FObj; -public class TableHeaderContainer extends GenericContainer +public class TableHeaderContainer extends AbstractTableContainer implements org.axsl.areaR.TableHeaderContainer, org.axsl.areaW.TableHeaderContainer { 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-08 21:14:21 UTC (rev 7216) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-08 21:35:17 UTC (rev 7217) @@ -24,6 +24,7 @@ package org.foray.pioneer; +import org.foray.area.AbstractTableContainer; import org.foray.area.Area; import org.foray.area.TableRowContainer; @@ -151,7 +152,9 @@ } } - TableRowContainer areaContainer = new TableRowContainer(node, area); + AbstractTableContainer container = (AbstractTableContainer) area; + TableRowContainer areaContainer = new TableRowContainer(node, + container); org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); int height = Constants.DIMENSION_AUTO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 21:14:25
|
Revision: 7216 Author: victormote Date: 2006-05-08 14:14:21 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7216&view=rev Log Message: ----------- Minor refactoring to assist in conversion. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 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-08 21:07:46 UTC (rev 7215) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-08 21:14:21 UTC (rev 7216) @@ -153,7 +153,12 @@ TableRowContainer areaContainer = new TableRowContainer(node, area); - int height = node.getHeight(area.heightNearestGenByBlockLevelFO()); + org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); + int height = Constants.DIMENSION_AUTO; + if (nearest != null) { + height = nearest.crBPD(); + } + height = node.getHeight(height); largestCellHeight = height; // Flag indicaing whether any cell didn't fit in available space This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 20:38:45
|
Revision: 7214 Author: victormote Date: 2006-05-08 13:38:25 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7214&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 20:25:03 UTC (rev 7213) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 20:38:25 UTC (rev 7214) @@ -399,12 +399,12 @@ return ancestorLineArea(); } - public TableRA ancestorTableRA() { + public org.axsl.areaW.TableArea ancestorTableArea() { AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } - return parent.ancestorTableRA(); + return parent.ancestorTableArea(); } public PageCollection ancestorPageCollection() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-08 20:25:03 UTC (rev 7213) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-08 20:38:25 UTC (rev 7214) @@ -24,10 +24,10 @@ package org.foray.area; -import org.axsl.foR.fo.TableCell; - import org.axsl.areaR.TableCellArea; +import org.axsl.areaW.TableArea; import org.axsl.common.Constants; +import org.axsl.foR.fo.TableCell; public class TableCellRA extends ContainerRA implements TableCellArea, org.axsl.areaW.TableCellArea { @@ -145,7 +145,7 @@ * columns. */ public int getProgressionDimension() { - TableRA tableRA = this.ancestorTableRA(); + TableArea tableRA = this.ancestorTableArea(); int startingColumn = this.traitGeneratedBy().traitColumnNumber(); int span = this.traitGeneratedBy().traitNumberColumnsSpanned(); return tableRA.ipdCell(startingColumn, span); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-08 20:25:03 UTC (rev 7213) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-08 20:38:25 UTC (rev 7214) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.TableColumnArea; +import org.axsl.areaW.TableArea; import org.axsl.foR.FObj; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; @@ -42,7 +43,7 @@ public int getComputedColumnWidth() { TableColumn column = (TableColumn) traitGeneratedBy(); - TableRA tableArea = this.ancestorTableRA(); + TableArea tableArea = this.ancestorTableArea(); Table table = (Table) tableArea.traitGeneratedBy(); int columnNum = table.getTableColumnIndex(column); return tableArea.getResolvedColumnWidth(columnNum); 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-08 20:25:03 UTC (rev 7213) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-08 20:38:25 UTC (rev 7214) @@ -25,10 +25,10 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.TableRA; import org.foray.area.TableRowContainer; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.TableArea; import org.axsl.common.Constants; import org.axsl.foR.Keep; import org.axsl.foR.fo.TableCell; @@ -177,7 +177,7 @@ TableCell cell; TableCellPL cellPL; ++iColIndex; - TableRA tableArea = area.ancestorTableRA(); + TableArea tableArea = area.ancestorTableArea(); int colWidth = tableArea.getResolvedColumnWidth(i); if (cellArray.getCellType(iColIndex) == RowCellArray.CELLSTART) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 20:11:46
|
Revision: 7211 Author: victormote Date: 2006-05-08 13:11:38 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7211&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 20:04:57 UTC (rev 7210) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 20:11:38 UTC (rev 7211) @@ -26,12 +26,14 @@ import org.axsl.areaW.AreaWException; import org.axsl.areaW.NormalBlockArea; +import org.axsl.areaW.TableArea; import org.axsl.areaW.TableFooterContainer; import org.axsl.areaW.TableHeaderContainer; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; import org.axsl.foR.fo.BasicLink; +import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableBody; import org.axsl.foR.fo.TableFooter; import org.axsl.foR.fo.TableHeader; @@ -1180,6 +1182,10 @@ return new org.foray.area.TableFooterContainer(tableFooter, this); } + public TableArea makeTableArea(Table table) { + return new org.foray.area.TableRA(table, this); + } + public NormalBlockArea makeNormalBlockArea(FObj fobj) { return new org.foray.area.NormalBlockArea(fobj, this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 20:05:05
|
Revision: 7210 Author: victormote Date: 2006-05-08 13:04:57 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7210&view=rev Log Message: ----------- Minor refactoring to assist in conversion. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-05-08 20:01:38 UTC (rev 7209) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-05-08 20:04:57 UTC (rev 7210) @@ -58,13 +58,14 @@ public int layout(Area area) throws AreaWException { TableColumn node = getFO(); + TableRA tableArea = (TableRA) area; Table table = node.getNearestTable(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } int columnNumber = table.getTableColumnIndex(node); - if (((TableRA) area).getResolvedColumnWidth(columnNumber) > 0) { - TableColumnRA areaContainer = new TableColumnRA(node, area); + if (tableArea.getResolvedColumnWidth(columnNumber) > 0) { + TableColumnRA areaContainer = new TableColumnRA(node, tableArea); areaContainer.setProgressionDimension(area.crBPD()); } 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-05-08 19:47:43
|
Revision: 7207 Author: victormote Date: 2006-05-08 12:47:37 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7207&view=rev Log Message: ----------- Minor refactoring to assist in conversion. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.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-08 19:42:01 UTC (rev 7206) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-08 19:47:37 UTC (rev 7207) @@ -145,8 +145,9 @@ bDone = true; // Adjust for minimum cell content height - int minCellHeight = node.getHeight( - area.heightNearestGenByBlockLevelFO()); + org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); + int minCellHeight = nearest.crBPD(); + minCellHeight = node.getHeight(minCellHeight); if (minCellHeight > cellArea.crBPD()) { cellArea.setProgressionDimension(minCellHeight); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 19:36:57
|
Revision: 7205 Author: victormote Date: 2006-05-08 12:36:49 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7205&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-08 19:23:22 UTC (rev 7204) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-08 19:36:49 UTC (rev 7205) @@ -24,7 +24,9 @@ package org.foray.area; +import org.axsl.areaW.TableCellArea; import org.axsl.foR.WritingMode; +import org.axsl.foR.fo.TableCell; import org.axsl.foR.fo.TableRow; @@ -61,4 +63,8 @@ return super.crOriginBPDOffset(); } + public TableCellArea makeTableCellArea(TableCell node) { + return new TableCellRA(node, this); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 19:12:15
|
Revision: 7203 Author: victormote Date: 2006-05-08 12:12:08 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7203&view=rev Log Message: ----------- Implement new interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-08 18:29:23 UTC (rev 7202) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-08 19:12:08 UTC (rev 7203) @@ -29,7 +29,8 @@ import org.axsl.areaR.TableCellArea; import org.axsl.common.Constants; -public class TableCellRA extends ContainerRA implements TableCellArea { +public class TableCellRA extends ContainerRA implements TableCellArea, + org.axsl.areaW.TableCellArea { /* * Adjustments to padding that are due to centering. (Probably only used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 18:29:31
|
Revision: 7202 Author: victormote Date: 2006-05-08 11:29:23 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7202&view=rev Log Message: ----------- Add currently unnecessary casting in preparation for conversion. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.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 18:20:56 UTC (rev 7201) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-08 18:29:23 UTC (rev 7202) @@ -151,11 +151,11 @@ */ ContainerRA areaContainer = null; if (node instanceof TableBody) { - areaContainer = new TableBodyContainer(node, area); + areaContainer = new TableBodyContainer((TableBody) node, area); } else if (node instanceof TableHeader) { - areaContainer = new TableHeaderContainer(node, area); + areaContainer = new TableHeaderContainer((TableHeader) node, area); } else if (node instanceof TableFooter) { - areaContainer = new TableFooterContainer(node, area); + areaContainer = new TableFooterContainer((TableFooter) node, area); } areaContainerRef = new WeakReference(areaContainer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 18:21:07
|
Revision: 7201 Author: victormote Date: 2006-05-08 11:20:56 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7201&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java trunk/foray/foray-layout/.classpath Modified: trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-05-08 17:50:36 UTC (rev 7200) +++ trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-05-08 18:20:56 UTC (rev 7201) @@ -39,7 +39,8 @@ * javax.swing.tree.DefaultMutableTreeNode instead of creating this class. * However, the data portion of that class was not deemed suitable.</p> */ -public abstract class OrderedTreeNode implements TreeNode { +public abstract class OrderedTreeNode + implements org.axsl.common.OrderedTreeNode { /** * An enumeration that is always empty. This is used when an enumeration @@ -163,7 +164,7 @@ * @return Return the sibling immediately preceding "this" in the parent's * children, or null if this is the first child. */ - public OrderedTreeNode getPreviousSibling() { + public org.axsl.common.OrderedTreeNode getPreviousSibling() { int mySiblingIndex = siblingIndex(); if (mySiblingIndex < 1) { return null; @@ -175,7 +176,7 @@ * @return Return the sibling immediately following "this" in the parent's * children, or null if this is the last child. */ - public OrderedTreeNode getNextSibling() { + public org.axsl.common.OrderedTreeNode getNextSibling() { int mySiblingIndex = siblingIndex(); if (mySiblingIndex < 0) { return null; @@ -201,7 +202,7 @@ return false; } - public OrderedTreeNode getFirstChild() { + public org.axsl.common.OrderedTreeNode getFirstChild() { List children = getChildren(); if (children == null) { return null; @@ -212,7 +213,7 @@ return (OrderedTreeNode) children.get(0); } - public OrderedTreeNode getLastChild() { + public org.axsl.common.OrderedTreeNode getLastChild() { List children = getChildren(); if (children == null) { return null; @@ -228,12 +229,12 @@ * pre-order traversal order. This is also known as breadth-first order. * @return The next pre-order node, or null if there is none. */ - public OrderedTreeNode nextPreOrderNode() { + public org.axsl.common.OrderedTreeNode nextPreOrderNode() { // Any children? if (getChildCount() > 0) { return (OrderedTreeNode) getChildren().get(0); } - OrderedTreeNode currentNode = this; + org.axsl.common.OrderedTreeNode currentNode = this; while (currentNode != null) { currentNode = currentNode.getNextSibling(); if (currentNode != null) { @@ -256,8 +257,8 @@ * @see DefaultMutableTreeNode#isNodeDescendant * @return the first leaf in the subtree rooted at this node */ - public OrderedTreeNode getFirstLeaf() { - OrderedTreeNode node = this; + public org.axsl.common.OrderedTreeNode getFirstLeaf() { + org.axsl.common.OrderedTreeNode node = this; while (!node.isLeaf()) { node = node.getFirstChild(); } @@ -275,8 +276,8 @@ * @see DefaultMutableTreeNode#isNodeDescendant * @return the last leaf in the subtree rooted at this node */ - public OrderedTreeNode getLastLeaf() { - OrderedTreeNode node = this; + public org.axsl.common.OrderedTreeNode getLastLeaf() { + org.axsl.common.OrderedTreeNode node = this; while (!node.isLeaf()) { node = node.getLastChild(); } @@ -304,8 +305,8 @@ * @see #isLeaf * @return returns the next leaf past this node */ - public OrderedTreeNode getNextLeaf() { - OrderedTreeNode nextSibling; + public org.axsl.common.OrderedTreeNode getNextLeaf() { + org.axsl.common.OrderedTreeNode nextSibling; OrderedTreeNode myParent = (OrderedTreeNode) getParent(); if (myParent == null) { return null; @@ -338,8 +339,8 @@ * @see #isLeaf * @return returns the leaf before this node */ - public OrderedTreeNode getPreviousLeaf() { - OrderedTreeNode previousSibling; + public org.axsl.common.OrderedTreeNode getPreviousLeaf() { + org.axsl.common.OrderedTreeNode previousSibling; OrderedTreeNode myParent = (OrderedTreeNode) getParent(); if (myParent == null) { return null; Modified: trunk/foray/foray-layout/.classpath =================================================================== --- trunk/foray/foray-layout/.classpath 2006-05-08 17:50:36 UTC (rev 7200) +++ trunk/foray/foray-layout/.classpath 2006-05-08 18:20:56 UTC (rev 7201) @@ -10,5 +10,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/> <classpathentry combineaccessrules="false" kind="src" path="/axslGraphic-R"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> 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:58:31
|
Revision: 7175 Author: victormote Date: 2006-05-07 12:00:17 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7175&view=rev Log Message: ----------- Implement new axsl interfaces. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -30,7 +30,8 @@ * Areas generated by the fo:basic-link object. */ public class BasicLinkArea extends AbstractInlineArea - implements org.axsl.areaR.BasicLinkArea { + implements org.axsl.areaR.BasicLinkArea, + org.axsl.areaW.BasicLinkArea { public BasicLinkArea(BasicLink generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -29,7 +29,8 @@ import org.axsl.graphicR.Graphic; public class ExternalGraphicArea extends AbstractInlineArea - implements org.axsl.areaR.ExternalGraphicArea { + implements org.axsl.areaR.ExternalGraphicArea, + org.axsl.areaW.ExternalGraphicArea { public ExternalGraphicArea(ExternalGraphic generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -29,7 +29,8 @@ import org.axsl.foR.svg.SVGElement; public class ForeignObjectArea extends AbstractInlineArea - implements org.axsl.areaR.ForeignObjectArea { + implements org.axsl.areaR.ForeignObjectArea, + org.axsl.areaW.ForeignObjectArea { public ForeignObjectArea(InstreamForeignObject generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -30,7 +30,8 @@ * Areas generated by the fo:inline object. */ public class InlineArea extends AbstractInlineArea - implements org.axsl.areaR.InlineArea { + implements org.axsl.areaR.InlineArea, + org.axsl.areaW.InlineArea { public InlineArea(Inline generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -53,7 +53,8 @@ * </ul> */ public class LeaderArea extends AbstractInlineArea - implements org.axsl.areaR.LeaderArea { + implements org.axsl.areaR.LeaderArea, + org.axsl.areaW.LeaderArea { public LeaderArea(Leader generatedBy, Area parentArea, int initialProgressionDimension) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -30,7 +30,8 @@ * The normal inline-area created by an fo:page-number object. */ public class PageNumberArea extends AbstractInlineArea - implements org.axsl.areaR.PageNumberArea { + implements org.axsl.areaR.PageNumberArea, + org.axsl.areaW.PageNumberArea { public PageNumberArea(FObj generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -27,7 +27,8 @@ import org.axsl.foR.FObj; public class PageNumberCitationArea extends AbstractInlineArea - implements org.axsl.areaR.PageNumberCitationArea { + implements org.axsl.areaR.PageNumberCitationArea, + org.axsl.areaW.PageNumberCitationArea { public PageNumberCitationArea(FObj generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-05-07 18:36:02 UTC (rev 7174) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-05-07 19:00:17 UTC (rev 7175) @@ -51,7 +51,7 @@ * However , a TextSegment always springs from exactly one FOText node. */ public class TextArea extends AbstractInlineArea - implements org.axsl.areaR.TextArea { + implements org.axsl.areaR.TextArea, org.axsl.areaW.TextArea { /** * Index into the Collection of the children of the generated-by that 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:56:41
|
Revision: 7155 Author: victormote Date: 2006-05-06 16:06:09 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7155&view=rev Log Message: ----------- Add new package skeleton for generic layout classes. Added Paths: ----------- trunk/foray/foray-layout/ trunk/foray/foray-layout/.checkstyle trunk/foray/foray-layout/.project trunk/foray/foray-layout/scripts/ trunk/foray/foray-layout/scripts/build.bat trunk/foray/foray-layout/scripts/build.sh trunk/foray/foray-layout/scripts/build.xml trunk/foray/foray-layout/src/ trunk/foray/foray-layout/src/java/ trunk/foray/foray-layout/src/java/org/ trunk/foray/foray-layout/src/java/org/foray/ trunk/foray/foray-layout/src/java/org/foray/layout/ trunk/foray/foray-layout/src/java/org/foray/layout/package.html Added: trunk/foray/foray-layout/.checkstyle =================================================================== --- trunk/foray/foray-layout/.checkstyle (rev 0) +++ trunk/foray/foray-layout/.checkstyle 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-layout/.project =================================================================== --- trunk/foray/foray-layout/.project (rev 0) +++ trunk/foray/foray-layout/.project 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>FOrayLayout</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + </natures> +</projectDescription> Added: trunk/foray/foray-layout/scripts/build.bat =================================================================== --- trunk/foray/foray-layout/scripts/build.bat (rev 0) +++ trunk/foray/foray-layout/scripts/build.bat 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,27 @@ +@echo off + +echo "FOray Build System" +echo "------------------" + +IF "%JAVA_HOME%" == "" GOTO JAVA_HOME_ERR +IF "%ANT_HOME%" == "" GOTO ANT_HOME_ERR + +call %ANT_HOME%\bin\ant.bat %* + +GOTO END + +:JAVA_HOME_ERR + echo ERROR: JAVA_HOME not found in your environment. + echo + echo Please set the JAVA_HOME variable in your environment to match the + echo location of the Java Virtual Machine you want to use. +GOTO END + +:ANT_HOME_ERR + echo ERROR: ANT_HOME not found in your environment. + echo + echo Please set the ANT_HOME variable in your environment to match the + echo location of the root of your ANT installation. +GOTO END + +:END Added: trunk/foray/foray-layout/scripts/build.sh =================================================================== --- trunk/foray/foray-layout/scripts/build.sh (rev 0) +++ trunk/foray/foray-layout/scripts/build.sh 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,29 @@ +#!/bin/sh + +# This file must be executable. + +echo +echo "FOray Build System" +echo "------------------" + +if [ "$JAVA_HOME" = "" ] +then + echo "ERROR: JAVA_HOME not found in your environment." + echo + echo "Please set the JAVA_HOME variable in your environment to match the" + echo "location of the Java Virtual Machine you want to use." + exit 1 +fi + +if [ "$ANT_HOME" = "" ] +then + echo "ERROR: ANT_HOME not found in your environment." + echo + echo "Please set the ANT_HOME variable in your environment to match the" + echo "location of the root of your ANT installation." + exit 1 +fi + +"$ANT_HOME"/bin/ant "$@" + +##### Last Line of $RCSfile$ ##### Property changes on: trunk/foray/foray-layout/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-layout/scripts/build.xml =================================================================== --- trunk/foray/foray-layout/scripts/build.xml (rev 0) +++ trunk/foray/foray-layout/scripts/build.xml 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,173 @@ +<?xml version="1.0"?> +<!-- $Id$ --> + +<project default="package" basedir="."> + + <!-- Set up a prefix to designate environment variables. --> + <property environment="env"/> + + <target name="env"> + <!-- If the environment variable FORAY_CONFIG is set, use it. --> + <condition property="foray.config" value="${env.FORAY_CONFIG}"> + <and> + <isset property="env.FORAY_CONFIG"/> + <available file="${env.FORAY_CONFIG}"/> + </and> + </condition> + <!-- Otherwise, set it to the FOray scripts directory. --> + <property name="foray.config" location="../../scripts"/> + <echo>foray.config: ${foray.config}</echo> + + <!-- Retrieve externally-configured properties. --> + <property file="${foray.config}/foray-build.properties"/> + + <!-- Get a default for {foray.home}. --> + <property name="foray.home" location="../.."/> + <echo>foray.home: ${foray.home}</echo> + + <!-- Set up dependent properties. --> + <property name="lib.dir" location="${foray.home}/lib"/> + <property name="axsl.build" location="${lib.dir}"/> + + <path id="libs-build-classpath"> + <fileset dir="${axsl.build}"> + <include name="**/axsl*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="xml-apis.jar"/> + <include name="batik.jar"/> + <include name="axsl*.jar"/> + <include name="commons-logging.jar"/> + </fileset> + <fileset dir="${foray.home}/foray-common/build/ant"> + <include name="*.jar"/> + </fileset> + </path> + </target> + + <!-- =================================================================== --> + <!-- Initialization target --> + <!-- =================================================================== --> + <target name="init" depends="env"> + <tstamp/> + <property name="name" value="foray"/> + <property name="contact.info" + value="The FOray project http://www.foray.org"/> + <property name="module" value="areatree"/> + <property name="module.dir" value="${foray.home}/foray-${module}"/> + <property name="version" value="0.1"/> + <property name="src.dir" value="${module.dir}/src"/> + <property name="build.dir" value="${module.dir}/build/ant"/> + <property name="classes.dir" value="${build.dir}/classes"/> + <property name="debug" value="on"/> + <property name="optimize" value="off"/> + <property name="deprecation" value="off"/> + <property name="source" value="1.4"/> + </target> + + <!-- =================================================================== --> + <!-- Prepares the build directory --> + <!-- =================================================================== --> + <target name="prepare" depends="init"> + <!-- create directories --> + <echo message="Preparing the build directories"/> + <mkdir dir="${build.dir}"/> + <mkdir dir="${classes.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the source directory --> + <!-- =================================================================== --> + <target name="compile" depends="prepare"> + <echo message="Compiling the sources "/> + <!-- create directories --> + <mkdir dir="${build.dir}"/> + <javac srcdir="${src.dir}" + destdir="${classes.dir}" + debug="${debug}" + deprecation="${deprecation}" + optimize="${optimize}" + source="${source}" + > + <classpath refid="libs-build-classpath"/> + </javac> + </target> + + <!-- =================================================================== --> + <!-- Creates the class package --> + <!-- =================================================================== --> + <target name="package" depends="compile, style" + description="Generates the jar files (default target)"> + <echo message="Creating the jar file ${build.dir}/${name}.jar"/> + + <tstamp> + <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> + </tstamp> + <jar jarfile="${build.dir}/${name}-${module}.jar" + basedir="${classes.dir}" + > + <manifest> + <attribute name="Implementation-Title" value="${name}-${module}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" + value="${contact.info}"/> + </manifest> + </jar> + + </target> + + <target name="javadoc-api" depends="init" description="Creates API + documentation"> + <echo message="Producing the javadoc files "/> + <mkdir dir="${build.dir}/javadoc-api"/> + <javadoc + packagenames="org.foray.area" + sourcepath="${src.dir}/java" + destdir="${build.dir}/javadoc-api" + classpathref="libs-build-classpath" + author="true" + version="true" + windowtitle="FOray AreaTree API" + doctitle="FOray AreaTree API" + bottom="Copyright © 2004 The FOray Project. All Rights Reserved." + overview="${src.dir}/java/org/foray/area/overview.html" + use="true" + access="public" + failonerror="true"> + <classpath refid="libs-build-classpath"/> + <classpath> + <fileset dir="${lib.dir}"> + <include name="ant*.jar"/> + </fileset> + </classpath> + </javadoc> + </target> + + <!-- =================================================================== --> + <!-- Clean targets --> + <!-- =================================================================== --> + <target name="clean" depends="init" description="Cleans the build directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + +</project> + +<!-- Last Line of $RCSfile$ --> Property changes on: trunk/foray/foray-layout/scripts/build.xml ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-layout/src/java/org/foray/layout/package.html =================================================================== --- trunk/foray/foray-layout/src/java/org/foray/layout/package.html (rev 0) +++ trunk/foray/foray-layout/src/java/org/foray/layout/package.html 2006-05-06 23:06:09 UTC (rev 7155) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.layout</title> +<body> +<p>Generic classes used by actual layout strategies.</p> +</body> +</html> Property changes on: trunk/foray/foray-layout/src/java/org/foray/layout/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-08 17:54:18
|
Revision: 7184 Author: victormote Date: 2006-05-07 16:16:00 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7184&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 22:51:34 UTC (rev 7183) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 23:16:00 UTC (rev 7184) @@ -58,7 +58,7 @@ protected int pageNumber = 0; protected String formattedPageNumber; - public ArrayList footnotes = null; + private ArrayList footnotes = null; private ArrayList markers = null; @@ -158,10 +158,18 @@ return traitGeneratedBy().traitPageWidth(); } - public ArrayList getPendingFootnotes() { + public List getPendingFootnotes() { return footnotes; } + public void setPendingFootnotes(List footnotes) { + if (footnotes instanceof ArrayList) { + this.footnotes = (ArrayList) footnotes; + } else { + this.footnotes = new ArrayList(footnotes); + } + } + public void addPendingFootnote(FootnoteBody fb) { if (footnotes == null) { footnotes = new ArrayList(); 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 22:51:34 UTC (rev 7183) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-07 23:16:00 UTC (rev 7184) @@ -28,12 +28,12 @@ import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; import org.foray.area.NormalFlowRA; -import org.axsl.areaW.PageCollection; import org.foray.area.PageRA; import org.foray.area.RegionRABody; import org.foray.layout.LayoutStrategy; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.PageCollection; import org.axsl.areaW.RegionArea; import org.axsl.common.Constants; import org.axsl.foR.FONode; @@ -75,7 +75,7 @@ import org.apache.commons.logging.Log; -import java.util.ArrayList; +import java.util.List; /** * Class to manage the layout logic. @@ -149,7 +149,7 @@ PageRA newPage = (PageRA) pageCollection.getNextPage(false, false, isBlankPage); if (currentPage != null) { - ArrayList foots = currentPage.getPendingFootnotes(); + List foots = currentPage.getPendingFootnotes(); if (foots != null) { setPendingFootnotes(newPage, foots); } @@ -169,8 +169,8 @@ pageCollection.padPagesAtEnd(); } - public void setPendingFootnotes(PageRA pageArea, ArrayList footnotes) { - pageArea.footnotes = footnotes; + public void setPendingFootnotes(PageRA pageArea, List footnotes) { + pageArea.setPendingFootnotes(footnotes); if (footnotes != null) { for (int i = 0; i < footnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)footnotes.get(i); 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-08 17:46:43
|
Revision: 7182 Author: victormote Date: 2006-05-07 15:41:54 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7182&view=rev Log Message: ----------- Implement writable interface as well. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-07 22:23:19 UTC (rev 7181) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-07 22:41:54 UTC (rev 7182) @@ -33,7 +33,8 @@ * @see SpanRA for comments about FOray's philosophy of creating * span-reference-areas and normal-flow-reference-areas. */ -public class NormalFlowRA extends AreaFlexible implements NormalFlowArea{ +public class NormalFlowRA extends AreaFlexible implements NormalFlowArea, + org.axsl.areaW.NormalFlowRA { public NormalFlowRA(FObj generatedBy, SpanRA parentArea) { super(generatedBy, parentArea); 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:45:51
|
Revision: 7157 Author: victormote Date: 2006-05-06 17:04:01 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7157&view=rev Log Message: ----------- Add Eclipse classpath. Added Paths: ----------- trunk/foray/foray-layout/.classpath Added: trunk/foray/foray-layout/.classpath =================================================================== --- trunk/foray/foray-layout/.classpath (rev 0) +++ trunk/foray/foray-layout/.classpath 2006-05-07 00:04:01 UTC (rev 7157) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayAreaTree"/> + <classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslFO-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslText"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslGraphic-R"/> + <classpathentry kind="output" path="build/eclipse"/> +</classpath> 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:41:49
|
Revision: 7199 Author: victormote Date: 2006-05-08 10:41:39 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7199&view=rev Log Message: ----------- 1. Conform to new axsl methods. 2. Make some instance variables private. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 17:29:00 UTC (rev 7198) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 17:41:39 UTC (rev 7199) @@ -33,6 +33,7 @@ import org.axsl.foR.fo.RegionBody; import java.util.ArrayList; +import java.util.List; /** * This class represents a Block Area. @@ -48,9 +49,9 @@ implements org.axsl.areaR.NormalBlockArea, org.axsl.areaW.NormalBlockArea { - public LineArea currentLineArea; + private LineArea currentLineArea; - public ArrayList pendingFootnotes = null; + private ArrayList pendingFootnotes = null; public NormalBlockArea(FObj parentFObj, Area parentArea) { super(parentFObj, parentArea); @@ -212,4 +213,20 @@ return Math.max(labelBPD, bodyBPD); } + public List getPendingFootnotes() { + return this.pendingFootnotes; + } + + public void setPendingFootnotes(List newFootnotes) { + if (newFootnotes == null) { + this.pendingFootnotes = null; + return; + } + if (newFootnotes instanceof ArrayList) { + this.pendingFootnotes = (ArrayList) newFootnotes; + return; + } + this.pendingFootnotes = new ArrayList(newFootnotes); + } + } 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 17:29:00 UTC (rev 7198) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 17:41:39 UTC (rev 7199) @@ -98,24 +98,26 @@ public LineArea createNextLineArea(NormalBlockArea blockArea) throws AreaWException { - blockArea.addLineArea(blockArea.currentLineArea); + blockArea.addLineArea(blockArea.getCurrentLineArea()); addPendingFootnotes(blockArea); return (LineArea) blockArea.createNextLineArea(); } public void addPendingFootnotes(NormalBlockArea area) { // add pending footnotes - if (area.pendingFootnotes != null) { - for (int i = 0; i < area.pendingFootnotes.size(); i++) { - FootnoteBody fb = (FootnoteBody)area.pendingFootnotes.get(i); - FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fb)); - PageRA page = area.getPage(); - if (! fbPL.layoutFootnote(page, area)) { - page.addPendingFootnote(fb); - } + List pendingFootnotes = area.getPendingFootnotes(); + if (pendingFootnotes == null) { + return; + } + for (int i = 0; i < pendingFootnotes.size(); i++) { + FootnoteBody fb = (FootnoteBody) pendingFootnotes.get(i); + FootnoteBodyPL fbPL = ((FootnoteBodyPL) getLayoutProxy(fb)); + PageRA page = area.getPage(); + if (! fbPL.layoutFootnote(page, area)) { + page.addPendingFootnote(fb); } - area.pendingFootnotes = null; } + area.setPendingFootnotes(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:38:48
|
Revision: 7150 Author: victormote Date: 2006-05-06 09:11:14 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7150&view=rev Log Message: ----------- Conform to new aXSL FONode requirements. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-05-06 02:12:46 UTC (rev 7149) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-05-06 16:11:14 UTC (rev 7150) @@ -27,6 +27,7 @@ import org.foray.common.OrderedTreeNode; import org.axsl.foR.FONodeProxy; +import org.axsl.foR.FONodeResult; /** * Base class for nodes in the formatting object tree. @@ -36,6 +37,8 @@ private FONodeProxy proxy; + private FONodeResult result; + protected FONode(FObj parent) { super(parent); } @@ -70,8 +73,23 @@ /** * {@inheritDoc} */ + public void setResult(FONodeResult result) { + this.result = result; + } + + /** + * {@inheritDoc} + */ + public FONodeResult getResult() { + return this.result; + } + + /** + * {@inheritDoc} + */ public void reset() { this.proxy = null; + this.result = null; if (this.getChildren() == null) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
10 messages has been excluded from this view by a project administrator.