foray-commit Mailing List for FOray (Page 266)
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-09 12:47:19
|
Revision: 7235 Author: victormote Date: 2006-05-09 05:47:10 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7235&view=rev Log Message: ----------- Update axsl jar file. Modified Paths: -------------- trunk/foray/lib/axsl-0.1a.jar Modified: trunk/foray/lib/axsl-0.1a.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 12:33:17
|
Revision: 7234 Author: victormote Date: 2006-05-09 05:32:50 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7234&view=rev Log Message: ----------- 1. Move some methods from OutputControl to OutputTarget setters. 2. Remove no-longer needed OutputControl interface. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java Removed Paths: ------------- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.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-09 12:22:50 UTC (rev 7233) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-09 12:32:50 UTC (rev 7234) @@ -28,7 +28,6 @@ import org.foray.font.FOrayFontConsumer; import org.foray.font.FOrayFontServer; import org.foray.layout.LayoutStrategy; -import org.foray.output.OutputControl; import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; import org.foray.render.Renderer; @@ -64,8 +63,7 @@ FOTreeBuilder when a PageSequence is created, and AreaTree when a Page is formatted.<P> */ -public class FOrayTarget implements FOTreeListener, AreaTreeListener, - OutputControl { +public class FOrayTarget implements FOTreeListener, AreaTreeListener { private static final boolean MEM_PROFILE_WITH_GC = false; /** Render to PDF. OutputStream must be set. */ @@ -162,7 +160,6 @@ if (this.outputTarget == null) { throw new FOrayException("OutputTarget has not been set."); } - this.outputTarget.setOutputControl(this); // Validate the LayoutStrategy. If null, create a default one. this.layout = layout; @@ -194,8 +191,11 @@ this.outputTarget.setApplicationVersion(Application.getVersion()); this.outputTarget.setDeveloperURLShort( Application.getDeveloperURLShort()); + this.outputTarget.setStrokeSVGText(getConfiguration() + .optionStrokeSVGText()); + this.outputTarget.setLogger(this.getLogger()); + this.outputTarget.setFontConsumer(this.getFontConsumer()); - // Start the renderer. startRenderer(); } @@ -450,10 +450,6 @@ return this.outputTarget; } - public boolean strokeSVGText() { - return getConfiguration().optionStrokeSVGText(); - } - public SessionConfig getConfiguration() { return document.getConfiguration(); } Deleted: trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:22:50 UTC (rev 7233) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:32:50 UTC (rev 7234) @@ -1,49 +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.output; - -import org.axsl.fontR.FontConsumer; - -import org.apache.commons.logging.Log; - -/** - * Interface for programs external to the Rendering process to give the - * Renderers environmental information. - */ -public interface OutputControl { - - /** - * @return The FontConsumer implementation which should be used by this - * renderer. - */ - public FontConsumer getFontConsumer() ; - - /** - * @return The logger that should be used to log messages by this - * renderer. - */ - public Log getLogger() ; - -} Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 12:22:50 UTC (rev 7233) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 12:32:50 UTC (rev 7234) @@ -36,13 +36,14 @@ */ public abstract class OutputTarget { - protected OutputControl outputControl; OutputStream outputStream; public String applicationName; public String applicationNameShort; public String applicationVersion; public String developerURLShort; boolean strokeSVGText; + Log logger; + FontConsumer fontConsumer; protected OutputConfig options; @@ -53,25 +54,8 @@ this.options = outputConfig; } - /** - * @param outputControl The OutputControl instance which should be used - * to provide environmental information to this renderer. - */ - public void setOutputControl(OutputControl outputControl) { - this.outputControl = outputControl; - } - - /** - * Return the OutputControl implementation which is the conceptual "parent" - * of this renderer. - * @return The OutputControl instance that controls this renderer. - */ - public OutputControl getOutputControl() { - return this.outputControl; - } - public Log getLogger() { - return this.outputControl.getLogger(); + return this.logger; } /** @@ -79,7 +63,7 @@ * Renderer. */ public FontConsumer getFontConsumer() { - return outputControl.getFontConsumer(); + return this.fontConsumer; } /** @@ -197,4 +181,18 @@ return this.strokeSVGText; } + /** + * @param logger The logger to set. + */ + public void setLogger(Log logger) { + this.logger = logger; + } + + /** + * @param fontConsumer The fontConsumer to set. + */ + public void setFontConsumer(FontConsumer fontConsumer) { + this.fontConsumer = fontConsumer; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 12:23:06
|
Revision: 7233 Author: victormote Date: 2006-05-09 05:22:50 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7233&view=rev Log Message: ----------- Move some methods from OutputControl to OutputTarget setters. Modified Paths: -------------- 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-render/src/java/org/foray/render/pdf/PDFRenderer.java Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:18:02 UTC (rev 7232) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:22:50 UTC (rev 7233) @@ -46,10 +46,4 @@ */ public Log getLogger() ; - /** - * @return True if SVG text should be converted to strokes instead of - * rendered as characters of a Font. - */ - public boolean strokeSVGText() ; - } Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 12:18:02 UTC (rev 7232) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 12:22:50 UTC (rev 7233) @@ -42,6 +42,8 @@ public String applicationNameShort; public String applicationVersion; public String developerURLShort; + boolean strokeSVGText; + protected OutputConfig options; /** @@ -183,4 +185,16 @@ this.developerURLShort = developerURLShort; } + public void setStrokeSVGText(boolean stroke) { + this.strokeSVGText = stroke; + } + + /** + * @return True if SVG text should be converted to strokes instead of + * rendered as characters of a Font. + */ + public boolean getStrokeSVGText() { + return this.strokeSVGText; + } + } 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-09 12:18:02 UTC (rev 7232) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-05-09 12:22:50 UTC (rev 7233) @@ -227,7 +227,7 @@ float letterSpacing = area.actualLetterSpacing() / 1000f; getContentStream().drawGraphic(pdfContentRectangle, pdfClipRectangle, image, font, fontSize, letterSpacing, - outputControl.strokeSVGText()); + getStrokeSVGText()); } /** @@ -253,7 +253,7 @@ float letterSpacing = area.actualLetterSpacing() / 1000f; getContentStream().drawSVGDocument(area.getSVGDocument(), contentRectangle, null, font, fontSize, letterSpacing, - outputControl.strokeSVGText()); + getStrokeSVGText()); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 12:18:17
|
Revision: 7232 Author: victormote Date: 2006-05-09 05:18:02 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7232&view=rev Log Message: ----------- Remove no-longer-needed methods. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-output/src/java/org/foray/output/OutputControl.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-09 12:08:05 UTC (rev 7231) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-09 12:18:02 UTC (rev 7232) @@ -43,7 +43,6 @@ 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; @@ -52,7 +51,6 @@ import java.io.IOException; import java.io.OutputStream; -import java.net.URL; import java.util.ArrayList; /** @@ -432,15 +430,6 @@ return false; } - /** - * Required by FOTreeControl interface. - * @return The base URL that should be used for finding external files, like - * graphical images, etc. - */ - public URL getBaseURL() { - return document.getBaseURL(); - } - public FontConsumer getFontConsumer() { return this.fontConsumer; } @@ -453,10 +442,6 @@ return document.getTextServer(); } - public GraphicServer getGraphicServer() { - return document.getGraphicServer(); - } - public OutputStream getOutputStream() { return this.outputStream; } Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:08:05 UTC (rev 7231) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:18:02 UTC (rev 7232) @@ -25,12 +25,9 @@ package org.foray.output; import org.axsl.fontR.FontConsumer; -import org.axsl.graphicR.GraphicServer; import org.apache.commons.logging.Log; -import java.net.URL; - /** * Interface for programs external to the Rendering process to give the * Renderers environmental information. @@ -38,26 +35,12 @@ public interface OutputControl { /** - * Returns the base URL that should be used for constructing paths to - * external resources. - * @return The base URL that should be used for constructing paths to - * external resources. - */ - public URL getBaseURL() ; - - /** * @return The FontConsumer implementation which should be used by this * renderer. */ public FontConsumer getFontConsumer() ; /** - * @return The GraphicServer implementation which should be used by this - * renderer. - */ - public GraphicServer getGraphicServer() ; - - /** * @return The logger that should be used to log messages by this * renderer. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 12:08:43
|
Revision: 7231 Author: victormote Date: 2006-05-09 05:08:05 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7231&view=rev Log Message: ----------- Move some methods from OutputControl to OutputTarget setters. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.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-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.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-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -178,7 +178,6 @@ && outputStream == null) { throw new FOrayException("OutputStream is required."); } - this.outputTarget.setOutputStream(this.getOutputStream()); FontServer server = getFontServer(); if (server instanceof FOrayFontServer) { @@ -188,6 +187,17 @@ this.getOutputTarget().isUsingFreeStandingFonts()); } + /* Finish configuring the OutputTarget. */ + this.outputTarget.setOutputStream(this.getOutputStream()); + this.outputTarget.setApplicationName( + Application.getApplicationName()); + this.outputTarget.setApplicationNameShort( + Application.getApplicationNameShort()); + this.outputTarget.setApplicationVersion(Application.getVersion()); + this.outputTarget.setDeveloperURLShort( + Application.getDeveloperURLShort()); + + // Start the renderer. startRenderer(); } @@ -459,34 +469,6 @@ return getConfiguration().optionStrokeSVGText(); } - /** - * {@inheritDoc} - */ - public String getApplicationName() { - return Application.getApplicationName(); - } - - /** - * {@inheritDoc} - */ - public String getApplicationNameShort() { - return Application.getApplicationNameShort(); - } - - /** - * {@inheritDoc} - */ - public String getVersion() { - return Application.getVersion(); - } - - /** - * {@inheritDoc} - */ - public String getDeveloperURLShort() { - return Application.getDeveloperURLShort(); - } - public SessionConfig getConfiguration() { return document.getConfiguration(); } Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -69,30 +69,4 @@ */ public boolean strokeSVGText() ; - /** - * @return The name of the application that is creating the output. - */ - public String getApplicationName() ; - - /** - * @return The "short" name of the application that is creating the - * output. - * For example, if the name of the application is "XYZ Document Processor", - * the short name might be "XYZ". - */ - public String getApplicationNameShort() ; - - /** - * @return The current version of the application that is creating the - * output. - */ - public String getVersion() ; - - /** - * @return The shortened version of the URL to the home-page of the - * developer. For example, if the URL is "http://www.xyz.com", return - * "www.xyz.com". - */ - public String getDeveloperURLShort() ; - } Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -38,7 +38,10 @@ protected OutputControl outputControl; OutputStream outputStream; - + public String applicationName; + public String applicationNameShort; + public String applicationVersion; + public String developerURLShort; protected OutputConfig options; /** @@ -118,4 +121,66 @@ return true; } + /** + * @return The name of the application that is creating the output. + */ + public String getApplicationName() { + return applicationName; + } + + /** + * @param applicationName The applicationName to set. + */ + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + /** + * @return The "short" name of the application that is creating the + * output. + * For example, if the name of the application is "XYZ Document Processor", + * the short name might be "XYZ". + */ + public String getApplicationNameShort() { + return applicationNameShort; + } + + /** + * @param applicationNameShort The applicationNameShort to set. + */ + public void setApplicationNameShort(String applicationNameShort) { + this.applicationNameShort = applicationNameShort; + } + + /** + * @return The current version of the application that is creating the + * output. + */ + public String getApplicationVersion() { + return applicationVersion; + } + + /** + * @param applicationVersion The applicationVersion to set. + */ + public void setApplicationVersion(String applicationVersion) { + this.applicationVersion = applicationVersion; + } + + /** + * @return The shortened version of the URL to the home-page of the + * developer. For example, if the URL is "http://www.xyz.com", return + * "www.xyz.com". + */ + public String getDeveloperURLShort() { + return developerURLShort; + } + + /** + * @param developerURLShort The developerURLShort to set. + */ + public void setDeveloperURLShort(String developerURLShort) { + this.developerURLShort = developerURLShort; + } + } Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -184,7 +184,7 @@ this.setSize(new Dimension(379, 476)); previewArea.setMinimumSize(new Dimension(50, 50)); - this.setTitle(renderer.getOutputControl().getApplicationNameShort() + this.setTitle(renderer.getApplicationNameShort() + ": AWT-" + res.getString("Preview")); scale.addItem("25"); Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -32,7 +32,7 @@ package org.foray.render.awt.viewer; -import org.foray.output.OutputControl; +import org.foray.render.Renderer; import java.awt.AWTEvent; import java.awt.BorderLayout; @@ -78,10 +78,10 @@ public PreviewDialogAboutBox(PreviewDialog parent) { super(parent); - OutputControl control = parent.getRenderer().getOutputControl(); - String product = control.getApplicationNameShort() + " AWT-Preview"; - String version = "Version: " + control.getVersion(); - String copyright = "See " + control.getDeveloperURLShort(); + Renderer renderer = parent.getRenderer(); + String product = renderer.getApplicationNameShort() + " AWT-Preview"; + String version = "Version: " + renderer.getApplicationVersion(); + String copyright = "See " + renderer.getDeveloperURLShort(); enableEvents(AWTEvent.WINDOW_EVENT_MASK); /* imageIcon = new ImageIcon(getClass().getResource("Hier der 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-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -134,9 +134,8 @@ getLogger().error("Unsupported PDF Version: " + pdfVersion); } } - this.pdfDoc.setProducer( - getOutputControl().getApplicationNameShort() + " " - + getOutputControl().getVersion()); + this.pdfDoc.setProducer(getApplicationNameShort() + " " + + getApplicationVersion()); Date now = new Date(); this.pdfDoc.setCreationDate(now); // setup Encryption Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -228,7 +228,7 @@ } protected void writeProcs() { - this.basicProcSet = getOutputControl().getApplicationNameShort() + this.basicProcSet = getApplicationNameShort() + "procs"; write("%%BeginResource: procset " + this.basicProcSet); write("%%Title: Utility procedures"); @@ -321,7 +321,7 @@ write(fontContents); } - this.fontProcSet = getOutputControl().getApplicationNameShort() + this.fontProcSet = getApplicationNameShort() + "Fonts"; write("%%BeginResource: procset " + this.fontProcSet); write("%%Title: Font setup (shortcuts) for this file"); @@ -1060,7 +1060,7 @@ this.pagecount = 0; this.out = new PSStream(this.getOutputStream()); write("%!PS-Adobe-3.0"); - write("%%Creator: " + getOutputControl().getVersion()); + write("%%Creator: " + getApplicationVersion()); write("%%Pages: (atend)"); write("%%DocumentProcessColors: Black"); write("%%DocumentSuppliedResources: procset " + this.fontProcSet); Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-05-09 11:51:21 UTC (rev 7230) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-05-09 12:08:05 UTC (rev 7231) @@ -529,7 +529,7 @@ getLogger().debug("rendering areas to XML"); this.writer = new PrintWriter(this.getOutputStream()); this.writer.write("<?xml version=\"1.0\"?>\n<!-- produced by " - + this.getOutputControl().getVersion() + " -->\n"); + + getApplicationVersion() + " -->\n"); writeStartTag("<AreaTree>"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 11:51:40
|
Revision: 7230 Author: victormote Date: 2006-05-09 04:51:21 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7230&view=rev Log Message: ----------- Move some methods from OutputControl to OutputTarget setters. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-08 23:56:26 UTC (rev 7229) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-09 11:51:21 UTC (rev 7230) @@ -178,6 +178,7 @@ && outputStream == null) { throw new FOrayException("OutputStream is required."); } + this.outputTarget.setOutputStream(this.getOutputStream()); FontServer server = getFontServer(); if (server instanceof FOrayFontServer) { Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-08 23:56:26 UTC (rev 7229) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputControl.java 2006-05-09 11:51:21 UTC (rev 7230) @@ -29,7 +29,6 @@ import org.apache.commons.logging.Log; -import java.io.OutputStream; import java.net.URL; /** @@ -96,10 +95,4 @@ */ public String getDeveloperURLShort() ; - /** - * @return The OutputStream that should be written, or null if there is - * none. - */ - public OutputStream getOutputStream() ; - } Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-08 23:56:26 UTC (rev 7229) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-05-09 11:51:21 UTC (rev 7230) @@ -37,6 +37,7 @@ public abstract class OutputTarget { protected OutputControl outputControl; + OutputStream outputStream; protected OutputConfig options; @@ -101,8 +102,12 @@ */ public abstract boolean isUsingSystemFonts(); + public void setOutputStream(OutputStream stream) { + this.outputStream = stream; + } + public OutputStream getOutputStream() { - return this.outputControl.getOutputStream(); + return this.outputStream; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:26:27
|
Revision: 7192 Author: victormote Date: 2006-05-08 08:13:32 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7192&view=rev Log Message: ----------- Implement new axsl interfaces. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-08 15:02:04 UTC (rev 7191) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-08 15:13:32 UTC (rev 7192) @@ -28,7 +28,8 @@ import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; -public class TableRA extends NormalBlockArea implements TableArea { +public class TableRA extends NormalBlockArea implements TableArea, + org.axsl.areaW.TableArea { private int[] resolvedColumnWidth = null; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-08 15:02:04 UTC (rev 7191) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-08 15:13:32 UTC (rev 7192) @@ -33,7 +33,8 @@ * Note that fo:table-row does not really generate any areas. */ public class TableRowContainer extends ContainerRA - implements org.axsl.areaR.TableRowContainer { + implements org.axsl.areaR.TableRowContainer, + org.axsl.areaW.TableRowContainer { public TableRowContainer(TableRow generatedBy, Area parentArea) { super(generatedBy, parentArea); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:26:00
|
Revision: 7209 Author: victormote Date: 2006-05-08 13:01:38 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7209&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-08 19:53:10 UTC (rev 7208) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-08 20:01:38 UTC (rev 7209) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.TableArea; +import org.axsl.areaW.TableColumnArea; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; @@ -108,4 +109,8 @@ this.resolvedColumnWidth[startingColumn - 1] = columnWidth; } + public TableColumnArea makeTableColumnArea(TableColumn tableColumn) { + return new TableColumnRA(tableColumn, this); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:23:00
|
Revision: 7173 Author: victormote Date: 2006-05-07 11:13:51 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7173&view=rev Log Message: ----------- Remove unused method. Modified Paths: -------------- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java =================================================================== --- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 18:03:14 UTC (rev 7172) +++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 18:13:51 UTC (rev 7173) @@ -26,20 +26,19 @@ import org.foray.area.Area; import org.foray.area.AreaFlexible; -import org.axsl.areaW.AreaTree; import org.foray.area.BasicLinkArea; import org.foray.area.ExternalGraphicArea; -import org.foray.area.FOrayFOLinkage; import org.foray.area.ForeignObjectArea; import org.foray.area.InlineArea; import org.foray.area.LeaderArea; import org.foray.area.LineArea; -import org.axsl.areaW.PageCollection; import org.foray.area.PageNumberArea; import org.foray.area.PageNumberCitationArea; import org.foray.area.TextArea; +import org.axsl.areaW.AreaTree; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.PageCollection; import org.axsl.areaW.RegionArea; import org.axsl.foR.FONode; import org.axsl.foR.FONodeProxy; @@ -105,22 +104,6 @@ processPageSequence(pageCollection); } - /** - * Convenience method. - * - * @param fobj The FONode instance for which an FObjProxy should be - * retrieved or manufactured. - * @return The FObjProxy instance to which fobj is attached. - */ - /* TODO: Remove this method. */ - public FOrayFOLinkage getFObjProxy(FONode fobj) { - return (FOrayFOLinkage) fobj.getResult(); - } - - public int qtyAreasGenerated(FObj fobj) { - return getFObjProxy(fobj).qtyAreasGenerated(); - } - public abstract void processPageSequence(PageCollection pageCollection) throws AreaWException; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:20:43
|
Revision: 7180 Author: victormote Date: 2006-05-07 15:19:45 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7180&view=rev Log Message: ----------- Remove all remaining AreaTree dependencies on layout. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-areatree/.classpath 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/PageCollection.java trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.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-07 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -24,7 +24,7 @@ package org.foray.app; -import org.axsl.areaW.LayoutStrategy; +import org.foray.layout.LayoutStrategy; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; 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 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -29,7 +29,7 @@ import org.foray.area.PageRA; import org.foray.font.FOrayFontConsumer; import org.foray.font.FOrayFontServer; -import org.axsl.areaW.LayoutStrategy; +import org.foray.layout.LayoutStrategy; import org.foray.output.OutputControl; import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; @@ -300,8 +300,7 @@ if (this.areaTree == null) { this.areaTree = new AreaTree(this.document.getFOTreeBuilder() .getRootFObj(), this, this.getFontConsumer(), - this.getTextServer(), this.getLogger(), - this.getLayoutStrategy()); + this.getTextServer(), this.getLogger()); } return this.areaTree; } Modified: trunk/foray/foray-areatree/.classpath =================================================================== --- trunk/foray/foray-areatree/.classpath 2006-05-07 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-areatree/.classpath 2006-05-07 22:19:45 UTC (rev 7180) @@ -12,6 +12,10 @@ <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 combineaccessrules="false" kind="src" path="/axslArea-W"> + <accessrules> + <accessrule kind="nonaccessible" pattern="**/Layout**"/> + </accessrules> + </classpathentry> <classpathentry kind="output" path="build/eclipse"/> </classpath> 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:08:49 UTC (rev 7179) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -27,7 +27,6 @@ import org.foray.common.OrderedTreeNode; import org.axsl.areaW.FOLinkage; -import org.axsl.areaW.LayoutStrategy; import org.axsl.common.Constants; import org.axsl.foR.FONode; @@ -444,10 +443,6 @@ return true; } - public LayoutStrategy getLayoutStrategy() { - return this.getAreaNodeParent().getLayoutStrategy(); - } - public FOLinkage getFOLinkage(FONode foNode) { FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult(); if (linkage == null) { 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-07 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaW.Area; -import org.axsl.areaW.LayoutStrategy; import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; @@ -53,7 +52,6 @@ private FontConsumer fontConsumer; private TextServer textServer; private Log logger; - private LayoutStrategy layoutStrategy; private ArrayList documentMarkers = new ArrayList(); /** @@ -66,14 +64,12 @@ public ArrayList pageCollectionsProcessed = new ArrayList(); public AreaTree(Root root, AreaTreeControl control, - FontConsumer fontConsumer, TextServer textServer, Log logger, - LayoutStrategy layoutStrategy) { + FontConsumer fontConsumer, TextServer textServer, Log logger) { 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. @@ -113,14 +109,6 @@ 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/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-07 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -25,7 +25,6 @@ package org.foray.area; import org.axsl.areaW.AreaWException; -import org.axsl.areaW.LayoutStrategy; import org.axsl.areaW.PageArea; import org.axsl.common.Constants; import org.axsl.foR.FOTreeException; @@ -303,17 +302,6 @@ getNextPage(false, false, true); } - public void releasePages(LayoutStrategy layout) throws AreaWException { - for (int i = 0; i < getChildren().size(); i++) { - Object object = getChildren().get(i); - if (object instanceof PageRA) { - PageRA page = (PageRA) object; - layout.formatStaticContent(page); - page.layoutComplete(); - } - } - } - public byte getAreaType() { return AreaNode.AREATYPE_PAGE_COLLECTION; } Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java =================================================================== --- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 22:08:49 UTC (rev 7179) +++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 22:19:45 UTC (rev 7180) @@ -52,8 +52,7 @@ /** * Abstract base class for all Layout systems. */ -public abstract class LayoutStrategy implements LineBreakHandler, - org.axsl.areaW.LayoutStrategy { +public abstract class LayoutStrategy implements LineBreakHandler { Log logger; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:15:36
|
Revision: 7153 Author: victormote Date: 2006-05-06 15:30:41 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7153&view=rev Log Message: ----------- Rename class for 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 Added Paths: ----------- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java Removed Paths: ------------- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.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-06 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -87,7 +87,7 @@ /* * The "generated-by" trait, as defined in Section 6.1.1. */ - protected FOrayFONodeProxy generatedBy; + protected FOrayFOLinkage generatedBy; /** * Constructor. @@ -129,13 +129,13 @@ this.children.remove(areaNode); } - protected FOrayFONodeProxy getFObjProxy(FONode fobj) { + protected FOrayFOLinkage getFObjProxy(FONode fobj) { if (fobj == null) { return null; } - FOrayFONodeProxy linkage = (FOrayFONodeProxy) fobj.getResult(); + FOrayFOLinkage linkage = (FOrayFOLinkage) fobj.getResult(); if (linkage == null) { - linkage = new FOrayFONodeProxy(fobj); + linkage = new FOrayFOLinkage(fobj); fobj.setResult(linkage); } return linkage; 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-06 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -191,7 +191,7 @@ */ public Area firstNormalAreaReturned(String id) { FObj fobj = retrieveId(id); - FOrayFONodeProxy proxy = getFObjProxy(fobj); + FOrayFOLinkage proxy = getFObjProxy(fobj); return (Area) proxy.firstNormalAreaReturned(); } Copied: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java (from rev 7152, trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java) =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java (rev 0) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -0,0 +1,198 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.area; + +import org.axsl.areaW.Area; +import org.axsl.areaW.AreaNode; +import org.axsl.areaW.FOLinkage; +import org.axsl.foR.FONode; + +import java.util.ArrayList; + +/** + * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use + * with FOray.</p> + */ +public class FOrayFOLinkage implements FOLinkage { + + /** The FONode which generated the Areas in {@link #generatedAreas}. */ + private FONode realFONode; + + /** + * 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 = new ArrayList(); + + public FOrayFOLinkage(FONode realFObj) { + this.realFONode = realFObj; + } + + public FONode getFONode() { + return this.realFONode; + } + + public void registerGeneratedArea(AreaNode areaNode) { + 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.getGeneratedBy() == parent.getGeneratedBy()) { + 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; + } + +} Deleted: 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 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -1,198 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.area; - -import org.axsl.areaW.Area; -import org.axsl.areaW.AreaNode; -import org.axsl.areaW.FOLinkage; -import org.axsl.foR.FONode; - -import java.util.ArrayList; - -/** - * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use - * with FOray.</p> - */ -public class FOrayFONodeProxy implements FOLinkage { - - /** The FONode which generated the Areas in {@link #generatedAreas}. */ - private FONode realFONode; - - /** - * 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 = new ArrayList(); - - public FOrayFONodeProxy(FONode realFObj) { - this.realFONode = realFObj; - } - - public FONode getFONode() { - return this.realFONode; - } - - public void registerGeneratedArea(AreaNode areaNode) { - 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.getGeneratedBy() == parent.getGeneratedBy()) { - 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; - } - -} 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-06 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -105,7 +105,7 @@ * retrieved or manufactured. * @return The FObjProxy instance to which fobj is attached. */ - public FOrayFONodeProxy getFObjProxy(FONode fobj) { + public FOrayFOLinkage getFObjProxy(FONode fobj) { return areaTree.getFObjProxy(fobj); } 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-06 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -541,7 +541,7 @@ */ private boolean startsHere(Marker marker) { FObj parent = marker.parentFO(); - FOrayFONodeProxy proxy = getFObjProxy(parent); + FOrayFOLinkage proxy = getFObjProxy(parent); Area firstArea = (Area) proxy.firstNormalAreaReturned(); if (firstArea == null) { return false; @@ -558,7 +558,7 @@ */ private boolean endsHere(Marker marker) { FObj parent = marker.parentFO(); - FOrayFONodeProxy proxy = getFObjProxy(parent); + FOrayFOLinkage proxy = getFObjProxy(parent); Area lastArea = (Area) 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-06 22:25:18 UTC (rev 7152) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-06 22:30:41 UTC (rev 7153) @@ -25,7 +25,7 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FOrayFONodeProxy; +import org.foray.area.FOrayFOLinkage; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; import org.foray.common.FOrayException; @@ -129,8 +129,8 @@ return proxy; } - protected FOrayFONodeProxy getFONodeResult(FONode node) { - return (FOrayFONodeProxy) node.getResult(); + protected FOrayFOLinkage getFONodeResult(FONode node) { + return (FOrayFOLinkage) node.getResult(); } public abstract 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-09 01:15:14
|
Revision: 7168 Author: victormote Date: 2006-05-07 09:24:46 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7168&view=rev Log Message: ----------- Remove no-longer-needed LayoutControl interface. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java Removed Paths: ------------- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.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 16:21:14 UTC (rev 7167) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-07 16:24:46 UTC (rev 7168) @@ -26,7 +26,6 @@ import org.foray.area.AreaTree; import org.foray.area.AreaTreeControl; -import org.foray.area.LayoutControl; import org.foray.area.LayoutStrategy; import org.foray.area.PageCollection; import org.foray.area.PageRA; @@ -69,7 +68,7 @@ and AreaTree when a Page is formatted.<P> */ public class FOrayTarget implements FOTreeListener, - AreaTreeControl, LayoutControl, OutputControl { + AreaTreeControl, OutputControl { private static final boolean MEM_PROFILE_WITH_GC = false; /** Render to PDF. OutputStream must be set. */ @@ -173,7 +172,6 @@ if (this.layout == null) { this.layout = new PioneerLS(this.getLogger()); } - this.layout.setLayoutControl(this); // Validate the OutputStream. this.outputStream = outputStream; Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java 2006-05-07 16:21:14 UTC (rev 7167) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutControl.java 2006-05-07 16:24:46 UTC (rev 7168) @@ -1,37 +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.graphicR.GraphicServer; - -/** - * This interface allows the client application to pass information about the - * environment to the layout engine. - */ -public interface LayoutControl { - - public GraphicServer getGraphicServer(); - -} 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 16:21:14 UTC (rev 7167) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-07 16:24:46 UTC (rev 7168) @@ -56,12 +56,6 @@ public abstract class LayoutStrategy implements LineBreakHandler, org.axsl.areaW.LayoutStrategy { - /** - * The LayoutControl implementation that passes information to this - * layout system. - */ - protected LayoutControl control; - Log logger; /** @@ -77,14 +71,6 @@ } /** - * @param control The LayoutControl implementation that passes information - * to this layout system. - */ - public void setLayoutControl(LayoutControl control) { - this.control = control; - } - - /** * This the main processing of the LayoutStrategy implementation, which * is to create the needed content in the given PageCollection to satisfy * the PageCollection's cousin PageSequence in the FOTree. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:13:49
|
Revision: 7189 Author: victormote Date: 2006-05-08 07:52:14 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7189&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 14:40:49 UTC (rev 7188) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 14:52:14 UTC (rev 7189) @@ -81,7 +81,7 @@ */ public LineArea getCurrentLineArea() { if (this.currentLineArea == null) { - return createNextLineArea(); + return (LineArea) createNextLineArea(); } return this.currentLineArea; } @@ -100,7 +100,7 @@ * * @return the new current line area, which will be empty. */ - public LineArea createNextLineArea() { + public org.axsl.areaW.LineArea createNextLineArea() { if (this.getProgressionDimension() + traitGeneratedBy().traitLineHeightOpt() > this.progressionDimensionAvailable()) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 14:40:49 UTC (rev 7188) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-08 14:52:14 UTC (rev 7189) @@ -192,7 +192,7 @@ } // It did not fit on the line. Create new line & try again. NormalBlockArea blockArea = (NormalBlockArea) lineArea.getParentArea(); - lineArea = blockArea.createNextLineArea(); + lineArea = (LineArea) blockArea.createNextLineArea(); if (lineArea == null) { return Status.AREA_FULL_SOME; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 14:40:49 UTC (rev 7188) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-08 14:52:14 UTC (rev 7189) @@ -100,7 +100,7 @@ throws AreaWException { blockArea.addLineArea(blockArea.currentLineArea); addPendingFootnotes(blockArea); - return blockArea.createNextLineArea(); + return (LineArea) blockArea.createNextLineArea(); } public void addPendingFootnotes(NormalBlockArea area) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:12:19
|
Revision: 7152 Author: victormote Date: 2006-05-06 15:25:18 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7152&view=rev Log Message: ----------- Separate the AreaTree linkage/generated-by concept from the Layout proxy concept. Modified Paths: -------------- 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-areatree/src/java/org/foray/area/LayoutStrategy.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -133,12 +133,12 @@ if (fobj == null) { return null; } - FOrayFONodeProxy proxy = (FOrayFONodeProxy) fobj.getProxy(); - if (proxy == null) { - proxy = this.getLayoutStrategy().makeFObjProxy(fobj); - fobj.setProxy(proxy); + FOrayFONodeProxy linkage = (FOrayFONodeProxy) fobj.getResult(); + if (linkage == null) { + linkage = new FOrayFONodeProxy(fobj); + fobj.setResult(linkage); } - return proxy; + return linkage; } protected org.axsl.areaW.AreaNode getPreviousChildOfGeneratedBy() { 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 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFONodeProxy.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -35,10 +35,9 @@ * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use * with FOray.</p> */ -public class FOrayFONodeProxy implements org.axsl.foR.FONodeProxy, - FOLinkage { +public class FOrayFONodeProxy implements FOLinkage { - /** The real FONode which this proxy represents. */ + /** The FONode which generated the Areas in {@link #generatedAreas}. */ private FONode realFONode; /** @@ -47,7 +46,7 @@ * This is currently set up to only store the root node of any subtree that * was generated by {@link #realFONode}. */ - private ArrayList generatedAreas; + private ArrayList generatedAreas = new ArrayList(); public FOrayFONodeProxy(FONode realFObj) { this.realFONode = realFObj; 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -27,6 +27,7 @@ import org.foray.common.FOrayException; import org.axsl.foR.FONode; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOText; import org.axsl.foR.FObj; import org.axsl.foR.FObjMixed; @@ -130,9 +131,7 @@ * @param node * @return A new FObjProxy which proxies node. */ - public FOrayFONodeProxy makeFObjProxy(FONode node) { - return new FOrayFONodeProxy(node); - } + public abstract FONodeProxy makeFObjProxy(FONode node) ; public void handleLineBreakText(LineOutput lineOutput, LineText text, int startOffset, int sizeInChars, int sizeInline, 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -27,6 +27,7 @@ import org.foray.area.Area; import org.foray.common.FOrayException; +import org.axsl.areaW.FOLinkage; import org.axsl.foR.FONode; import org.axsl.foR.extension.ContinuedLabel; import org.axsl.foR.fo.Table; @@ -60,8 +61,8 @@ // See if ancestor table has generated any areas yet. Table table = label.getNearestTable(); - TablePL tablePL = (TablePL) layout.getFObjProxy(table); - if (tablePL != null && tablePL.qtyAreasGenerated() > 0) { + FOLinkage linkage = (FOLinkage) table.getResult(); + if (linkage != null && linkage.qtyAreasGenerated() > 0) { int numChildren = label.getChildren().size(); for (int i = getProgress(); i < numChildren; i++) { FONode fo = (FONode)label.getChildren().get(i); 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -30,6 +30,8 @@ import org.foray.area.NormalBlockArea; import org.foray.common.FOrayException; +import org.axsl.areaW.AreaNode; +import org.axsl.areaW.FOLinkage; import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.text.TextException; @@ -44,7 +46,7 @@ /** * */ -public abstract class FONodePL extends FOrayFONodeProxy { +public abstract class FONodePL implements org.axsl.foR.FONodeProxy { /** value of progress before layout begins. */ public static final int START = -1000; @@ -52,6 +54,9 @@ /** value of progress after break-after. */ public static final int BREAK_AFTER = -1001; + /** The real FONode which this proxy represents. */ + private FONode realFONode; + /** * where the layout was up to. * for FObjs it is the child number @@ -62,7 +67,8 @@ protected PioneerLS layout; public FONodePL(FONode realFObj, PioneerLS layout) { - super(realFObj); + this.realFONode = realFObj; + realFObj.setProxy(this); this.layout = layout; } @@ -113,9 +119,20 @@ } protected FONodePL getFObjProxy(FONode node) { - return (FONodePL) layout.getFObjProxy(node); + if (node == null) { + return null; + } + FONodePL proxy = (FONodePL) node.getProxy(); + if (proxy == null) { + proxy = (FONodePL) this.layout.makeFObjProxy(node); + } + return proxy; } + protected FOrayFONodeProxy getFONodeResult(FONode node) { + return (FOrayFONodeProxy) node.getResult(); + } + public abstract int layout(Area area) throws FOrayException; public Log getLogger() { @@ -228,4 +245,28 @@ return blockArea.getCurrentLineArea(); } + public FONode getFONode() { + return this.realFONode; + } + + public FOLinkage getFOLinkage() { + FONode foNode = this.getFONode(); + if (foNode == null) { + return null; + } + FOLinkage linkage = (FOLinkage) foNode.getResult(); + if (linkage == null) { + return null; + } + return linkage; + } + + public AreaNode getLastGeneratedBy() { + FOLinkage linkage = getFOLinkage(); + if (linkage == null) { + return null; + } + return linkage.getLastGeneratedBy(); + } + } 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 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -67,7 +67,8 @@ return snapshot; } FONode node = ((FONode)children.get(this.progress)); - return getFObjProxy(node).getProgressSnapshot(snapshot); + FONodePL proxy = getFObjProxy(node); + return proxy.getProgressSnapshot(snapshot); } public void rollback(ArrayList snapshot) { @@ -107,7 +108,7 @@ return null; } // Find the last Area generated by that FO - org.axsl.areaW.AreaNode lastGenerated = getFObjProxy(previousSibling) + org.axsl.areaW.AreaNode lastGenerated = getFONodeResult(previousSibling) .getLastGeneratedBy(); if (lastGenerated == null) { return null; 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -59,8 +59,7 @@ FONode fo = (FONode)node.childrenFO().get(i); if (fo instanceof Inline) { inline = (Inline) fo; - FObjMixedPL inlinePL = (FObjMixedPL) layout.getFObjProxy( - inline); + FObjMixedPL inlinePL = (FObjMixedPL) inline.getProxy(); int status = inlinePL.layout(area); if (Status.isIncomplete(status)) { return status; 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -25,7 +25,6 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.area.FOrayFONodeProxy; import org.foray.area.LayoutStrategy; import org.foray.area.LineArea; import org.foray.area.NormalBlockArea; @@ -38,6 +37,7 @@ import org.axsl.common.Constants; import org.axsl.foR.FONode; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOText; import org.axsl.foR.FObj; import org.axsl.foR.FObjMixed; @@ -107,8 +107,7 @@ if (area.pendingFootnotes != null) { for (int i = 0; i < area.pendingFootnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)area.pendingFootnotes.get(i); - FootnoteBodyPL fbPL - = ((FootnoteBodyPL) getFObjProxy(fb)); + FootnoteBodyPL fbPL = ((FootnoteBodyPL) fb.getProxy()); PageRA page = area.getPage(); if (! fbPL.layoutFootnote(page, area)) { page.addPendingFootnote(fb); @@ -125,6 +124,7 @@ throws FOrayException { PageSequence pageSeq = pageCollection.getPageSequence(); org.axsl.foR.fo.Flow flow = pageSeq.getFlow(); + flow.setProxy(new FlowPL(flow, this)); pageCollection.padPagesAtBeginning(); // make pages and layout content @@ -158,7 +158,7 @@ * static content. This is likely also justifiable because of spec. */ RegionRABody bodyArea = currentPage.getRegionRABody(); - FlowPL flowPL = (FlowPL) this.getFObjProxy(flow); + FlowPL flowPL = (FlowPL) flow.getProxy(); flowPL.layout(bodyArea); currentPage.formatStaticContent(this); currentPage.layoutComplete(); @@ -172,8 +172,7 @@ if (footnotes != null) { for (int i = 0; i < footnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)footnotes.get(i); - FootnoteBodyPL fbPL - = ((FootnoteBodyPL) getFObjProxy(fb)); + FootnoteBodyPL fbPL = ((FootnoteBodyPL) fb.getProxy()); if (! fbPL.layoutFootnote(pageArea, null)) { // footnotes are too large to fit on empty page } @@ -195,8 +194,7 @@ if (staticContent == null) { return; } - StaticContentPL staticPL - = (StaticContentPL) this.getFObjProxy(staticContent); + StaticContentPL staticPL = (StaticContentPL) staticContent.getProxy(); staticPL.layout(area); } @@ -255,7 +253,7 @@ } } - public FOrayFONodeProxy makeFObjProxy(FONode node) { + public FONodeProxy makeFObjProxy(FONode node) { switch (node.getNodeType()) { case FONode.NODE_ABSTRACT_FLOW: { return null; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-05-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -68,7 +68,7 @@ } TableCellPL getTableCellPL() { - return (TableCellPL) layout.getFObjProxy(this.cell); + return (TableCellPL) this.cell.getProxy(); } } 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-06 21:28:53 UTC (rev 7151) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-05-06 22:25:18 UTC (rev 7152) @@ -379,8 +379,7 @@ int columnOffset = 0; for (int i = 0; i < node.getTableColumns().size(); i++) { TableColumn column = (TableColumn) node.getTableColumns().get(i); - TableColumnPL columnPL = (TableColumnPL) layout.getFObjProxy( - column); + TableColumnPL columnPL = (TableColumnPL) column.getProxy(); if (columnPL != null) { columnPL.setColumnOffset(columnOffset); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:11:27
|
Revision: 7171 Author: victormote Date: 2006-05-07 10:56:15 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7171&view=rev Log Message: ----------- Implement new axsl method. 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 17:25:47 UTC (rev 7170) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-07 17:56:15 UTC (rev 7171) @@ -25,6 +25,8 @@ package org.foray.area; import org.foray.common.OrderedTreeNode; + +import org.axsl.areaW.FOLinkage; import org.axsl.areaW.LayoutStrategy; import org.axsl.common.Constants; @@ -446,4 +448,13 @@ return this.getAreaNodeParent().getLayoutStrategy(); } + public FOLinkage getFOLinkage(FONode foNode) { + FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult(); + if (linkage == null) { + linkage = new FOrayFOLinkage(foNode); + foNode.setResult(linkage); + } + return linkage; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:09:35
|
Revision: 7196 Author: victormote Date: 2006-05-08 09:42:04 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7196&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- 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/PageRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.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:20:42 UTC (rev 7195) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 16:42:04 UTC (rev 7196) @@ -111,7 +111,7 @@ } public int heightNearestGenByBlockLevelFO() { - Area nearest = nearestGeneratedByBlockLevelFO(); + org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); if (nearest == null) { return Constants.DIMENSION_AUTO; } @@ -119,7 +119,7 @@ } public int widthNearestGenByBlockLevelFO() { - AreaNode nearest = nearestGeneratedByBlockLevelFO(); + org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); if (nearest == null || ! (nearest instanceof Area)) { return Constants.DIMENSION_AUTO; } 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 16:20:42 UTC (rev 7195) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 16:42:04 UTC (rev 7196) @@ -267,7 +267,7 @@ * a block-level formatting object. * @return The Area generated by a block-level FO. */ - public Area nearestGeneratedByBlockLevelFO() { + public org.axsl.areaW.Area nearestGeneratedByBlockLevelFO() { if (this instanceof Area && traitGeneratedBy().isBlockLevelFO()) { return (Area) this; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-08 16:20:42 UTC (rev 7195) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-08 16:42:04 UTC (rev 7196) @@ -272,7 +272,7 @@ * that was generated by a block-level FO. * @return Always returns null (override of method in Area). */ - public Area nearestGeneratedByBlockLevelFO() { + public org.axsl.areaW.Area nearestGeneratedByBlockLevelFO() { return null; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-08 16:20:42 UTC (rev 7195) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-08 16:42:04 UTC (rev 7196) @@ -49,8 +49,11 @@ } // Compute effective width & height of containing Area - int height = node.getHeight(area.heightNearestGenByBlockLevelFO()); - int width = node.getWidth(area.widthNearestGenByBlockLevelFO()); + org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO(); + int height = nearest.crBPD(); + height = node.getHeight(height); + int width = nearest.crIPD(); + width = node.getWidth(width); if ((width == 0) && (height == 0)) { width = node.traitRight(0) - node.traitLeft(0); height = node.traitBottom(0) - node.traitTop(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-08 16:20:42 UTC (rev 7195) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2006-05-08 16:42:04 UTC (rev 7196) @@ -49,7 +49,8 @@ setProgress(0); } - Area parentForDimensions = area.nearestGeneratedByBlockLevelFO(); + org.axsl.areaW.Area parentForDimensions = + area.nearestGeneratedByBlockLevelFO(); int height = node.viewportBPD(parentForDimensions.crIPD(), parentForDimensions.crBPD()); if (area.progressionDimensionAvailable() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:07:14
|
Revision: 7160 Author: victormote Date: 2006-05-06 17:33:41 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7160&view=rev Log Message: ----------- Implement new axsl interfaces. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 00:15:04 UTC (rev 7159) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 00:33:41 UTC (rev 7160) @@ -47,7 +47,8 @@ import java.util.ArrayList; import java.util.List; -public class PageRA extends AreaFixed implements PageArea { +public class PageRA extends AreaFixed implements PageArea, + org.axsl.areaW.PageArea { private RegionRABody body; private RegionRA before; 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-07 00:15:04 UTC (rev 7159) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-07 00:33:41 UTC (rev 7160) @@ -34,7 +34,8 @@ /** * This class is used to manage a region-reference-area. */ -public class RegionRA extends AreaFixed implements RegionArea { +public class RegionRA extends AreaFixed implements RegionArea, + org.axsl.areaW.RegionArea { public RegionRA(Region generatedBy, PageRA parentArea) { super(generatedBy, parentArea); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:05:52
|
Revision: 7194 Author: victormote Date: 2006-05-08 08:45:42 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7194&view=rev Log Message: ----------- Implement new axsl interfaces. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 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-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -31,7 +31,7 @@ * The container area for the contents of a block-container FO. */ public class BlockContainerRA extends ContainerRA - implements BlockContainerArea { + implements BlockContainerArea, org.axsl.areaW.BlockContainerRA { private int xPosition; private int yPosition; 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-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -33,7 +33,8 @@ * before-float-reference-area, main-reference-area, footnote-reference-area, * span-reference-area, and column-reference-area. */ -public abstract class ContainerRA extends AreaFlexible { +public abstract class ContainerRA extends AreaFlexible + implements org.axsl.areaW.ContainerRA { public ContainerRA(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); 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-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -26,7 +26,8 @@ import org.axsl.foR.FObj; -public class GenericContainer extends ContainerRA { +public class GenericContainer extends ContainerRA + implements org.axsl.areaW.GenericContainer { int xPosition = 0; int yPosition = 0; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -27,7 +27,8 @@ import org.axsl.foR.FObj; public class TableBodyContainer extends GenericContainer - implements org.axsl.areaR.TableBodyContainer { + implements org.axsl.areaR.TableBodyContainer, + org.axsl.areaW.TableBodyContainer { public TableBodyContainer(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -27,7 +27,8 @@ import org.axsl.foR.FObj; public class TableFooterContainer extends GenericContainer - implements org.axsl.areaR.TableFooterContainer { + implements org.axsl.areaR.TableFooterContainer, + org.axsl.areaW.TableFooterContainer { public TableFooterContainer(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-08 15:28:54 UTC (rev 7193) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-08 15:45:42 UTC (rev 7194) @@ -27,7 +27,8 @@ import org.axsl.foR.FObj; public class TableHeaderContainer extends GenericContainer - implements org.axsl.areaR.TableHeaderContainer { + implements org.axsl.areaR.TableHeaderContainer, + org.axsl.areaW.TableHeaderContainer { public TableHeaderContainer(FObj generatedBy, Area parentArea) { super(generatedBy, parentArea); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:01:48
|
Revision: 7176 Author: victormote Date: 2006-05-07 12:54:28 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7176&view=rev Log Message: ----------- Conform to new axsl factory methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.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-07 19:00:17 UTC (rev 7175) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-07 19:54:28 UTC (rev 7176) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.areaW.Area; import org.axsl.areaW.LayoutStrategy; import org.axsl.areaW.AreaWException; 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-07 19:00:17 UTC (rev 7175) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-07 19:54:28 UTC (rev 7176) @@ -26,8 +26,17 @@ import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.foR.FONode; 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.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.text.line.LineOutput; import java.util.List; @@ -770,4 +779,57 @@ return this.children.size() > 0; } + public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea( + InstreamForeignObject ifo, int ipd) { + Area parentArea = findParentArea(ifo); + return new ForeignObjectArea(ifo, parentArea, ipd); + } + + public org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea( + ExternalGraphic ifo, int ipd) { + Area parentArea = findParentArea(ifo); + return new ExternalGraphicArea(ifo, parentArea, ipd); + } + + public org.axsl.areaW.LeaderArea makeLeaderArea( + Leader leader, int ipd) { + Area parentArea = findParentArea(leader); + return new LeaderArea(leader, parentArea, ipd); + } + + public org.axsl.areaW.PageNumberArea makePageNumberArea( + PageNumber pageNumber, int ipd) { + Area parentArea = findParentArea(pageNumber); + return new PageNumberArea(pageNumber, parentArea, ipd); + } + + public org.axsl.areaW.PageNumberCitationArea makePageNumberCitationArea( + PageNumberCitation citation, int ipd) { + Area parentArea = findParentArea(citation); + return new PageNumberCitationArea(citation, parentArea, ipd); + } + + private AreaFlexible findParentArea(FONode node) { + // This is the easy and probably most frequent case + if (node.parentFO() instanceof Block) { + return this; + } + /* + * TODO: A test needs to be + * added to see whether the last child of LineArea should be a parent + * or other ancestor of node. If so, as much of that hierarchy as is + * common to node should be preserved. + */ + if (node.parentFO() instanceof BasicLink) { + BasicLink bl = (BasicLink) node.parentFO(); + return new BasicLinkArea(bl, findParentArea(bl)); + } + if (node.parentFO() instanceof Inline) { + Inline inline = (Inline) node.parentFO(); + return new InlineArea(inline, findParentArea(inline)); + } + // Default if nothing else works. + return this; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-07 19:00:17 UTC (rev 7175) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-07 19:54:28 UTC (rev 7176) @@ -37,7 +37,7 @@ } public String resolve() { - Area area = getAreaTree().firstNormalAreaReturned(traitRefId()); + Area area = (Area) getAreaTree().firstNormalAreaReturned(traitRefId()); String text = null; if (area == null) { text = "???"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 01:01:43
|
Revision: 7177 Author: victormote Date: 2006-05-07 12:59:22 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7177&view=rev Log Message: ----------- Steps toward independence from FOray's AreaTree. Modified Paths: -------------- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java =================================================================== --- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 19:54:28 UTC (rev 7176) +++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2006-05-07 19:59:22 UTC (rev 7177) @@ -27,13 +27,8 @@ import org.foray.area.Area; import org.foray.area.AreaFlexible; import org.foray.area.BasicLinkArea; -import org.foray.area.ExternalGraphicArea; -import org.foray.area.ForeignObjectArea; import org.foray.area.InlineArea; -import org.foray.area.LeaderArea; import org.foray.area.LineArea; -import org.foray.area.PageNumberArea; -import org.foray.area.PageNumberCitationArea; import org.foray.area.TextArea; import org.axsl.areaW.AreaTree; @@ -157,24 +152,22 @@ LineNonText nonText, int sizeInline) throws TextException { checkLayoutTarget(lineOutput, nonText); LineArea lineArea = (LineArea) lineOutput; - FONode node = (FONode) nonText; - Area parentArea = findParentArea(node, lineArea); if (nonText instanceof InstreamForeignObject) { InstreamForeignObject ifo = (InstreamForeignObject) nonText; - new ForeignObjectArea(ifo, parentArea, sizeInline); + lineArea.makeForeignObjectArea(ifo, sizeInline); } else if (nonText instanceof ExternalGraphic) { ExternalGraphic graphic = (ExternalGraphic) nonText; - new ExternalGraphicArea(graphic, parentArea, sizeInline); + lineArea.makeExternalGraphicArea(graphic, sizeInline); } else if (nonText instanceof Leader) { Leader leader = (Leader) nonText; - new LeaderArea(leader, parentArea, sizeInline); + lineArea.makeLeaderArea(leader, sizeInline); } else if (nonText instanceof PageNumberCitation) { PageNumberCitation citation = (PageNumberCitation) nonText; - new PageNumberCitationArea(citation, parentArea, sizeInline); + lineArea.makePageNumberCitationArea(citation, sizeInline); } else if (nonText instanceof PageNumber) { PageNumber pageNumber = (PageNumber) nonText; - new PageNumberArea(pageNumber, parentArea, sizeInline); + lineArea.makePageNumberArea(pageNumber, sizeInline); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 00:59:39
|
Revision: 7197 Author: victormote Date: 2006-05-08 09:59:55 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7197&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.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:42:04 UTC (rev 7196) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 16:59:55 UTC (rev 7197) @@ -25,12 +25,14 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.TableFooterContainer; import org.axsl.areaW.TableHeaderContainer; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; import org.axsl.foR.fo.BasicLink; +import org.axsl.foR.fo.Block; import org.axsl.foR.fo.TableBody; import org.axsl.foR.fo.TableFooter; import org.axsl.foR.fo.TableHeader; @@ -952,8 +954,7 @@ } /** - * @return The amount of space, in millipoints, available in this Area for - * expansion in the progression direction. + * {@inherit} */ public abstract int progressionDimensionAvailable(); @@ -1180,4 +1181,8 @@ return new org.foray.area.TableFooterContainer(tableFooter, this); } + public NormalBlockArea makeNormalBlockArea(Block block) { + return new org.foray.area.NormalBlockArea(block, this); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-08 16:42:04 UTC (rev 7196) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-08 16:59:55 UTC (rev 7197) @@ -331,8 +331,8 @@ * @return The ColumnRA instance into which nextFObj should be laid out. * @throws AreaWException For errors creating the appropriate Areas. */ - public SpanRA startingReferenceArea(FObj lastFObj, FObj nextFObj) - throws AreaWException { + public org.axsl.areaW.SpanRA startingReferenceArea(FObj lastFObj, + FObj nextFObj) throws AreaWException { if (lastFObj != null) { Area lastArea = (Area) getFObjProxy(lastFObj) .getLastAreaGeneratedBy(); 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-08 16:42:04 UTC (rev 7196) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-08 16:59:55 UTC (rev 7197) @@ -38,7 +38,8 @@ * span-reference-area. The best guess is that it is generated by the * region-body fo. */ -public class SpanRA extends AreaFlexible implements SpanArea { +public class SpanRA extends AreaFlexible implements SpanArea, + org.axsl.areaW.SpanRA { private int currentColumn = 1; @@ -205,7 +206,7 @@ * @param fo The FObj instance whose to be contained. * @return SpanRA The NormalFlowRA instance into which fo should be placed. */ - public NormalFlowRA normalFlowForNextFO(FObj fo) { + public org.axsl.areaW.NormalFlowRA normalFlowForNextFO(FObj fo) { int qtyChildren = this.getChildren().size(); // If the span has only one column, then simply return it. if (qtyChildren == 1) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-08 16:42:04 UTC (rev 7196) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-05-08 16:59:55 UTC (rev 7197) @@ -26,7 +26,6 @@ import org.foray.area.NormalFlowRA; import org.foray.area.PageCollection; -import org.foray.area.SpanRA; import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; @@ -48,8 +47,9 @@ lastFObj = (FObj) children.get(i - 1); } FObj nextFObj = (FObj) children.get(i); - SpanRA span = pc.startingReferenceArea(lastFObj, nextFObj); - NormalFlowRA nf = span.normalFlowForNextFO(nextFObj); + org.axsl.areaW.SpanRA span = pc.startingReferenceArea(lastFObj, + nextFObj); + NormalFlowRA nf = (NormalFlowRA) span.normalFlowForNextFO(nextFObj); this.getLayoutProxy(nextFObj).layout(nf); } return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 00:56:20
|
Revision: 7187 Author: victormote Date: 2006-05-07 17:08:45 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7187&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 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-07 23:40:33 UTC (rev 7186) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-08 00:08:45 UTC (rev 7187) @@ -95,6 +95,10 @@ return footnoteReferenceArea; } + public org.axsl.areaW.FootnoteRA getWritableFootnoteReferenceArea() { + return footnoteReferenceArea; + } + public int getFootnoteState() { return footnoteState; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 00:55:32
|
Revision: 7195 Author: victormote Date: 2006-05-08 09:20:42 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7195&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.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 15:45:42 UTC (rev 7194) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-08 16:20:42 UTC (rev 7195) @@ -25,10 +25,15 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.areaW.TableFooterContainer; +import org.axsl.areaW.TableHeaderContainer; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; import org.axsl.foR.fo.BasicLink; +import org.axsl.foR.fo.TableBody; +import org.axsl.foR.fo.TableFooter; +import org.axsl.foR.fo.TableHeader; import org.axsl.fontR.Font; import org.axsl.fontR.FontUse; import org.axsl.graphicR.Graphic; @@ -1159,4 +1164,20 @@ return this.traitGeneratedBy().traitLineHeightOpt(); } + public org.axsl.areaW.TableBodyContainer makeTableBodyContainer( + TableBody tableBody) { + return new org.foray.area.TableBodyContainer(tableBody, this); + } + + public TableHeaderContainer makeTableHeaderContainer( + TableHeader tableHeader) { + return new org.foray.area.TableHeaderContainer(tableHeader, this); + + } + + public TableFooterContainer makeTableFooterContainer( + TableFooter tableFooter) { + return new org.foray.area.TableFooterContainer(tableFooter, this); + } + } 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 15:45:42 UTC (rev 7194) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-08 16:20:42 UTC (rev 7195) @@ -127,7 +127,7 @@ this.generatedBy.unregisterGeneratedArea(this); } - public void removeChild(AreaNode areaNode) { + public void removeChild(org.axsl.areaW.AreaNode areaNode) { this.children.remove(areaNode); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-09 00:52:56
|
Revision: 7163 Author: victormote Date: 2006-05-07 08:21:53 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7163&view=rev Log Message: ----------- Move FOrayException class from Common to App module, forcing other modules to use more appropriate Exception classes. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/FOray.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/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/Options.java trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java trunk/foray/foray-app/src/java/org/foray/app/Starter.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.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/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.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/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/PageRA.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-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/PageNumberCitationPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableColumnPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Added Paths: ----------- trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java Removed Paths: ------------- trunk/foray/foray-common/src/java/org/foray/common/FOrayException.java Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -31,7 +31,6 @@ * Modified to use streaming API by Mark Lillywhite, mar...@in... */ -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.foray.render.awt.AWTRenderer; import org.foray.render.awt.viewer.PreviewDialog; Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.foray.output.OutputConfig; 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -25,7 +25,6 @@ package org.foray.app; import org.foray.area.LayoutStrategy; -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/FOInputHandler.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOray.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.common.Logging; 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.common.XMLParser; import org.foray.output.MIFConverter; import org.foray.output.OutputConfig; Copied: trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java (from rev 7155, trunk/foray/foray-common/src/java/org/foray/common/FOrayException.java) =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java (rev 0) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayException.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -0,0 +1,166 @@ +/* + * 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.app; + +import org.xml.sax.SAXException; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.lang.reflect.InvocationTargetException; + +/** + * Exception thrown when FOray has a problem. + */ +public class FOrayException extends Exception { + static final long serialVersionUID = 298590433713255908L; + + private static final String EXCEPTION_SEPARATOR = "\n---------\n"; + + private Throwable _exception; + private String contextMessage; + + /** + * Create a new FOray Exception + * + * @param message descriptive message + */ + public FOrayException(String message) { + super(message); + this.contextMessage = null; + } + + public FOrayException(String message, String contextMessage) { + super(message); + this.contextMessage = contextMessage; + } + + public FOrayException(Throwable e) { + super(e.getMessage()); + setException(e); + this.contextMessage = null; + } + + public FOrayException(Throwable e, String contextMessage) { + super(e.getMessage()); + setException(e); + this.contextMessage = contextMessage; + } + + public FOrayException(String message, Throwable e) { + super(message); + setException(e); + this.contextMessage = null; + } + + public FOrayException(String message, Throwable e, String contextMessage) { + super(message); + setException(e); + this.contextMessage = contextMessage; + } + + protected void setException(Throwable t) { + _exception = t; + } + + public Throwable getException() { + return _exception; + } + + public void setContextMessage(String contextMessage) { + this.contextMessage = contextMessage; + } + + public boolean isContextSet() { + return this.contextMessage != null; + } + + protected Throwable getRootException() { + Throwable result = _exception; + + if (result instanceof SAXException) { + result = ((SAXException)result).getException(); + } + if (result instanceof InvocationTargetException) { + result = + ((InvocationTargetException)result) + .getTargetException(); + } + if (result != _exception) { + return result; + } + return null; + } + + public String getMessage() { + if (this.contextMessage != null) { + return super.getMessage() + "\n" + + this.contextMessage; + } + return super.getMessage(); + } + + public void printStackTrace() { + synchronized (System.err) { + super.printStackTrace(); + if (_exception != null) { + System.err.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(); + } + if (getRootException() != null) { + System.err.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(); + } + } + } + + public void printStackTrace(PrintStream stream) { + synchronized (stream) { + super.printStackTrace(stream); + if (_exception != null) { + stream.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(stream); + } + if (getRootException() != null) { + stream.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(stream); + } + } + } + + public void printStackTrace(PrintWriter writer) { + synchronized (writer) { + super.printStackTrace(writer); + if (_exception != null) { + writer.println(EXCEPTION_SEPARATOR); + _exception.printStackTrace(writer); + } + if (getRootException() != null) { + writer.println(EXCEPTION_SEPARATOR); + getRootException().printStackTrace(writer); + } + } + } + +} 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.foray.common.XMLParser; import org.foray.font.FOrayFontServer; 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 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -30,7 +30,6 @@ import org.foray.area.LayoutStrategy; import org.foray.area.PageCollection; import org.foray.area.PageRA; -import org.foray.common.FOrayException; import org.foray.font.FOrayFontConsumer; import org.foray.font.FOrayFontServer; import org.foray.output.OutputControl; @@ -40,6 +39,7 @@ import org.axsl.areaR.AreaRException; import org.axsl.areaR.PageArea; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FOTreeEvent; import org.axsl.foR.FOTreeListener; import org.axsl.foR.fo.PageSequence; @@ -281,7 +281,7 @@ (pageSequence); try { layout.formatPageSequence(pageCollection); - } catch (FOrayException e) { + } catch (AreaWException e) { throw new SAXException(e); } this.results.haveFormattedPageSequence(pageSequence, @@ -309,7 +309,7 @@ return this.areaTree; } - public synchronized void queuePage(PageRA page) throws FOrayException { + public synchronized void queuePage(PageRA page) throws AreaWException { /* * We run the pages through a queue because any page page that contains @@ -396,7 +396,7 @@ .getRootFObj(); try { getAreaTree().layoutDocumentNodes(rootFObj); - } catch (FOrayException e1) { + } catch (AreaWException e1) { getLogger().error("Error in layout of Document nodes."); e1.printStackTrace(); } Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/Options.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.foray.output.OutputConfig; Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -25,7 +25,6 @@ package org.foray.app; -import org.foray.common.FOrayException; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,9 +24,9 @@ package org.foray.app.ant; +import org.foray.app.FOrayException; import org.foray.app.FOrayTarget; import org.foray.app.Starter; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -26,13 +26,13 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; +import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.Options; import org.foray.app.SessionConfig; import org.foray.app.Starter; -import org.foray.common.FOrayException; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -26,12 +26,12 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; +import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.SessionConfig; import org.foray.app.TraxInputHandler; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.foray.output.OutputConfig; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -35,13 +35,13 @@ import javax.xml.transform.TransformerException; import org.foray.app.Application; +import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; -import org.foray.common.FOrayException; import org.foray.render.awt.AWTRenderer; import org.foray.render.awt.viewer.PreviewDialog; import org.foray.render.awt.viewer.SecureResourceBundle; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -30,13 +30,13 @@ import java.io.OutputStream; import org.foray.app.Application; +import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; -import org.foray.common.FOrayException; import org.foray.output.OutputTarget; /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -36,11 +36,11 @@ import javax.xml.transform.stream.StreamSource; import org.foray.app.Application; +import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; -import org.foray.common.FOrayException; import org.foray.output.OutputTarget; import org.foray.demo.embed.model.ProjectTeam; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -36,11 +36,11 @@ import javax.xml.transform.stream.StreamSource; import org.foray.app.Application; +import org.foray.app.FOrayException; import org.foray.app.SessionConfig; import org.foray.app.FOrayDocument; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; -import org.foray.common.FOrayException; import org.foray.output.OutputTarget; /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -26,11 +26,11 @@ import org.foray.app.FOInputHandler; import org.foray.app.FOrayDocument; +import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; import org.foray.app.SessionConfig; -import org.foray.common.FOrayException; import org.foray.common.Logging; import org.foray.output.OutputTarget; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -25,10 +25,10 @@ package org.foray.demo.servlet; import org.foray.app.FOrayDocument; +import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; -import org.foray.common.FOrayException; import org.foray.render.awt.AWTPrintRenderer; import java.awt.print.PrinterJob ; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -25,10 +25,10 @@ package org.foray.demo.servlet; import org.foray.app.FOrayDocument; +import org.foray.app.FOrayException; import org.foray.app.FOraySession; import org.foray.app.FOrayTarget; import org.foray.app.InputHandler; -import org.foray.common.FOrayException; import org.foray.output.OutputTarget; import java.io.ByteArrayOutputStream; 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,9 +24,8 @@ package org.foray.area; -import org.foray.common.FOrayException; - import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; @@ -53,7 +52,7 @@ return WritingMode.AXIS_IP; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; @@ -985,7 +984,7 @@ * overflow condition. */ public abstract Area getOverflowArea(Area childRequesting) - throws FOrayException; + throws AreaWException; public int traitHalfLeadingOpt() { return traitGeneratedBy().traitHalfLeadingOpt(); 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.fo.Bookmark; import org.axsl.foR.fo.BookmarkTitle; @@ -129,11 +128,11 @@ * @param rootFObj The Root instance that is the grand ancestor of the * FOTree that was parsed. */ - public void layoutDocumentNodes(Root rootFObj) throws FOrayException { + public void layoutDocumentNodes(Root rootFObj) throws AreaWException { layoutBookmarkTree(rootFObj); } - private void layoutBookmarkTree(Root rootFObj) throws FOrayException { + private void layoutBookmarkTree(Root rootFObj) throws AreaWException { BookmarkTree bookmarkTree = rootFObj.getBookmarkTree(); if (bookmarkTree == null) { return; @@ -146,7 +145,7 @@ } public void layoutBookmark(Bookmark bookmark, AreaNode area) - throws FOrayException { + throws AreaWException { BookmarkArea bookmarkArea = new BookmarkArea(bookmark, area); List children = bookmark.getChildren(); for (int i = 0; i < children.size(); i++) { 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTreeControl.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,7 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; +import org.axsl.areaW.AreaWException; /** * This is conceptually the ancestor of the entire AreaTree. Implementations @@ -37,6 +37,6 @@ * (presumable renders it). * @param page The PageRA instance to be processed. */ - public void queuePage(PageRA page) throws FOrayException ; + public void queuePage(PageRA page) throws AreaWException ; } 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; /** @@ -79,7 +78,7 @@ return 0; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; /** @@ -40,7 +39,7 @@ super(generatedBy, parentArea); } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; /** @@ -70,7 +69,7 @@ return offset; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } 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 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LayoutStrategy.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOText; @@ -84,15 +83,15 @@ * is to create the needed content in the given PageCollection to satisfy * the PageCollection's cousin PageSequence in the FOTree. * @param pageCollection A PageCollection instance from the AreaTree. - * @throws FOrayException For errors during layout. + * @throws AreaWException For errors during layout. */ public void formatPageSequence(PageCollection pageCollection) - throws FOrayException { + throws AreaWException { if (areaTree == null) { areaTree = pageCollection.getAreaTree(); } else { if (areaTree != pageCollection.getAreaTree()) { - throw new FOrayException("Cannot reuse a LayoutStrategy " + throw new AreaWException("Cannot reuse a LayoutStrategy " + "instance."); } } @@ -115,7 +114,7 @@ } public abstract void processPageSequence(PageCollection pageCollection) - throws FOrayException; + throws AreaWException; /** * For a given page, layout the static content on that page. This method @@ -124,7 +123,7 @@ * having to know the specifics of the layout process. */ public abstract void layoutStaticContent(PageSequence pageSequence, - Region region, RegionRA area) throws FOrayException; + Region region, RegionRA area) throws AreaWException; /** * LayoutStrategy implementations can override this method to create 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,12 +24,10 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; +import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; - -import org.axsl.common.Constants; import org.axsl.text.line.LineOutput; import java.util.List; @@ -552,7 +550,7 @@ return dimension; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,9 +24,8 @@ package org.foray.area; -import org.foray.common.FOrayException; - import org.axsl.areaR.MainReferenceArea; +import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; @@ -61,7 +60,7 @@ * @param fo The next formatting object * @return the next column area (possibly the current one) */ - public NormalFlowRA getNextArea(FObj fo) throws FOrayException { + public NormalFlowRA getNextArea(FObj fo) throws AreaWException { isNewSpanArea = false; int span = Constants.FOVAL_NONE; @@ -99,7 +98,7 @@ * area */ return addSpanArea(this.traitColumnCount()); } else { - throw new FOrayException("BodyAreaContainer::getNextArea(): Span " + throw new AreaWException("BodyAreaContainer::getNextArea(): Span " + "attribute messed up"); } } @@ -236,7 +235,7 @@ return ((RegionRABody) getParentArea()).getDimensionBeforeFloatRA(); } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { RegionRABody bodyRegion = (RegionRABody) getParentArea() .getOverflowArea(this); return bodyRegion.getMainRA(); 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.fo.FootnoteBody; import org.axsl.foR.fo.ListItem; @@ -131,10 +130,10 @@ return AreaNode.AREATYPE_BLOCK; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { Area overflow = getParentArea().getOverflowArea(this); if (overflow == null) { - throw new FOrayException("BlockArea overflow failed."); + throw new AreaWException("BlockArea overflow failed."); } NormalFlowRA overflowColumn = null; if (overflow instanceof NormalFlowRA) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,9 +24,8 @@ package org.foray.area; -import org.foray.common.FOrayException; - import org.axsl.areaR.NormalFlowArea; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; /** @@ -40,7 +39,7 @@ super(generatedBy, parentArea); } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { // If my children are overflowed, I must be also. Area overflowArea = getParentArea().getOverflowArea(this); // If parent SpanArea can create another column @@ -52,7 +51,7 @@ if (overflowArea instanceof MainRA) { return overflowArea; } - throw new FOrayException("ColumnRA overflow failed."); + throw new AreaWException("ColumnRA overflow failed."); } public byte getAreaType() { 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,16 +24,14 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; +import org.axsl.common.Constants; 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 java.util.ArrayList; /** @@ -134,9 +132,9 @@ * params. */ public PageRA getNextPage(boolean forceOdd, boolean forceEven, - boolean isBlank) throws FOrayException { + boolean isBlank) throws AreaWException { if (forceOdd && forceEven) { - throw new FOrayException("Cannot force a page to be both odd and " + throw new AreaWException("Cannot force a page to be both odd and " + "even."); } if (forceOdd) { @@ -154,7 +152,7 @@ spm = pageSeq.getPageMaster(this.pageCount, getCurrentPageNumber(), false, isBlank); } catch (FOTreeException e) { - throw new FOrayException(e); + throw new AreaWException(e); } PageRA newPage = new PageRA(spm, this); int newPageNumber = getCurrentPageNumber(); @@ -174,10 +172,9 @@ /** * This method creates any blank pages that are needed at the beginning of * an PageCollection to meet the related PageSequence's constraints. - * @throws FOrayException + * @throws AreaWException */ - public void padPagesAtBeginning() - throws FOrayException { + public void padPagesAtBeginning() throws AreaWException { PageSequence pageSeq = getPageSequence(); PageCollection previousPageCollection = previousPageCollection(); if (previousPageCollection == null) { @@ -255,9 +252,9 @@ /** * This method creates any blank pages that are needed at the end of a * PageCollection to meet the related PageSequence's constraints. - * @throws FOrayException + * @throws AreaWException */ - public void padPagesAtEnd() throws FOrayException { + public void padPagesAtEnd() throws AreaWException { PageSequence pageSeq = getPageSequence(); switch (pageSeq.traitForcePageCount()) { case Constants.FOVAL_AUTO: { @@ -300,11 +297,11 @@ } } - private void makeBlankPage() throws FOrayException { + private void makeBlankPage() throws AreaWException { getNextPage(false, false, true); } - public void releasePages(LayoutStrategy layout) throws FOrayException { + public void releasePages(LayoutStrategy layout) throws AreaWException { for (int i = 0; i < getChildren().size(); i++) { Object object = getChildren().get(i); if (object instanceof PageRA) { @@ -342,10 +339,10 @@ * @param nextFObj The FObj for which we are trying to find the staring * Area for layout. * @return The ColumnRA instance into which nextFObj should be laid out. - * @throws FOrayException For errors creating the appropriate Areas. + * @throws AreaWException For errors creating the appropriate Areas. */ public SpanRA startingReferenceArea(FObj lastFObj, FObj nextFObj) - throws FOrayException { + throws AreaWException { if (lastFObj != null) { Area lastArea = (Area) getFObjProxy(lastFObj) .getLastAreaGeneratedBy(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,11 +24,10 @@ package org.foray.area; -import org.foray.common.FOrayException; - import org.axsl.areaR.PageArea; import org.axsl.areaR.RegionArea; import org.axsl.areaR.RegionBodyArea; +import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.WritingMode; @@ -269,7 +268,7 @@ * This method should be run after the page is completely laid out, and it * is ready to be rendered. It makes the page available to be rendered. */ - public void layoutComplete() throws FOrayException { + public void layoutComplete() throws AreaWException { purgeEmptyNodes(this); ArrayList markers = getMarkers(); if (markers != null) { @@ -426,7 +425,7 @@ * Overrides method in Area, because at this point, a new page needs to * be created. */ - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getPageCollection().getNextPage(false, false, false); } @@ -454,7 +453,7 @@ * Formats the static content of the current page. */ public void formatStaticContent(LayoutStrategy layout) - throws FOrayException { + throws AreaWException { PageCollection areaTree = getPageCollection(); PageSequence pageSeq = areaTree.getPageSequence(); SimplePageMaster simpleMaster = getPageMaster(); 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,10 +24,9 @@ package org.foray.area; -import org.foray.common.FOrayException; - import org.axsl.areaR.MainReferenceArea; import org.axsl.areaR.RegionBodyArea; +import org.axsl.areaW.AreaWException; import org.axsl.foR.WritingMode; import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.SimplePageMaster; @@ -236,7 +235,7 @@ return page.getRegionBefore().traitExtent(); } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { PageRA page = (PageRA) getParentArea().getOverflowArea(this); return page.getRegionRABody(); } 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,8 +24,7 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaW.AreaWException; import org.axsl.foR.svg.SVGElement; import org.w3c.dom.svg.SVGDocument; @@ -55,7 +54,7 @@ return AreaNode.AREATYPE_SVG; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,14 +24,12 @@ package org.foray.area; -import org.foray.common.FOrayException; - +import org.axsl.areaR.SpanArea; +import org.axsl.areaW.AreaWException; +import org.axsl.common.Constants; 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; /** @@ -123,7 +121,7 @@ return AreaNode.AREATYPE_SPAN_RA; } - public Area getOverflowArea(Area childRequesting) throws FOrayException { + public Area getOverflowArea(Area childRequesting) throws AreaWException { AreaNode nextColumn = (AreaNode) childRequesting.getNextSibling(); if (nextColumn != null & nextColumn instanceof Area) { return (Area) nextColumn; @@ -218,7 +216,7 @@ } public LineArea createNextLineArea(NormalBlockArea blockArea) - throws FOrayException { + throws AreaWException { LineArea newLineArea = null; if (canAddLineArea(blockArea)) { newLineArea = new LineArea(blockArea.traitGeneratedBy(), blockArea); Deleted: trunk/foray/foray-common/src/java/org/foray/common/FOrayException.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayException.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayException.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -1,166 +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.common; - -import org.xml.sax.SAXException; - -import java.io.PrintStream; -import java.io.PrintWriter; -import java.lang.reflect.InvocationTargetException; - -/** - * Exception thrown when FOray has a problem. - */ -public class FOrayException extends Exception { - static final long serialVersionUID = 298590433713255908L; - - private static final String EXCEPTION_SEPARATOR = "\n---------\n"; - - private Throwable _exception; - private String contextMessage; - - /** - * Create a new FOray Exception - * - * @param message descriptive message - */ - public FOrayException(String message) { - super(message); - this.contextMessage = null; - } - - public FOrayException(String message, String contextMessage) { - super(message); - this.contextMessage = contextMessage; - } - - public FOrayException(Throwable e) { - super(e.getMessage()); - setException(e); - this.contextMessage = null; - } - - public FOrayException(Throwable e, String contextMessage) { - super(e.getMessage()); - setException(e); - this.contextMessage = contextMessage; - } - - public FOrayException(String message, Throwable e) { - super(message); - setException(e); - this.contextMessage = null; - } - - public FOrayException(String message, Throwable e, String contextMessage) { - super(message); - setException(e); - this.contextMessage = contextMessage; - } - - protected void setException(Throwable t) { - _exception = t; - } - - public Throwable getException() { - return _exception; - } - - public void setContextMessage(String contextMessage) { - this.contextMessage = contextMessage; - } - - public boolean isContextSet() { - return this.contextMessage != null; - } - - protected Throwable getRootException() { - Throwable result = _exception; - - if (result instanceof SAXException) { - result = ((SAXException)result).getException(); - } - if (result instanceof InvocationTargetException) { - result = - ((InvocationTargetException)result) - .getTargetException(); - } - if (result != _exception) { - return result; - } - return null; - } - - public String getMessage() { - if (this.contextMessage != null) { - return super.getMessage() + "\n" - + this.contextMessage; - } - return super.getMessage(); - } - - public void printStackTrace() { - synchronized (System.err) { - super.printStackTrace(); - if (_exception != null) { - System.err.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(); - } - if (getRootException() != null) { - System.err.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(); - } - } - } - - public void printStackTrace(PrintStream stream) { - synchronized (stream) { - super.printStackTrace(stream); - if (_exception != null) { - stream.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(stream); - } - if (getRootException() != null) { - stream.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(stream); - } - } - } - - public void printStackTrace(PrintWriter writer) { - synchronized (writer) { - super.printStackTrace(writer); - if (_exception != null) { - writer.println(EXCEPTION_SEPARATOR); - _exception.printStackTrace(writer); - } - if (getRootException() != null) { - writer.println(EXCEPTION_SEPARATOR); - getRootException().printStackTrace(writer); - } - } - } - -} Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -28,8 +28,8 @@ import org.foray.area.NormalFlowRA; import org.foray.area.RegionRABody; import org.foray.area.SpanRA; -import org.foray.common.FOrayException; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; import org.axsl.foR.fo.AbstractFlow; import org.axsl.foR.fo.Region; @@ -78,7 +78,7 @@ this.progressSnapshot = progressSnapshot; } - public int layout(Area area) throws FOrayException { + public int layout(Area area) throws AreaWException { return layout(area, null); } @@ -86,7 +86,7 @@ return (AbstractFlow) this.getFONode(); } - public int layout(Area area, Region region) throws FOrayException { + public int layout(Area area, Region region) throws AreaWException { if (getProgress() == FONodePL.START) { setProgress(0); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -24,6 +24,17 @@ package org.foray.pioneer; +import org.foray.area.Area; +import org.foray.area.BlockContainerRA; +import org.foray.area.ContainerRA; +import org.foray.area.GenericContainer; +import org.foray.area.NormalBlockArea; +import org.foray.area.TableBodyContainer; +import org.foray.area.TableFooterContainer; +import org.foray.area.TableHeaderContainer; + +import org.axsl.areaW.AreaWException; +import org.axsl.common.Constants; import org.axsl.foR.FONode; import org.axsl.foR.fo.AbstractTableBody; import org.axsl.foR.fo.Marker; @@ -33,18 +44,6 @@ import org.axsl.foR.fo.TableHeader; import org.axsl.foR.fo.TableRow; -import org.foray.area.NormalBlockArea; -import org.foray.area.BlockContainerRA; -import org.foray.area.ContainerRA; -import org.foray.area.GenericContainer; -import org.foray.area.Area; -import org.foray.area.TableBodyContainer; -import org.foray.area.TableFooterContainer; -import org.foray.area.TableHeaderContainer; -import org.foray.common.FOrayException; - -import org.axsl.common.Constants; - import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -114,8 +113,7 @@ return (AbstractTableBody) this.getFONode(); } - public int layout(Area area) - throws FOrayException { + public int layout(Area area) throws AreaWException { AbstractTableBody node = getReal(); Table table = node.getNearestTable(); if (getProgress() == FONodePL.BREAK_AFTER) { @@ -173,7 +171,7 @@ continue; } if (!(child instanceof TableRow)) { - throw new FOrayException("Currently only Table Rows are " + throw new AreaWException("Currently only Table Rows are " + "supported in table body, header and footer"); } TableRow row = (TableRow)child; 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-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -25,8 +25,8 @@ package org.foray.pioneer; import org.foray.area.Area; -import org.foray.common.FOrayException; +import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.BlockContainer; /** @@ -42,7 +42,7 @@ return (BlockContainer) this.getFONode(); } - public int layout(Area area) throws FOrayException { + public int layout(Area area) throws AreaWException { BlockContainer node = getFO(); if (getProgress() == FONodePL.START) { setProgress(0); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-07 14:57:29 UTC (rev 7162) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-05-07 15:21:53 UTC (rev 7163) @@ -26,8 +26,8 @@ import org.foray.area.Area; import org.foray.area.NormalBlockArea; -import org.foray.common.FOrayException; +import org.axsl.areaW.AreaWException; import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; @@ -59,7 +59,7 @@ return (Block) this.ge... [truncated message content] |
|
From: <vic...@us...> - 2006-05-09 00:52:46
|
Revision: 7159 Author: victormote Date: 2006-05-06 17:15:04 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7159&view=rev Log Message: ----------- Add layout to classpath. Modified Paths: -------------- trunk/foray/foray-pioneer/.classpath Modified: trunk/foray/foray-pioneer/.classpath =================================================================== --- trunk/foray/foray-pioneer/.classpath 2006-05-07 00:10:45 UTC (rev 7158) +++ trunk/foray/foray-pioneer/.classpath 2006-05-07 00:15:04 UTC (rev 7159) @@ -14,5 +14,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="/FOrayLayout"/> <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. |
10 messages has been excluded from this view by a project administrator.