foray-commit Mailing List for FOray (Page 269)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vic...@us...> - 2006-05-08 17:38:39
|
Revision: 7162 Author: victormote Date: 2006-05-07 07:57:29 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7162&view=rev Log Message: ----------- Use more render-specific Exception. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-07 01:07:38 UTC (rev 7161) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-07 14:57:29 UTC (rev 7162) @@ -38,6 +38,7 @@ import org.foray.pioneer.PioneerLS; import org.foray.render.Renderer; +import org.axsl.areaR.AreaRException; import org.axsl.areaR.PageArea; import org.axsl.foR.FOTreeEvent; import org.axsl.foR.FOTreeListener; @@ -221,7 +222,7 @@ try { processQueue(true); outputTarget.stopOutput(); - } catch (FOrayException e) { + } catch (AreaRException e) { throw new SAXException(e); } catch (IOException e) { @@ -287,7 +288,7 @@ pageCollection); try { processQueue(false); - } catch (FOrayException e1) { + } catch (AreaRException e1) { throw new SAXException(e1); } catch (IOException e1) { // TODO Auto-generated catch block @@ -336,7 +337,7 @@ move forward, so return. */ private synchronized void processQueue(boolean force) - throws FOrayException, IOException { + throws AreaRException, IOException { if (! (this.outputTarget instanceof Renderer)) { return; } Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-05-07 01:07:38 UTC (rev 7161) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-05-07 14:57:29 UTC (rev 7162) @@ -29,7 +29,7 @@ package org.foray.render; -import org.foray.common.FOrayException; +import org.axsl.areaR.AreaRException; import org.foray.common.MUserAgent; import org.foray.common.SVGUserAgent; import org.foray.output.OutputConfig; @@ -100,7 +100,7 @@ * render the given area tree to the given stream */ public abstract void render(PageArea page) throws IOException, - FOrayException; + AreaRException; protected void doFrame(Area area) { markBorder(area); 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-05-07 01:07:38 UTC (rev 7161) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-05-07 14:57:29 UTC (rev 7162) @@ -29,7 +29,7 @@ package org.foray.render.pdf; -import org.foray.common.FOrayException; +import org.axsl.areaR.AreaRException; import org.foray.common.StringUtilPre5; import org.foray.output.OutputConfig; import org.foray.render.PrintRenderer; @@ -373,7 +373,7 @@ /** * Render page to PDF. {@inheritDoc} */ - public void render(PageArea page) throws FOrayException, IOException { + public void render(PageArea page) throws AreaRException, IOException { getLogger().debug("Rendering single page to PDF."); float w = page.getWidth(); float h = page.getHeight(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:34:38
|
Revision: 7183 Author: victormote Date: 2006-05-07 15:51:34 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7183&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-07 22:41:54 UTC (rev 7182) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-07 22:51:34 UTC (rev 7183) @@ -27,7 +27,7 @@ import org.foray.common.OrderedTreeNode; import org.axsl.areaW.FOLinkage; - +import org.axsl.areaW.PageArea; import org.axsl.common.Constants; import org.axsl.foR.FONode; import org.axsl.foR.FObj; @@ -238,6 +238,10 @@ return getAreaNodeParent().getPage(); } + public PageArea getWritablePage() { + return getAreaNodeParent().getPage(); + } + public FontConsumer getFontConsumer() { return getAreaNodeParent().getFontConsumer(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:29:16
|
Revision: 7198 Author: victormote Date: 2006-05-08 10:29:00 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7198&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 16:59:55 UTC (rev 7197) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 17:29:00 UTC (rev 7198) @@ -32,7 +32,6 @@ import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; import org.axsl.foR.fo.BasicLink; -import org.axsl.foR.fo.Block; import org.axsl.foR.fo.TableBody; import org.axsl.foR.fo.TableFooter; import org.axsl.foR.fo.TableHeader; @@ -1181,8 +1180,8 @@ return new org.foray.area.TableFooterContainer(tableFooter, this); } - public NormalBlockArea makeNormalBlockArea(Block block) { - return new org.foray.area.NormalBlockArea(block, this); + public NormalBlockArea makeNormalBlockArea(FObj fobj) { + return new org.foray.area.NormalBlockArea(fobj, this); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:23:38
|
Revision: 7154 Author: victormote Date: 2006-05-06 15:50:21 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7154&view=rev Log Message: ----------- Implement new axsl interfaces. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-06 22:30:41 UTC (rev 7153) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-06 22:50:21 UTC (rev 7154) @@ -35,7 +35,8 @@ import java.util.List; public class LineArea extends BlockArea implements LineOutput, - org.axsl.areaR.LineArea { + org.axsl.areaR.LineArea, + org.axsl.areaW.LineArea { // Whether the line has already had the leader sizes adjusted. private boolean optimized = false; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-06 22:30:41 UTC (rev 7153) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-06 22:50:21 UTC (rev 7154) @@ -46,7 +46,8 @@ * out how to stack the lines. */ public class NormalBlockArea extends BlockArea - implements org.axsl.areaR.NormalBlockArea { + implements org.axsl.areaR.NormalBlockArea, + org.axsl.areaW.NormalBlockArea { public LineArea currentLineArea; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:23:34
|
Revision: 7156 Author: victormote Date: 2006-05-06 16:10:22 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7156&view=rev Log Message: ----------- Add ignore properties on new project. Property Changed: ---------------- trunk/foray/foray-layout/ Property changes on: trunk/foray/foray-layout ___________________________________________________________________ Name: svn:ignore + build zzlocal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:22:12
|
Revision: 7158 Author: victormote Date: 2006-05-06 17:10:45 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7158&view=rev Log Message: ----------- Implement new axsl LayoutStrategy. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-07 00:04:01 UTC (rev 7157) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-07 00:10:45 UTC (rev 7158) @@ -51,7 +51,8 @@ /** * Abstract base class for all Layout systems. */ -public abstract class LayoutStrategy implements LineBreakHandler { +public abstract class LayoutStrategy implements LineBreakHandler, + org.axsl.areaW.LayoutStrategy { /** * The LayoutControl implementation that passes information to this This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:15:46
|
Revision: 7167 Author: victormote Date: 2006-05-07 09:21:14 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7167&view=rev Log Message: ----------- Fix NPE problem. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.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-05-07 16:15:00 UTC (rev 7166) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-07 16:21:14 UTC (rev 7167) @@ -196,6 +196,10 @@ return; } StaticContentPL staticPL = (StaticContentPL) staticContent.getProxy(); + if (staticPL == null) { + staticPL = new StaticContentPL(staticContent, this); + staticContent.setProxy(staticPL); + } /* TODO: Remove the following ugly, ugly cast after moduls are * settled down. */ staticPL.layout((Area)area); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:15:17
|
Revision: 7170 Author: victormote Date: 2006-05-07 10:25:47 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7170&view=rev Log Message: ----------- Update build scripts for new module dependencies. Modified Paths: -------------- trunk/foray/foray-app/scripts/build.xml trunk/foray/foray-layout/scripts/build.xml trunk/foray/foray-pioneer/scripts/build.xml trunk/foray/scripts/build.xml Modified: trunk/foray/foray-app/scripts/build.xml =================================================================== --- trunk/foray/foray-app/scripts/build.xml 2006-05-07 17:01:08 UTC (rev 7169) +++ trunk/foray/foray-app/scripts/build.xml 2006-05-07 17:25:47 UTC (rev 7170) @@ -61,12 +61,15 @@ <fileset dir="${foray.home}/foray-areatree/build/ant"> <include name="*.jar"/> </fileset> + <fileset dir="${foray.home}/foray-layout/build/ant"> + <include name="*.jar"/> + </fileset> <fileset dir="${foray.home}/foray-pioneer/build/ant"> <include name="*.jar"/> </fileset> - <fileset dir="${foray.home}/foray-output/build/ant"> - <include name="*.jar"/> - </fileset> + <fileset dir="${foray.home}/foray-output/build/ant"> + <include name="*.jar"/> + </fileset> <fileset dir="${foray.home}/foray-render/build/ant"> <include name="*.jar"/> </fileset> Modified: trunk/foray/foray-layout/scripts/build.xml =================================================================== --- trunk/foray/foray-layout/scripts/build.xml 2006-05-07 17:01:08 UTC (rev 7169) +++ trunk/foray/foray-layout/scripts/build.xml 2006-05-07 17:25:47 UTC (rev 7170) @@ -34,14 +34,14 @@ <include name="**/axsl*.jar"/> </fileset> <fileset dir="${lib.dir}"> - <include name="xml-apis.jar"/> - <include name="batik.jar"/> - <include name="axsl*.jar"/> <include name="commons-logging.jar"/> </fileset> <fileset dir="${foray.home}/foray-common/build/ant"> <include name="*.jar"/> </fileset> + <fileset dir="${foray.home}/foray-areatree/build/ant"> + <include name="*.jar"/> + </fileset> </path> </target> @@ -53,7 +53,7 @@ <property name="name" value="foray"/> <property name="contact.info" value="The FOray project http://www.foray.org"/> - <property name="module" value="areatree"/> + <property name="module" value="layout"/> <property name="module.dir" value="${foray.home}/foray-${module}"/> <property name="version" value="0.1"/> <property name="src.dir" value="${module.dir}/src"/> @@ -121,16 +121,16 @@ <echo message="Producing the javadoc files "/> <mkdir dir="${build.dir}/javadoc-api"/> <javadoc - packagenames="org.foray.area" + packagenames="org.foray.layout" sourcepath="${src.dir}/java" destdir="${build.dir}/javadoc-api" classpathref="libs-build-classpath" author="true" version="true" - windowtitle="FOray AreaTree API" - doctitle="FOray AreaTree API" + windowtitle="FOray Generic Layout API" + doctitle="FOray Generic Layout API" bottom="Copyright © 2004 The FOray Project. All Rights Reserved." - overview="${src.dir}/java/org/foray/area/overview.html" + overview="${src.dir}/java/org/foray/layout/overview.html" use="true" access="public" failonerror="true"> Modified: trunk/foray/foray-pioneer/scripts/build.xml =================================================================== --- trunk/foray/foray-pioneer/scripts/build.xml 2006-05-07 17:01:08 UTC (rev 7169) +++ trunk/foray/foray-pioneer/scripts/build.xml 2006-05-07 17:25:47 UTC (rev 7170) @@ -42,6 +42,9 @@ <fileset dir="${foray.home}/foray-common/build/ant"> <include name="*.jar"/> </fileset> + <fileset dir="${foray.home}/foray-layout/build/ant"> + <include name="*.jar"/> + </fileset> <fileset dir="${foray.home}/foray-areatree/build/ant"> <include name="*.jar"/> </fileset> Modified: trunk/foray/scripts/build.xml =================================================================== --- trunk/foray/scripts/build.xml 2006-05-07 17:01:08 UTC (rev 7169) +++ trunk/foray/scripts/build.xml 2006-05-07 17:25:47 UTC (rev 7170) @@ -129,6 +129,12 @@ <property name="foray.config" value="${foray.config}"/> </ant> + <ant antfile="${foray.home}/foray-layout/scripts/build.xml" + inheritall="false" + target="package"> + <property name="foray.config" value="${foray.config}"/> + </ant> + <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" inheritall="false" target="package"> @@ -210,6 +216,10 @@ dir="${foray.home}/foray-areatree/build/ant/classes"> <include name="**"/> </fileset> + <fileset id="foray-layout-classes" + dir="${foray.home}/foray-layout/build/ant/classes"> + <include name="**"/> + </fileset> <fileset id="foray-pioneer-classes" dir="${foray.home}/foray-pioneer/build/ant/classes"> <include name="**"/> @@ -240,6 +250,7 @@ <fileset refid="foray-text-resources"/> <fileset refid="foray-fotree-classes"/> <fileset refid="foray-areatree-classes"/> + <fileset refid="foray-layout-classes"/> <fileset refid="foray-pioneer-classes"/> <fileset refid="foray-output-classes"/> <fileset refid="foray-render-classes"/> @@ -368,6 +379,7 @@ <pathelement path="${foray.home}/foray-font/src/java"/> <pathelement path="${foray.home}/foray-fotree/src/java"/> <pathelement path="${foray.home}/foray-areatree/src/java"/> + <pathelement path="${foray.home}/foray-layout/src/java"/> <pathelement path="${foray.home}/foray-pioneer/src/java"/> <pathelement path="${foray.home}/foray-output/src/java"/> <pathelement path="${foray.home}/foray-render/src/java"/> @@ -417,7 +429,9 @@ <package name="org.foray.area"/> <package name="org.foray.area.*"/> </group> - <group title="The FOray Pioneer Layout System Module"> + <group title="The FOray Layout System"> + <package name="org.foray.layout"/> + <package name="org.foray.layout"/> <package name="org.foray.pioneer"/> <package name="org.foray.pioneer.*"/> </group> @@ -500,6 +514,10 @@ inheritall="false" target="clean"/> + <ant antfile="${foray.home}/foray-layout/scripts/build.xml" + inheritall="false" + target="clean"/> + <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" inheritall="false" target="clean"/> @@ -551,6 +569,9 @@ <ant antfile="${foray.home}/foray-areatree/scripts/build.xml" inheritall="false" target="style"/> + <ant antfile="${foray.home}/foray-layout/scripts/build.xml" + inheritall="false" + target="style"/> <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" inheritall="false" target="style"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:14:53
|
Revision: 7172 Author: victormote Date: 2006-05-07 11:03:14 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7172&view=rev Log Message: ----------- Remove extraneous methods in favor of standards. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 17:56:15 UTC (rev 7171) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-07 18:03:14 UTC (rev 7172) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FOrayFOLinkage; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; @@ -129,10 +128,6 @@ return proxy; } - protected FOrayFOLinkage getFONodeResult(FONode node) { - return (FOrayFOLinkage) node.getResult(); - } - public abstract int layout(Area area) throws AreaWException; public Log getLogger() { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 17:56:15 UTC (rev 7171) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-07 18:03:14 UTC (rev 7172) @@ -27,6 +27,7 @@ import org.foray.area.Area; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.FOLinkage; import org.axsl.foR.FONode; import org.axsl.foR.FObj; @@ -108,8 +109,11 @@ return null; } // Find the last Area generated by that FO - org.axsl.areaW.AreaNode lastGenerated = getFONodeResult(previousSibling) - .getLastGeneratedBy(); + FOLinkage linkage = (FOLinkage) previousSibling.getResult(); + if (linkage == null) { + return null; + } + org.axsl.areaW.AreaNode lastGenerated = linkage.getLastGeneratedBy(); if (lastGenerated == null) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:13:02
|
Revision: 7181 Author: victormote Date: 2006-05-07 15:23:19 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7181&view=rev Log Message: ----------- Update Eclipse classpath. LayoutStrategy interface no longer exists. Modified Paths: -------------- trunk/foray/foray-areatree/.classpath Modified: trunk/foray/foray-areatree/.classpath =================================================================== --- trunk/foray/foray-areatree/.classpath 2006-05-07 22:19:45 UTC (rev 7180) +++ trunk/foray/foray-areatree/.classpath 2006-05-07 22:23:19 UTC (rev 7181) @@ -12,10 +12,6 @@ <classpathentry kind="src" path="/axslText"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"> - <accessrules> - <accessrule kind="nonaccessible" pattern="**/Layout**"/> - </accessrules> - </classpathentry> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-08 17:05:47
|
Revision: 7188 Author: victormote Date: 2006-05-08 07:40:49 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7188&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 00:08:45 UTC (rev 7187) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 14:40:49 UTC (rev 7188) @@ -226,6 +226,10 @@ return parent.ancestorNormalBlockArea(); } + public org.axsl.areaW.NormalBlockArea ancestorWritableNormalBlockArea() { + return ancestorNormalBlockArea(); + } + public Area getContainingReferenceArea() { Area parent = getParentArea(); if (parent.traitIsReferenceArea()) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 00:08:45 UTC (rev 7187) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 14:40:49 UTC (rev 7188) @@ -86,6 +86,10 @@ return this.currentLineArea; } + public org.axsl.areaW.LineArea getWritableCurrentLineArea() { + return getCurrentLineArea(); + } + /** * Create a new line area to add inline objects. * This should be called after getting the current line area This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-06 02:13:03
|
Revision: 7149 Author: victormote Date: 2006-05-05 19:12:46 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7149&view=rev Log Message: ----------- Use new aXSL features to take some baby steps toward making Area Tree independent of layout. Modified Paths: -------------- trunk/foray/foray-app/.classpath trunk/foray/foray-areatree/.classpath trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java Modified: trunk/foray/foray-app/.classpath =================================================================== --- trunk/foray/foray-app/.classpath 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-app/.classpath 2006-05-06 02:12:46 UTC (rev 7149) @@ -29,5 +29,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/FOrayPDF"/> <classpathentry kind="var" path="ANT_HOME/lib/ant-launcher.jar"/> <classpathentry kind="var" path="ANT_HOME/lib/ant-trax.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-areatree/.classpath =================================================================== --- trunk/foray/foray-areatree/.classpath 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-areatree/.classpath 2006-05-06 02:12:46 UTC (rev 7149) @@ -12,5 +12,6 @@ <classpathentry kind="src" path="/axslText"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-06 02:12:46 UTC (rev 7149) @@ -38,7 +38,8 @@ import java.awt.geom.Rectangle2D; import java.util.List; -public abstract class Area extends AreaNode implements org.axsl.areaR.Area { +public abstract class Area extends AreaNode implements org.axsl.areaR.Area, + org.axsl.areaW.Area { /** * Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-06 02:12:46 UTC (rev 7149) @@ -39,7 +39,7 @@ import java.util.List; public abstract class AreaNode extends OrderedTreeNode - implements org.axsl.areaR.AreaNode { + implements org.axsl.areaR.AreaNode, org.axsl.areaW.AreaNode { public static final byte AREATYPE_BLOCK = 1; public static final byte AREATYPE_FOREIGN_OBJECT = 2; @@ -141,11 +141,11 @@ return proxy; } - protected AreaNode getPreviousChildOfGeneratedBy() { + protected org.axsl.areaW.AreaNode getPreviousChildOfGeneratedBy() { return generatedBy.getPreviousGeneratedBy(this); } - protected AreaNode getNextChildOfGeneratedBy() { + protected org.axsl.areaW.AreaNode getNextChildOfGeneratedBy() { return generatedBy.getNextGeneratedBy(this); } protected boolean isFirstChildOfGeneratedBy() { @@ -164,6 +164,18 @@ return (AreaNode) getParent(); } + public org.axsl.areaW.AreaNode getWritableParent() { + return (org.axsl.areaW.AreaNode) getParent(); + } + + public FONode getGeneratedBy() { + return this.generatedBy.getFONode(); + } + + public org.axsl.areaW.Area getWritableParentArea() { + return (org.axsl.areaW.Area) getParentArea(); + } + public Area getParentArea() { AreaNode parent = getAreaNodeParent(); if (parent == null) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-06 02:12:46 UTC (rev 7149) @@ -24,6 +24,8 @@ package org.foray.area; +import org.axsl.areaW.FOLinkage; +import org.axsl.areaW.AreaNode; import org.axsl.foR.FONode; import java.util.ArrayList; @@ -32,7 +34,8 @@ * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use * with FOray.</p> */ -public class FOrayFONodeProxy implements org.axsl.foR.FONodeProxy { +public class FOrayFONodeProxy implements org.axsl.foR.FONodeProxy, + FOLinkage { /** The real FONode which this proxy represents. */ private FONode realFONode; @@ -54,13 +57,13 @@ } public void registerGeneratedArea(AreaNode areaNode) { - AreaNode parent = areaNode.getAreaNodeParent(); + AreaNode parent = areaNode.getWritableParent(); if (parent != null) { /* * If the parent was generated by the same FObj, then we shouldn't * register this one also. */ - if (areaNode.generatedBy == parent.generatedBy) { + if (areaNode.getGeneratedBy() == parent.getGeneratedBy()) { return; } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-06 02:12:46 UTC (rev 7149) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.AreaNode; import org.foray.common.FOrayException; import org.axsl.foR.FONode; @@ -99,7 +98,7 @@ * RealFObj generates. * @return The Area into which this should start generating Areas. */ - Area findStartingLayoutArea() { + org.axsl.areaW.Area findStartingLayoutArea() { // Find the previous sibling FO // The cast to FObj below s/b OK because FONodes won't be running this. FObj realFObj = (FObj) this.getFONode(); @@ -108,13 +107,13 @@ return null; } // Find the last Area generated by that FO - AreaNode lastGenerated = getFObjProxy(previousSibling) + org.axsl.areaW.AreaNode lastGenerated = getFObjProxy(previousSibling) .getLastGeneratedBy(); if (lastGenerated == null) { return null; } // Find the parent of that node - return lastGenerated.getParentArea(); + return lastGenerated.getWritableParentArea(); } protected int layoutChildren(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-05-06 01:00:59 UTC (rev 7148) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java 2006-05-06 02:12:46 UTC (rev 7149) @@ -24,7 +24,7 @@ package org.foray.pioneer; -import org.foray.area.Area; +import org.axsl.areaW.Area; import org.foray.area.PageRA; import org.foray.area.PageCollection; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-06 01:01:13
|
Revision: 7148 Author: victormote Date: 2006-05-05 18:00:59 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7148&view=rev Log Message: ----------- Minor doc change. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-05 19:31:03 UTC (rev 7147) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-06 01:00:59 UTC (rev 7148) @@ -38,10 +38,10 @@ private FONode realFONode; /** - * The ordered list of Area instances generated by realFObj. Index 0 - * "is-first" and Index size() - 1 "is-last". This is currently set up to - * only store the root node of any subtree that was generated by - * realFObj. + * The ordered list of Area instances generated by {@link #realFONode}. + * Index 0 "is-first" and Index size() - 1 "is-last". + * This is currently set up to only store the root node of any subtree that + * was generated by {@link #realFONode}. */ private ArrayList generatedAreas; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-05 19:43:47
|
Revision: 7147 Author: victormote Date: 2006-05-05 12:31:03 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7147&view=rev Log Message: ----------- Use accessor to get the real node. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -34,8 +34,8 @@ */ public class FOrayFONodeProxy implements org.axsl.foR.FONodeProxy { - /** The real FObj which this proxy represents. */ - protected FONode realFObj; + /** The real FONode which this proxy represents. */ + private FONode realFONode; /** * The ordered list of Area instances generated by realFObj. Index 0 @@ -46,11 +46,11 @@ private ArrayList generatedAreas; public FOrayFONodeProxy(FONode realFObj) { - this.realFObj = realFObj; + this.realFONode = realFObj; } public FONode getFONode() { - return this.realFObj; + return this.realFONode; } public void registerGeneratedArea(AreaNode areaNode) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -53,16 +53,16 @@ } public int crBPD() { - if (this.generatedBy.realFObj instanceof RegionBefore - || this.generatedBy.realFObj instanceof RegionAfter) { + if (this.generatedBy.getFONode() instanceof RegionBefore + || this.generatedBy.getFONode() instanceof RegionAfter) { return traitGeneratedBy().traitExtent(); } return getParentArea().brBPD(); } public int crIPD() { - if (this.generatedBy.realFObj instanceof RegionStart - || this.generatedBy.realFObj instanceof RegionEnd) { + if (this.generatedBy.getFONode() instanceof RegionStart + || this.generatedBy.getFONode() instanceof RegionEnd) { return traitGeneratedBy().traitExtent(); } return getParentArea().brIPD(); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -83,7 +83,7 @@ } public AbstractFlow getFO() { - return (AbstractFlow) this.realFObj; + return (AbstractFlow) this.getFONode(); } public int layout(Area area, Region region) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -111,7 +111,7 @@ } AbstractTableBody getReal() { - return (AbstractTableBody) realFObj; + return (AbstractTableBody) this.getFONode(); } public int layout(Area area) Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -39,7 +39,7 @@ } public BlockContainer getFO() { - return (BlockContainer) this.realFObj; + return (BlockContainer) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -56,7 +56,7 @@ } public Block getFO() { - return (Block) this.realFObj; + return (Block) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -39,7 +39,7 @@ } public Character getFO() { - return (Character) this.realFObj; + return (Character) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -41,7 +41,7 @@ } public ContinuedLabel getFO() { - return (ContinuedLabel) this.realFObj; + return (ContinuedLabel) this.getFONode(); } /** Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -40,7 +40,7 @@ } public ExternalGraphic getFO() { - return (ExternalGraphic) this.realFObj; + return (ExternalGraphic) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -43,7 +43,7 @@ } public FOText getFO() { - return (FOText) this.realFObj; + return (FOText) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -41,7 +41,7 @@ } public FObjMixed getFObjMixed() { - return (FObjMixed) this.realFObj; + return (FObjMixed) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -118,7 +118,7 @@ } protected int layoutChildren(Area area) throws FOrayException { - FONode node = this.realFObj; + FONode node = this.getFONode(); int start = getProgress(); if (start == FONodePL.START) { start = 0; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -48,7 +48,7 @@ } public FootnoteBody getFO() { - return (FootnoteBody) this.realFObj; + return (FootnoteBody) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -44,7 +44,7 @@ } public Footnote getFO() { - return (Footnote) this.realFObj; + return (Footnote) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -41,7 +41,7 @@ } public InstreamForeignObject getFO() { - return (InstreamForeignObject) this.realFObj; + return (InstreamForeignObject) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -40,7 +40,7 @@ } public Leader getFO() { - return (Leader) this.realFObj; + return (Leader) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -41,7 +41,7 @@ } public ListBlock getFO() { - return (ListBlock) this.realFObj; + return (ListBlock) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -40,7 +40,7 @@ } public ListItemBody getFO() { - return (ListItemBody) this.realFObj; + return (ListItemBody) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -41,7 +41,7 @@ } public ListItemLabel getFO() { - return (ListItemLabel) this.realFObj; + return (ListItemLabel) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -42,7 +42,7 @@ } public ListItem getFO() { - return (ListItem) this.realFObj; + return (ListItem) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -35,7 +35,7 @@ } Marker getReal() { - return (Marker) realFObj; + return (Marker) this.getFONode(); } public int layout(Area area) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -40,7 +40,7 @@ } public PageNumberCitation getFO() { - return (PageNumberCitation) this.realFObj; + return (PageNumberCitation) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -40,7 +40,7 @@ } public PageNumber getFO() { - return (PageNumber) this.realFObj; + return (PageNumber) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -42,7 +42,7 @@ } public RetrieveMarker getFO() { - return (RetrieveMarker) this.realFObj; + return (RetrieveMarker) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -37,7 +37,7 @@ } public int layout(Area area) throws FOrayException { - StaticContent node = (StaticContent) this.realFObj; + StaticContent node = (StaticContent) this.getFONode(); int numChildren = node.childrenFO().size(); for (int i = 0; i < numChildren; i++) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -108,7 +108,7 @@ } TableCell getReal() { - return (TableCell) realFObj; + return (TableCell) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -53,7 +53,7 @@ } public TableColumn getFO() { - return (TableColumn) this.realFObj; + return (TableColumn) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -60,7 +60,7 @@ } public Table getFO() { - return (Table) this.realFObj; + return (Table) this.getFONode(); } public int layout(Area area) throws FOrayException { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-05 17:14:59 UTC (rev 7146) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-05-05 19:31:03 UTC (rev 7147) @@ -126,7 +126,7 @@ } private TableRow getReal() { - return (TableRow) realFObj; + return (TableRow) this.getFONode(); } public int layout(Area area) throws FOrayException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-05 17:18:49
|
Revision: 7146 Author: victormote Date: 2006-05-05 10:14:59 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7146&view=rev Log Message: ----------- Conform to aXSL java source directory relocation. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 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/BlockArea.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/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.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/LayoutControl.java trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.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/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.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/TableColumnRA.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 trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java trunk/foray/foray-font/src/java/org/foray/font/Subset.java trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutputFactory.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDFFactory.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPS.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPSFactory.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.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/PageMasterReference.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/Region.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/SubSequenceSpecifier.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/fo/prop/BackgroundImage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShape.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNamedDestination.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineItem.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineParent.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXImage.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXObject.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXReference.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFImageElementBridge.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageSequencePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableFooterPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableHeaderPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/TempImage.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.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/PSFont.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.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 trunk/foray/foray-text/src/java/org/foray/text/TextServer.java trunk/foray/foray-text/src/java/org/foray/text/line/EagerLineBreaker.java trunk/foray/foray-text/src/java/org/foray/text/line/LineBreakServer.java trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLBS.java trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -30,9 +30,9 @@ import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; -import org.axsl.font.FontServer; -import org.axsl.fotree.FOTreeServer; -import org.axsl.graphic.GraphicServer; +import org.axsl.foR.FOTreeServer; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -37,10 +37,10 @@ import org.foray.render.txt.TXTRenderer; import org.foray.render.xml.XMLRenderer; -import org.axsl.font.FontConsumer; -import org.axsl.font.FontServer; -import org.axsl.graphic.GraphicServer; -import org.axsl.pdf.PDFDocument; +import org.axsl.fontR.FontConsumer; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; +import org.axsl.pdfW.PDFDocument; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; @@ -98,7 +98,7 @@ private ArrayList targetList = new ArrayList(); /** The FO tree builder, which handles the SAX events. */ - private org.axsl.fotree.FOTreeBuilder treeBuilder; + private org.axsl.foR.FOTreeBuilder treeBuilder; private FOrayTarget currentTarget; @@ -332,7 +332,7 @@ return session.getConfiguration(); } - public org.axsl.fotree.FOTreeBuilder getFOTreeBuilder() { + public org.axsl.foR.FOTreeBuilder getFOTreeBuilder() { return this.treeBuilder; } Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -31,10 +31,10 @@ import org.foray.fotree.FOrayFOTreeServer; import org.foray.graphic.FOrayGraphicServer; -import org.axsl.font.FontException; -import org.axsl.font.FontServer; -import org.axsl.fotree.FOTreeServer; -import org.axsl.graphic.GraphicServer; +import org.axsl.foR.FOTreeServer; +import org.axsl.fontR.FontException; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -38,13 +38,13 @@ import org.foray.pioneer.PioneerLS; import org.foray.render.Renderer; -import org.axsl.areaOut.PageArea; -import org.axsl.font.FontConsumer; -import org.axsl.font.FontServer; -import org.axsl.fotree.FOTreeEvent; -import org.axsl.fotree.FOTreeListener; -import org.axsl.fotree.fo.PageSequence; -import org.axsl.graphic.GraphicServer; +import org.axsl.areaR.PageArea; +import org.axsl.foR.FOTreeEvent; +import org.axsl.foR.FOTreeListener; +import org.axsl.foR.fo.PageSequence; +import org.axsl.fontR.FontConsumer; +import org.axsl.fontR.FontServer; +import org.axsl.graphicR.GraphicServer; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; @@ -391,7 +391,7 @@ * @param event the FOTreeEvent that was fired */ public void foDocumentComplete (FOTreeEvent event) { - org.axsl.fotree.fo.Root rootFObj = document.getFOTreeBuilder() + org.axsl.foR.fo.Root rootFObj = document.getFOTreeBuilder() .getRootFObj(); try { getAreaTree().layoutDocumentNodes(rootFObj); Modified: trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,8 +25,9 @@ package org.foray.app; import org.foray.area.PageCollection; -import org.axsl.fotree.fo.PageSequence; +import org.axsl.foR.fo.PageSequence; + import java.util.ArrayList; import java.util.List; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,10 +26,10 @@ import org.foray.common.FOrayException; -import org.axsl.areaOut.GeneralInlineArea; -import org.axsl.fotree.FObj; +import org.axsl.areaR.GeneralInlineArea; +import org.axsl.foR.FObj; +import org.axsl.foR.WritingMode; -import org.axsl.fotree.WritingMode; public abstract class AbstractInlineArea extends AreaFlexible implements GeneralInlineArea{ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -27,18 +27,18 @@ import org.foray.common.FOrayException; import org.axsl.common.Constants; -import org.axsl.font.Font; -import org.axsl.font.FontUse; -import org.axsl.fotree.FObj; -import org.axsl.fotree.WritingMode; -import org.axsl.fotree.fo.BasicLink; -import org.axsl.graphic.Graphic; +import org.axsl.foR.FObj; +import org.axsl.foR.WritingMode; +import org.axsl.foR.fo.BasicLink; +import org.axsl.fontR.Font; +import org.axsl.fontR.FontUse; +import org.axsl.graphicR.Graphic; import java.awt.Color; import java.awt.geom.Rectangle2D; import java.util.List; -public abstract class Area extends AreaNode implements org.axsl.areaOut.Area { +public abstract class Area extends AreaNode implements org.axsl.areaR.Area { /** * Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,7 +24,7 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; import java.util.List; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,9 +24,9 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; +import org.axsl.foR.WritingMode; -import org.axsl.fotree.WritingMode; import java.util.List; @@ -35,7 +35,7 @@ * information. The opposite of AreaFlexible is {@link AreaFixed}. */ public abstract class AreaFlexible extends Area - implements org.axsl.areaOut.AreaFlexible { + implements org.axsl.areaR.AreaFlexible { /** * See {@link #getProgressionDimension()} for a description of Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -27,9 +27,9 @@ import org.foray.common.OrderedTreeNode; import org.axsl.common.Constants; -import org.axsl.font.FontConsumer; -import org.axsl.fotree.FONode; -import org.axsl.fotree.FObj; +import org.axsl.foR.FONode; +import org.axsl.foR.FObj; +import org.axsl.fontR.FontConsumer; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; @@ -39,7 +39,7 @@ import java.util.List; public abstract class AreaNode extends OrderedTreeNode - implements org.axsl.areaOut.AreaNode { + implements org.axsl.areaR.AreaNode { public static final byte AREATYPE_BLOCK = 1; public static final byte AREATYPE_FOREIGN_OBJECT = 2; @@ -107,8 +107,8 @@ } } - public org.axsl.areaOut.AreaNode getParentOut() { - return (org.axsl.areaOut.AreaNode) getParent(); + public org.axsl.areaR.AreaNode getParentOut() { + return (org.axsl.areaR.AreaNode) getParent(); } public List getChildren() { @@ -373,7 +373,7 @@ return parent.ancestorLineArea(); } - public org.axsl.areaOut.LineArea ancestorLineAreaOut() { + public org.axsl.areaR.LineArea ancestorLineAreaOut() { return ancestorLineArea(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,13 +26,13 @@ import org.foray.common.FOrayException; -import org.axsl.font.FontConsumer; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.Bookmark; -import org.axsl.fotree.fo.BookmarkTitle; -import org.axsl.fotree.fo.BookmarkTree; -import org.axsl.fotree.fo.PageSequence; -import org.axsl.fotree.fo.Root; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.Bookmark; +import org.axsl.foR.fo.BookmarkTitle; +import org.axsl.foR.fo.BookmarkTree; +import org.axsl.foR.fo.PageSequence; +import org.axsl.foR.fo.Root; +import org.axsl.fontR.FontConsumer; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; @@ -43,7 +43,7 @@ /** * The root of the AreaTree. */ -public class AreaTree extends NonArea implements org.axsl.areaOut.AreaTree { +public class AreaTree extends NonArea implements org.axsl.areaR.AreaTree { /** The AreaTreeControl implementation that controls this AreaTree. */ AreaTreeControl control; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,13 +24,13 @@ package org.foray.area; -import org.axsl.fotree.fo.BasicLink; +import org.axsl.foR.fo.BasicLink; /** * Areas generated by the fo:basic-link object. */ public class BasicLinkArea extends AbstractInlineArea - implements org.axsl.areaOut.BasicLinkArea { + implements org.axsl.areaR.BasicLinkArea { public BasicLinkArea(BasicLink generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,8 +25,9 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; + /** * Manages the before-float-reference-area. Its parent should always be an * instance of RegionRABody. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,7 +24,7 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; /** * Superclass for normal block-areas (NormalBlockArea) and line-areas Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,8 +24,8 @@ package org.foray.area; -import org.axsl.areaOut.BlockContainerArea; -import org.axsl.fotree.FObj; +import org.axsl.areaR.BlockContainerArea; +import org.axsl.foR.FObj; /** * The container area for the contents of a block-container FO. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,14 +24,14 @@ package org.foray.area; -import org.axsl.areaOut.BookmarkTitleArea; -import org.axsl.fotree.fo.Bookmark; +import org.axsl.areaR.BookmarkTitleArea; +import org.axsl.foR.fo.Bookmark; /** * The AreaTree representation of an fo:bookmark object. */ public class BookmarkArea extends NonArea - implements org.axsl.areaOut.BookmarkArea { + implements org.axsl.areaR.BookmarkArea { public BookmarkArea(Bookmark generatedBy, AreaNode parent) { super(generatedBy, parent); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,13 +24,13 @@ package org.foray.area; -import org.axsl.fotree.fo.BookmarkTitle; +import org.axsl.foR.fo.BookmarkTitle; /** * The AreaTree representation of an fo:bookmark-title object. */ public class BookmarkTitleArea extends NonArea - implements org.axsl.areaOut.BookmarkTitleArea { + implements org.axsl.areaR.BookmarkTitleArea { public BookmarkTitleArea(BookmarkTitle generatedBy, BookmarkArea parent) { super(generatedBy, parent); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,13 +24,13 @@ package org.foray.area; -import org.axsl.fotree.fo.BookmarkTree; +import org.axsl.foR.fo.BookmarkTree; /** * A NonArea class for items generated by fo:bookmark-tree. */ public class BookmarkTreeArea extends NonArea - implements org.axsl.areaOut.BookmarkTreeArea { + implements org.axsl.areaR.BookmarkTreeArea { public BookmarkTreeArea(BookmarkTree generatedBy, AreaNode parent) { super(generatedBy, parent); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,8 +25,9 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; + /** * Abstract superclass for areas that are primarily for collection and * positioning other areas. Examples include region-reference-area, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,12 +24,12 @@ package org.foray.area; -import org.axsl.fotree.fo.ExternalGraphic; +import org.axsl.foR.fo.ExternalGraphic; -import org.axsl.graphic.Graphic; +import org.axsl.graphicR.Graphic; public class ExternalGraphicArea extends AbstractInlineArea - implements org.axsl.areaOut.ExternalGraphicArea { + implements org.axsl.areaR.ExternalGraphicArea { public ExternalGraphicArea(ExternalGraphic generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,15 +24,15 @@ package org.foray.area; -import org.axsl.fotree.FONode; +import org.axsl.foR.FONode; import java.util.ArrayList; /** - * <p>An implementation of {@link org.axsl.fotree.FONodeProxy} suitable for use + * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use * with FOray.</p> */ -public class FOrayFONodeProxy implements org.axsl.fotree.FONodeProxy { +public class FOrayFONodeProxy implements org.axsl.foR.FONodeProxy { /** The real FObj which this proxy represents. */ protected FONode realFObj; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,8 +25,9 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; + /** * Manages the main-reference-area. Its parent should always be an instance of * RegionRABody. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,12 +24,12 @@ package org.foray.area; -import org.axsl.fotree.ForeignXML; -import org.axsl.fotree.fo.InstreamForeignObject; -import org.axsl.fotree.svg.SVGElement; +import org.axsl.foR.ForeignXML; +import org.axsl.foR.fo.InstreamForeignObject; +import org.axsl.foR.svg.SVGElement; public class ForeignObjectArea extends AbstractInlineArea - implements org.axsl.areaOut.ForeignObjectArea { + implements org.axsl.areaR.ForeignObjectArea { public ForeignObjectArea(InstreamForeignObject generatedBy, Area parentArea, int width) { @@ -69,7 +69,7 @@ parentForDimensions.crBPD()); } - public org.axsl.areaOut.AreaNode getContainedForeignObject() { + public org.axsl.areaR.AreaNode getContainedForeignObject() { return getFirstAreaNodeChild(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,7 +24,7 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; public class GenericContainer extends ContainerRA { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,13 +24,13 @@ package org.foray.area; -import org.axsl.fotree.fo.Inline; +import org.axsl.foR.fo.Inline; /** * Areas generated by the fo:inline object. */ public class InlineArea extends AbstractInlineArea - implements org.axsl.areaOut.InlineArea { + implements org.axsl.areaR.InlineArea { public InlineArea(Inline generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,7 +24,7 @@ package org.foray.area; -import org.axsl.graphic.GraphicServer; +import org.axsl.graphicR.GraphicServer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,21 +26,21 @@ import org.foray.common.FOrayException; -import org.axsl.fotree.FONode; -import org.axsl.fotree.FOText; -import org.axsl.fotree.FObj; -import org.axsl.fotree.FObjMixed; -import org.axsl.fotree.fo.BasicLink; -import org.axsl.fotree.fo.Block; -import org.axsl.fotree.fo.Character; -import org.axsl.fotree.fo.ExternalGraphic; -import org.axsl.fotree.fo.Inline; -import org.axsl.fotree.fo.InstreamForeignObject; -import org.axsl.fotree.fo.Leader; -import org.axsl.fotree.fo.PageNumber; -import org.axsl.fotree.fo.PageNumberCitation; -import org.axsl.fotree.fo.PageSequence; -import org.axsl.fotree.fo.Region; +import org.axsl.foR.FONode; +import org.axsl.foR.FOText; +import org.axsl.foR.FObj; +import org.axsl.foR.FObjMixed; +import org.axsl.foR.fo.BasicLink; +import org.axsl.foR.fo.Block; +import org.axsl.foR.fo.Character; +import org.axsl.foR.fo.ExternalGraphic; +import org.axsl.foR.fo.Inline; +import org.axsl.foR.fo.InstreamForeignObject; +import org.axsl.foR.fo.Leader; +import org.axsl.foR.fo.PageNumber; +import org.axsl.foR.fo.PageNumberCitation; +import org.axsl.foR.fo.PageSequence; +import org.axsl.foR.fo.Region; import org.axsl.text.TextException; import org.axsl.text.line.LineBreakHandler; import org.axsl.text.line.LineNonText; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,8 +24,8 @@ package org.foray.area; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.Leader; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.Leader; import org.axsl.common.Constants; @@ -53,7 +53,7 @@ * </ul> */ public class LeaderArea extends AbstractInlineArea - implements org.axsl.areaOut.LeaderArea { + implements org.axsl.areaR.LeaderArea { public LeaderArea(Leader generatedBy, Area parentArea, int initialProgressionDimension) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,16 +25,17 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; +import org.axsl.foR.WritingMode; + import org.axsl.common.Constants; -import org.axsl.fotree.WritingMode; import org.axsl.text.line.LineOutput; import java.util.List; public class LineArea extends BlockArea implements LineOutput, - org.axsl.areaOut.LineArea { + org.axsl.areaR.LineArea { // Whether the line has already had the leader sizes adjusted. private boolean optimized = false; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,12 +26,12 @@ import org.foray.common.FOrayException; -import org.axsl.areaOut.MainReferenceArea; +import org.axsl.areaR.MainReferenceArea; import org.axsl.common.Constants; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.Block; -import org.axsl.fotree.fo.BlockContainer; -import org.axsl.fotree.fo.RegionBody; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.Block; +import org.axsl.foR.fo.BlockContainer; +import org.axsl.foR.fo.RegionBody; import java.util.List; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,7 +24,7 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; /** * Abstract base class for all AreaNodes that do not occupy any area. 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-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,13 +25,14 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.FootnoteBody; -import org.axsl.fotree.fo.ListItem; -import org.axsl.fotree.fo.ListItemLabel; -import org.axsl.fotree.fo.ListItemBody; -import org.axsl.fotree.fo.RegionBody; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.FootnoteBody; +import org.axsl.foR.fo.ListItem; +import org.axsl.foR.fo.ListItemBody; +import org.axsl.foR.fo.ListItemLabel; +import org.axsl.foR.fo.RegionBody; + import java.util.ArrayList; /** @@ -45,7 +46,7 @@ * out how to stack the lines. */ public class NormalBlockArea extends BlockArea - implements org.axsl.areaOut.NormalBlockArea { + implements org.axsl.areaR.NormalBlockArea { public LineArea currentLineArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,8 +26,8 @@ import org.foray.common.FOrayException; -import org.axsl.areaOut.NormalFlowArea; -import org.axsl.fotree.FObj; +import org.axsl.areaR.NormalFlowArea; +import org.axsl.foR.FObj; /** * Represents a normal-flow-reference-area. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,13 +25,14 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.PageSequence; -import org.axsl.fotree.fo.RegionBody; -import org.axsl.fotree.fo.SimplePageMaster; +import org.axsl.foR.FOTreeException; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.PageSequence; +import org.axsl.foR.fo.RegionBody; +import org.axsl.foR.fo.SimplePageMaster; + import org.axsl.common.Constants; -import org.axsl.fotree.FOTreeException; import java.util.ArrayList; @@ -42,7 +43,7 @@ * and its children should always be PageRA instances. */ public class PageCollection extends NonArea - implements org.axsl.areaOut.PageCollection { + implements org.axsl.areaR.PageCollection { /** The number of pages (so far) in this PageCollection. */ private int pageCount = 0; @@ -322,9 +323,9 @@ return (AreaTree) getParent(); } - public org.axsl.areaOut.AreaTree getAreaTreeOut() { + public org.axsl.areaR.AreaTree getAreaTreeOut() { // Cast validated during construction. - return (org.axsl.areaOut.AreaTree) getParent(); + return (org.axsl.areaR.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-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,13 +24,13 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; /** * The normal inline-area created by an fo:page-number object. */ public class PageNumberArea extends AbstractInlineArea - implements org.axsl.areaOut.PageNumberArea { + implements org.axsl.areaR.PageNumberArea { public PageNumberArea(FObj generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,10 +24,10 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; public class PageNumberCitationArea extends AbstractInlineArea - implements org.axsl.areaOut.PageNumberCitationArea { + implements org.axsl.areaR.PageNumberCitationArea { public PageNumberCitationArea(FObj generatedBy, Area parentArea, int width) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,23 +26,23 @@ import org.foray.common.FOrayException; -import org.axsl.areaOut.PageArea; -import org.axsl.areaOut.RegionArea; -import org.axsl.areaOut.RegionBodyArea; +import org.axsl.areaR.PageArea; +import org.axsl.areaR.RegionArea; +import org.axsl.areaR.RegionBodyArea; import org.axsl.common.Constants; -import org.axsl.fotree.FObj; -import org.axsl.fotree.WritingMode; -import org.axsl.fotree.fo.FootnoteBody; -import org.axsl.fotree.fo.Marker; -import org.axsl.fotree.fo.PageSequence; -import org.axsl.fotree.fo.Region; -import org.axsl.fotree.fo.RegionAfter; -import org.axsl.fotree.fo.RegionBefore; -import org.axsl.fotree.fo.RegionBody; -import org.axsl.fotree.fo.RegionEnd; -import org.axsl.fotree.fo.RegionStart; -import org.axsl.fotree.fo.RetrieveMarker; -import org.axsl.fotree.fo.SimplePageMaster; +import org.axsl.foR.FObj; +import org.axsl.foR.WritingMode; +import org.axsl.foR.fo.FootnoteBody; +import org.axsl.foR.fo.Marker; +import org.axsl.foR.fo.PageSequence; +import org.axsl.foR.fo.Region; +import org.axsl.foR.fo.RegionAfter; +import org.axsl.foR.fo.RegionBefore; +import org.axsl.foR.fo.RegionBody; +import org.axsl.foR.fo.RegionEnd; +import org.axsl.foR.fo.RegionStart; +import org.axsl.foR.fo.RetrieveMarker; +import org.axsl.foR.fo.SimplePageMaster; import java.util.ArrayList; import java.util.List; @@ -298,7 +298,7 @@ * @return The first node on this page that has an unresolved "ref-id", or * null if there are no such nodes. */ - public org.axsl.areaOut.AreaNode firstUnresolvedRefId() { + public org.axsl.areaR.AreaNode firstUnresolvedRefId() { return firstUnresolvedRefId(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-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,12 +24,12 @@ package org.foray.area; -import org.axsl.areaOut.RegionArea; -import org.axsl.fotree.fo.Region; -import org.axsl.fotree.fo.RegionAfter; -import org.axsl.fotree.fo.RegionBefore; -import org.axsl.fotree.fo.RegionEnd; -import org.axsl.fotree.fo.RegionStart; +import org.axsl.areaR.RegionArea; +import org.axsl.foR.fo.Region; +import org.axsl.foR.fo.RegionAfter; +import org.axsl.foR.fo.RegionBefore; +import org.axsl.foR.fo.RegionEnd; +import org.axsl.foR.fo.RegionStart; /** * This class is used to manage a region-reference-area. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -26,11 +26,11 @@ import org.foray.common.FOrayException; -import org.axsl.areaOut.MainReferenceArea; -import org.axsl.areaOut.RegionBodyArea; -import org.axsl.fotree.WritingMode; -import org.axsl.fotree.fo.RegionBody; -import org.axsl.fotree.fo.SimplePageMaster; +import org.axsl.areaR.MainReferenceArea; +import org.axsl.areaR.RegionBodyArea; +import org.axsl.foR.WritingMode; +import org.axsl.foR.fo.RegionBody; +import org.axsl.foR.fo.SimplePageMaster; import java.util.List; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,15 +25,16 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.svg.SVGElement; +import org.axsl.foR.svg.SVGElement; + import org.w3c.dom.svg.SVGDocument; /** * An SVGArea represents the <em>reference </em> area that contains the * content that is in a {@link ForeignObjectArea} <em>viewport </em> area. */ -public class SVGArea extends AreaFlexible implements org.axsl.areaOut.SVGArea { +public class SVGArea extends AreaFlexible implements org.axsl.areaR.SVGArea { /** * Construct an SVG area. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -25,10 +25,11 @@ package org.foray.area; import org.foray.common.FOrayException; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.RegionBody; -import org.axsl.areaOut.SpanArea; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.RegionBody; + +import org.axsl.areaR.SpanArea; import org.axsl.common.Constants; import java.util.Iterator; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,10 +24,10 @@ package org.foray.area; -import org.axsl.fotree.FObj; +import org.axsl.foR.FObj; public class TableBodyContainer extends GenericContainer - implements org.axsl.areaOut.TableBodyContainer { + implements org.axsl.areaR.TableBodyContainer { public TableBodyContainer(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,9 +24,9 @@ package org.foray.area; -import org.axsl.fotree.fo.TableCell; +import org.axsl.foR.fo.TableCell; -import org.axsl.areaOut.TableCellArea; +import org.axsl.areaR.TableCellArea; import org.axsl.common.Constants; public class TableCellRA extends ContainerRA implements TableCellArea { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-05 14:40:42 UTC (rev 7145) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-05 17:14:59 UTC (rev 7146) @@ -24,10 +24,10 @@ package org.foray.area; -import org.axsl.areaOut.TableColumnArea; -import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.Table; -import org.axsl.fotree.fo.TableColumn; +import org.axsl.areaR.TableColumnArea; +import org.axsl.foR.FObj; +import org.axsl.foR.fo.Table; +import org.axsl.foR.fo.TableColumn; public class TableColumnRA extends ContainerRA implements TableColumnArea { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java ======... [truncated message content] |
|
From: <vic...@us...> - 2006-05-05 14:41:08
|
Revision: 7145 Author: victormote Date: 2006-05-05 07:40:42 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7145&view=rev Log Message: ----------- Conform to axsl module name changes. Modified Paths: -------------- trunk/foray/foray-app/.classpath trunk/foray/foray-areatree/.classpath trunk/foray/foray-font/.classpath trunk/foray/foray-fotree/.classpath trunk/foray/foray-graphic/.classpath trunk/foray/foray-output/.classpath trunk/foray/foray-pdf/.classpath trunk/foray/foray-pioneer/.classpath trunk/foray/foray-ps/.classpath trunk/foray/foray-render/.classpath trunk/foray/foray-text/.classpath Modified: trunk/foray/foray-app/.classpath =================================================================== --- trunk/foray/foray-app/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-app/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -9,11 +9,11 @@ <classpathentry kind="src" path="/FOrayRender"/> <classpathentry kind="src" path="/FOrayAreaTree"/> <classpathentry kind="src" path="/FOrayPioneer"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> - <classpathentry kind="src" path="/axslAreaOut"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> + <classpathentry kind="src" path="/axslArea-R"/> <classpathentry kind="src" path="/FOrayOutput"/> - <classpathentry kind="src" path="/axslFOTree"/> + <classpathentry kind="src" path="/axslFO-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/axslText"/> <classpathentry kind="src" path="/FOrayText"/> @@ -25,7 +25,7 @@ <classpathentry kind="var" path="FORAY_LIB_ROOT/resolver.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/xml-apis-1.3.02.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/axslPDF"/> + <classpathentry kind="src" path="/axslPDF-W"/> <classpathentry combineaccessrules="false" kind="src" path="/FOrayPDF"/> <classpathentry kind="var" path="ANT_HOME/lib/ant-launcher.jar"/> <classpathentry kind="var" path="ANT_HOME/lib/ant-trax.jar"/> Modified: trunk/foray/foray-areatree/.classpath =================================================================== --- trunk/foray/foray-areatree/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-areatree/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,10 +4,10 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> - <classpathentry kind="src" path="/axslAreaOut"/> - <classpathentry kind="src" path="/axslFOTree"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> + <classpathentry kind="src" path="/axslArea-R"/> + <classpathentry kind="src" path="/axslFO-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/axslText"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> Modified: trunk/foray/foray-font/.classpath =================================================================== --- trunk/foray/foray-font/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-font/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,9 +4,9 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayPS"/> - <classpathentry kind="src" path="/axslFont"/> + <classpathentry kind="src" path="/axslFont-R"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslPS"/> + <classpathentry kind="src" path="/axslPS-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/> Modified: trunk/foray/foray-fotree/.classpath =================================================================== --- trunk/foray/foray-fotree/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-fotree/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,9 +4,9 @@ <classpathentry kind="src" path="/FOrayCommon"/> <classpathentry excluding=".#*" kind="src" path="src/java"/> <classpathentry kind="src" path="scripts"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> - <classpathentry kind="src" path="/axslFOTree"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> + <classpathentry kind="src" path="/axslFO-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/axslText"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> Modified: trunk/foray/foray-graphic/.classpath =================================================================== --- trunk/foray/foray-graphic/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-graphic/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,7 +4,7 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslGraphic"/> + <classpathentry kind="src" path="/axslGraphic-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="JAI_HOME/lib/jai_codec.jar"/> Modified: trunk/foray/foray-output/.classpath =================================================================== --- trunk/foray/foray-output/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-output/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -3,10 +3,10 @@ <classpathentry kind="src" path="src/java"/> <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/axslGraphic"/> + <classpathentry kind="src" path="/axslGraphic-R"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslFOTree"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslFO-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/FOrayMIF"/> Modified: trunk/foray/foray-pdf/.classpath =================================================================== --- trunk/foray/foray-pdf/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-pdf/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -3,15 +3,15 @@ <classpathentry excluding=".#*" kind="src" path="src/java"/> <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslPS"/> + <classpathentry kind="src" path="/axslPS-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/FOrayPS"/> <classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/axslPDF"/> + <classpathentry kind="src" path="/axslPDF-W"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-pioneer/.classpath =================================================================== --- trunk/foray/foray-pioneer/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-pioneer/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,11 +4,11 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayAreaTree"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> - <classpathentry kind="src" path="/axslAreaOut"/> - <classpathentry kind="src" path="/axslAreaIn"/> - <classpathentry kind="src" path="/axslFOTree"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> + <classpathentry kind="src" path="/axslArea-R"/> + <classpathentry kind="src" path="/axslArea-W"/> + <classpathentry kind="src" path="/axslFO-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/FOrayCommon"/> <classpathentry kind="src" path="/axslText"/> Modified: trunk/foray/foray-ps/.classpath =================================================================== --- trunk/foray/foray-ps/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-ps/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,7 +4,7 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslPS"/> + <classpathentry kind="src" path="/axslPS-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> <classpathentry kind="output" path="build/eclipse"/> Modified: trunk/foray/foray-render/.classpath =================================================================== --- trunk/foray/foray-render/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-render/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -4,16 +4,16 @@ <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/FOrayCommon"/> - <classpathentry kind="src" path="/axslFont"/> - <classpathentry kind="src" path="/axslGraphic"/> - <classpathentry kind="src" path="/axslAreaOut"/> + <classpathentry kind="src" path="/axslFont-R"/> + <classpathentry kind="src" path="/axslGraphic-R"/> + <classpathentry kind="src" path="/axslArea-R"/> <classpathentry kind="src" path="/FOrayOutput"/> - <classpathentry kind="src" path="/axslPS"/> + <classpathentry kind="src" path="/axslPS-R"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/axslText"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/axslPDF"/> + <classpathentry kind="src" path="/axslPDF-W"/> <classpathentry combineaccessrules="false" kind="src" path="/FOrayPS"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-text/.classpath =================================================================== --- trunk/foray/foray-text/.classpath 2006-05-04 23:51:39 UTC (rev 7144) +++ trunk/foray/foray-text/.classpath 2006-05-05 14:40:42 UTC (rev 7145) @@ -3,7 +3,7 @@ <classpathentry excluding=".#*" kind="src" path="src/java"/> <classpathentry kind="src" path="scripts"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/axslFont"/> + <classpathentry kind="src" path="/axslFont-R"/> <classpathentry kind="src" path="/axslText"/> <classpathentry kind="src" path="/axslCommon"/> <classpathentry kind="src" path="/FOrayCommon"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 23:51:43
|
Revision: 7144 Author: victormote Date: 2006-05-04 16:51:39 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7144&view=rev Log Message: ----------- Move more methods from AreaTreeControl to AreaTree classes. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 23:47:36 UTC (rev 7143) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 23:51:39 UTC (rev 7144) @@ -134,11 +134,6 @@ private ArrayList renderQueue = new ArrayList(); /** - * The list of markers. - */ - private PageSequence currentPageSequence; - - /** * Keeps track of how many page-sequence objects have been processed. * Used in messages to the users. */ @@ -357,11 +352,6 @@ } } - // Auxillary function for retrieving markers. - public PageSequence getCurrentPageSequence() { - return currentPageSequence; - } - /** * Return the logger to be used. (Required by the FontConsumer interface). */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 23:47:52
|
Revision: 7143 Author: victormote Date: 2006-05-04 16:47:36 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7143&view=rev Log Message: ----------- Move more methods from AreaTreeControl to AreaTree classes. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 23:19:48 UTC (rev 7142) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 23:47:36 UTC (rev 7143) @@ -43,7 +43,6 @@ import org.axsl.font.FontServer; import org.axsl.fotree.FOTreeEvent; import org.axsl.fotree.FOTreeListener; -import org.axsl.fotree.fo.Marker; import org.axsl.fotree.fo.PageSequence; import org.axsl.graphic.GraphicServer; import org.axsl.text.TextServer; @@ -137,8 +136,6 @@ /** * The list of markers. */ - private ArrayList documentMarkers; - private ArrayList currentPageSequenceMarkers; private PageSequence currentPageSequence; /** @@ -317,26 +314,6 @@ } public synchronized void queuePage(PageRA page) throws FOrayException { - // process markers - PageSequence pageSequence = page.getPageSequence(); - if (pageSequence != currentPageSequence) { - currentPageSequence = pageSequence; - currentPageSequenceMarkers = null; - } - ArrayList markers = page.getMarkers(); - if (markers != null) { - if (documentMarkers == null) { - documentMarkers = new ArrayList(); - } - if (currentPageSequenceMarkers == null) { - currentPageSequenceMarkers = new ArrayList(); - } - for (int i = 0; i < markers.size(); i++) { - Marker marker = (Marker) markers.get(i); - currentPageSequenceMarkers.add(marker); - documentMarkers.add(marker); - } - } /* * We run the pages through a queue because any page page that contains @@ -381,20 +358,10 @@ } // Auxillary function for retrieving markers. - public ArrayList getDocumentMarkers() { - return documentMarkers; - } - - // Auxillary function for retrieving markers. public PageSequence getCurrentPageSequence() { return currentPageSequence; } - // Auxillary function for retrieving markers. - public ArrayList getCurrentPageSequenceMarkers() { - return currentPageSequenceMarkers; - } - /** * Return the logger to be used. (Required by the FontConsumer interface). */ Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 23:19:48 UTC (rev 7142) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 23:47:36 UTC (rev 7143) @@ -51,6 +51,7 @@ private TextServer textServer; private Log logger; private LayoutStrategy layoutStrategy; + private ArrayList documentMarkers = new ArrayList(); /** * An ordered list of all of the PageCollection objects that have been @@ -96,12 +97,8 @@ return this.fontConsumer; } - public ArrayList getCurrentPageSequenceMarkers() { - return control.getCurrentPageSequenceMarkers(); - } - public ArrayList getDocumentMarkers() { - return control.getDocumentMarkers(); + return this.documentMarkers; } public TextServer getTextServer() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 23:19:48 UTC (rev 7142) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 23:47:36 UTC (rev 7143) @@ -26,8 +26,6 @@ import org.foray.common.FOrayException; -import java.util.ArrayList; - /** * This is conceptually the ancestor of the entire AreaTree. Implementations * are usually classes from applications wanting to build and use an AreaTree. @@ -41,8 +39,4 @@ */ public void queuePage(PageRA page) throws FOrayException ; - public ArrayList getCurrentPageSequenceMarkers() ; - - public ArrayList getDocumentMarkers() ; - } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-04 23:19:48 UTC (rev 7142) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-04 23:47:36 UTC (rev 7143) @@ -54,6 +54,8 @@ */ public int currentPageNumber; + private ArrayList currentPageSequenceMarkers = new ArrayList(); + /** * Constructor. * @param pageSeq The "cousin" PageSequence object for which this @@ -115,7 +117,7 @@ } public ArrayList getCurrentPageSequenceMarkers() { - return getAreaTree().getCurrentPageSequenceMarkers(); + return this.currentPageSequenceMarkers; } public ArrayList getDocumentMarkers() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 23:19:48 UTC (rev 7142) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 23:47:36 UTC (rev 7143) @@ -250,6 +250,15 @@ */ public void layoutComplete() throws FOrayException { purgeEmptyNodes(this); + ArrayList markers = getMarkers(); + if (markers != null) { + for (int i = 0; i < markers.size(); i++) { + Marker marker = (Marker) markers.get(i); + this.getPageCollection().getCurrentPageSequenceMarkers() + .add(marker); + this.getAreaTree().getDocumentMarkers().add(marker); + } + } getAreaTreeControl().queuePage(this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 23:19:55
|
Revision: 7142 Author: victormote Date: 2006-05-04 16:19:48 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7142&view=rev Log Message: ----------- Remove no-longer-needed AreaTreeControl method. 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/AreaTreeControl.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 23:14:31 UTC (rev 7141) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 23:19:48 UTC (rev 7142) @@ -30,7 +30,6 @@ import org.axsl.font.FontConsumer; import org.axsl.fotree.FONode; import org.axsl.fotree.FObj; -import org.axsl.fotree.fo.PageSequence; import org.axsl.text.TextServer; import org.apache.commons.logging.Log; @@ -237,10 +236,6 @@ return getAreaNodeParent().getLogger(); } - public PageSequence getCurrentPageSequence() { - return getAreaNodeParent().getCurrentPageSequence(); - } - public AreaTreeControl getAreaTreeControl() { return getAreaNodeParent().getAreaTreeControl(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 23:14:31 UTC (rev 7141) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 23:19:48 UTC (rev 7142) @@ -96,10 +96,6 @@ return this.fontConsumer; } - public PageSequence getCurrentPageSequence() { - return control.getCurrentPageSequence(); - } - public ArrayList getCurrentPageSequenceMarkers() { return control.getCurrentPageSequenceMarkers(); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 23:14:31 UTC (rev 7141) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 23:19:48 UTC (rev 7142) @@ -26,8 +26,6 @@ import org.foray.common.FOrayException; -import org.axsl.fotree.fo.PageSequence; - import java.util.ArrayList; /** @@ -43,8 +41,6 @@ */ public void queuePage(PageRA page) throws FOrayException ; - public PageSequence getCurrentPageSequence() ; - public ArrayList getCurrentPageSequenceMarkers() ; public ArrayList getDocumentMarkers() ; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 23:14:31 UTC (rev 7141) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 23:19:48 UTC (rev 7142) @@ -502,15 +502,16 @@ // If marker not yet found, and 'retrieve-boundary' permits, // search backward. ArrayList additionalMarkers = null; - PageCollection areaTree = getPageCollection(); + PageCollection pageCollection = getPageCollection(); if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_PAGE_SEQUENCE) { - PageSequence pageSequence = areaTree.getCurrentPageSequence(); + PageSequence pageSequence = pageCollection.getPageSequence(); if (pageSequence == getPageSequence()) { - additionalMarkers = areaTree.getCurrentPageSequenceMarkers(); + additionalMarkers = pageCollection + .getCurrentPageSequenceMarkers(); } } else if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_DOCUMENT) { - additionalMarkers = areaTree.getDocumentMarkers(); + additionalMarkers = pageCollection.getDocumentMarkers(); } if (additionalMarkers == null) { return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 23:14:36
|
Revision: 7141 Author: victormote Date: 2006-05-04 16:14:31 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7141&view=rev Log Message: ----------- Fix NPE. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:55:45 UTC (rev 7140) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 23:14:31 UTC (rev 7141) @@ -131,6 +131,9 @@ } protected FOrayFONodeProxy getFObjProxy(FONode fobj) { + if (fobj == null) { + return null; + } FOrayFONodeProxy proxy = (FOrayFONodeProxy) fobj.getProxy(); if (proxy == null) { proxy = this.getLayoutStrategy().makeFObjProxy(fobj); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 22:55:57
|
Revision: 7140 Author: victormote Date: 2006-05-04 15:55:45 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7140&view=rev Log Message: ----------- Move some AreaTreeControl methods to AreaTree constructor. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 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/AreaTreeControl.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 22:35:10 UTC (rev 7139) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-04 22:55:45 UTC (rev 7140) @@ -309,7 +309,9 @@ private AreaTree getAreaTree() { if (this.areaTree == null) { this.areaTree = new AreaTree(this.document.getFOTreeBuilder() - .getRootFObj(), this); + .getRootFObj(), this, this.getFontConsumer(), + this.getTextServer(), this.getLogger(), + this.getLayoutStrategy()); } return this.areaTree; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:35:10 UTC (rev 7139) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:55:45 UTC (rev 7140) @@ -432,7 +432,7 @@ } public LayoutStrategy getLayoutStrategy() { - return this.getAreaTreeControl().getLayoutStrategy(); + return this.getAreaNodeParent().getLayoutStrategy(); } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:35:10 UTC (rev 7139) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:55:45 UTC (rev 7140) @@ -47,6 +47,10 @@ /** The AreaTreeControl implementation that controls this AreaTree. */ AreaTreeControl control; + private FontConsumer fontConsumer; + private TextServer textServer; + private Log logger; + private LayoutStrategy layoutStrategy; /** * An ordered list of all of the PageCollection objects that have been @@ -57,9 +61,15 @@ */ public ArrayList pageCollectionsProcessed = new ArrayList(); - public AreaTree(Root root, AreaTreeControl control) { + public AreaTree(Root root, AreaTreeControl control, + FontConsumer fontConsumer, TextServer textServer, Log logger, + LayoutStrategy layoutStrategy) { super(root, null); this.control = control; + this.fontConsumer = fontConsumer; + this.textServer = textServer; + this.logger = logger; + this.layoutStrategy = layoutStrategy; /* * These registration steps must take place after the AreaTreeControl * has been stored. @@ -83,7 +93,7 @@ } public FontConsumer getFontConsumer() { - return control.getFontConsumer(); + return this.fontConsumer; } public PageSequence getCurrentPageSequence() { @@ -99,13 +109,21 @@ } public TextServer getTextServer() { - return control.getTextServer(); + return this.textServer; } public Log getLogger() { - return control.getLogger(); + return this.logger; } + /** + * Overrides method in AreaNode, because this knows how to return the + * LayoutStrategy directly. + */ + public LayoutStrategy getLayoutStrategy() { + return this.layoutStrategy; + } + public byte getAreaType() { return AreaNode.AREATYPE_AREA_TREE; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 22:35:10 UTC (rev 7139) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-04 22:55:45 UTC (rev 7140) @@ -26,12 +26,8 @@ import org.foray.common.FOrayException; -import org.axsl.font.FontConsumer; import org.axsl.fotree.fo.PageSequence; -import org.axsl.text.TextServer; -import org.apache.commons.logging.Log; - import java.util.ArrayList; /** @@ -41,11 +37,6 @@ public interface AreaTreeControl { /** - * Returns the FontConsumer that is being used to process this document. - */ - public FontConsumer getFontConsumer(); - - /** * Takes a completed page from the AreaTree and does something with it * (presumable renders it). * @param page The PageRA instance to be processed. @@ -58,10 +49,4 @@ public ArrayList getDocumentMarkers() ; - public TextServer getTextServer() ; - - public Log getLogger() ; - - public LayoutStrategy getLayoutStrategy() ; - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 22:35:16
|
Revision: 7139 Author: victormote Date: 2006-05-04 15:35:10 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7139&view=rev Log Message: ----------- More cleanup of FONode/Proxy mapping. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:22:36 UTC (rev 7138) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:35:10 UTC (rev 7139) @@ -131,7 +131,12 @@ } protected FOrayFONodeProxy getFObjProxy(FONode fobj) { - return getAreaTree().lookupFObjProxy(fobj); + FOrayFONodeProxy proxy = (FOrayFONodeProxy) fobj.getProxy(); + if (proxy == null) { + proxy = this.getLayoutStrategy().makeFObjProxy(fobj); + fobj.setProxy(proxy); + } + return proxy; } protected AreaNode getPreviousChildOfGeneratedBy() { @@ -426,4 +431,8 @@ return true; } + public LayoutStrategy getLayoutStrategy() { + return this.getAreaTreeControl().getLayoutStrategy(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:22:36 UTC (rev 7138) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:35:10 UTC (rev 7139) @@ -27,7 +27,6 @@ import org.foray.common.FOrayException; import org.axsl.font.FontConsumer; -import org.axsl.fotree.FONode; import org.axsl.fotree.FObj; import org.axsl.fotree.fo.Bookmark; import org.axsl.fotree.fo.BookmarkTitle; @@ -161,18 +160,6 @@ return this; } - public FOrayFONodeProxy lookupFObjProxy(FONode fobj) { - if (fobj == null) { - return null; - } - FOrayFONodeProxy proxy = (FOrayFONodeProxy) fobj.getProxy(); - if (proxy == null) { - proxy = control.getLayoutStrategy().makeFObjProxy(fobj); - fobj.setProxy(proxy); - } - return proxy; - } - /** * Retrieves the FObj instance that is associated with id. * @param id The id whose FObj instance is sought. @@ -193,10 +180,7 @@ */ public Area firstNormalAreaReturned(String id) { FObj fobj = retrieveId(id); - FOrayFONodeProxy proxy = lookupFObjProxy(fobj); - if (proxy == null) { - return null; - } + FOrayFONodeProxy proxy = getFObjProxy(fobj); return proxy.firstNormalAreaReturned(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 22:22:41
|
Revision: 7138 Author: victormote Date: 2006-05-04 15:22:36 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7138&view=rev Log Message: ----------- Replace the Map of FONode to Proxy with the embedded cross-referenced scheme. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:00:18 UTC (rev 7137) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:22:36 UTC (rev 7138) @@ -39,11 +39,10 @@ import org.apache.commons.logging.Log; import java.util.ArrayList; -import java.util.IdentityHashMap; import java.util.List; /** - * + * The root of the AreaTree. */ public class AreaTree extends NonArea implements org.axsl.areaOut.AreaTree { @@ -59,12 +58,6 @@ */ public ArrayList pageCollectionsProcessed = new ArrayList(); - /** - * Map implementation whose key is an FObj instance, and whose value is - * that FObj instance's FObjProxy. - */ - private IdentityHashMap proxyMap = new IdentityHashMap(); - public AreaTree(Root root, AreaTreeControl control) { super(root, null); this.control = control; @@ -172,10 +165,10 @@ if (fobj == null) { return null; } - FOrayFONodeProxy proxy = (FOrayFONodeProxy) proxyMap.get(fobj); + FOrayFONodeProxy proxy = (FOrayFONodeProxy) fobj.getProxy(); if (proxy == null) { proxy = control.getLayoutStrategy().makeFObjProxy(fobj); - proxyMap.put(fobj, proxy); + fobj.setProxy(proxy); } return proxy; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 22:00:34
|
Revision: 7137 Author: victormote Date: 2006-05-04 15:00:18 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7137&view=rev Log Message: ----------- Rename class FObjProxy to FOrayFONodeProxy, for consistency and clarity. 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/LayoutStrategy.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Added Paths: ----------- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java Removed Paths: ------------- trunk/foray/foray-areatree/src/java/org/foray/area/FObjProxy.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -88,7 +88,7 @@ /* * The "generated-by" trait, as defined in Section 6.1.1. */ - protected FObjProxy generatedBy; + protected FOrayFONodeProxy generatedBy; /** * Constructor. @@ -130,7 +130,7 @@ this.children.remove(areaNode); } - protected FObjProxy getFObjProxy(FONode fobj) { + protected FOrayFONodeProxy getFObjProxy(FONode fobj) { return getAreaTree().lookupFObjProxy(fobj); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -168,11 +168,11 @@ return this; } - public FObjProxy lookupFObjProxy(FONode fobj) { + public FOrayFONodeProxy lookupFObjProxy(FONode fobj) { if (fobj == null) { return null; } - FObjProxy proxy = (FObjProxy) proxyMap.get(fobj); + FOrayFONodeProxy proxy = (FOrayFONodeProxy) proxyMap.get(fobj); if (proxy == null) { proxy = control.getLayoutStrategy().makeFObjProxy(fobj); proxyMap.put(fobj, proxy); @@ -200,7 +200,7 @@ */ public Area firstNormalAreaReturned(String id) { FObj fobj = retrieveId(id); - FObjProxy proxy = lookupFObjProxy(fobj); + FOrayFONodeProxy proxy = lookupFObjProxy(fobj); if (proxy == null) { return null; } Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/FObjProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FObjProxy.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FObjProxy.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -1,209 +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.fotree.FONode; - -import java.util.ArrayList; - -/** - * <p>FObjProxy is a class whose instances serve as proxies for FObj instances. - * One of its main purposes is to cross-reference generator FObj instances with - * generated Area instances so that "generated-by" and "returned-by" traits - * are handled properly. However, it can also be subclassed by layout - * systems to maintain state information for FObj instances as they are being - * laid out.</p> - * - * <p>The information stored in this class could theoretically be stored - * directly in the FObj instance. However, the FOray designers wish to keep - * all layout and AreaTree data out of the FOTree so that it can be reused. - * In addition, it is considered probable that most layout systems will wish - * to store state information about FObj instances anyway.</p> - * - * <p>More information about the <em>proxy</em> design pattern can be found - * in the Gang of Four literature. This specific implementation shares some - * characteristics of the Protection Proxy and of the Smart Reference.</p> - */ -public class FObjProxy implements org.axsl.fotree.FONodeProxy { - - /** The real FObj which this proxy represents. */ - protected FONode realFObj; - - /** - * The ordered list of Area instances generated by realFObj. Index 0 - * "is-first" and Index size() - 1 "is-last". This is currently set up to - * only store the root node of any subtree that was generated by - * realFObj. - */ - private ArrayList generatedAreas; - - public FObjProxy(FONode realFObj) { - this.realFObj = realFObj; - } - - public FONode getFONode() { - return this.realFObj; - } - - public void registerGeneratedArea(AreaNode areaNode) { - AreaNode parent = areaNode.getAreaNodeParent(); - if (parent != null) { - /* - * If the parent was generated by the same FObj, then we shouldn't - * register this one also. - */ - if (areaNode.generatedBy == parent.generatedBy) { - return; - } - } - if (generatedAreas == null) { - generatedAreas = new ArrayList(); - } - generatedAreas.add(areaNode); - } - - public void unregisterGeneratedArea(AreaNode areaNode) { - generatedAreas.remove(areaNode); - } - - public AreaNode getFirstGeneratedBy() { - if (generatedAreas == null || generatedAreas.size() < 1) { - return null; - } - return (AreaNode) generatedAreas.get(0); - } - - public AreaNode getPreviousGeneratedBy(AreaNode area) { - if (generatedAreas == null) { - return null; - } - int index = generatedAreas.indexOf(area); - if (index > 0) { - return (AreaNode) generatedAreas.get(index - 1); - } - return null; - } - - public AreaNode getNextGeneratedBy(AreaNode area) { - if (generatedAreas == null) { - return null; - } - int index = generatedAreas.indexOf(area); - if (index > 0 && index < generatedAreas.size() - 1) { - return (AreaNode) generatedAreas.get(index + 1); - } - return null; - } - - /** - * @param area An Area instance. - * @return True iff area is the first Area generated by this. - */ - public boolean isFirstGeneratedBy(AreaNode area) { - if (generatedAreas.indexOf(area) == 0) { - return true; - } - return false; - } - - /** - * @param area An Area instance. - * @return True iff area is the first Area generated by this. - */ - public boolean isLastGeneratedBy(AreaNode area) { - if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) { - return true; - } - return false; - } - - /** - * @return The current count of areas that have been generated by the FObj. - */ - public int qtyAreasGenerated() { - return this.generatedAreas.size(); - } - - /** - * @return The last AreaNode generated by the parent FObj. - */ - public AreaNode getLastGeneratedBy() { - if (generatedAreas == null || generatedAreas.size() < 1) { - return null; - } - return (AreaNode) generatedAreas.get(generatedAreas.size() - 1); - } - - /** - * @return The last Area generated by the parent FObj. - */ - public Area getLastAreaGeneratedBy() { - if (generatedAreas == null || generatedAreas.size() < 1) { - return null; - } - for (int i = generatedAreas.size() - 1; i >= 0; i--) { - Object object = generatedAreas.get(i); - if (object instanceof Area) { - return (Area) object; - } - } - return null; - } - - public Area firstNormalAreaReturned() { - /* - * TODO: This is not right, but will do for now. It is not considering - * areas that are returned by the FO but not generated by it. - */ - if (generatedAreas == null) { - return null; - } - for (int i = 0; i < generatedAreas.size(); i ++) { - Object object = generatedAreas.get(i); - if (object instanceof Area) { - return (Area) object; - } - } - return null; - } - - public Area lastNormalAreaReturned() { - /* - * TODO: This is not right, but will do for now. It is not considering - * areas that are returned by the FO but not generated by it. - */ - if (generatedAreas == null) { - return null; - } - for (int i = generatedAreas.size() - 1; i >= 0; i --) { - Object object = generatedAreas.get(i); - if (object instanceof Area) { - return (Area) object; - } - } - return null; - } - -} Added: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java (rev 0) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -0,0 +1,195 @@ +/* + * 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.fotree.FONode; + +import java.util.ArrayList; + +/** + * <p>An implementation of {@link org.axsl.fotree.FONodeProxy} suitable for use + * with FOray.</p> + */ +public class FOrayFONodeProxy implements org.axsl.fotree.FONodeProxy { + + /** The real FObj which this proxy represents. */ + protected FONode realFObj; + + /** + * The ordered list of Area instances generated by realFObj. Index 0 + * "is-first" and Index size() - 1 "is-last". This is currently set up to + * only store the root node of any subtree that was generated by + * realFObj. + */ + private ArrayList generatedAreas; + + public FOrayFONodeProxy(FONode realFObj) { + this.realFObj = realFObj; + } + + public FONode getFONode() { + return this.realFObj; + } + + public void registerGeneratedArea(AreaNode areaNode) { + AreaNode parent = areaNode.getAreaNodeParent(); + if (parent != null) { + /* + * If the parent was generated by the same FObj, then we shouldn't + * register this one also. + */ + if (areaNode.generatedBy == parent.generatedBy) { + return; + } + } + if (generatedAreas == null) { + generatedAreas = new ArrayList(); + } + generatedAreas.add(areaNode); + } + + public void unregisterGeneratedArea(AreaNode areaNode) { + generatedAreas.remove(areaNode); + } + + public AreaNode getFirstGeneratedBy() { + if (generatedAreas == null || generatedAreas.size() < 1) { + return null; + } + return (AreaNode) generatedAreas.get(0); + } + + public AreaNode getPreviousGeneratedBy(AreaNode area) { + if (generatedAreas == null) { + return null; + } + int index = generatedAreas.indexOf(area); + if (index > 0) { + return (AreaNode) generatedAreas.get(index - 1); + } + return null; + } + + public AreaNode getNextGeneratedBy(AreaNode area) { + if (generatedAreas == null) { + return null; + } + int index = generatedAreas.indexOf(area); + if (index > 0 && index < generatedAreas.size() - 1) { + return (AreaNode) generatedAreas.get(index + 1); + } + return null; + } + + /** + * @param area An Area instance. + * @return True iff area is the first Area generated by this. + */ + public boolean isFirstGeneratedBy(AreaNode area) { + if (generatedAreas.indexOf(area) == 0) { + return true; + } + return false; + } + + /** + * @param area An Area instance. + * @return True iff area is the first Area generated by this. + */ + public boolean isLastGeneratedBy(AreaNode area) { + if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) { + return true; + } + return false; + } + + /** + * @return The current count of areas that have been generated by the FObj. + */ + public int qtyAreasGenerated() { + return this.generatedAreas.size(); + } + + /** + * @return The last AreaNode generated by the parent FObj. + */ + public AreaNode getLastGeneratedBy() { + if (generatedAreas == null || generatedAreas.size() < 1) { + return null; + } + return (AreaNode) generatedAreas.get(generatedAreas.size() - 1); + } + + /** + * @return The last Area generated by the parent FObj. + */ + public Area getLastAreaGeneratedBy() { + if (generatedAreas == null || generatedAreas.size() < 1) { + return null; + } + for (int i = generatedAreas.size() - 1; i >= 0; i--) { + Object object = generatedAreas.get(i); + if (object instanceof Area) { + return (Area) object; + } + } + return null; + } + + public Area firstNormalAreaReturned() { + /* + * TODO: This is not right, but will do for now. It is not considering + * areas that are returned by the FO but not generated by it. + */ + if (generatedAreas == null) { + return null; + } + for (int i = 0; i < generatedAreas.size(); i ++) { + Object object = generatedAreas.get(i); + if (object instanceof Area) { + return (Area) object; + } + } + return null; + } + + public Area lastNormalAreaReturned() { + /* + * TODO: This is not right, but will do for now. It is not considering + * areas that are returned by the FO but not generated by it. + */ + if (generatedAreas == null) { + return null; + } + for (int i = generatedAreas.size() - 1; i >= 0; i --) { + Object object = generatedAreas.get(i); + if (object instanceof Area) { + return (Area) object; + } + } + return null; + } + +} Property changes on: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -104,7 +104,7 @@ * retrieved or manufactured. * @return The FObjProxy instance to which fobj is attached. */ - public FObjProxy getFObjProxy(FONode fobj) { + public FOrayFONodeProxy getFObjProxy(FONode fobj) { return areaTree.getFObjProxy(fobj); } @@ -130,8 +130,8 @@ * @param node * @return A new FObjProxy which proxies node. */ - public FObjProxy makeFObjProxy(FONode node) { - return new FObjProxy(node); + public FOrayFONodeProxy makeFObjProxy(FONode node) { + return new FOrayFONodeProxy(node); } public void handleLineBreakText(LineOutput lineOutput, LineText text, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -531,7 +531,7 @@ */ private boolean startsHere(Marker marker) { FObj parent = marker.parentFO(); - FObjProxy proxy = getFObjProxy(parent); + FOrayFONodeProxy proxy = getFObjProxy(parent); Area firstArea = proxy.firstNormalAreaReturned(); if (firstArea == null) { return false; @@ -548,7 +548,7 @@ */ private boolean endsHere(Marker marker) { FObj parent = marker.parentFO(); - FObjProxy proxy = getFObjProxy(parent); + FOrayFONodeProxy proxy = getFObjProxy(parent); Area lastArea = proxy.lastNormalAreaReturned(); if (lastArea == null) { return false; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -25,7 +25,7 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FObjProxy; +import org.foray.area.FOrayFONodeProxy; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; import org.foray.common.FOrayException; @@ -44,7 +44,7 @@ /** * */ -public abstract class FONodePL extends FObjProxy { +public abstract class FONodePL extends FOrayFONodeProxy { /** value of progress before layout begins. */ public static final int START = -1000; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-04 21:39:10 UTC (rev 7136) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-04 22:00:18 UTC (rev 7137) @@ -25,7 +25,7 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FObjProxy; +import org.foray.area.FOrayFONodeProxy; import org.foray.area.LayoutStrategy; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; @@ -255,7 +255,7 @@ } } - public FObjProxy makeFObjProxy(FONode node) { + public FOrayFONodeProxy makeFObjProxy(FONode node) { switch (node.getNodeType()) { case FONode.NODE_ABSTRACT_FLOW: { return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-04 21:39:15
|
Revision: 7136 Author: victormote Date: 2006-05-04 14:39:10 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7136&view=rev Log Message: ----------- Remove constants duplicated in the interface. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-05-04 21:36:47 UTC (rev 7135) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-05-04 21:39:10 UTC (rev 7136) @@ -34,83 +34,6 @@ public abstract class FONode extends OrderedTreeNode implements org.axsl.fotree.FONode { - public static final byte NODE_ABSTRACT_FLOW = 1; - public static final byte NODE_CONTINUED_LABEL = 2; - public static final byte NODE_PAGE_SEQUENCE = 3; - public static final byte NODE_DESTINATION = 4; - public static final byte NODE_BOOKMARK_TITLE = 5; - public static final byte NODE_BOOKMARK = 6; - public static final byte NODE_COLOR_PROFILE = 7; - public static final byte NODE_DECLARATIONS = 8; - public static final byte NODE_TEXT = 9; - public static final byte NODE_TITLE = 10; - public static final byte NODE_UNKNOWN = 11; - public static final byte NODE_UNKNOWN_XML = 12; - public static final byte NODE_XML_ELEMENT = 13; - public static final byte NODE_SVG = 14; - public static final byte NODE_BIDI_OVERRIDE = 15; - public static final byte NODE_BLOCK = 16; - public static final byte NODE_BLOCK_CONTAINER = 17; - public static final byte NODE_CHARACTER = 18; - public static final byte NODE_EXTERNAL_GRAPHIC = 19; - public static final byte NODE_FLOW = 20; - public static final byte NODE_FOOTNOTE = 21; - public static final byte NODE_FLOAT = 22; - public static final byte NODE_FOOTNOTE_BODY = 23; - public static final byte NODE_INITIAL_PROPERTY_SET = 24; - public static final byte NODE_INLINE = 25; - public static final byte NODE_INLINE_CONTAINER = 26; - public static final byte NODE_INSTREAM_FOREIGN_OBJECT = 27; - public static final byte NODE_LEADER = 28; - public static final byte NODE_LIST_BLOCK = 29; - public static final byte NODE_LIST_ITEM = 30; - public static final byte NODE_LIST_ITEM_BODY = 31; - public static final byte NODE_LIST_ITEM_LABEL = 32; - public static final byte NODE_MARKER = 33; - public static final byte NODE_MULTI_CASE = 34; - public static final byte NODE_MULTI_PROPERTIES = 35; - public static final byte NODE_MULTI_PROPERTY_SET = 36; - public static final byte NODE_MULTI_SWITCH = 37; - public static final byte NODE_MULTI_TOGGLE = 38; - public static final byte NODE_PAGE_NUMBER = 39; - public static final byte NODE_PAGE_NUMBER_CITATION = 40; - public static final byte NODE_RETRIEVE_MARKER = 41; - public static final byte NODE_STATIC_CONTENT = 42; - public static final byte NODE_TABLE = 43; - public static final byte NODE_TABLE_AND_CAPTION = 44; - public static final byte NODE_TABLE_BODY = 45; - public static final byte NODE_TABLE_CAPTION = 46; - public static final byte NODE_TABLE_CELL = 47; - public static final byte NODE_TABLE_COLUMN = 48; - public static final byte NODE_TABLE_FOOTER = 49; - public static final byte NODE_TABLE_HEADER = 50; - public static final byte NODE_TABLE_ROW = 51; - public static final byte NODE_WRAPPER = 52; - public static final byte NODE_COND_PAGE_MASTER_REF = 53; - public static final byte NODE_LAYOUT_MASTER_SET = 54; - public static final byte NODE_PAGE_SEQUENCE_MASTER = 55; - public static final byte NODE_REGION_AFTER = 56; - public static final byte NODE_REGION_BEFORE = 57; - public static final byte NODE_REGION_BODY = 58; - public static final byte NODE_REGION_END = 59; - public static final byte NODE_REGION_START = 60; - public static final byte NODE_REPEAT_PAGE_MASTER_ALTERN = 61; - public static final byte NODE_REPEAT_PAGE_MASTER_REF = 62; - public static final byte NODE_ROOT = 63; - public static final byte NODE_SIMPLE_PAGE_MASTER = 64; - public static final byte NODE_SIMPLE_PAGE_MASTER_REF = 65; - public static final byte NODE_EXTENSION = 66; - public static final byte NODE_FOBJ = 67; - public static final byte NODE_FOBJ_MIXED = 68; - public static final byte NODE_TO_BE_IMPLEMENTED = 69; - public static final byte NODE_XML_OBJ = 70; - public static final byte NODE_BASIC_LINK = 71; - public static final byte NODE_ABSTRACT_TABLE_BODY = 72; - public static final byte NODE_REGION = 73; - public static final byte NODE_PAGE_MASTER_REFERENCE = 74; - public static final byte NODE_SVG_ELEMENT = 75; - public static final byte NODE_BOOKMARK_TREE = 76; - private FONodeProxy proxy; protected FONode(FObj parent) { 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.