foray-commit Mailing List for FOray (Page 255)
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-06-10 17:04:17
|
Revision: 7511 Author: victormote Date: 2006-06-10 10:03:25 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7511&view=rev Log Message: ----------- Conform to axsl change: Add interface for an abstract proxy factory. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,6 +28,8 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; +import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.Leader; import org.axsl.fontR.FontUse; @@ -941,5 +943,9 @@ public int getColumn() { return this.parentFO().getColumn(); } - + + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -57,4 +59,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.ArrayList; import java.util.List; @@ -153,4 +155,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class BlockContainer extends FObj implements org.axsl.foR.fo.BlockContainer { @@ -64,4 +66,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark object in XSL-FO. @@ -119,4 +121,8 @@ return traitInternalDestination(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark-title object in XSL-FO. @@ -66,4 +68,8 @@ return false; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark-tree object in XSL-FO. @@ -69,4 +71,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * Represents the flow object 'fo:character'. @@ -79,4 +81,8 @@ return text.getAreaTreeText(context); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ColorProfile extends FObj @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -33,7 +33,9 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -128,4 +130,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Declarations extends FObj @@ -52,4 +54,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; import org.axsl.text.line.LineNonText; @@ -141,4 +143,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -64,4 +66,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Flow extends AbstractFlow implements org.axsl.foR.fo.Flow { @@ -86,4 +88,8 @@ return FONode.NODE_FLOW; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Footnote extends FObj implements org.axsl.foR.fo.Footnote { @@ -82,4 +84,8 @@ return (FootnoteBody) this.children.get(1); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class FootnoteBody extends FObj @@ -52,4 +54,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Inline extends FObjMixed implements org.axsl.foR.fo.Inline { @@ -66,4 +68,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -62,4 +64,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class InstreamForeignObject extends FObjScaled implements org.axsl.foR.fo.InstreamForeignObject { @@ -93,4 +95,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.HashMap; import java.util.Map; @@ -150,4 +152,8 @@ regionMap.put(region.traitRegionName(), region.getName()); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.text.line.LineNonText; /** @@ -116,4 +118,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListBlock extends FObj implements org.axsl.foR.fo.ListBlock { @@ -67,4 +69,8 @@ } } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItem extends FObj implements org.axsl.foR.fo.ListItem { @@ -72,4 +74,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItemBody extends FObj implements org.axsl.foR.fo.ListItemBody { @@ -60,4 +62,8 @@ return this; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItemLabel extends FObj @@ -61,4 +63,8 @@ return this; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.List; @@ -104,4 +106,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -65,4 +67,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -65,4 +67,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -58,4 +60,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.text.line.LineNonText; public class PageNumber extends FObj implements LineNonText, @@ -78,4 +80,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.text.line.LineNonText; /** @@ -90,4 +92,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Flow; import org.axsl.foR.fo.SimplePageMaster; @@ -255,4 +257,8 @@ } } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.ArrayList; @@ -159,4 +161,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -95,4 +97,8 @@ return traitExtent(context); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -99,4 +101,8 @@ return traitExtent(context); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -101,4 +103,8 @@ - this.getMarginBottom(context, pageWidth); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -96,4 +98,8 @@ return height; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -95,4 +97,8 @@ return height; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.ArrayList; @@ -107,4 +109,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -92,4 +94,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class RetrieveMarker extends FObj @@ -64,4 +66,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.apache.commons.logging.Log; @@ -235,4 +237,8 @@ return null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * Models the fo:simple-page-master object. @@ -283,4 +285,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -87,4 +89,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,7 +28,9 @@ import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class StaticContent extends AbstractFlow @@ -71,4 +73,8 @@ return FONode.NODE_STATIC_CONTENT; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.ArrayList; @@ -200,4 +202,8 @@ return tableHeader; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:table-and-caption object in XSL-FO. @@ -58,4 +60,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,7 +28,9 @@ import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class TableBody extends AbstractTableBody @@ -47,4 +49,8 @@ return FONode.NODE_TABLE_BODY; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -59,4 +61,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.List; @@ -121,4 +123,8 @@ } } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.List; @@ -105,4 +107,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,7 +28,9 @@ import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class TableFooter extends AbstractTableBody @@ -47,4 +49,8 @@ return FONode.NODE_TABLE_FOOTER; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,7 +28,9 @@ import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class TableHeader extends AbstractTableBody @@ -47,4 +49,8 @@ return FONode.NODE_TABLE_HEADER; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class TableRow extends FObj implements org.axsl.foR.fo.TableRow { @@ -54,4 +56,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -59,4 +61,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * Implementation for fo:wrapper formatting object. @@ -110,4 +112,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * Implement continued labels for table header/footer. @@ -55,4 +57,8 @@ return this.getFOTreeBuilder().getExtensionNamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyListUnparsed; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.UnitProcessor; @@ -139,4 +141,8 @@ return FObjScaled.pixelsToMillipoints(pixels, 72); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 14:29:06
|
Revision: 7510 Author: victormote Date: 2006-06-10 07:28:33 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7510&view=rev Log Message: ----------- Conform to axsl change: Remove no-longer-needed AreaTree constants. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.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/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.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/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.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-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.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-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -281,12 +281,6 @@ return traitGeneratedBy().traitFontStyle(this); } - /** - * Reports the area type without needing to do an instanceof(). - * @return One of the AREATYPE_ constants. - */ - public abstract byte getAreaType(); - public AreaNode getFirstAreaNodeChild() { return (AreaNode) getFirstChild(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -30,7 +30,6 @@ import org.axsl.areaW.AreaTreeListener; import org.axsl.areaW.AreaWException; import org.axsl.areaW.PageArea; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Bookmark; import org.axsl.foR.fo.BookmarkTitle; @@ -108,10 +107,6 @@ return this.logger; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_AREA_TREE; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BasicLink; /** @@ -39,10 +38,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BASIC_LINK; - } - public int crIPD() { int ipd = 0; for (int i = 0; i < getChildren().size(); i++) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -41,10 +40,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BEFORE_FLOAT_RA; - } - public int crBPD() { return ((RegionRABody) getParentArea()).getDimensionBeforeFloatRA(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -27,7 +27,6 @@ import org.axsl.areaR.BlockContainerArea; import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -40,10 +39,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BLOCK_CONTAINER; - } - public boolean isAbsolutelyPositioned() { if (this.traitAbsolutePosition() == Constants.FOVAL_AUTO) { return false; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.BookmarkTitleArea; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Bookmark; /** @@ -39,10 +38,6 @@ super(generatedBy, parent); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BOOKMARK; - } - public BookmarkTitleArea getBookmarkTitle() { if (getChildren() == null || getChildren().size() < 1 || ! (getChildren().get(0) instanceof BookmarkTitleArea)) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTitle; /** @@ -38,10 +37,6 @@ super(generatedBy, parent); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BOOKMARK_TITLE; - } - public String getTitleText() { // Cast verified at construction. BookmarkTitle generatedBy = (BookmarkTitle) traitGeneratedBy(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTree; /** @@ -38,10 +37,6 @@ super(generatedBy, parent); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BOOKMARK_TREE; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.ExternalGraphic; import org.axsl.graphicR.Graphic; @@ -46,10 +45,6 @@ return ((ExternalGraphic) this.traitGeneratedBy()).getGraphic(this); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_IMAGE; - } - public void initializeProgressionDimension() { // PD is set in the constructor. return; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -39,10 +38,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_FOOTNOTE_RA; - } - public int crBPD() { return ((RegionRABody) getParentArea()).getDimensionFootnoteRA(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.ForeignXML; import org.axsl.foR.fo.InstreamForeignObject; import org.axsl.foR.svg.SVGElement; @@ -48,10 +47,6 @@ } } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_FOREIGN_OBJECT; - } - public boolean traitIsReferenceArea() { return true; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -24,7 +24,6 @@ package org.foray.area; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public abstract class GenericContainer extends ContainerRA @@ -53,8 +52,4 @@ return this.yPosition; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_GENERIC_CONTAINER; - } - } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOText; import org.axsl.foR.fo.ExternalGraphic; import org.axsl.foR.fo.Inline; @@ -45,10 +44,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_INLINE; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -34,7 +34,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; /** * An Area containing a leader item. @@ -69,10 +68,6 @@ setProgressionDimension(initialProgressionDimension); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_LEADER; - } - /** * Pass-thru of the FOTree trait value, with one exception. In the case of * leader-pattern="rule", if the effective rule-thickness is 0, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -27,7 +27,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOContext; import org.axsl.foR.FOText; import org.axsl.foR.FOTextContent; @@ -424,10 +423,6 @@ return !(children.size() > 0); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_LINE; - } - /** * @return True iff this is the first LineArea instance generated by the * parent Block. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.ListBlock; import org.axsl.foR.fo.ListItem; @@ -40,10 +39,6 @@ return new ListItemArea(listItem, this); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_LIST_BLOCK; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -28,7 +28,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.BlockContainer; @@ -49,10 +48,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_MAIN_RA; - } - /** * Depending on the column-count of the next FO, determine whether * a new span area needs to be constructed or not, and return the Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.RetrieveMarker; @@ -45,10 +44,6 @@ this.marker = marker; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_MARKER_CONTENT; - } - public String getAreaName() { return "marker-content"; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; @@ -75,10 +74,6 @@ return new LineArea(traitGeneratedBy(), this); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BLOCK; - } - public Area getOverflowArea(Area childRequesting) throws AreaWException { Area overflow = getParentArea().getOverflowArea(this); if (overflow == null) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -27,7 +27,6 @@ import org.axsl.areaR.NormalFlowArea; import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -57,10 +56,6 @@ throw new AreaWException("ColumnRA overflow failed."); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_COLUMN_RA; - } - public SpanRA getParentSpan() { return (SpanRA) getParentArea(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -28,7 +28,6 @@ import org.axsl.areaW.AreaWException; import org.axsl.areaW.PageArea; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOTreeException; import org.axsl.foR.FObj; import org.axsl.foR.fo.PageSequence; @@ -305,10 +304,6 @@ getNextPage(false, false, true); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_PAGE_COLLECTION; - } - public AreaTree getAreaTree() { // Cast validated during construction. return (AreaTree) getParent(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -47,10 +46,6 @@ return text; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_PAGE_NUMBER_AREA; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class PageNumberCitationArea extends AbstractInlineArea @@ -50,10 +49,6 @@ return text; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_PAGE_NUMBER_CITATION_AREA; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -30,7 +30,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.PageSequence; @@ -345,10 +344,6 @@ return null; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_PAGE; - } - public int crIPD() { if (getWritingMode().getIPAxis() == Constants.AXIS_HORIZONTAL) { return traitPageWidth() - getMarginLeft() - getMarginRight(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.RegionArea; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Region; import org.axsl.foR.fo.RegionAfter; import org.axsl.foR.fo.RegionBefore; @@ -51,10 +50,6 @@ return ((Region) traitGeneratedBy()).getXPositionVP_CR(this); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_REGION_RA; - } - public int crBPD() { if (this.generatedBy.getFONode() instanceof RegionBefore || this.generatedBy.getFONode() instanceof RegionAfter) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -29,7 +29,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.SimplePageMaster; @@ -74,10 +73,6 @@ return footnoteReferenceArea; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_BODY_AREA_CONTAINER; - } - public int crBPD() { int dimension = getParentArea().brBPD(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -26,7 +26,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.svg.SVGElement; import org.w3c.dom.svg.SVGDocument; @@ -52,10 +51,6 @@ return generatedBy.getSVGDocument(); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_SVG; - } - public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -28,7 +28,6 @@ import org.axsl.areaR.SpanArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.RegionBody; @@ -120,10 +119,6 @@ return (currentColumn == traitColumnCount()); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_SPAN_RA; - } - public Area getOverflowArea(Area childRequesting) throws AreaWException { AreaNode nextColumn = (AreaNode) childRequesting.getNextSibling(); if (nextColumn != null & nextColumn instanceof Area) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableBodyContainer extends AbstractTableContainer @@ -52,10 +51,6 @@ return this.yPosition; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_BODY_RA; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -27,7 +27,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaR.TableCellArea; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.TableCell; public class TableCellRA extends ContainerRA implements TableCellArea, @@ -77,10 +76,6 @@ return tableCellGeneratedBy().traitNumberColumnsSpanned(); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_CELL_RA; - } - /** * @return Returns the centeringPaddingBottom. */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableFooterContainer extends AbstractTableContainer @@ -52,10 +51,6 @@ return this.yPosition; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_FOOTER_RA; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.RenderVisitor; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableHeaderContainer extends AbstractTableContainer @@ -52,10 +51,6 @@ return this.yPosition; } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_HEADER_RA; - } - /** * {@inheritDoc} */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -28,7 +28,6 @@ import org.axsl.areaR.TableArea; import org.axsl.areaW.TableFooterContainer; import org.axsl.areaW.TableHeaderContainer; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOContext; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableBody; @@ -51,10 +50,6 @@ this.calcFixedColumnWidths(this.crIPD()); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_RA; - } - /** * Computes the content-rectangle inline-progression-dimension of a * cell. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -27,7 +27,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.TableCellArea; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.TableCell; import org.axsl.foR.fo.TableRow; @@ -44,10 +43,6 @@ super(generatedBy, parentArea); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_ROW_RA; - } - /* * Overrides superclass method because TableRowContainer contents stack in * the IPD. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-10 14:12:55 UTC (rev 7509) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-10 14:28:33 UTC (rev 7510) @@ -28,7 +28,6 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; -import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FONode; import org.axsl.foR.FOTextContent; import org.axsl.foR.FObj; @@ -183,10 +182,6 @@ return this.getTextContent().getAreaTreeText(this); } - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TEXT_AREA; - } - /** * Overrides Area because line-areas have no borders or padding. See * XSL-FO Standard 1.0, Section 4.5. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 14:13:08
|
Revision: 7509 Author: victormote Date: 2006-06-10 07:12:55 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7509&view=rev Log Message: ----------- Use new AreaTree Visitor pattern to eliminate dependency on type constants and casting. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -67,7 +67,6 @@ import org.axsl.areaR.TableHeaderContainer; import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; -import org.axsl.common.ConstantsAreaTree; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; @@ -86,7 +85,7 @@ * fragment. */ public abstract class Renderer extends OutputTarget - implements org.axsl.output.Renderer { + implements org.axsl.output.Renderer, org.axsl.areaR.RenderVisitor { AreaTree areaTree; @@ -300,7 +299,7 @@ protected abstract void drawGraphic(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle); - protected void render(AreaNode node) { + public void render(AreaNode node) { renderChildren(node); } @@ -330,12 +329,12 @@ * * @param area the area container to render */ - protected void render(BlockContainerArea area) { + public void render(BlockContainerArea area) { doFrame(area); renderChildren(area); } - protected void render(RegionBodyArea area) { + public void render(RegionBodyArea area) { markBackground(area); renderChildren(area); } @@ -345,7 +344,7 @@ * * @param area the region area container to render */ - protected void render(RegionArea area) { + public void render(RegionArea area) { markBackground(area); renderChildren(area); } @@ -353,19 +352,19 @@ /** * render the given span area */ - protected void render(SpanArea area) { + public void render(SpanArea area) { renderChildren(area); } - protected void render(NormalFlowArea area) { + public void render(NormalFlowArea area) { renderChildren(area); } - protected void renderChildren(AreaNode area) { + public void renderChildren(AreaNode area) { List children = area.getChildren(); for (int i = 0; i < children.size(); i++) { - AreaNode b = (AreaNode)children.get(i); - renderUnknownArea(b); + AreaNode child = (AreaNode)children.get(i); + child.render(this); } } @@ -374,7 +373,7 @@ * * @param area the block area to render */ - protected void render(NormalBlockArea area) { + public void render(NormalBlockArea area) { doFrame(area); renderChildren(area); } @@ -382,17 +381,17 @@ /** * render the given SVG area */ - protected abstract void render(SVGArea area); + public abstract void render(SVGArea area); /** * render a foreign object area */ - protected abstract void render(ForeignObjectArea area); + public abstract void render(ForeignObjectArea area); /** * render the given image area */ - protected void render(ExternalGraphicArea area) { + public void render(ExternalGraphicArea area) { Graphic graphic = area.getGraphic(); if (graphic == null) { getLogger().error("(Render) ImageArea contains no graphic."); @@ -407,7 +406,7 @@ * Render a table-reference-area. * @param area The TableRA instance to render. */ - protected void render(TableArea area) { + public void render(TableArea area) { Area[] backgroundAreas = area.getBackgroundAreas(); if (backgroundAreas != null) { for (int i = 0; i < backgroundAreas.length; i++) { @@ -444,22 +443,22 @@ } } - protected void render(TableRowContainer area) { + public void render(TableRowContainer area) { doFrame(area); renderChildren(area); } - protected void render(TableBodyContainer area) { + public void render(TableBodyContainer area) { markBackground(area); renderChildren(area); } - protected void render(TableHeaderContainer area) { + public void render(TableHeaderContainer area) { markBackground(area); renderChildren(area); } - protected void render(TableFooterContainer area) { + public void render(TableFooterContainer area) { markBackground(area); renderChildren(area); } @@ -469,7 +468,7 @@ * * @param area the area container to render */ - protected void render(TableCellArea area) { + public void render(TableCellArea area) { doFrame(area); renderChildren(area); } @@ -489,7 +488,7 @@ * Render a line-area. * @param area area to render */ - protected void render(LineArea area) { + public void render(LineArea area) { area.optimizeLine(); renderChildren(area); } @@ -497,40 +496,40 @@ /** * render the given leader area */ - protected abstract void render(LeaderArea area); + public abstract void render(LeaderArea area); - protected abstract void render(TextArea area); + public abstract void render(TextArea area); - protected abstract void render(BookmarkTreeArea area); + public abstract void render(BookmarkTreeArea area); - protected void render(FootnoteArea area) { + public void render(FootnoteArea area) { renderChildren(area); } - protected void render(BeforeFloatArea area) { + public void render(BeforeFloatArea area) { renderChildren(area); } - protected void render(MainReferenceArea area) { + public void render(MainReferenceArea area) { renderChildren(area); } - protected void render(PageNumberCitationArea area) { + public void render(PageNumberCitationArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - protected void render(PageNumberArea area) { + public void render(PageNumberArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - protected void render(BasicLinkArea area) { + public void render(BasicLinkArea area) { createBasicLink(area); renderChildren(area); } protected abstract void createBasicLink(BasicLinkArea area) ; - protected void render(InlineArea area) { + public void render(InlineArea area) { doFrame(area); renderChildren(area); } @@ -545,161 +544,12 @@ for (int i = 0; i < children.size(); i++) { AreaNode atNode = (AreaNode) children.get(i); if (! (atNode instanceof PageCollection)) { - renderUnknownArea(atNode); + render(atNode); } } } /** - * Render a generic area by first casting it to the proper subclass. - * This method uses contiguous integrals returned from the AreaNode - * subclasses to mimic inheritance. This allows us to keep the rendering - * logic out of the area tree. - * @param atNode The AreaNode that should be cast and rendered. - */ - protected void renderUnknownArea(AreaNode atNode) { - if (atNode == null) { - return; - } - /* - * Keep the items in order and contiguous for better performance. - */ - switch (atNode.getAreaType()) { - case ConstantsAreaTree.AREATYPE_BLOCK: { - render((NormalBlockArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_FOREIGN_OBJECT: { - render((ForeignObjectArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BLOCK_CONTAINER: { - render((BlockContainerArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BODY_AREA_CONTAINER: { - render((RegionBodyArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_LINE: { - render((LineArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_IMAGE: { - render((ExternalGraphicArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_SVG: { - render((SVGArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_LEADER: { - render((LeaderArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_EXTENSION: { - /* There is nothing to do here. */ - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_REGION_RA: { - render((RegionArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_FOOTNOTE_RA: { - render((FootnoteArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BEFORE_FLOAT_RA: { - render((BeforeFloatArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_MAIN_RA: { - render((MainReferenceArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_SPAN_RA: { - render((SpanArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_COLUMN_RA: { - render((NormalFlowArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_RA: { - render((TableArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_GENERIC_CONTAINER: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_CELL_RA: { - render((TableCellArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA: { - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_ROW_RA: { - render((TableRowContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_BODY_RA: { - render((TableBodyContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_HEADER_RA: { - render((TableHeaderContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_FOOTER_RA: { - render((TableFooterContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BOOKMARK: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_DESTINATION: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BLOCK_GROUP: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TEXT_AREA: { - render((TextArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_PAGE_NUMBER_CITATION_AREA: { - render((PageNumberCitationArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BOOKMARK_TREE: { - render((BookmarkTreeArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_PAGE_NUMBER_AREA: { - render((PageNumberArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BASIC_LINK: { - render((BasicLinkArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_INLINE: { - render((InlineArea) atNode); - return; - } - default: { - render(atNode); - } - } - } - - /** * Provides the Renderer with an opportunity to close any text objects that * are in progress. */ Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -865,7 +865,7 @@ */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } public void startOutput() throws IOException {} Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -441,7 +441,7 @@ case Constants.FOVAL_HIDDEN: break; } - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -239,7 +239,7 @@ * @param area the foreign object area to be rendered */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -438,7 +438,7 @@ * render a foreign object area */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -522,7 +522,7 @@ } public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } public void startOutput() throws IOException { Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -440,7 +440,7 @@ case Constants.FOVAL_HIDDEN: break; } - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -472,7 +472,7 @@ this.writer.write("</content>\n"); } - protected void render(PageNumberCitationArea area) { + public void render(PageNumberCitationArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -482,7 +482,7 @@ writeEndTag(area); } - protected void render(BasicLinkArea area) { + public void render(BasicLinkArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -492,7 +492,7 @@ writeEndTag(area); } - protected void render(InlineArea area) { + public void render(InlineArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -502,7 +502,7 @@ writeEndTag(area); } - protected void render(TableArea area) { + public void render(TableArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -512,7 +512,7 @@ writeEndTag(area); } - protected void render(TableHeaderContainer area) { + public void render(TableHeaderContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -522,7 +522,7 @@ writeEndTag(area); } - protected void render(TableFooterContainer area) { + public void render(TableFooterContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -532,7 +532,7 @@ writeEndTag(area); } - protected void render(TableBodyContainer area) { + public void render(TableBodyContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -542,7 +542,7 @@ writeEndTag(area); } - protected void render(TableRowContainer area) { + public void render(TableRowContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -552,7 +552,7 @@ writeEndTag(area); } - protected void render(TableCellArea area) { + public void render(TableCellArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -562,7 +562,7 @@ writeEndTag(area); } - protected void render(AreaNode node) { + public void render(AreaNode node) { writeStartTag(node, null); renderChildren(node); writeEndTag(node); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 14:12:18
|
Revision: 7508 Author: victormote Date: 2006-06-10 07:11:43 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7508&view=rev Log Message: ----------- Conform to axsl changes: Expose a Visitor pattern that can be used to allow an Area to cast itself properly for an external Renderer. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.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/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.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/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.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-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.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-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.Area; import org.axsl.areaW.AreaTreeEvent; import org.axsl.areaW.AreaTreeListener; @@ -233,4 +234,8 @@ return "area-tree"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BasicLink; @@ -61,4 +62,8 @@ return "basic-link"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -93,4 +94,8 @@ this.getRegionBodyArea().incrementBeforeFloatDimension(incrementAmount); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.BlockContainerArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -80,4 +81,8 @@ return "block-container"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.BookmarkTitleArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Bookmark; @@ -57,4 +58,8 @@ return "bookmark"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTitle; @@ -54,4 +55,8 @@ return "bookmark-title"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTree; @@ -48,4 +49,8 @@ return "bookmark-tree"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.ExternalGraphic; @@ -73,4 +74,8 @@ return "external-graphic"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -104,4 +105,8 @@ this.getRegionBodyArea().incrementFootnoteDimension(incrementAmount); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.ForeignXML; import org.axsl.foR.fo.InstreamForeignObject; @@ -80,4 +81,8 @@ return "foreign-object"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOText; import org.axsl.foR.fo.ExternalGraphic; @@ -91,4 +92,8 @@ isLastItemOnLine, this); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -32,6 +32,7 @@ import org.axsl.foR.fo.PageNumber; import org.axsl.foR.fo.PageNumberCitation; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -289,4 +290,8 @@ isLastItemOnLine, this); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -916,4 +917,8 @@ return "line"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.ListBlock; import org.axsl.foR.fo.ListItem; @@ -55,4 +56,8 @@ return null; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.MainReferenceArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -267,4 +268,8 @@ return "main"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.RetrieveMarker; @@ -61,4 +62,8 @@ return (RetrieveMarker) this.generatedBy; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -178,4 +179,8 @@ return "normal-block"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.NormalFlowArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -117,4 +118,8 @@ return "normal-flow"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.areaW.PageArea; import org.axsl.common.Constants; @@ -376,4 +377,8 @@ return "page-collection"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -57,4 +58,8 @@ return "page-number"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -70,4 +71,8 @@ return "page-number-citation"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -27,6 +27,7 @@ import org.axsl.areaR.PageArea; import org.axsl.areaR.RegionArea; import org.axsl.areaR.RegionBodyArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -575,4 +576,8 @@ return "page"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.RegionArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Region; import org.axsl.foR.fo.RegionAfter; @@ -120,4 +121,8 @@ return this.generatedByName(); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -26,6 +26,7 @@ import org.axsl.areaR.MainReferenceArea; import org.axsl.areaR.RegionBodyArea; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -226,4 +227,8 @@ this.dimensionBeforeFloatRA += incrementAmount; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.AreaWException; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.svg.SVGElement; @@ -66,4 +67,8 @@ return "svg"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaR.SpanArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; @@ -283,4 +284,8 @@ return "span"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -62,4 +63,8 @@ return "table-body"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaR.TableCellArea; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -163,4 +164,8 @@ return (TableCell) this.traitGeneratedBy(); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -62,4 +63,8 @@ return "table-footer"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; @@ -62,4 +63,8 @@ return "table-header"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaR.TableArea; import org.axsl.areaW.TableFooterContainer; import org.axsl.areaW.TableHeaderContainer; @@ -300,4 +301,8 @@ return null; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.areaW.TableCellArea; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; @@ -75,4 +76,8 @@ return "table-row"; } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-10 13:03:09 UTC (rev 7507) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-10 14:11:43 UTC (rev 7508) @@ -26,6 +26,7 @@ import org.foray.common.XMLCharacter; +import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FONode; @@ -542,4 +543,8 @@ return generatedBy.parentFO(); } + public void render(RenderVisitor visitor) { + visitor.render(this); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 13:03:13
|
Revision: 7507 Author: victormote Date: 2006-06-10 06:03:09 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7507&view=rev Log Message: ----------- Require a HyphenationServer to start a FOraySession. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-06-10 13:02:57 UTC (rev 7506) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-06-10 13:03:09 UTC (rev 7507) @@ -78,8 +78,10 @@ Log logger = FOraySpecific.makeLogger(sessionConfig); FontServer fontServer = FOraySpecific.makeFontServer(logger, sessionConfig); + HyphenationServer hyphenServer = FOraySpecific.makeHyphenationServer( + logger, sessionConfig); TextServer textServer = FOraySpecific.makeTextServer(logger, - sessionConfig); + hyphenServer); GraphicServer graphicServer = FOraySpecific.makeGraphicServer(logger); FOTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(logger, sessionConfig, graphicServer, textServer); @@ -87,8 +89,8 @@ logger, textServer); LayoutFactory layoutFactory = FOraySpecific.makeLayoutFactory(logger); FOraySession session = new FOraySession(logger, sessionConfig, - fontServer, textServer, graphicServer, foTreeServer, - areaTreeFactory, layoutFactory); + fontServer, hyphenServer, textServer, graphicServer, + foTreeServer, areaTreeFactory, layoutFactory); return session; } @@ -118,10 +120,8 @@ } public static TextServer makeTextServer(Log logger, - SessionConfig configuration) throws FOrayException { - HyphenationServer hyphenationServer = makeHyphenationServer(logger, - configuration); - return new org.foray.text.TextServer(logger, hyphenationServer); + HyphenationServer hyphenServer) throws FOrayException { + return new org.foray.text.TextServer(logger, hyphenServer); } public static HyphenationServer makeHyphenationServer(Log logger, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 13:03:06
|
Revision: 7506 Author: victormote Date: 2006-06-10 06:02:57 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7506&view=rev Log Message: ----------- Require a HyphenationServer to start a FOraySession. Modified Paths: -------------- trunk/foray/foray-core/.classpath trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java Modified: trunk/foray/foray-core/.classpath =================================================================== --- trunk/foray/foray-core/.classpath 2006-06-10 02:39:08 UTC (rev 7505) +++ trunk/foray/foray-core/.classpath 2006-06-10 13:02:57 UTC (rev 7506) @@ -13,5 +13,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/axslArea-R"/> <classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/> <classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2006-06-10 02:39:08 UTC (rev 7505) +++ trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2006-06-10 13:02:57 UTC (rev 7506) @@ -29,6 +29,7 @@ import org.axsl.foR.FOTreeFactory; import org.axsl.fontR.FontServer; import org.axsl.graphicR.GraphicServer; +import org.axsl.hyphenR.HyphenationServer; import org.axsl.layout.LayoutFactory; import org.axsl.text.TextServer; @@ -68,6 +69,8 @@ /** A FontServer instance to be used for this session. */ private FontServer fontServer; + private HyphenationServer hyphenServer; + /** A TextServer instance to be used for this session. */ private TextServer textServer; @@ -108,10 +111,10 @@ * it needs to be fully configured and ready to be used. */ public FOraySession(Log logger, SessionConfig configuration, - FontServer fontServer, TextServer textServer, - GraphicServer graphicServer, FOTreeFactory foTreeFactory, - AreaTreeFactory areaTreeFactory, LayoutFactory layoutFactory) - throws FOrayException { + FontServer fontServer, HyphenationServer hyphenServer, + TextServer textServer, GraphicServer graphicServer, + FOTreeFactory foTreeFactory, AreaTreeFactory areaTreeFactory, + LayoutFactory layoutFactory) throws FOrayException { /* Validate Logger. */ if (logger == null) { throw new FOrayException("Logger required for FOraySession."); @@ -132,6 +135,13 @@ this.fontServer = fontServer; setupFontServer(); + /* Validate HyphenationServer. */ + if (hyphenServer == null) { + throw new FOrayException("HyphenationServer required for " + + "FOraySession"); + } + this.hyphenServer = hyphenServer; + /* Validate TextServer. */ if (textServer == null) { throw new FOrayException("TextServer required for FOraySession."); @@ -211,6 +221,10 @@ return this.fontServer; } + public HyphenationServer getHyphenationServer() { + return this.hyphenServer; + } + public TextServer getTextServer() { return this.textServer; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:39:19
|
Revision: 7505 Author: victormote Date: 2006-06-09 19:39:08 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7505&view=rev Log Message: ----------- Conform to axsl changes: Move three methods from FObj to TableCell. Two of these can conceivably be used by TableColumn, but probably will not be. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 02:38:58 UTC (rev 7504) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 02:39:08 UTC (rev 7505) @@ -553,23 +553,14 @@ return propertyList.getRetrieveBoundary(context); } - /** - * {@inheritDoc} - */ public int traitColumnNumber(FOContext context) { return propertyList.getColumnNumber(context); } - /** - * {@inheritDoc} - */ public int traitNumberColumnsSpanned() { return propertyList.getNumberColumnsSpanned(); } - /** - * {@inheritDoc} - */ public int traitNumberRowsSpanned() { return propertyList.getNumberRowsSpanned(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:38:58 UTC (rev 7504) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:39:08 UTC (rev 7505) @@ -31,7 +31,6 @@ import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; -import org.axsl.foR.fo.TableColumn; import java.util.ArrayList; @@ -184,7 +183,7 @@ return (TableColumn) this.columns[index]; } - public TableColumn[] getTableColumns() { + public org.axsl.foR.fo.TableColumn[] getTableColumns() { return this.columns; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:39:06
|
Revision: 7504 Author: victormote Date: 2006-06-09 19:38:58 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7504&view=rev Log Message: ----------- Conform to axsl changes: Move three methods from FObj to TableCell. Two of these can conceivably be used by TableColumn, but probably will not be. 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-06-10 02:02:16 UTC (rev 7503) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 02:38:58 UTC (rev 7504) @@ -69,11 +69,11 @@ } public int traitNumberRowsSpanned() { - return traitGeneratedBy().traitNumberRowsSpanned(); + return tableCellGeneratedBy().traitNumberRowsSpanned(); } public int traitNumberColumnsSpanned() { - return traitGeneratedBy().traitNumberColumnsSpanned(); + return tableCellGeneratedBy().traitNumberColumnsSpanned(); } public byte getAreaType() { @@ -146,8 +146,9 @@ */ public int getProgressionDimension() { TableRA tableRA = this.ancestorTableArea(); - int startingColumn = this.traitGeneratedBy().traitColumnNumber(this); - int span = this.traitGeneratedBy().traitNumberColumnsSpanned(); + int startingColumn = this.tableCellGeneratedBy().traitColumnNumber( + this); + int span = this.tableCellGeneratedBy().traitNumberColumnsSpanned(); return tableRA.ipdCell(startingColumn, span); } @@ -158,4 +159,8 @@ return "table-cell"; } + public TableCell tableCellGeneratedBy() { + return (TableCell) this.traitGeneratedBy(); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:02:21
|
Revision: 7503 Author: victormote Date: 2006-06-09 19:02:16 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7503&view=rev Log Message: ----------- Conform to axsl change: Return the TableCells in a more convenient cast. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-10 02:02:09 UTC (rev 7502) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-10 02:02:16 UTC (rev 7503) @@ -125,7 +125,7 @@ } if (rowSpanMgr == null) { - rowSpanMgr = new RowSpanMgr(table.getTableColumns().size()); + rowSpanMgr = new RowSpanMgr(table.getTableColumns().length); } // if (this.isInListBody) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-10 02:02:09 UTC (rev 7502) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-10 02:02:16 UTC (rev 7503) @@ -32,10 +32,9 @@ import org.axsl.foR.FOContext; import org.axsl.foR.Keep; import org.axsl.foR.fo.TableCell; +import org.axsl.foR.fo.TableColumn; import org.axsl.foR.fo.TableRow; -import java.util.List; - public class TableRowPL extends FObjPL { private RowSpanMgr rowSpanMgr = null; @@ -64,8 +63,8 @@ */ private void initCellArray(FOContext context) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable(context).getTableColumns(); - cellArray = new RowCellArray(rowSpanMgr, columns.size()); + TableColumn[] columns = node.getNearestTable(context).getTableColumns(); + cellArray = new RowCellArray(rowSpanMgr, columns.length); int colNum = 1; for (int i = 0; i < getReal().getChildren().size(); i++) { colNum = cellArray.getNextFreeCell(colNum); @@ -85,7 +84,7 @@ + "positioned beyond number of columns"); } cellColNum = colNum; - } else if (cellColNum > columns.size()) { + } else if (cellColNum > columns.length) { // Explicit colomn number specification out of range, skip it. layout.getLogger().error("Cell (#" + i + ") explicitly " + "positioned beyond number of columns, dropped:\n" @@ -93,12 +92,12 @@ continue; } // see if it fits and doesn't overwrite anything - if (cellColNum + numCols - 1 > columns.size()) { + if (cellColNum + numCols - 1 > columns.length) { // Too many columns spanned. layout.getLogger().error("Cell (#" + i + ") spans columns " + "beyond available number, clipped:\n" + cell.getContextMessage()); - numCols = columns.size() - cellColNum + 1; + numCols = columns.length - cellColNum + 1; } // Check for overwriting other cells (returns false) if (cellArray.storeCell(cell, cellColNum, numCols) == false) { @@ -125,7 +124,7 @@ public int layout(Area area) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable(area).getTableColumns(); + TableColumn[] columns = node.getNearestTable(area).getTableColumns(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -168,7 +167,7 @@ * Pass column object to cell to get offset and width and border * info if borders are "collapsed". */ - for (int i = 0; i < columns.size(); i++) { + for (int i = 0; i < columns.length; i++) { TableCell cell; TableCellPL cellPL; ++iColIndex; @@ -227,7 +226,7 @@ // Only do this for "STARTCELL", ending spans are handled separately // What about empty cells? Yes, we should set their height too! - for (int iCol = 1; iCol <= columns.size(); iCol++) { + for (int iCol = 1; iCol <= columns.length; iCol++) { if (cellArray.getCellType(iCol) == RowCellArray.CELLSTART && rowSpanMgr.isSpanned(iCol) == false) { TableCell cell = cellArray.getCell(iCol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:02:14
|
Revision: 7502 Author: victormote Date: 2006-06-09 19:02:09 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7502&view=rev Log Message: ----------- Conform to axsl change: Return the TableCells in a more convenient cast. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:01:59 UTC (rev 7501) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:02:09 UTC (rev 7502) @@ -48,7 +48,7 @@ /** A List of the TableColumns instances associated with this table. These * can also be found in this.children, but not necessarily in the same * order. */ - private ArrayList columns = new ArrayList(); + private TableColumn[] columns; public Table(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -60,6 +60,7 @@ } public void end() throws FOTreeException { + ArrayList columns = new ArrayList(); boolean doneWithMarkers = false; boolean doneWithColumns = false; boolean doneWithHeader = false; @@ -74,7 +75,7 @@ if (child instanceof TableColumn && ! doneWithColumns) { doneWithMarkers = true; TableColumn c = (TableColumn) child; - nextColumnNumber = processColumn(nextColumnNumber, c); + nextColumnNumber = processColumn(nextColumnNumber, c, columns); continue; } if (child instanceof TableHeader && ! doneWithHeader) { @@ -101,6 +102,10 @@ } throwException("Invalid Table content."); } + this.columns = new TableColumn[columns.size()]; + for (int i = 0; i < columns.size(); i++) { + this.columns[i] = (TableColumn) columns.get(i); + } } /** @@ -108,12 +113,10 @@ * @param c * @throws FOTreeException */ - private int processColumn(int nextColumnNumber, TableColumn c) - throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; + private int processColumn(int nextColumnNumber, TableColumn c, + ArrayList columns) throws FOTreeException { int numColumnsRepeated = c.traitNumberColumnsRepeated(); - int currentColumnNumber = c.traitColumnNumber(context); + int currentColumnNumber = c.traitColumnNumber(null); if (currentColumnNumber == 0) { currentColumnNumber = nextColumnNumber; } @@ -166,7 +169,7 @@ * @return The number of columns in this table. */ public int numberOfColumns() { - return this.columns.size(); + return this.columns.length; } /** @@ -175,23 +178,13 @@ * @return The TableColumn specified, or null if index is not valid. */ public TableColumn getTableColumn(int index) { - if (index < 0 || index > this.columns.size() - 1) { + if (index < 0 || index > this.columns.length - 1) { return null; } - return (TableColumn) this.columns.get(index); + return (TableColumn) this.columns[index]; } - /** - * Returns the 0-based index into the List of TableColumns for a specific - * TableColumn. - * @param tableColumn The TableColumn whose index is sought. - * @return The 0-based index of tableColumn. - */ - public int getTableColumnIndex(TableColumn tableColumn) { - return this.getTableColumns().indexOf(tableColumn); - } - - public ArrayList getTableColumns() { + public TableColumn[] getTableColumns() { return this.columns; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:02:06
|
Revision: 7501 Author: victormote Date: 2006-06-09 19:01:59 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7501&view=rev Log Message: ----------- Conform to axsl change: Return the TableCells in a more convenient cast. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 01:20:55 UTC (rev 7500) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 02:01:59 UTC (rev 7501) @@ -142,8 +142,8 @@ * Loop through the columns and total the fixed widths and proportional * units for each one. */ - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn column = (TableColumn) node.getTableColumns().get(i); + for (int i = 0; i < node.getTableColumns().length; i++) { + TableColumn column = (TableColumn) node.getTableColumns()[i]; if (column == null) { getLogger().warn("No table-column specification for column " + (i + 1) + "."); @@ -258,8 +258,8 @@ } // Now distribute the extra units onto each column and set offsets int columnOffset = 0; - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn column = (TableColumn) node.getTableColumns().get(i); + for (int i = 0; i < node.getTableColumns().length; i++) { + TableColumn column = node.getTableColumns()[i]; if (column != null) { //Compute the width of the column int colWidth = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 01:21:01
|
Revision: 7500 Author: victormote Date: 2006-06-09 18:20:55 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7500&view=rev Log Message: ----------- Conform to axsl: Remove unneeded method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 01:14:30 UTC (rev 7499) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 01:20:55 UTC (rev 7500) @@ -46,13 +46,6 @@ super(generatedBy, parentArea); int numColumns = generatedBy.numberOfColumns(); resolvedColumnWidth = new int[numColumns]; - for (int i = 0; i < numColumns; i++) { - TableColumn column = generatedBy.getTableColumn(i); - if (column != null) { - resolvedColumnWidth[i] = column.traitColumnWidth(this, - this.crIPD()); - } - } /* Not sure this is right. */ this.calcFixedColumnWidths(this.crIPD()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 01:14:35
|
Revision: 7499 Author: victormote Date: 2006-06-09 18:14:30 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7499&view=rev Log Message: ----------- Conform to axsl change: Remove two uneeded methods. 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/TableRA.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-06-10 01:08:37 UTC (rev 7498) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-10 01:14:30 UTC (rev 7499) @@ -353,7 +353,7 @@ return ancestorLineArea(); } - public org.axsl.areaW.TableArea ancestorTableArea() { + public TableRA ancestorTableArea() { AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 01:08:37 UTC (rev 7498) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-10 01:14:30 UTC (rev 7499) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.TableCellArea; -import org.axsl.areaW.TableArea; import org.axsl.common.Constants; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.TableCell; @@ -146,7 +145,7 @@ * columns. */ public int getProgressionDimension() { - TableArea tableRA = this.ancestorTableArea(); + TableRA tableRA = this.ancestorTableArea(); int startingColumn = this.traitGeneratedBy().traitColumnNumber(this); int span = this.traitGeneratedBy().traitNumberColumnsSpanned(); return tableRA.ipdCell(startingColumn, span); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 01:08:37 UTC (rev 7498) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 01:14:30 UTC (rev 7499) @@ -86,7 +86,7 @@ /** * Overrides the AreaNode method, because this is the TableRA being sought. */ - public org.axsl.areaW.TableArea ancestorTableArea() { + public TableRA ancestorTableArea() { return this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 01:08:41
|
Revision: 7498 Author: victormote Date: 2006-06-09 18:08:37 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7498&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded method. 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-06-10 00:41:44 UTC (rev 7497) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-10 01:08:37 UTC (rev 7498) @@ -27,7 +27,6 @@ import org.axsl.areaW.AbstractTableContainer; import org.axsl.areaW.Area; import org.axsl.areaW.AreaWException; -import org.axsl.areaW.TableArea; import org.axsl.areaW.TableRowContainer; import org.axsl.common.Constants; import org.axsl.foR.FOContext; @@ -162,7 +161,6 @@ * not just those from the progress indicator so that the borders * will be drawn properly. */ - int offset = 0; // Offset of each cell from table start edge int iColIndex = 0; // 1-based column index /* * Ideas: set offset on each column when they are initialized @@ -174,8 +172,6 @@ TableCell cell; TableCellPL cellPL; ++iColIndex; - TableArea tableArea = area.ancestorTableArea(); - int colWidth = tableArea.getResolvedColumnWidth(i); if (cellArray.getCellType(iColIndex) == RowCellArray.CELLSTART) { cell = cellArray.getCell(iColIndex); @@ -191,11 +187,9 @@ largestCellHeight = h; } } - offset += colWidth; continue; } cellPL = (TableCellPL) this.getLayoutProxy(cell); - offset += colWidth; int rowSpan = cell.traitNumberRowsSpanned(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 00:41:53
|
Revision: 7497 Author: victormote Date: 2006-06-09 17:41:44 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7497&view=rev Log Message: ----------- Use new method returning the background-only areas to paint the backgrounds for the various table areas. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 00:41:01 UTC (rev 7496) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 00:41:44 UTC (rev 7497) @@ -408,10 +408,16 @@ * @param area The TableRA instance to render. */ protected void render(TableArea area) { - /* TODO: Add logic that tries to paint the background as efficiently - * as possible. Contiguous cells should have their backgrounds painted - * at the same time (at least to the extent they are in the same - * rectangle. */ + Area[] backgroundAreas = area.getBackgroundAreas(); + if (backgroundAreas != null) { + for (int i = 0; i < backgroundAreas.length; i++) { + Area bga = backgroundAreas[i]; + markBackground(bga); + } + } + /* TODO: Add logic that tries to paint the borders as efficiently + * as possible. Contiguous cells that have identical borders should have + * their borders painted at the same time. */ doFrame(area); List children = area.getChildren(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 00:41:07
|
Revision: 7496 Author: victormote Date: 2006-06-09 17:41:01 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7496&view=rev Log Message: ----------- Conform to axsl change: Add method returning the background-only areas. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 00:01:54 UTC (rev 7495) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-10 00:41:01 UTC (rev 7496) @@ -299,4 +299,12 @@ return columnOffset; } + /** + * {@inheritDoc} + */ + public org.axsl.areaR.Area[] getBackgroundAreas() { + /* TODO: Implement this. See the method javadoc for details. */ + return null; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 00:02:01
|
Revision: 7495 Author: victormote Date: 2006-06-09 17:01:54 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7495&view=rev Log Message: ----------- Removed Paths: ------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-10 00:01:22 UTC (rev 7494) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-10 00:01:54 UTC (rev 7495) @@ -1,58 +0,0 @@ -///* -// * Copyright 2004 The FOray Project. -// * http://www.foray.org -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// * -// * This work is in part derived from the following work(s), used with the -// * permission of the licensor: -// * Apache FOP, licensed by the Apache Software Foundation -// * -// */ -// -///* $Id$ */ -// -//package org.foray.area; -// -//import org.axsl.areaW.TableArea; -//import org.axsl.common.ConstantsAreaTree; -//import org.axsl.foR.FObj; -//import org.axsl.foR.fo.Table; -//import org.axsl.foR.fo.TableColumn; -// -//public class TableColumnRA extends ContainerRA { -// -// public TableColumnRA(FObj generatedBy, Area parentArea) { -// super(generatedBy, parentArea); -// } -// -// public byte getAreaType() { -// return ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA; -// } -// -// public int getComputedColumnWidth() { -// TableColumn column = (TableColumn) traitGeneratedBy(); -// TableArea tableArea = this.ancestorTableArea(); -// Table table = (Table) tableArea.traitGeneratedBy(); -// int columnNum = table.getTableColumnIndex(column); -// return tableArea.getResolvedColumnWidth(columnNum); -// } -// -// /** -// * {@inheritDoc} -// */ -// public String getAreaName() { -// return "table-column"; -// } -// -//} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 00:01:27
|
Revision: 7494 Author: victormote Date: 2006-06-09 17:01:22 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7494&view=rev Log Message: ----------- Remove no-longer-needed class. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-09 23:59:25 UTC (rev 7493) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-10 00:01:22 UTC (rev 7494) @@ -1,58 +1,58 @@ -/* - * 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.areaW.TableArea; -import org.axsl.common.ConstantsAreaTree; -import org.axsl.foR.FObj; -import org.axsl.foR.fo.Table; -import org.axsl.foR.fo.TableColumn; - -public class TableColumnRA extends ContainerRA { - - public TableColumnRA(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); - } - - public byte getAreaType() { - return ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA; - } - - public int getComputedColumnWidth() { - TableColumn column = (TableColumn) traitGeneratedBy(); - TableArea tableArea = this.ancestorTableArea(); - Table table = (Table) tableArea.traitGeneratedBy(); - int columnNum = table.getTableColumnIndex(column); - return tableArea.getResolvedColumnWidth(columnNum); - } - - /** - * {@inheritDoc} - */ - public String getAreaName() { - return "table-column"; - } - -} +///* +// * 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.areaW.TableArea; +//import org.axsl.common.ConstantsAreaTree; +//import org.axsl.foR.FObj; +//import org.axsl.foR.fo.Table; +//import org.axsl.foR.fo.TableColumn; +// +//public class TableColumnRA extends ContainerRA { +// +// public TableColumnRA(FObj generatedBy, Area parentArea) { +// super(generatedBy, parentArea); +// } +// +// public byte getAreaType() { +// return ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA; +// } +// +// public int getComputedColumnWidth() { +// TableColumn column = (TableColumn) traitGeneratedBy(); +// TableArea tableArea = this.ancestorTableArea(); +// Table table = (Table) tableArea.traitGeneratedBy(); +// int columnNum = table.getTableColumnIndex(column); +// return tableArea.getResolvedColumnWidth(columnNum); +// } +// +// /** +// * {@inheritDoc} +// */ +// public String getAreaName() { +// return "table-column"; +// } +// +//} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:59:30
|
Revision: 7493 Author: victormote Date: 2006-06-09 16:59:25 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7493&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-09 23:55:48 UTC (rev 7492) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-09 23:59:25 UTC (rev 7493) @@ -30,8 +30,7 @@ import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; -public class TableColumnRA extends ContainerRA - implements org.axsl.areaW.TableColumnArea { +public class TableColumnRA extends ContainerRA { public TableColumnRA(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 23:55:48 UTC (rev 7492) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 23:59:25 UTC (rev 7493) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaR.TableArea; -import org.axsl.areaW.TableColumnArea; import org.axsl.areaW.TableFooterContainer; import org.axsl.areaW.TableHeaderContainer; import org.axsl.common.ConstantsAreaTree; @@ -106,10 +105,6 @@ return this.resolvedColumnWidth[startingColumn - 1]; } - public TableColumnArea makeTableColumnArea(TableColumn tableColumn) { - return new TableColumnRA(tableColumn, this); - } - public org.axsl.areaW.TableBodyContainer makeTableBodyContainer( TableBody tableBody) { return new org.foray.area.TableBodyContainer(tableBody, this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:55:57
|
Revision: 7492 Author: victormote Date: 2006-06-09 16:55:48 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7492&view=rev Log Message: ----------- Remove unneeded class. There is no layout work to do on a column. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Removed Paths: ------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -404,7 +404,7 @@ return new TableCellPL((TableCell) node, this); } case FONode.NODE_TABLE_COLUMN: { - return new TableColumnPL((TableColumn) node, this); + return new NoLayoutPL((TableColumn) node, this); } case FONode.NODE_TABLE_FOOTER: { return new TableFooterPL((TableFooter) node, this); Deleted: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -1,78 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.pioneer; - -import org.axsl.areaW.Area; -import org.axsl.areaW.TableColumnArea; -import org.axsl.areaW.TableArea; - -import org.axsl.areaW.AreaWException; -import org.axsl.foR.fo.Table; -import org.axsl.foR.fo.TableColumn; - - -public class TableColumnPL extends FObjPL { - public TableColumnArea areaContainer; - - /** - * The offset, in millipoints, for this column, relative to the start - * of the table, in the column-progression-direction. - */ - public int columnOffset; - - public TableColumnPL(TableColumn parent, PioneerLS layout) { - super(parent, layout); - } - - public void setHeight(int height) { - if (areaContainer != null) { - areaContainer.setProgressionDimension(height); - } - } - - public TableColumn getFO() { - return (TableColumn) this.getFONode(); - } - - public int layout(Area area) throws AreaWException { - TableColumn node = getFO(); - TableArea tableArea = (TableArea) area; - Table table = node.getNearestTable(area); - if (getProgress() == FONodePL.BREAK_AFTER) { - return Status.OK; - } - int columnNumber = table.getTableColumnIndex(node); - if (tableArea.getResolvedColumnWidth(columnNumber) > 0) { - TableColumnArea areaContainer = tableArea.makeTableColumnArea(node); - areaContainer.setProgressionDimension(area.crBPD()); - } - return Status.OK; - } - - public void setColumnOffset(int columnOffset) { - this.columnOffset = columnOffset; - } - -} Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:51:46 UTC (rev 7491) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:55:48 UTC (rev 7492) @@ -35,7 +35,6 @@ import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableBody; -import org.axsl.foR.fo.TableColumn; import org.axsl.foR.fo.TableFooter; import org.axsl.foR.fo.TableHeader; @@ -90,7 +89,6 @@ boolean addedHeader = false; boolean addedFooter = false; - layoutColumns(areaContainer); if (node.numberOfColumns() == 0) { layout.getLogger().warn("current implementation of tables " + "requires a table-column for each column, " @@ -249,17 +247,6 @@ return Status.OK; } - private void layoutColumns(Area tableArea) throws AreaWException { - Table node = getTableFO(); - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn c = (TableColumn) node.getTableColumns().get(i); - if (c != null) { - TableColumnPL tcPL = (TableColumnPL) getLayoutProxy(c); - tcPL.layout(tableArea); - } - } - } - // FIXME: this seems odd. public int getTableFooterYPosition(FOContext context, TableFooter tFooter) { TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:51:50
|
Revision: 7491 Author: victormote Date: 2006-06-09 16:51:46 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7491&view=rev Log Message: ----------- Remove useless code. Layout can't control the height of a table column. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:43:20 UTC (rev 7490) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:51:46 UTC (rev 7491) @@ -185,7 +185,6 @@ tableFooterPL.setYPosition(yPosition + tableBodyPL.getHeight(area)); } - setupColumnHeights(node, areaContainer); status = Status.AREA_FULL_SOME; } return status; @@ -229,8 +228,6 @@ areaContainer.setProgressionDimension(height); } - setupColumnHeights(node, areaContainer); - /* should this be combined into above? */ area.incrementProgressionDimension(areaContainer.crBPD()); @@ -269,14 +266,4 @@ return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(context); } - 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); - if (c != null) { - tablecolumnPL.setHeight(areaContainer.crBPD()); - } - } - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:43:24
|
Revision: 7490 Author: victormote Date: 2006-06-09 16:43:20 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7490&view=rev Log Message: ----------- Conform to axsl change: Remove undesirable method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 23:35:11 UTC (rev 7489) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 23:43:20 UTC (rev 7490) @@ -106,18 +106,6 @@ return this.resolvedColumnWidth[startingColumn - 1]; } - /** - * {@inheritDoc} - */ - public void setResolvedColumnWidth(int startingColumn, int columnWidth) { - // Array is 0-based, column-number is 1-based. - if (startingColumn < 1 - || startingColumn > this.resolvedColumnWidth.length) { - return; - } - this.resolvedColumnWidth[startingColumn - 1] = columnWidth; - } - public TableColumnArea makeTableColumnArea(TableColumn tableColumn) { return new TableColumnRA(tableColumn, this); } @@ -304,7 +292,11 @@ // Increase column sizes to use up extra space colWidth *= dWidthFactor; } - this.setResolvedColumnWidth(i, colWidth); + // Array is 0-based, column-number is 1-based. + if (i >= 1 + && i <= this.resolvedColumnWidth.length) { + this.resolvedColumnWidth[i - 1] = colWidth; + } columnOffset += colWidth; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:35:15
|
Revision: 7489 Author: victormote Date: 2006-06-09 16:35:11 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7489&view=rev Log Message: ----------- Move table column width computation from layout to AreaTree. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:35:03 UTC (rev 7488) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-06-09 23:35:11 UTC (rev 7489) @@ -44,17 +44,8 @@ */ public class TablePL extends BlockPL { - private static final int MINCOLWIDTH = 10000; // 10pt - public int bodyCount = 0; - /** Optimum inline-progression-dimension */ - private int optIPD; - /** Minimum inline-progression-dimension */ - private int minIPD; - /** Maximum inline-progression-dimension */ - private int maxIPD; - public TablePL(Table table, PioneerLS layout) { super(table, layout); } @@ -288,177 +279,4 @@ } } - public int calcFixedColumnWidths(TableArea tableArea, - int maxAllocationWidth) { - Table node = getTableFO(); - int tableWidth = node.traitIPDimensionOpt(tableArea, tableArea.crIPD()); - /* Accumulates the total table units used in columns in this table. */ - double totalTableUnits = 0.0; - /* - * Accumulates the total width, in millipoints(?), of the columns that - * have a fixed width. - */ - int totalFixedWidth = 0; - /* Minimum number of proportional units. */ - double tuMin = 100000.0; - /* - * Loop through the columns and total the fixed widths and proportional - * units for each one. - */ - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn column = (TableColumn) node.getTableColumns().get(i); - if (column == null) { - getLogger().warn("No table-column specification for column " + - (i + 1) + "."); - } else { - double tu = column.traitColumnWidthTableUnits(); - /* Keep track of minimum number of proportional units - * in any column which has only proportional units. - */ - if (tu > 0 && tu < tuMin - && column.traitColumnWidth(tableArea, - tableWidth) == 0) { - tuMin = tu; - } - totalTableUnits += tu; - totalFixedWidth += column.traitColumnWidth(tableArea, - tableWidth); - } - } - - double dWidthFactor = 0.0; - double dUnitLength = 0.0; - setIPD(tableArea, (totalTableUnits > 0.0), maxAllocationWidth); - if (totalTableUnits > 0.0) { - int iProportionalWidth = 0; - if (this.optIPD > totalFixedWidth) { - iProportionalWidth = this.optIPD - totalFixedWidth; - } - else if (this.maxIPD > totalFixedWidth) { - iProportionalWidth = this.maxIPD - totalFixedWidth; - } - else { - iProportionalWidth = maxAllocationWidth - totalFixedWidth; - } - if (iProportionalWidth > 0) { - dUnitLength = iProportionalWidth / totalTableUnits; - } - else { - getLogger().error("Sum of fixed column widths " - + totalFixedWidth - + " greater than maximum available IPD " - + maxAllocationWidth + "; no space for " - + totalTableUnits + " proportional units."); - /* Set remaining proportional units to a number which - * will assure the minimum column size for tuMin. - */ - dUnitLength = MINCOLWIDTH/tuMin; - // Reduce fixed column widths by this much??? - } - //log.debug("1 table-unit = " + dUnitLength + " mpt"); - } - else { - /* No proportional units. If minimum IPD is specified, check - * that sum of column widths > minIPD. - */ - if (this.minIPD > totalFixedWidth) { - // Add extra space to each column - dWidthFactor = (double)this.minIPD/(double)totalFixedWidth; - } - else if (this.maxIPD < totalFixedWidth) { - // Note: if maxIPD=auto, use maxAllocWidth - getLogger().warn("Sum of fixed column widths " - + totalFixedWidth - + " greater than maximum specified IPD " + this.maxIPD); - } - else if (this.optIPD != -1 && totalFixedWidth != this.optIPD) { - getLogger().warn("Sum of fixed column widths " - + totalFixedWidth - + " differs from specified optimum IPD " + this.optIPD); - } - } - // Now distribute the extra units onto each column and set offsets - int columnOffset = 0; - for (int i = 0; i < node.getTableColumns().size(); i++) { - TableColumn column = (TableColumn) node.getTableColumns().get(i); - TableColumnPL columnPL = (TableColumnPL) column.getProxy(); - if (columnPL != null) { - columnPL.setColumnOffset(columnOffset); - } - if (column != null) { - //Compute the width of the column - int colWidth = -1; - if (column.traitColumnWidthTableUnits() > 0) { - //Proportional width - colWidth = ((int)(column.traitColumnWidthTableUnits() - * dUnitLength)); - } else { - //Fixed width - colWidth = column.traitColumnWidth(tableArea, tableWidth); - } - - // Check minimum values and adjust if necessary - if (colWidth <= 0) { - getLogger().warn("Zero-width table column!"); - } - if (dWidthFactor > 0.0) { - // Increase column sizes to use up extra space - colWidth *= dWidthFactor; - } - tableArea.setResolvedColumnWidth(i, colWidth); - columnOffset += colWidth; - } - } - // columnOffset now contains the width of the table. - return columnOffset; - } - - /** - * Initialize table inline-progression-properties values - * TODO: A lot of logic in this method appears to duplicate what is in the - * standard getIPD... methods in FObj. Whatever is different should probably - * be factored into methods that override (but use) the FObj methods. - */ - private void setIPD(FOContext context, boolean bHasProportionalUnits, - int maxAllocIPD) { - Table node = getTableFO(); - if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { - this.maxIPD = node.traitIPDimensionMax(context, maxAllocIPD); - } else { - this.maxIPD = maxAllocIPD; - } - - if (node.traitIPDimensionOpt(context, maxAllocIPD) < 0) { - this.optIPD = -1; - } else { - /* TODO: This looks like a bug. Should be getIPDOptimum()? */ - this.optIPD = node.traitIPDimensionMax(context, maxAllocIPD); - } - - if (node.traitIPDimensionMin(context, maxAllocIPD) < 0) { - this.minIPD = -1; - } else { - this.minIPD = node.traitIPDimensionMin(context, maxAllocIPD); - } - - if (bHasProportionalUnits && this.optIPD < 0) { - if (this.minIPD > 0) { - if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { - this.optIPD = (minIPD + maxIPD)/2; - } - else { - this.optIPD = this.minIPD; - } - } - else if (node.traitIPDimensionMax(context, maxAllocIPD) >= 0) { - this.optIPD = this.maxIPD; - } - else { - getLogger().error("At least one of minimum, optimum, or " - + "maximum IPD must be specified on table."); - this.optIPD = this.maxIPD; - } - } - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 23:35:11
|
Revision: 7488 Author: victormote Date: 2006-06-09 16:35:03 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7488&view=rev Log Message: ----------- Move table column width computation from layout to AreaTree. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 22:51:29 UTC (rev 7487) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-09 23:35:03 UTC (rev 7488) @@ -39,6 +39,8 @@ public class TableRA extends AbstractNormalBlockArea implements TableArea, org.axsl.areaW.TableArea { + private static final int MINCOLWIDTH = 10000; // 10pt + private int[] resolvedColumnWidth = null; public TableRA(Table generatedBy, Area parentArea) { @@ -52,6 +54,8 @@ this.crIPD()); } } + /* Not sure this is right. */ + this.calcFixedColumnWidths(this.crIPD()); } public byte getAreaType() { @@ -146,4 +150,166 @@ return null; } + private int calcFixedColumnWidths(int maxAllocationIPD) { + Table node = (Table) this.traitGeneratedBy(); + int tableWidth = node.traitIPDimensionOpt(this, this.crIPD()); + /* Accumulates the total table units used in columns in this table. */ + double totalTableUnits = 0.0; + /* + * Accumulates the total width, in millipoints(?), of the columns that + * have a fixed width. + */ + int totalFixedWidth = 0; + /* Minimum number of proportional units. */ + double tuMin = 100000.0; + /* + * Loop through the columns and total the fixed widths and proportional + * units for each one. + */ + for (int i = 0; i < node.getTableColumns().size(); i++) { + TableColumn column = (TableColumn) node.getTableColumns().get(i); + if (column == null) { + getLogger().warn("No table-column specification for column " + + (i + 1) + "."); + } else { + double tu = column.traitColumnWidthTableUnits(); + /* Keep track of minimum number of proportional units + * in any column which has only proportional units. + */ + if (tu > 0 && tu < tuMin + && column.traitColumnWidth(this, + tableWidth) == 0) { + tuMin = tu; + } + totalTableUnits += tu; + totalFixedWidth += column.traitColumnWidth(this, + tableWidth); + } + } + + double dWidthFactor = 0.0; + double dUnitLength = 0.0; + int optIPD; + int minIPD; + int maxIPD; + + boolean bHasProportionalUnits = (totalTableUnits > 0.0); + if (node.traitIPDimensionMax(this, maxAllocationIPD) >= 0) { + maxIPD = node.traitIPDimensionMax(this, maxAllocationIPD); + } else { + maxIPD = maxAllocationIPD; + } + + if (node.traitIPDimensionOpt(this, maxAllocationIPD) < 0) { + optIPD = -1; + } else { + /* TODO: This looks like a bug. Should be getIPDOptimum()? */ + optIPD = node.traitIPDimensionMax(this, maxAllocationIPD); + } + + if (node.traitIPDimensionMin(this, maxAllocationIPD) < 0) { + minIPD = -1; + } else { + minIPD = node.traitIPDimensionMin(this, maxAllocationIPD); + } + + if (bHasProportionalUnits && optIPD < 0) { + if (minIPD > 0) { + if (node.traitIPDimensionMax(this, maxAllocationIPD) >= 0) { + optIPD = (minIPD + maxIPD)/2; + } + else { + optIPD = minIPD; + } + } + else if (node.traitIPDimensionMax(this, maxAllocationIPD) >= 0) { + optIPD = maxIPD; + } + else { + getLogger().error("At least one of minimum, optimum, or " + + "maximum IPD must be specified on table."); + optIPD = maxIPD; + } + } + + if (totalTableUnits > 0.0) { + int iProportionalWidth = 0; + if (optIPD > totalFixedWidth) { + iProportionalWidth = optIPD - totalFixedWidth; + } + else if (maxIPD > totalFixedWidth) { + iProportionalWidth = maxIPD - totalFixedWidth; + } + else { + iProportionalWidth = maxAllocationIPD - totalFixedWidth; + } + if (iProportionalWidth > 0) { + dUnitLength = iProportionalWidth / totalTableUnits; + } + else { + getLogger().error("Sum of fixed column widths " + + totalFixedWidth + + " greater than maximum available IPD " + + maxAllocationIPD + "; no space for " + + totalTableUnits + " proportional units."); + /* Set remaining proportional units to a number which + * will assure the minimum column size for tuMin. + */ + dUnitLength = MINCOLWIDTH/tuMin; + // Reduce fixed column widths by this much??? + } + //log.debug("1 table-unit = " + dUnitLength + " mpt"); + } + else { + /* No proportional units. If minimum IPD is specified, check + * that sum of column widths > minIPD. + */ + if (minIPD > totalFixedWidth) { + // Add extra space to each column + dWidthFactor = (double) minIPD/(double)totalFixedWidth; + } + else if (maxIPD < totalFixedWidth) { + // Note: if maxIPD=auto, use maxAllocWidth + getLogger().warn("Sum of fixed column widths " + + totalFixedWidth + + " greater than maximum specified IPD " + maxIPD); + } + else if (optIPD != -1 && totalFixedWidth != optIPD) { + getLogger().warn("Sum of fixed column widths " + + totalFixedWidth + + " differs from specified optimum IPD " + optIPD); + } + } + // Now distribute the extra units onto each column and set offsets + int columnOffset = 0; + for (int i = 0; i < node.getTableColumns().size(); i++) { + TableColumn column = (TableColumn) node.getTableColumns().get(i); + if (column != null) { + //Compute the width of the column + int colWidth = -1; + if (column.traitColumnWidthTableUnits() > 0) { + //Proportional width + colWidth = ((int)(column.traitColumnWidthTableUnits() + * dUnitLength)); + } else { + //Fixed width + colWidth = column.traitColumnWidth(this, tableWidth); + } + + // Check minimum values and adjust if necessary + if (colWidth <= 0) { + getLogger().warn("Zero-width table column!"); + } + if (dWidthFactor > 0.0) { + // Increase column sizes to use up extra space + colWidth *= dWidthFactor; + } + this.setResolvedColumnWidth(i, colWidth); + columnOffset += colWidth; + } + } + // columnOffset now contains the width of the table. + return columnOffset; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 22:51:33
|
Revision: 7487 Author: victormote Date: 2006-06-09 15:51:29 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7487&view=rev Log Message: ----------- Conform to axsl change: Remove interface for table-column. This is not a real area, and was only used to paint the background in the renderer. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-09 22:51:22 UTC (rev 7486) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-06-09 22:51:29 UTC (rev 7487) @@ -24,15 +24,14 @@ package org.foray.area; -import org.axsl.areaR.TableColumnArea; import org.axsl.areaW.TableArea; import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; -public class TableColumnRA extends ContainerRA implements TableColumnArea, - org.axsl.areaW.TableColumnArea { +public class TableColumnRA extends ContainerRA + implements org.axsl.areaW.TableColumnArea { public TableColumnRA(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); 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.
