|
From: <vic...@us...> - 2006-05-26 22:36:44
|
Revision: 7289 Author: victormote Date: 2006-05-26 15:36:29 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7289&view=rev Log Message: ----------- Clean up build problem. aXSL is not supposed to have access to any logging. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -33,6 +33,8 @@ import org.axsl.common.Constants; import org.axsl.fontR.FontConsumer; +import org.apache.commons.logging.Log; + import java.awt.Color; /** @@ -40,8 +42,8 @@ */ public abstract class PrintRenderer extends Renderer { - public PrintRenderer(OutputConfig renderConfig) { - super(renderConfig); + public PrintRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -69,6 +69,7 @@ import org.axsl.graphicR.GraphicException; import org.apache.batik.bridge.BridgeContext; +import org.apache.commons.logging.Log; import java.awt.Color; import java.awt.Rectangle; @@ -89,8 +90,8 @@ /** * Constructor. */ - public Renderer(OutputConfig renderConfig) { - super(renderConfig); + public Renderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } public void setAreaTree(AreaTree areaTree) { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -28,6 +28,8 @@ import org.axsl.areaR.PageArea; +import org.apache.commons.logging.Log; + import java.awt.print.PrinterException; import java.awt.print.PrinterJob; import java.io.IOException; @@ -44,8 +46,9 @@ private int mode = EVEN_AND_ALL; private PrinterJob printerJob; - public AWTPrintRenderer(OutputConfig renderConfig, PrinterJob printerJob) { - super(renderConfig); + public AWTPrintRenderer(Log logger, OutputConfig renderConfig, + PrinterJob printerJob) { + super(logger, renderConfig); this.printerJob = printerJob; startNumber = getIntProperty("start", 1) - 1; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -49,6 +49,7 @@ import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.bridge.ViewBox; import org.apache.batik.gvt.GraphicsNode; +import org.apache.commons.logging.Log; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGDocument; @@ -147,8 +148,8 @@ */ protected Component parent; - public AWTRenderer(OutputConfig renderConfig) { - super(renderConfig); + public AWTRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -48,6 +48,8 @@ import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; +import org.apache.commons.logging.Log; + import java.awt.Color; import java.awt.Rectangle; import java.awt.color.ColorSpace; @@ -80,8 +82,8 @@ /** * Create the PCL renderer */ - public PCLRenderer(OutputConfig renderConfig) { - super(renderConfig); + public PCLRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } /** 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-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -61,6 +61,8 @@ import org.axsl.pdfW.PDFPathPaint; import org.axsl.pdfW.PDFUtility; +import org.apache.commons.logging.Log; + import java.awt.Color; import java.awt.Rectangle; import java.awt.geom.Line2D; @@ -83,8 +85,9 @@ /** * Create a PDF renderer. */ - public PDFRenderer(OutputConfig renderConfig, PDFDocument document) { - super(renderConfig); + public PDFRenderer(Log logger, OutputConfig renderConfig, + PDFDocument document) { + super(logger, renderConfig); this.pdfDoc = document; } 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-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -58,6 +58,7 @@ import org.apache.batik.bridge.ViewBox; import org.apache.batik.ext.awt.g2d.GraphicContext; import org.apache.batik.gvt.GraphicsNode; +import org.apache.commons.logging.Log; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGDocument; @@ -156,8 +157,8 @@ */ private HashMap fontMap = new HashMap(); - public PSRenderer(OutputConfig renderConfig) { - super(renderConfig); + public PSRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -49,6 +49,7 @@ import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.svg2svg.SVGTranscoder; +import org.apache.commons.logging.Log; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; @@ -101,8 +102,8 @@ protected float currentGreen = 0; protected float currentBlue = 0; - public SVGRenderer(OutputConfig renderConfig) { - super(renderConfig); + public SVGRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-05-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -39,6 +39,8 @@ import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; +import org.apache.commons.logging.Log; + import org.w3c.dom.svg.SVGSVGElement; import java.awt.Color; @@ -95,8 +97,8 @@ public boolean suppressGraphics = false; boolean firstPage = false; - public TXTRenderer(OutputConfig renderConfig) { - super(renderConfig); + public TXTRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } void addStr(int row, int col, String str, boolean ischar) { 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-26 22:36:22 UTC (rev 7288) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-05-26 22:36:29 UTC (rev 7289) @@ -57,6 +57,8 @@ import org.axsl.fontR.FontConsumer; import org.axsl.graphicR.Graphic; +import org.apache.commons.logging.Log; + import java.awt.Color; import java.awt.Rectangle; import java.io.IOException; @@ -82,8 +84,8 @@ */ protected PrintWriter writer; - public XMLRenderer(OutputConfig renderConfig) { - super(renderConfig); + public XMLRenderer(Log logger, OutputConfig renderConfig) { + super(logger, renderConfig); } public void render(PageArea page) throws IOException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-29 21:49:29
|
Revision: 7311 Author: victormote Date: 2006-05-29 14:49:18 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7311&view=rev Log Message: ----------- Handle axsl changes regarding cursor positioning methods. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-05-29 19:57:56 UTC (rev 7310) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-05-29 21:49:18 UTC (rev 7311) @@ -119,7 +119,7 @@ * @return The Y position that should be used for the underline stroke. */ protected int getUnderlineYPosition(GeneralInlineArea area) { - return area.alignmentPointY() - (area.traitFontSize() / 10); + return area.baselineY() - (area.traitFontSize() / 10); } /** @@ -128,7 +128,7 @@ * @return The Y position that should be used for the overline stroke. */ protected int getOverlineYPosition(GeneralInlineArea area) { - return area.alignmentPointY() + area.getFontAscender() + return area.baselineY() + area.getFontAscender() + (area.traitFontSize() / 10); } @@ -138,7 +138,7 @@ * @return The Y position that should be used for the through stroke. */ protected int getThroughYPosition(GeneralInlineArea area) { - return area.alignmentPointY() + (area.getFontAscender() * 3 / 8); + return area.baselineY() + (area.getFontAscender() * 3 / 8); } /** 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-29 19:57:56 UTC (rev 7310) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-05-29 21:49:18 UTC (rev 7311) @@ -288,10 +288,8 @@ getContentStream().setCharacterSpacing(letterspacing); /* Position the cursor. */ - float originX = area.rrOriginX() / 1000f; - float originY = (area.rrOriginY() - - area.ancestorLineAreaOut().alignmentPointOffset()) - / 1000f; + float originX = area.baselineX() / 1000f; + float originY = area.baselineY() / 1000f; getContentStream().setCursor(originX, originY); FontUse primaryFont = area.getPrimaryFont(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 14:13:08
|
Revision: 7509 Author: victormote Date: 2006-06-10 07:12:55 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7509&view=rev Log Message: ----------- Use new AreaTree Visitor pattern to eliminate dependency on type constants and casting. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -67,7 +67,6 @@ import org.axsl.areaR.TableHeaderContainer; import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; -import org.axsl.common.ConstantsAreaTree; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; @@ -86,7 +85,7 @@ * fragment. */ public abstract class Renderer extends OutputTarget - implements org.axsl.output.Renderer { + implements org.axsl.output.Renderer, org.axsl.areaR.RenderVisitor { AreaTree areaTree; @@ -300,7 +299,7 @@ protected abstract void drawGraphic(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle); - protected void render(AreaNode node) { + public void render(AreaNode node) { renderChildren(node); } @@ -330,12 +329,12 @@ * * @param area the area container to render */ - protected void render(BlockContainerArea area) { + public void render(BlockContainerArea area) { doFrame(area); renderChildren(area); } - protected void render(RegionBodyArea area) { + public void render(RegionBodyArea area) { markBackground(area); renderChildren(area); } @@ -345,7 +344,7 @@ * * @param area the region area container to render */ - protected void render(RegionArea area) { + public void render(RegionArea area) { markBackground(area); renderChildren(area); } @@ -353,19 +352,19 @@ /** * render the given span area */ - protected void render(SpanArea area) { + public void render(SpanArea area) { renderChildren(area); } - protected void render(NormalFlowArea area) { + public void render(NormalFlowArea area) { renderChildren(area); } - protected void renderChildren(AreaNode area) { + public void renderChildren(AreaNode area) { List children = area.getChildren(); for (int i = 0; i < children.size(); i++) { - AreaNode b = (AreaNode)children.get(i); - renderUnknownArea(b); + AreaNode child = (AreaNode)children.get(i); + child.render(this); } } @@ -374,7 +373,7 @@ * * @param area the block area to render */ - protected void render(NormalBlockArea area) { + public void render(NormalBlockArea area) { doFrame(area); renderChildren(area); } @@ -382,17 +381,17 @@ /** * render the given SVG area */ - protected abstract void render(SVGArea area); + public abstract void render(SVGArea area); /** * render a foreign object area */ - protected abstract void render(ForeignObjectArea area); + public abstract void render(ForeignObjectArea area); /** * render the given image area */ - protected void render(ExternalGraphicArea area) { + public void render(ExternalGraphicArea area) { Graphic graphic = area.getGraphic(); if (graphic == null) { getLogger().error("(Render) ImageArea contains no graphic."); @@ -407,7 +406,7 @@ * Render a table-reference-area. * @param area The TableRA instance to render. */ - protected void render(TableArea area) { + public void render(TableArea area) { Area[] backgroundAreas = area.getBackgroundAreas(); if (backgroundAreas != null) { for (int i = 0; i < backgroundAreas.length; i++) { @@ -444,22 +443,22 @@ } } - protected void render(TableRowContainer area) { + public void render(TableRowContainer area) { doFrame(area); renderChildren(area); } - protected void render(TableBodyContainer area) { + public void render(TableBodyContainer area) { markBackground(area); renderChildren(area); } - protected void render(TableHeaderContainer area) { + public void render(TableHeaderContainer area) { markBackground(area); renderChildren(area); } - protected void render(TableFooterContainer area) { + public void render(TableFooterContainer area) { markBackground(area); renderChildren(area); } @@ -469,7 +468,7 @@ * * @param area the area container to render */ - protected void render(TableCellArea area) { + public void render(TableCellArea area) { doFrame(area); renderChildren(area); } @@ -489,7 +488,7 @@ * Render a line-area. * @param area area to render */ - protected void render(LineArea area) { + public void render(LineArea area) { area.optimizeLine(); renderChildren(area); } @@ -497,40 +496,40 @@ /** * render the given leader area */ - protected abstract void render(LeaderArea area); + public abstract void render(LeaderArea area); - protected abstract void render(TextArea area); + public abstract void render(TextArea area); - protected abstract void render(BookmarkTreeArea area); + public abstract void render(BookmarkTreeArea area); - protected void render(FootnoteArea area) { + public void render(FootnoteArea area) { renderChildren(area); } - protected void render(BeforeFloatArea area) { + public void render(BeforeFloatArea area) { renderChildren(area); } - protected void render(MainReferenceArea area) { + public void render(MainReferenceArea area) { renderChildren(area); } - protected void render(PageNumberCitationArea area) { + public void render(PageNumberCitationArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - protected void render(PageNumberArea area) { + public void render(PageNumberArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - protected void render(BasicLinkArea area) { + public void render(BasicLinkArea area) { createBasicLink(area); renderChildren(area); } protected abstract void createBasicLink(BasicLinkArea area) ; - protected void render(InlineArea area) { + public void render(InlineArea area) { doFrame(area); renderChildren(area); } @@ -545,161 +544,12 @@ for (int i = 0; i < children.size(); i++) { AreaNode atNode = (AreaNode) children.get(i); if (! (atNode instanceof PageCollection)) { - renderUnknownArea(atNode); + render(atNode); } } } /** - * Render a generic area by first casting it to the proper subclass. - * This method uses contiguous integrals returned from the AreaNode - * subclasses to mimic inheritance. This allows us to keep the rendering - * logic out of the area tree. - * @param atNode The AreaNode that should be cast and rendered. - */ - protected void renderUnknownArea(AreaNode atNode) { - if (atNode == null) { - return; - } - /* - * Keep the items in order and contiguous for better performance. - */ - switch (atNode.getAreaType()) { - case ConstantsAreaTree.AREATYPE_BLOCK: { - render((NormalBlockArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_FOREIGN_OBJECT: { - render((ForeignObjectArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BLOCK_CONTAINER: { - render((BlockContainerArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BODY_AREA_CONTAINER: { - render((RegionBodyArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_LINE: { - render((LineArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_IMAGE: { - render((ExternalGraphicArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_SVG: { - render((SVGArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_LEADER: { - render((LeaderArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_EXTENSION: { - /* There is nothing to do here. */ - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_REGION_RA: { - render((RegionArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_FOOTNOTE_RA: { - render((FootnoteArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BEFORE_FLOAT_RA: { - render((BeforeFloatArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_MAIN_RA: { - render((MainReferenceArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_SPAN_RA: { - render((SpanArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_COLUMN_RA: { - render((NormalFlowArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_RA: { - render((TableArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_GENERIC_CONTAINER: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_CELL_RA: { - render((TableCellArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA: { - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_ROW_RA: { - render((TableRowContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_BODY_RA: { - render((TableBodyContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_HEADER_RA: { - render((TableHeaderContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TABLE_FOOTER_RA: { - render((TableFooterContainer) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BOOKMARK: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_DESTINATION: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BLOCK_GROUP: { - render(atNode); - return; - } - case ConstantsAreaTree.AREATYPE_TEXT_AREA: { - render((TextArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_PAGE_NUMBER_CITATION_AREA: { - render((PageNumberCitationArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BOOKMARK_TREE: { - render((BookmarkTreeArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_PAGE_NUMBER_AREA: { - render((PageNumberArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_BASIC_LINK: { - render((BasicLinkArea) atNode); - return; - } - case ConstantsAreaTree.AREATYPE_INLINE: { - render((InlineArea) atNode); - return; - } - default: { - render(atNode); - } - } - } - - /** * Provides the Renderer with an opportunity to close any text objects that * are in progress. */ Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -865,7 +865,7 @@ */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } public void startOutput() throws IOException {} Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -441,7 +441,7 @@ case Constants.FOVAL_HIDDEN: break; } - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -239,7 +239,7 @@ * @param area the foreign object area to be rendered */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -438,7 +438,7 @@ * render a foreign object area */ public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -522,7 +522,7 @@ } public void render(ForeignObjectArea area) { - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } public void startOutput() throws IOException { Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -440,7 +440,7 @@ case Constants.FOVAL_HIDDEN: break; } - renderUnknownArea(area.getContainedForeignObject()); + render(area.getContainedForeignObject()); } Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-10 14:11:43 UTC (rev 7508) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-10 14:12:55 UTC (rev 7509) @@ -472,7 +472,7 @@ this.writer.write("</content>\n"); } - protected void render(PageNumberCitationArea area) { + public void render(PageNumberCitationArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -482,7 +482,7 @@ writeEndTag(area); } - protected void render(BasicLinkArea area) { + public void render(BasicLinkArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -492,7 +492,7 @@ writeEndTag(area); } - protected void render(InlineArea area) { + public void render(InlineArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -502,7 +502,7 @@ writeEndTag(area); } - protected void render(TableArea area) { + public void render(TableArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -512,7 +512,7 @@ writeEndTag(area); } - protected void render(TableHeaderContainer area) { + public void render(TableHeaderContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -522,7 +522,7 @@ writeEndTag(area); } - protected void render(TableFooterContainer area) { + public void render(TableFooterContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -532,7 +532,7 @@ writeEndTag(area); } - protected void render(TableBodyContainer area) { + public void render(TableBodyContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -542,7 +542,7 @@ writeEndTag(area); } - protected void render(TableRowContainer area) { + public void render(TableRowContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -552,7 +552,7 @@ writeEndTag(area); } - protected void render(TableCellArea area) { + public void render(TableCellArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); @@ -562,7 +562,7 @@ writeEndTag(area); } - protected void render(AreaNode node) { + public void render(AreaNode node) { writeStartTag(node, null); renderChildren(node); writeEndTag(node); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-07-23 23:17:54
|
Revision: 7829 Author: victormote Date: 2006-07-23 16:17:34 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7829&view=rev Log Message: ----------- Implement standard use of final modifier on local variable and method parameters. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/TempImage.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTStream.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -43,23 +43,23 @@ */ public abstract class PrintRenderer extends Renderer { - public PrintRenderer(Log logger, OutputConfig renderConfig) { + public PrintRenderer(final Log logger, final OutputConfig renderConfig) { super(logger, renderConfig); } /** * @param area */ - protected void markBorder(Area area) { - int w = area.brIPD(); - int h = area.brBPD(); - int rx = area.brOriginX(); - int ry = area.brOriginY(); + protected void markBorder(final Area area) { + final int w = area.brIPD(); + final int h = area.brBPD(); + final int rx = area.brOriginX(); + final int ry = area.brOriginY(); - int left = area.getBorderLeftWidth(); - int right = area.getBorderRightWidth(); - int top = area.getBorderTopWidth(); - int bottom = area.getBorderBottomWidth(); + final int left = area.getBorderLeftWidth(); + final int right = area.getBorderRightWidth(); + final int top = area.getBorderTopWidth(); + final int bottom = area.getBorderBottomWidth(); // If style is solid, use filled rectangles if (top != 0) { drawRectangle(rx, ry, w, top, true, area.traitBorderTopColor(), @@ -82,10 +82,10 @@ } } - protected void renderGenericSpace(GeneralInlineArea area) { - int startX = area.rrOriginX(); + protected void renderGenericSpace(final GeneralInlineArea area) { + final int startX = area.rrOriginX(); int startY; - int endX = area.rrOriginX() + area.rrIPD(); + final int endX = area.rrOriginX() + area.rrIPD(); if (area.traitUnderlineScore()) { startY = getUnderlineYPosition(area); drawLine(startX, startY, endX, startY, getScoreSize(area), @@ -110,7 +110,7 @@ * @return The size, in millipoints, of the score that should be used for * area. */ - protected int getScoreSize(GeneralInlineArea area) { + protected int getScoreSize(final GeneralInlineArea area) { return area.traitFontSize() / 14; } @@ -119,9 +119,10 @@ * @param area The area whose metrics should be used for the computation. * @return The Y position that should be used for the underline stroke. */ - protected int getUnderlineYPosition(GeneralInlineArea area) { - Font font = area.getPrimaryFont().getFont(); - int underlinePosition = font.underlinePosition(area.traitFontSize()); + protected int getUnderlineYPosition(final GeneralInlineArea area) { + final Font font = area.getPrimaryFont().getFont(); + final int underlinePosition = font.underlinePosition( + area.traitFontSize()); return area.baselineY() + underlinePosition; } @@ -130,9 +131,10 @@ * @param area The area whose metrics should be used for the computation. * @return The Y position that should be used for the overline stroke. */ - protected int getOverlineYPosition(GeneralInlineArea area) { - Font font = area.getPrimaryFont().getFont(); - int overlinePosition = font.overlinePosition(area.traitFontSize()); + protected int getOverlineYPosition(final GeneralInlineArea area) { + final Font font = area.getPrimaryFont().getFont(); + final int overlinePosition = font.overlinePosition( + area.traitFontSize()); return area.baselineY() + overlinePosition; } @@ -141,9 +143,10 @@ * @param area The area whose metrics should be used for the computation. * @return The Y position that should be used for the through stroke. */ - protected int getThroughYPosition(GeneralInlineArea area) { - Font font = area.getPrimaryFont().getFont(); - int strikeoutPosition = font.strikeoutPosition(area.traitFontSize()); + protected int getThroughYPosition(final GeneralInlineArea area) { + final Font font = area.getPrimaryFont().getFont(); + final int strikeoutPosition = font.strikeoutPosition( + area.traitFontSize()); return area.baselineY() + strikeoutPosition; } @@ -152,7 +155,7 @@ * * @param area area to render */ - public void render(LeaderArea area) { + public void render(final LeaderArea area) { // Handle text decoration. renderGenericSpace(area); @@ -160,7 +163,7 @@ return; } if (area.traitLeaderPattern() == Constants.FOVAL_DOTS) { - char[] text = area.dotLeaderText(); + final char[] text = area.dotLeaderText(); if (text == null) { return; } @@ -168,11 +171,11 @@ renderTextSegment(area, text); return; } - int rx = area.rrOriginX(); - int ry = area.rrOriginY(); - int w = area.rrIPD(); - int th = area.traitRuleThickness(); - int st = area.traitRuleStyle(); + final int rx = area.rrOriginX(); + final int ry = area.rrOriginY(); + final int w = area.rrIPD(); + final int th = area.traitRuleThickness(); + final int st = area.traitRuleStyle(); // checks whether thickness is = 0, because of bug in pdf (or where?), // a line with thickness 0 is still displayed @@ -200,8 +203,8 @@ } } - public void render(TextArea area) { - char[] text = area.getText(); + public void render(final TextArea area) { + final char[] text = area.getText(); renderGenericSpace(area); renderTextSegment(area, text); } Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -92,11 +92,11 @@ /** * Constructor. */ - public Renderer(Log logger, OutputConfig renderConfig) { + public Renderer(final Log logger, final OutputConfig renderConfig) { super(logger, renderConfig); } - public void setAreaTree(AreaTree areaTree) { + public void setAreaTree(final AreaTree areaTree) { this.areaTree = areaTree; } @@ -112,7 +112,7 @@ * Renders an area's background. * @param area The area whose background should be rendered. */ - protected void markBackground(BackgroundArea area) { + protected void markBackground(final BackgroundArea area) { markBackgroundColor(area); markBackgroundImage(area); } @@ -120,21 +120,21 @@ /** * @param area */ - private void markBackgroundColor(BackgroundArea area) { + private void markBackgroundColor(final BackgroundArea area) { /* * Per XSL-FO Spec 1.0, Section 4.9.4, the background is rendered * inside the padding-rectangle. */ - int x = area.prOriginX(); - int y = area.prOriginY(); - int w = area.prIPD(); - int h = area.prBPD(); + final int x = area.prOriginX(); + final int y = area.prOriginY(); + final int w = area.prIPD(); + final int h = area.prBPD(); if (h == 0 || w == 0) { return; } - Color backgroundColor = area.traitBackgroundColor(); + final Color backgroundColor = area.traitBackgroundColor(); if (backgroundColor.getAlpha() == 255) { this.drawRectangle(x, y, w, -h, false, null, true, backgroundColor); } @@ -143,8 +143,8 @@ /** * @param area */ - private void markBackgroundImage(BackgroundArea area) { - Graphic backgroundImage = area.traitBackgroundImage(); + private void markBackgroundImage(final BackgroundArea area) { + final Graphic backgroundImage = area.traitBackgroundImage(); if (backgroundImage == null) { return; } @@ -152,10 +152,10 @@ * Per XSL-FO Spec 1.0, Section 4.9.4, the background is rendered * inside the padding-rectangle. */ - int x = area.prOriginX(); - int y = area.prOriginY(); - int w = area.prIPD(); - int h = area.prBPD(); + final int x = area.prOriginX(); + final int y = area.prOriginY(); + final int w = area.prIPD(); + final int h = area.prBPD(); if (h == 0 || w == 0) { return; @@ -167,7 +167,7 @@ imgW = backgroundImage.absoluteWidth(getPixelsPerInch()); imgH = backgroundImage.absoluteHeight(getPixelsPerInch()); } - catch (GraphicException fie) { + catch (final GraphicException fie) { getLogger().error("Error obtaining bg image width and height"); getLogger().error(fie.getMessage()); return; @@ -175,13 +175,13 @@ int currentX = x; int currentY = y; - int endX = x + w; - int endY = y - h; - int clipW = w % imgW; - int clipH = h % imgH; + final int endX = x + w; + final int endY = y - h; + final int clipW = w % imgW; + final int clipH = h % imgH; - boolean repeatX = area.backgroundRepeatX(); - boolean repeatY = area.backgroundRepeatY(); + final boolean repeatX = area.backgroundRepeatX(); + final boolean repeatY = area.backgroundRepeatY(); Rectangle contentRectangle = null; Rectangle clipRectangle = null; @@ -294,10 +294,10 @@ * @param clipRectangle The rectangle to which the content should be clipped * after any scaling. */ - protected void drawGraphic(GraphicArea area, Graphic graphic, - Rectangle contentRectangle, Rectangle clipRectangle) { + protected void drawGraphic(final GraphicArea area, final Graphic graphic, + final Rectangle contentRectangle, final Rectangle clipRectangle) { if (graphic instanceof SVGGraphic) { - SVGGraphic svg = (SVGGraphic) graphic; + final SVGGraphic svg = (SVGGraphic) graphic; drawSVG(area, svg, contentRectangle, clipRectangle); return; } @@ -318,7 +318,7 @@ protected abstract void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) ; - public void render(AreaNode node) { + public void render(final AreaNode node) { renderChildren(node); } @@ -327,7 +327,7 @@ * * @param page the page whose regions to render */ - protected void renderRegions(PageArea page) { + protected void renderRegions(final PageArea page) { render(page.getRegionBody()); if (page.getRegionBefore() != null) { render(page.getRegionBefore()); @@ -348,13 +348,13 @@ * * @param area the area container to render */ - public void render(BlockContainerArea area) { + public void render(final BlockContainerArea area) { markBorder(area); markBackground(area); renderChildren(area); } - public void render(RegionBodyArea area) { + public void render(final RegionBodyArea area) { markBackground(area); renderChildren(area); } @@ -364,7 +364,7 @@ * * @param area the region area container to render */ - public void render(RegionArea area) { + public void render(final RegionArea area) { markBackground(area); renderChildren(area); } @@ -372,18 +372,18 @@ /** * render the given span area */ - public void render(SpanArea area) { + public void render(final SpanArea area) { renderChildren(area); } - public void render(NormalFlowArea area) { + public void render(final NormalFlowArea area) { renderChildren(area); } - public void renderChildren(AreaNode area) { - List children = area.getChildren(); + public void renderChildren(final AreaNode area) { + final List children = area.getChildren(); for (int i = 0; i < children.size(); i++) { - AreaNode child = (AreaNode)children.get(i); + final AreaNode child = (AreaNode)children.get(i); child.render(this); } } @@ -393,7 +393,7 @@ * * @param area the block area to render */ - public void render(NormalBlockArea area) { + public void render(final NormalBlockArea area) { markBorder(area); markBackground(area); renderChildren(area); @@ -412,13 +412,13 @@ /** * render the given image area */ - public void render(ExternalGraphicArea area) { - Graphic graphic = area.getGraphic(); + public void render(final ExternalGraphicArea area) { + final Graphic graphic = area.getGraphic(); if (graphic == null) { getLogger().error("(Render) ImageArea contains no graphic."); return; } - Rectangle contentRect = new Rectangle(area.rrOriginX(), + final Rectangle contentRect = new Rectangle(area.rrOriginX(), area.rrOriginY(), area.rrIPD(), area.rrBPD()); drawGraphic(area, graphic, contentRect, null); } @@ -427,13 +427,13 @@ * Render a table-reference-area. * @param area The TableRA instance to render. */ - public void render(TableArea area) { + public void render(final TableArea area) { /* Render background Areas for the table-related background-only * areas. */ - BackgroundArea[] backgroundAreas = area.getBackgroundAreas(); + final BackgroundArea[] backgroundAreas = area.getBackgroundAreas(); if (backgroundAreas != null) { for (int i = 0; i < backgroundAreas.length; i++) { - BackgroundArea bga = backgroundAreas[i]; + final BackgroundArea bga = backgroundAreas[i]; markBackground(bga); } } @@ -449,7 +449,7 @@ * * @param area the area container to render */ - public void render(TableCellArea area) { + public void render(final TableCellArea area) { markBorder(area); markBackground(area); renderChildren(area); @@ -470,7 +470,7 @@ * Render a line-area. * @param area area to render */ - public void render(LineArea area) { + public void render(final LineArea area) { area.optimizeLine(); renderChildren(area); } @@ -484,34 +484,34 @@ public abstract void render(BookmarkTreeArea area); - public void render(FootnoteArea area) { + public void render(final FootnoteArea area) { renderChildren(area); } - public void render(BeforeFloatArea area) { + public void render(final BeforeFloatArea area) { renderChildren(area); } - public void render(MainReferenceArea area) { + public void render(final MainReferenceArea area) { renderChildren(area); } - public void render(PageNumberCitationArea area) { + public void render(final PageNumberCitationArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - public void render(PageNumberArea area) { + public void render(final PageNumberArea area) { renderTextSegment(area, area.resolve().toCharArray()); } - public void render(BasicLinkArea area) { + public void render(final BasicLinkArea area) { createBasicLink(area); renderChildren(area); } protected abstract void createBasicLink(BasicLinkArea area) ; - public void render(InlineArea area) { + public void render(final InlineArea area) { markBorder(area); markBackground(area); renderChildren(area); @@ -523,9 +523,9 @@ * includes items like Destinations and Bookmarks. */ protected void renderDocumentNodes() { - List children = this.areaTree.getChildren(); + final List children = this.areaTree.getChildren(); for (int i = 0; i < children.size(); i++) { - AreaNode atNode = (AreaNode) children.get(i); + final AreaNode atNode = (AreaNode) children.get(i); if (! (atNode instanceof PageCollection)) { atNode.render(this); } @@ -544,7 +544,7 @@ * @return A Batik BridgeContext instance. */ public BridgeContext makeBridgeContext() { - SVGUserAgent userAgent = new SVGUserAgent(new AffineTransform()); + final SVGUserAgent userAgent = new SVGUserAgent(new AffineTransform()); userAgent.setLogger(getLogger()); return new BridgeContext(userAgent); } @@ -555,7 +555,7 @@ * @return A Batik BridgeContext instance. */ public BridgeContext makeBridgeContextAWT() { - MUserAgent userAgent = new MUserAgent(new AffineTransform()); + final MUserAgent userAgent = new MUserAgent(new AffineTransform()); userAgent.setLogger(getLogger()); return new BridgeContext(userAgent); } @@ -566,7 +566,7 @@ * @return A new rectangle whose dimensions are stored as points. */ public static Rectangle2D.Float convertMillipointRectangle( - Rectangle input) { + final Rectangle input) { if (input == null) { return null; } Modified: trunk/foray/foray-render/src/java/org/foray/render/TempImage.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -47,8 +47,8 @@ Color transparent = new Color(255, 255, 255); URL url; - public TempImage(URL url, int width, int height, byte[] result, - byte[] mask) throws GraphicException { + public TempImage(final URL url, final int width, final int height, + final byte[] result, final byte[] mask) throws GraphicException { this.url = url; this.m_height = height; this.m_width = width; @@ -164,14 +164,14 @@ /** * {@inheritDoc} */ - public int absoluteWidth(int pixelsPerInch) throws GraphicException { + public int absoluteWidth(final int pixelsPerInch) throws GraphicException { return -1; } /** * {@inheritDoc} */ - public int absoluteHeight(int pixelsPerInch) throws GraphicException { + public int absoluteHeight(final int pixelsPerInch) throws GraphicException { return -1; } Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -60,12 +60,12 @@ private int bw = 0; - public ASCII85OutputStream(OutputStream out) { + public ASCII85OutputStream(final OutputStream out) { super(out); } - public void write(int b) throws IOException { + public void write(final int b) throws IOException { if (pos == 0) { buffer += (b << 24) & 0xff000000L; } else if (pos == 1) { @@ -84,30 +84,32 @@ } } - private void checkedWrite(byte[] buf) throws IOException { + private void checkedWrite(final byte[] buf) throws IOException { checkedWrite(buf, buf.length, false); } - private void checkedWrite(byte[] buf, boolean nosplit) throws IOException { + private void checkedWrite(final byte[] buf, final boolean nosplit) + throws IOException { checkedWrite(buf, buf.length, nosplit); } - private void checkedWrite(byte[] buf , int len) throws IOException { + private void checkedWrite(final byte[] buf, final int len) + throws IOException { checkedWrite(buf, len, false); } - private void checkedWrite(byte[] buf , int len, boolean nosplit) - throws IOException { + private void checkedWrite(final byte[] buf, final int len, + final boolean nosplit) throws IOException { if (posinline + len > 80) { - int firstpart = (nosplit ? 0 : len - (posinline + len - 80)); + final int firstpart = (nosplit ? 0 : len - (posinline + len - 80)); if (firstpart > 0) { out.write(buf, 0, firstpart); } out.write(EOL); bw++; - int rest = len - firstpart; + final int rest = len - firstpart; if (rest > 0) { out.write(buf, firstpart, rest); } @@ -138,21 +140,21 @@ if (word < 0) { word = -word; } - byte c1 = (byte)((word / base85_1) & 0xFF); - byte c2 = (byte)(((word - (c1 * base85_1)) / base85_2) & 0xFF); - byte c3 = + final byte c1 = (byte)((word / base85_1) & 0xFF); + final byte c2 = (byte)(((word - (c1 * base85_1)) / base85_2) & 0xFF); + final byte c3 = (byte)(((word - (c1 * base85_1) - (c2 * base85_2)) / base85_3) & 0xFF); - byte c4 = + final byte c4 = (byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 * base85_3)) / base85_4) & 0xFF); - byte c5 = + final byte c5 = (byte)(((word - (c1 * base85_1) - (c2 * base85_2) - (c3 * base85_3) - (c4 * base85_4))) & 0xFF); - byte[] ret = { + final byte[] ret = { (byte)(c1 + START), (byte)(c2 + START), (byte)(c3 + START), (byte)(c4 + START), (byte)(c5 + START) @@ -175,7 +177,7 @@ // then convert like normal (except not applying the special zero rule) // and write out the first n+1 bytes from the result if (pos > 0) { - int rest = pos; + final int rest = pos; /* byte[] lastdata = new byte[4]; int i = 0; Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -42,7 +42,7 @@ implements Finalizable { - public FlateEncodeOutputStream(OutputStream out) { + public FlateEncodeOutputStream(final OutputStream out) { super(out); } Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -48,7 +48,7 @@ * @param fontUse The FontUse instance which is the basis for this * PostScript font. */ - public PSFont(FontUse fontUse, int count) { + public PSFont(final FontUse fontUse, final int count) { super(); this.fontUse = fontUse; this.fontCount = count; Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-07-23 22:40:26 UTC (rev 7828) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-07-23 23:17:34 UTC (rev 7829) @@ -112,8 +112,8 @@ * This is used to create a Graphics object for use inside an already * existing document. */ - public PSGraphics2D(boolean textAsShapes, PSRenderer ren, - String font, int size, int xpos, int ypos) { + public PSGraphics2D(final boolean textAsShapes, final PSRenderer ren, + final String font, final int size, final int xpos, final int ypos) { super(textAsShapes); psRenderer = ren; currentFontName = font; @@ -122,18 +122,18 @@ currentXPosition = xpos; } - public PSGraphics2D(boolean textAsShapes) { + public PSGraphics2D(final boolean textAsShapes) { super(textAsShapes); } - public void setGraphicContext(GraphicContext c) { + public void setGraphicContext(final GraphicContext c) { gc = c; } /** * This constructor supports the create method */ - public PSGraphics2D(PSGraphics2D g) { + public PSGraphics2D(final PSGraphics2D g) { super(g); } @@ -172,17 +172,18 @@ * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, * int, int, int) */ - public boolean drawImage(Image img, int x, int y, ImageObserver observer) { + public boolean drawImage(final Image img, final int x, final int y, + final ImageObserver observer) { final int width = img.getWidth(observer); final int height = img.getHeight(observer); if (width == -1 || height == -1) { return false; } - Dimension size = new Dimension(width, height); - BufferedImage buf = buildBufferedImage(size); + final Dimension size = new Dimension(width, height); + final BufferedImage buf = buildBufferedImage(size); - Graphics2D g = buf.createGraphics(); + final Graphics2D g = buf.createGraphics(); g.setComposite(AlphaComposite.SrcOver); g.setBackground(new Color(1, 1, 1, 0)); g.setPaint(new Color(1, 1, 1, 0)); @@ -197,13 +198,13 @@ final byte[] result = new byte[buf.getWidth() * buf.getHeight() * 3]; final byte[] mask = new byte[buf.getWidth() * buf.getHeight()]; - Raster raster = buf.getData(); - DataBuffer bd = raster.getDataBuffer(); + final Raster raster = buf.getData(); + final DataBuffer bd = raster.getDataBuffer(); int count = 0; switch (bd.getDataType()) { case DataBuffer.TYPE_INT: - int[][] idata = ((DataBufferInt)bd).getBankData(); + final int[][] idata = ((DataBufferInt)bd).getBankData(); for (int i = 0; i < idata.length; i++) { for (int j = 0; j < idata[i].length; j++) { // mask[maskpos++] = (byte)((idata[i][j] >> 24) & 0xFF); @@ -225,12 +226,13 @@ } try { - Graphic graphic = new TempImage(null, width, height, result, mask); - AffineTransform at = getTransform(); - double[] matrix = new double[6]; + final Graphic graphic = new TempImage(null, width, height, result, + mask); + final AffineTransform at = getTransform(); + final double[] matrix = new double[6]; at.getMatrix(matrix); psRenderer.write("gsave"); - Shape imclip = getClip(); + final Shape imclip = getClip(); writeClip(imclip); psRenderer.write("1000 -1000 scale"); // psRenderer.write("" + matrix[0] + " " + matrix[1] + @@ -238,13 +240,13 @@ // matrix[4] + " " + matrix[5] + " cm\n"); psRenderer.renderBitmap(graphic, x, -y, width, height); psRenderer.write("grestore"); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); } return true; } - public BufferedImage buildBufferedImage(Dimension size) { + public BufferedImage buildBufferedImage(final Dimension size) { return new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB); } @@ -283,8 +285,8 @@ * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, * int, int, int) */ - public boolean drawImage(Image img, int x, int y, int width, int height, - ImageObserver observer) { + public boole... [truncated message content] |
|
From: <vic...@us...> - 2006-06-03 17:34:18
|
Revision: 7380 Author: victormote Date: 2006-06-03 10:34:08 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7380&view=rev Log Message: ----------- Add render methods for the main, before-float, and footnote areas. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-03 17:28:08 UTC (rev 7379) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-03 17:34:08 UTC (rev 7380) @@ -29,7 +29,6 @@ package org.foray.render; -import org.axsl.areaR.AreaRException; import org.foray.common.MUserAgent; import org.foray.common.SVGUserAgent; import org.foray.output.OutputConfig; @@ -37,16 +36,20 @@ import org.axsl.areaR.Area; import org.axsl.areaR.AreaNode; +import org.axsl.areaR.AreaRException; import org.axsl.areaR.AreaTree; import org.axsl.areaR.BasicLinkArea; +import org.axsl.areaR.BeforeFloatArea; import org.axsl.areaR.BlockContainerArea; import org.axsl.areaR.BookmarkTreeArea; import org.axsl.areaR.ExternalGraphicArea; +import org.axsl.areaR.FootnoteArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; import org.axsl.areaR.InlineArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.LineArea; +import org.axsl.areaR.MainReferenceArea; import org.axsl.areaR.NormalBlockArea; import org.axsl.areaR.NormalFlowArea; import org.axsl.areaR.PageArea; @@ -496,6 +499,18 @@ protected abstract void render(BookmarkTreeArea area); + protected void render(FootnoteArea area) { + renderChildren(area); + } + + protected void render(BeforeFloatArea area) { + renderChildren(area); + } + + protected void render(MainReferenceArea area) { + renderChildren(area); + } + protected void render(PageNumberCitationArea area) { renderTextSegment(area, area.resolve().toCharArray()); } @@ -568,8 +583,7 @@ return; } case ConstantsAreaTree.AREATYPE_LINE: { - LineArea la = (LineArea) atNode; - render(la); + render((LineArea) atNode); return; } case ConstantsAreaTree.AREATYPE_IMAGE: { @@ -598,15 +612,15 @@ return; } case ConstantsAreaTree.AREATYPE_FOOTNOTE_RA: { - render(atNode); + render((FootnoteArea) atNode); return; } case ConstantsAreaTree.AREATYPE_BEFORE_FLOAT_RA: { - render(atNode); + render((BeforeFloatArea) atNode); return; } case ConstantsAreaTree.AREATYPE_MAIN_RA: { - render(atNode); + render((MainReferenceArea) atNode); return; } case ConstantsAreaTree.AREATYPE_SPAN_RA: { Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-03 17:28:08 UTC (rev 7379) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-03 17:34:08 UTC (rev 7380) @@ -35,7 +35,9 @@ import org.axsl.areaR.Area; import org.axsl.areaR.AreaFlexible; +import org.axsl.areaR.AreaNode; import org.axsl.areaR.BasicLinkArea; +import org.axsl.areaR.BeforeFloatArea; import org.axsl.areaR.BlockContainerArea; import org.axsl.areaR.BookmarkTreeArea; import org.axsl.areaR.ExternalGraphicArea; @@ -45,6 +47,7 @@ import org.axsl.areaR.InlineArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.LineArea; +import org.axsl.areaR.MainReferenceArea; import org.axsl.areaR.NormalBlockArea; import org.axsl.areaR.NormalFlowArea; import org.axsl.areaR.PageArea; @@ -176,26 +179,28 @@ /** * Write the start tag, attribues, and end-tag for an element. - * @param area The area for whom element is written. + * @param node The area for whom element is written. * @param attributes Text of the attributes to be written. */ - protected void writeStartTag(Area area, StringBuffer attributes) { + protected void writeStartTag(AreaNode node, StringBuffer attributes) { writeIndent(); this.indent++; this.writer.write("<"); - this.writer.write(area.getAreaName()); - this.writer.write(attributes.toString()); + this.writer.write(node.getAreaName()); + if (attributes != null) { + this.writer.write(attributes.toString()); + } this.writer.write(">\n"); } /** * Write an end tag. - * @param area The area whose end-tag should be written. + * @param node The area whose end-tag should be written. */ - protected void writeEndTag(Area area) { + protected void writeEndTag(AreaNode node) { this.indent--; writeIndent(); - this.writer.write("</" + area.getAreaName() + ">\n"); + this.writer.write("</" + node.getAreaName() + ">\n"); } /** @@ -234,6 +239,15 @@ writeEndTag(area); } + public void render(MainReferenceArea area) { + StringBuffer buffer = new StringBuffer(); + outputGeneratedBy(area, buffer); + writeStartTag(area, buffer); + outputAllRectangles(area); + renderChildren(area); + writeEndTag(area); + } + /** * render a body area container to XML * @@ -263,6 +277,20 @@ } /** + * render a body area container to XML + * + * @param area the body area container to render + */ + public void render(BeforeFloatArea area) { + StringBuffer buffer = new StringBuffer(); + outputGeneratedBy(area, buffer); + writeStartTag(area, buffer); + outputAllRectangles(area); + renderChildren(area); + writeEndTag(area); + } + + /** * render a region area container to XML * * @param area the region area container to render @@ -518,6 +546,12 @@ writeEndTag(area); } + protected void render(AreaNode node) { + writeStartTag(node, null); + renderChildren(node); + writeEndTag(node); + } + private boolean isCoarseXml() { if (options == null) { return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-03 23:30:29
|
Revision: 7396 Author: victormote Date: 2006-06-03 16:30:16 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7396&view=rev Log Message: ----------- Conform to axsl change: For greater flexibility with other color spaces, return a java Color instead of the r, g, b components. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.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-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-03 23:30:08 UTC (rev 7395) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-03 23:30:16 UTC (rev 7396) @@ -173,18 +173,12 @@ if (th != 0) { switch (st) { case Constants.FOVAL_DOUBLE: - drawLine(rx, ry, rx + w, ry, th / 3, st, - new Color(area.getRed(), area.getGreen(), - area.getBlue())); + drawLine(rx, ry, rx + w, ry, th / 3, st, area.getColor()); drawLine(rx, ry + (2 * th / 3), rx + w, ry + (2 * th / 3), - th / 3, st, - new Color(area.getRed(), area.getGreen(), - area.getBlue())); + th / 3, st, area.getColor()); break; case Constants.FOVAL_GROOVE: - drawLine(rx, ry, rx + w, ry, th / 2, st, - new Color(area.getRed(), area.getGreen(), - area.getBlue())); + drawLine(rx, ry, rx + w, ry, th / 2, st, area.getColor()); drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st, new Color(255, 255, 255)); break; @@ -192,13 +186,10 @@ drawLine(rx, ry, rx + w, ry, th / 2, st, new Color(255, 255, 255)); drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st, - new Color(area.getRed(), area.getGreen(), - area.getBlue())); + area.getColor()); break; default: - drawLine(rx, ry, rx + w, ry, th, st, - new Color(area.getRed(), area.getGreen(), - area.getBlue())); + drawLine(rx, ry, rx + w, ry, th, st, area.getColor()); } } } Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-03 23:30:08 UTC (rev 7395) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-03 23:30:16 UTC (rev 7396) @@ -558,9 +558,9 @@ FontUse font = area.getPrimaryFont(); int size = area.traitFontSize(); - float red = area.getRed(); - float green = area.getGreen(); - float blue = area.getBlue(); + float red = area.getColor().getRed() / 255f; + float green = area.getColor().getGreen() / 255f; + float blue = area.getColor().getBlue() / 255f; if ((font != this.currentFont) || (size != this.currentFontSize)) { @@ -681,9 +681,9 @@ int ry = area.rrOriginY(); int w = area.rrIPD(); int th = area.traitRuleThickness(); - float r = area.getRed(); - float g = area.getGreen(); - float b = area.getBlue(); + float r = area.getColor().getRed() / 255f; + float g = area.getColor().getGreen() / 255f; + float b = area.getColor().getBlue() / 255f; Color oldColor = graphics.getColor(); graphics.setColor(new Color(r, g, b)); Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-03 23:30:08 UTC (rev 7395) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-03 23:30:16 UTC (rev 7396) @@ -131,9 +131,7 @@ private PSFont currentPSFont; private int currentFontSize; - private float currRed; - private float currGreen; - private float currBlue; + private Color currentColor; private int psLevel = 3; @@ -809,7 +807,7 @@ FontUse fontUse = area.getPrimaryFont(); PSFont psFont = (PSFont) this.fontMap.get(fontUse); useFont(psFont, area.traitFontSize()); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write(moveTo(area)); StringBuffer sb = new StringBuffer(); String s = new String(text); @@ -909,7 +907,7 @@ if (area.traitRuleStyle() == Constants.FOVAL_NONE) { break; } - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("gsave"); write("0 setlinecap"); switch (area.traitRuleStyle()) { @@ -919,7 +917,7 @@ write(th + " setlinewidth"); write(rx + " " + ry + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); break; case Constants.FOVAL_DASHED: @@ -928,7 +926,7 @@ write(th + " setlinewidth"); write(rx + " " + ry + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); break; case Constants.FOVAL_SOLID: @@ -936,7 +934,7 @@ write(th + " setlinewidth"); write(rx + " " + ry + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); break; case Constants.FOVAL_DOUBLE: @@ -946,7 +944,7 @@ write(w + " 0 rlineto"); write(rx + " " + (ry + th3) + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); break; case Constants.FOVAL_GROOVE: @@ -954,12 +952,12 @@ write("newpath"); write(rx + " " + (ry - th4) + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); write("newpath"); write(rx + " " + (ry + th4) + " M"); write(w + " 0 rlineto"); - useColor(1, 1, 1); // white + useColor(Color.WHITE); write("stroke"); break; case Constants.FOVAL_RIDGE: @@ -967,12 +965,12 @@ write("newpath"); write(rx + " " + (ry - th4) + " M"); write(w + " 0 rlineto"); - useColor(1, 1, 1); // white + useColor(Color.WHITE); write("stroke"); write("newpath"); write(rx + " " + (ry + th4) + " M"); write(w + " 0 rlineto"); - useColor(area.getRed(), area.getGreen(), area.getBlue()); + useColor(area.getColor()); write("stroke"); break; } @@ -1039,17 +1037,12 @@ } private void useColor(Color col) { - useColor(col.getRed() / 255f, col.getGreen() / 255f, - col.getBlue() / 255f); - } - - private void useColor(float red, float green, float blue) { - if ((red != currRed) || (green != currGreen) || (blue != currBlue)) { - write(red + " " + green + " " + blue + " setrgbcolor"); - currRed = red; - currGreen = green; - currBlue = blue; + if (col.equals(this.currentColor)) { + return; } + write(col.getRed() / 255f + " " + col.getGreen() / 255f + " " + + col.getBlue() / 255f + " setrgbcolor"); + this.currentColor = col; } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-03 23:30:08 UTC (rev 7395) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-03 23:30:16 UTC (rev 7396) @@ -689,11 +689,11 @@ } public void outputColor(AreaFlexible area, StringBuffer buffer) { - String color = area.getRed() + String color = area.getColor().getRed() / 255 + ", " - + area.getGreen() + + area.getColor().getGreen() / 255 + ", " - + area.getBlue(); + + area.getColor().getBlue() / 255; outputAttribute(buffer, "rgb", color); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-04 00:02:39
|
Revision: 7397 Author: victormote Date: 2006-06-03 17:01:41 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7397&view=rev Log Message: ----------- Add some missing package-level javadoc. Modified Paths: -------------- trunk/foray/foray-output/src/java/org/foray/output/package.html trunk/foray/foray-render/src/java/org/foray/render/package.html trunk/foray/foray-render/src/java/org/foray/render/ps/package.html Added Paths: ----------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html trunk/foray/foray-render/src/java/org/foray/render/awt/package.html trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.fotree.fo</title> +<body> +<p>Namespace and Factory classes for objects in the fo: (XSL Formatting Objects) +namespace.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.fotree.foray</title> +<body> +<p>Namespace and Factory classes for objects in the foray: (custom) namespace.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.fotree.svg.obj</title> +<body> +<p>Classes representing objects in the svg: (Scalable Vector +Graphics) namespace.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.fotree.svg</title> +<body> +<p>Namespace and Factory classes for objects in the svg: (Scalable Vector +Graphics) namespace.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.fotree.xml</title> +<body> +<p>Namespace and Factory classes for objects in the xml: (Generic XML) +namespace.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.fotree.xml.prop</title> +<body> +<p>Classes representing generic XML properties.</p> +</body> +</html> Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/foray-output/src/java/org/foray/output/package.html =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/package.html 2006-06-03 23:30:16 UTC (rev 7396) +++ trunk/foray/foray-output/src/java/org/foray/output/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -1,7 +1,14 @@ <html> -<title>Package org.foray.render.mif Package</title> +<title>Package org.foray.output</title> <body> -<p>Classes for rendering the Area Tree to MIF (Maker Interchange Format, used -by Adobe FrameMaker).</p> +<p>Classes for converting an FO Tree (not an Area Tree) to some specific output +medium. +Classes in this package are useful for converting an FO document to an output +medium that knows how to do its own layout. +Examples include Rich Text Format (RTF), readable by Microsoft Word, +and Maker Interchange Format (MIF), readable by Adobe FrameMaker. +For output media that must be laid out prior to creation, that is, that should be +created from an Area Tree, see the org.foray.render package. +</p> </body> </html> Added: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html (rev 0) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.pdf.object</title> +<body> +<p>Classes representing various PDF objects, used in the construction of a +PDF document.</p> +</body> +</html> Property changes on: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html (rev 0) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.pretty.dtd</title> +<body> +<p>Classes partially modelling an XML Document Type Definition (DTD).</p> +</body> +</html> Property changes on: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html (rev 0) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.pretty</title> +<body> +<p>Classes for pretty-printing XML documents.</p> +</body> +</html> Property changes on: trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-render/src/java/org/foray/render/awt/package.html =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/package.html (rev 0) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,7 @@ +<html> +<title>Package org.foray.render.awt</title> +<body> +<p>Classes for rendering the Area Tree to Java's Abstract Windowing Toolkit + (AWT).</p> +</body> +</html> Property changes on: trunk/foray/foray-render/src/java/org/foray/render/awt/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html (rev 0) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -0,0 +1,6 @@ +<html> +<title>Package org.foray.render.awt</title> +<body> +<p>Classes for displaying a rendered AWT document to the screen.</p> +</body> +</html> Property changes on: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/foray-render/src/java/org/foray/render/package.html =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/package.html 2006-06-03 23:30:16 UTC (rev 7396) +++ trunk/foray/foray-render/src/java/org/foray/render/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -1,9 +1,9 @@ <html> -<title>org.foray.render Package</title> +<title>Package org.foray.render</title> <body> - <p>Each Renderer is responsible to convert the contents of an AreaTree into -an output medium. For example, the PDF Renderer converts an AreaTree into a -PDF document. This package contains an abstract Renderer and some other classes + <p>Classes for rendering an Area Tree to some output medium. +For example, the PDF Renderer converts an AreaTree into a PDF document. +This package contains an abstract Renderer and some other classes helpful to the rendering process. The Renderers themselves are in sub-packages.</p> </body> Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/package.html =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/package.html 2006-06-03 23:30:16 UTC (rev 7396) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/package.html 2006-06-04 00:01:41 UTC (rev 7397) @@ -1,5 +1,5 @@ <html> -<title>Package org.foray.render.ps Package</title> +<title>Package org.foray.render.ps</title> <body> <p>Classes for rendering the Area Tree to Postscript.</p> </body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 00:35:54
|
Revision: 7661 Author: victormote Date: 2006-06-16 17:35:48 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7661&view=rev Log Message: ----------- Conform to axsl changes: 1. Remove TableBodyContainer, TableFooterContainer, and TableHeaderContainer interfaces. 2. Add BackgroundArea interface to replace these three. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-17 00:35:39 UTC (rev 7660) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-17 00:35:48 UTC (rev 7661) @@ -61,10 +61,7 @@ import org.axsl.areaR.SVGArea; import org.axsl.areaR.SpanArea; import org.axsl.areaR.TableArea; -import org.axsl.areaR.TableBodyContainer; import org.axsl.areaR.TableCellArea; -import org.axsl.areaR.TableFooterContainer; -import org.axsl.areaR.TableHeaderContainer; import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; import org.axsl.graphicR.Graphic; @@ -426,21 +423,6 @@ renderChildren(area); } - public void render(TableBodyContainer area) { - markBackground(area); - renderChildren(area); - } - - public void render(TableHeaderContainer area) { - markBackground(area); - renderChildren(area); - } - - public void render(TableFooterContainer area) { - markBackground(area); - renderChildren(area); - } - /** * render area container * Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-17 00:35:39 UTC (rev 7660) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-17 00:35:48 UTC (rev 7661) @@ -56,10 +56,7 @@ import org.axsl.areaR.SVGArea; import org.axsl.areaR.SpanArea; import org.axsl.areaR.TableArea; -import org.axsl.areaR.TableBodyContainer; import org.axsl.areaR.TableCellArea; -import org.axsl.areaR.TableFooterContainer; -import org.axsl.areaR.TableHeaderContainer; import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; import org.axsl.common.Constants; @@ -511,36 +508,6 @@ writeEndTag(area); } - public void render(TableHeaderContainer area) { - StringBuffer buffer = new StringBuffer(); - outputGeneratedBy(area, buffer); - outputDimension(area, buffer); - writeStartTag(area, buffer); - outputAllRectangles(area); - renderChildren(area); - writeEndTag(area); - } - - public void render(TableFooterContainer area) { - StringBuffer buffer = new StringBuffer(); - outputGeneratedBy(area, buffer); - outputDimension(area, buffer); - writeStartTag(area, buffer); - outputAllRectangles(area); - renderChildren(area); - writeEndTag(area); - } - - public void render(TableBodyContainer area) { - StringBuffer buffer = new StringBuffer(); - outputGeneratedBy(area, buffer); - outputDimension(area, buffer); - writeStartTag(area, buffer); - outputAllRectangles(area); - renderChildren(area); - writeEndTag(area); - } - public void render(TableRowContainer area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:58:08
|
Revision: 7697 Author: victormote Date: 2006-06-17 14:57:31 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7697&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/TempImage.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.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/awt/viewer/ProgressListener.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.en trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ja trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ru trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.tr trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.cs trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.de trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.en trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.tr trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/Finalizable.java trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTStream.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render; import org.foray.output.OutputConfig; Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-render/src/java/org/foray/render/TempImage.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt; import org.foray.output.OutputConfig; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt; import org.foray.output.OutputConfig; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; /* * Juergen Verwohlt: Jue...@jc..., Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; /* Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; import java.io.BufferedReader; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; import java.awt.BorderLayout; 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-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; /* 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-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; /* Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; /** Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.render.awt.viewer; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,25 +1,25 @@ ############################################################################### # # This file contains the czech messages. -# +# # NOTICE: When defining a new message it has to be created in message files for each language. -# # # -# +# +# # DEFINING A MESSAGE # ================== -# +# # A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation. # For each message there are additional switches: # - iconType (see below) # - buttonType (see below) # - messageText may contain placeholders for parameters. - + # A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found". -# -# A messsage definition is placed within a single row, its switches are seperated by a colon ":". # +# A messsage definition is placed within a single row, its switches are seperated by a colon ":". +# # Format: # ======= # <MESSAGE_ID>=<iconType>:<buttonType>:<message text> @@ -35,18 +35,18 @@ # # buttonType: # STYLE_Y ("yes" Button) -# STYLE_Y_N ("yes" and "no" Buttons) -# STYLE_Y_N_C ("yes", "no" and "cancel" Buttons) +# STYLE_Y_N ("yes" and "no" Buttons) +# STYLE_Y_N_C ("yes", "no" and "cancel" Buttons) # # # Example with a parameter array: # ================================ # Message definition: # No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue? -# Aufruf: +# Aufruf: # answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame); # if (answer == UserMessage.NO) -# return; +# return; # # Example with an Exception: # ============================= @@ -56,10 +56,10 @@ # Aufruf: # try { # String str = null; -# int index = str.indexOf("abc"); +# int index = str.indexOf("abc"); # } catch (Exception ex) { -# UserMessage.show("UNEXPECTED_EXCEPTION", ex); -# } +# UserMessage.show("UNEXPECTED_EXCEPTION", ex); +# } # # # Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de 2006-06-17 21:57:22 UTC (rev 7696) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de 2006-06-17 21:57:31 UTC (rev 7697) @@ -1,24 +1,24 @@ ############################################################################### # -# In dieser Datei werden im Abschnitt "Messages" Meldungen auf deutsch -# definiert. -# Zu beachten: Beim Definieren einer neuen neuen Meldung, diese soweit möglich -# in allen Sprachen anlegen. +# In dieser Datei werden im Abschnitt "Messages" Meldungen auf deutsch +# definiert. +# Zu beachten: Beim Definieren einer neuen neuen Meldung, diese soweit möglich +# in allen Sprachen anlegen. # # # # MELDUNG DEFINIEREN # ================== -# +# # Eine Meldung hat eine eindeutige textuelle ID. Diese steht links vom Gleichheitszeichen. # Zu jeder Meldung wird angegeben: # - iconType (Typen siehe unten) # - buttonType (Typen siehe unten) # - Meldungstext mit evtl. Platzhaltern für Parameter. # -# Ein Parameterplatzhalter ist ein dreifaches kaumänisches "und". Siehe Beispielmeldung -# "No_Records_found". -# ... [truncated message content] |
|
From: <vic...@us...> - 2006-06-19 20:58:38
|
Revision: 7712 Author: victormote Date: 2006-06-19 13:58:29 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7712&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded interface. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 20:58:22 UTC (rev 7711) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 20:58:29 UTC (rev 7712) @@ -63,7 +63,6 @@ import org.axsl.areaR.SpanArea; import org.axsl.areaR.TableArea; import org.axsl.areaR.TableCellArea; -import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; @@ -419,12 +418,6 @@ renderChildren(area); } - public void render(TableRowContainer area) { - markBorder(area); - markBackground(area); - renderChildren(area); - } - /** * render area container * Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 20:58:22 UTC (rev 7711) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) @@ -57,7 +57,6 @@ import org.axsl.areaR.SpanArea; import org.axsl.areaR.TableArea; import org.axsl.areaR.TableCellArea; -import org.axsl.areaR.TableRowContainer; import org.axsl.areaR.TextArea; import org.axsl.common.Constants; import org.axsl.fontR.FontConsumer; @@ -508,16 +507,6 @@ writeEndTag(area); } - public void render(TableRowContainer area) { - StringBuffer buffer = new StringBuffer(); - outputGeneratedBy(area, buffer); - outputDimension(area, buffer); - writeStartTag(area, buffer); - outputAllRectangles(area); - renderChildren(area); - writeEndTag(area); - } - public void render(TableCellArea area) { StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-19 21:06:59
|
Revision: 7713 Author: victormote Date: 2006-06-19 14:06:47 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7713&view=rev Log Message: ----------- Rename method for future expansion. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -190,7 +190,7 @@ // no x clipping, no y clipping contentRectangle = new Rectangle(currentX, currentY, imgW, imgH); - drawGraphic(area, backgroundImage, contentRectangle, + drawImage(area, backgroundImage, contentRectangle, null); } else { // no x clipping, y clipping @@ -198,7 +198,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX, currentY - clipH, imgW, clipH); - drawGraphic(area, backgroundImage, contentRectangle, + drawImage(area, backgroundImage, contentRectangle, clipRectangle); } } else { @@ -209,7 +209,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX + clipW, currentY, clipW, imgH); - drawGraphic(area, backgroundImage, contentRectangle, + drawImage(area, backgroundImage, contentRectangle, clipRectangle); } else { // x clipping, y clipping @@ -217,7 +217,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX + clipW, currentY - clipH, clipW, clipH); - drawGraphic(area, backgroundImage, contentRectangle, + drawImage(area, backgroundImage, contentRectangle, clipRectangle); } } @@ -280,9 +280,10 @@ Color fillColor) ; /** - * Renders an image, scaling it to the given width and height. - * If the scaled width and height is the same intrinsic size - * of the image, the image is not scaled. + * Renders an image, scaling it to a given contentRectangle, and clipping it + * within a given clip rectangle. + * If the content rectangle is the same as the intrinsic dimensions of the + * image, no scaling is done. * @param area The Area instance from which to obtain traits. * @param image the image to be rendered * @param contentRectangle The rectangle to which the graphic should be @@ -290,7 +291,7 @@ * @param clipRectangle The rectangle to which the content should be clipped * after any scaling. */ - protected abstract void drawGraphic(Area area, Graphic image, + protected abstract void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle); public void render(AreaNode node) { @@ -395,7 +396,7 @@ } Rectangle contentRect = new Rectangle(area.rrOriginX(), area.rrOriginY(), area.rrIPD(), area.rrBPD()); - drawGraphic(area, graphic, contentRect, null); + drawImage(area, graphic, contentRect, null); } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -474,7 +474,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -235,7 +235,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -212,7 +212,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { Rectangle2D.Float pdfContentRectangle = new Rectangle2D.Float( contentRectangle.x / 1000f, contentRectangle.y / 1000, Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -527,7 +527,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { if (clipRectangle.width > 0 || clipRectangle.height >0) { drawImageClipped(contentRectangle.x, contentRectangle.y, @@ -562,7 +562,7 @@ int w = image.pixelWidth() * 1000; int h = image.pixelHeight() * 1000; Rectangle rect = new Rectangle(x, y, w, h); - drawGraphic(area, image, rect, null); + drawImage(area, image, rect, null); } catch (GraphicException e) { getLogger().error("Error getting image extents"); getLogger().error(e.getMessage()); @@ -761,7 +761,7 @@ + "null"); } else { Rectangle rect = new Rectangle(x, y, w, h); - drawGraphic(area, img, rect, null); + drawImage(area, img, rect, null); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -334,7 +334,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -333,7 +333,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 20:58:29 UTC (rev 7712) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) @@ -201,7 +201,7 @@ /** * {@inheritDoc} */ - protected void drawGraphic(Area area, Graphic image, + protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-19 21:23:17
|
Revision: 7714 Author: victormote Date: 2006-06-19 14:23:06 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7714&view=rev Log Message: ----------- Add new method for drawing SVG. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -66,6 +66,7 @@ import org.axsl.areaR.TextArea; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; +import org.axsl.graphicR.SVGGraphic; import org.apache.batik.bridge.BridgeContext; import org.apache.commons.logging.Log; @@ -280,20 +281,41 @@ Color fillColor) ; /** - * Renders an image, scaling it to a given contentRectangle, and clipping it - * within a given clip rectangle. + * Renders a generic Graphic, regardless of type to a given + * contentRectangle, and clipping it within a given clip rectangle. * If the content rectangle is the same as the intrinsic dimensions of the * image, no scaling is done. * @param area The Area instance from which to obtain traits. - * @param image the image to be rendered + * @param graphic The graphic to be rendered. * @param contentRectangle The rectangle to which the graphic should be * scaled during drawing. * @param clipRectangle The rectangle to which the content should be clipped * after any scaling. */ + protected void drawGraphic(Area area, Graphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + if (graphic instanceof SVGGraphic) { + SVGGraphic svg = (SVGGraphic) graphic; + drawSVG(area, svg, contentRectangle, clipRectangle); + return; + } + drawImage(area, graphic, contentRectangle, clipRectangle); + } + + /** + * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)}, + * except for the specific case of bitmapped images. + */ protected abstract void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle); + /** + * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)}, + * except for the specific case of SVG graphics. + */ + protected abstract void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) ; + public void render(AreaNode node) { renderChildren(node); } Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -479,6 +479,14 @@ // TODO: implement this } + /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + public void render(ExternalGraphicArea area) { int x = area.rrOriginX(); int y = area.rrOriginY(); Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -47,6 +47,7 @@ import org.axsl.fontR.Font; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; +import org.axsl.graphicR.SVGGraphic; import org.apache.commons.logging.Log; @@ -240,6 +241,14 @@ // TODO: implement this } + /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + boolean printBMP(Graphic img, int x, int y, int w, int h) throws GraphicException { // Print the passed image file in PCL. Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -48,6 +48,7 @@ import org.axsl.common.Constants; import org.axsl.fontR.FontUse; import org.axsl.graphicR.Graphic; +import org.axsl.graphicR.SVGGraphic; import org.axsl.pdfW.PDFColor; import org.axsl.pdfW.PDFContentStream; import org.axsl.pdfW.PDFDocument; @@ -234,6 +235,14 @@ } /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + + /** * render a foreign object area * * @param area the foreign object area to be rendered Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -570,6 +570,14 @@ write("grestore"); } + /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + public void renderEPS(EPSGraphic img, int x, int y, int w, int h) { try { out.writeByteArr(epsToPostScript(img, x, y, w, h)); Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -339,6 +339,14 @@ // TODO: implement this } + /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + public void render(ExternalGraphicArea area) { int x = area.rrOriginX(); int y = area.rrOriginY(); Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -38,6 +38,7 @@ import org.axsl.common.Constants; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; +import org.axsl.graphicR.SVGGraphic; import org.apache.commons.logging.Log; @@ -338,6 +339,14 @@ // TODO: implement this } + /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* TODO: Implement this. */ + } + boolean printBMP(Graphic img, int x, int y, int w, int h) throws GraphicException { getLogger().debug("TXTRenderer.printBMP(" + img + ", " + x Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 21:06:47 UTC (rev 7713) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) @@ -61,6 +61,7 @@ import org.axsl.common.Constants; import org.axsl.fontR.FontConsumer; import org.axsl.graphicR.Graphic; +import org.axsl.graphicR.SVGGraphic; import org.apache.commons.logging.Log; @@ -203,10 +204,18 @@ */ protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { - // TODO: implement this + /* There is nothing to do here. */ } /** + * {@inheritDoc} + */ + protected void drawSVG(Area area, SVGGraphic graphic, + Rectangle contentRectangle, Rectangle clipRectangle) { + /* There is nothing to do here. */ + } + + /** * render an area container to XML * * @param area the area container to render This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-19 22:29:12
|
Revision: 7715 Author: victormote Date: 2006-06-19 15:29:06 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7715&view=rev Log Message: ----------- Separate SVG logic from other graphic logic a bit more. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 21:23:06 UTC (rev 7714) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-19 22:29:06 UTC (rev 7715) @@ -74,6 +74,7 @@ import java.awt.Color; import java.awt.Rectangle; import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; import java.io.IOException; import java.util.List; @@ -191,7 +192,7 @@ // no x clipping, no y clipping contentRectangle = new Rectangle(currentX, currentY, imgW, imgH); - drawImage(area, backgroundImage, contentRectangle, + drawGraphic(area, backgroundImage, contentRectangle, null); } else { // no x clipping, y clipping @@ -199,7 +200,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX, currentY - clipH, imgW, clipH); - drawImage(area, backgroundImage, contentRectangle, + drawGraphic(area, backgroundImage, contentRectangle, clipRectangle); } } else { @@ -210,7 +211,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX + clipW, currentY, clipW, imgH); - drawImage(area, backgroundImage, contentRectangle, + drawGraphic(area, backgroundImage, contentRectangle, clipRectangle); } else { // x clipping, y clipping @@ -218,7 +219,7 @@ imgW, imgH); clipRectangle = new Rectangle(currentX + clipW, currentY - clipH, clipW, clipH); - drawImage(area, backgroundImage, contentRectangle, + drawGraphic(area, backgroundImage, contentRectangle, clipRectangle); } } @@ -418,7 +419,7 @@ } Rectangle contentRect = new Rectangle(area.rrOriginX(), area.rrOriginY(), area.rrIPD(), area.rrBPD()); - drawImage(area, graphic, contentRect, null); + drawGraphic(area, graphic, contentRect, null); } /** @@ -557,4 +558,21 @@ return new BridgeContext(userAgent); } + /** + * Converts a Rectangle storing millipoints to one storing points. + * @param input A rectangle whose dimensions are stored as millipoints. + * @return A new rectangle whose dimensions are stored as points. + */ + public static Rectangle2D.Float convertMillipointRectangle( + Rectangle input) { + if (input == null) { + return null; + } + return new Rectangle2D.Float( + input.x / 1000f, + input.y / 1000, + input.width / 1000f, + input.height / 1000f); + } + } Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 21:23:06 UTC (rev 7714) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-19 22:29:06 UTC (rev 7715) @@ -215,17 +215,10 @@ */ protected void drawImage(Area area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { - Rectangle2D.Float pdfContentRectangle = new Rectangle2D.Float( - contentRectangle.x / 1000f, contentRectangle.y / 1000, - contentRectangle.width / 1000f, - contentRectangle.height / 1000f); - Rectangle2D.Float pdfClipRectangle = null; - if (clipRectangle != null) { - pdfClipRectangle = new Rectangle2D.Float( - clipRectangle.x / 1000f, clipRectangle.y / 1000, - clipRectangle.width / 1000f, - clipRectangle.height / 1000f); - } + Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle( + contentRectangle); + Rectangle2D.Float pdfClipRectangle = convertMillipointRectangle( + clipRectangle); FontUse font = area.getPrimaryFont(); float fontSize = area.traitFontSize()/1000; float letterSpacing = area.actualLetterSpacing() / 1000f; @@ -239,7 +232,16 @@ */ protected void drawSVG(Area area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { - /* TODO: Implement this. */ + Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle( + contentRectangle); + Rectangle2D.Float pdfClipRectangle = convertMillipointRectangle( + clipRectangle); + FontUse font = area.getPrimaryFont(); + float fontSize = area.traitFontSize()/1000; + float letterSpacing = area.actualLetterSpacing() / 1000f; + getContentStream().drawGraphic(pdfContentRectangle, pdfClipRectangle, + graphic, font, fontSize, letterSpacing, + getStrokeSVGText()); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-20 00:37:12
|
Revision: 7729 Author: victormote Date: 2006-06-19 17:37:00 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7729&view=rev Log Message: ----------- Use new cleaned up graphic rendering to allow background images to be processed cleanly (without other Area information). Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -47,6 +47,7 @@ import org.axsl.areaR.FootnoteArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.InlineArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.LineArea; @@ -111,7 +112,7 @@ * Renders an area's background. * @param area The area whose background should be rendered. */ - protected void markBackground(Area area) { + protected void markBackground(BackgroundArea area) { markBackgroundColor(area); markBackgroundImage(area); } @@ -119,7 +120,7 @@ /** * @param area */ - private void markBackgroundColor(Area area) { + private void markBackgroundColor(BackgroundArea area) { /* * Per XSL-FO Spec 1.0, Section 4.9.4, the background is rendered * inside the padding-rectangle. @@ -142,7 +143,7 @@ /** * @param area */ - private void markBackgroundImage(Area area) { + private void markBackgroundImage(BackgroundArea area) { Graphic backgroundImage = area.traitBackgroundImage(); if (backgroundImage == null) { return; @@ -293,7 +294,7 @@ * @param clipRectangle The rectangle to which the content should be clipped * after any scaling. */ - protected void drawGraphic(Area area, Graphic graphic, + protected void drawGraphic(GraphicArea area, Graphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { if (graphic instanceof SVGGraphic) { SVGGraphic svg = (SVGGraphic) graphic; @@ -304,17 +305,17 @@ } /** - * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)}, - * except for the specific case of bitmapped images. + * The same as {@link #drawGraphic(GraphicArea, Graphic, Rectangle, + * Rectangle)}, except for the specific case of bitmapped images. */ - protected abstract void drawImage(Area area, Graphic image, + protected abstract void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle); /** - * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)}, - * except for the specific case of SVG graphics. + * The same as {@link #drawGraphic(GraphicArea, Graphic, Rectangle, + * Rectangle)}, except for the specific case of SVG graphics. */ - protected abstract void drawSVG(Area area, SVGGraphic graphic, + protected abstract void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) ; public void render(AreaNode node) { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -34,6 +34,7 @@ import org.axsl.areaR.ExternalGraphicArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.PageArea; import org.axsl.areaR.SVGArea; @@ -474,7 +475,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } @@ -482,7 +483,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* TODO: Implement this. */ } Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -35,12 +35,12 @@ import org.foray.output.OutputConfig; import org.foray.render.PrintRenderer; -import org.axsl.areaR.Area; import org.axsl.areaR.BasicLinkArea; import org.axsl.areaR.BookmarkTreeArea; import org.axsl.areaR.ExternalGraphicArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.PageArea; import org.axsl.areaR.SVGArea; import org.axsl.common.Constants; @@ -236,7 +236,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } @@ -244,7 +244,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* TODO: Implement this. */ } Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -41,6 +41,7 @@ import org.axsl.areaR.BookmarkTreeArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.PageArea; import org.axsl.areaR.SVGArea; @@ -216,7 +217,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle( contentRectangle); @@ -229,7 +230,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle( contentRectangle); Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -38,6 +38,7 @@ import org.axsl.areaR.ExternalGraphicArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.LineArea; import org.axsl.areaR.PageArea; @@ -460,7 +461,7 @@ * @param y the y offset */ protected void renderSVGDocument(Document doc, int x, int y, - Area area) { + GraphicArea area) { BridgeContext ctx = makeBridgeContext(); GVTBuilder builder = new GVTBuilder(); @@ -509,7 +510,7 @@ PSGraphics2D graphics = new PSGraphics2D(false, this, currentPSFont.getName(), - currentFontSize, area.rrOriginX(), area.rrOriginY()); + currentFontSize, x, y); graphics.setGraphicContext(new GraphicContext()); try { root.paint(graphics); @@ -527,7 +528,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { if (clipRectangle.width > 0 || clipRectangle.height >0) { drawImageClipped(contentRectangle.x, contentRectangle.y, @@ -553,7 +554,7 @@ } protected void drawImageClipped(int x, int y, - int clipW, int clipH, Graphic image, Area area) { + int clipW, int clipH, Graphic image, GraphicArea area) { write("gsave"); write("0 0 " + clipW + " " + clipH + " re"); write("clippath"); @@ -573,7 +574,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* TODO: Implement this. */ } Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -33,6 +33,7 @@ import org.axsl.areaR.ExternalGraphicArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.PageArea; import org.axsl.areaR.SVGArea; @@ -334,7 +335,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } @@ -342,7 +343,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* TODO: Implement this. */ } Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -27,12 +27,12 @@ import org.foray.output.OutputConfig; import org.foray.render.PrintRenderer; -import org.axsl.areaR.Area; import org.axsl.areaR.BasicLinkArea; import org.axsl.areaR.BookmarkTreeArea; import org.axsl.areaR.ExternalGraphicArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.PageArea; import org.axsl.areaR.SVGArea; import org.axsl.common.Constants; @@ -334,7 +334,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { // TODO: implement this } @@ -342,7 +342,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* TODO: Implement this. */ } Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-20 00:28:29 UTC (rev 7728) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-06-20 00:37:00 UTC (rev 7729) @@ -43,6 +43,7 @@ import org.axsl.areaR.FootnoteArea; import org.axsl.areaR.ForeignObjectArea; import org.axsl.areaR.GeneralInlineArea; +import org.axsl.areaR.GraphicArea; import org.axsl.areaR.InlineArea; import org.axsl.areaR.LeaderArea; import org.axsl.areaR.LineArea; @@ -202,7 +203,7 @@ /** * {@inheritDoc} */ - protected void drawImage(Area area, Graphic image, + protected void drawImage(GraphicArea area, Graphic image, Rectangle contentRectangle, Rectangle clipRectangle) { /* There is nothing to do here. */ } @@ -210,7 +211,7 @@ /** * {@inheritDoc} */ - protected void drawSVG(Area area, SVGGraphic graphic, + protected void drawSVG(GraphicArea area, SVGGraphic graphic, Rectangle contentRectangle, Rectangle clipRectangle) { /* There is nothing to do here. */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-08-27 23:31:00
|
Revision: 7838 Author: victormote Date: 2006-08-27 16:30:49 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7838&view=rev Log Message: ----------- Use the relative-direction methods instead of the absolute-direction methods. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 21:26:23 UTC (rev 7837) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 23:30:49 UTC (rev 7838) @@ -56,10 +56,10 @@ final int rx = area.brOriginX(); final int ry = area.brOriginY(); - final int left = area.getBorderLeftWidth(); - final int right = area.getBorderRightWidth(); - final int top = area.getBorderTopWidth(); - final int bottom = area.getBorderBottomWidth(); + final int left = area.traitBorderStartWidth(); + final int right = area.traitBorderEndWidth(); + final int top = area.traitBorderBeforeWidth(); + final int bottom = area.traitBorderAfterWidth(); // If style is solid, use filled rectangles if (top != 0) { drawRectangle(rx, ry, w, top, true, area.traitBorderTopColor(), Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 21:26:23 UTC (rev 7837) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 23:30:49 UTC (rev 7838) @@ -448,23 +448,23 @@ final int w = area.brIPD(); final int h = area.brBPD(); - if (area.getBorderTopWidth() != 0) { - drawLine(rx, ry, rx + w, ry, -area.getBorderTopWidth(), + if (area.traitBorderBeforeWidth() != 0) { + drawLine(rx, ry, rx + w, ry, -area.traitBorderBeforeWidth(), Constants.FOVAL_SOLID, area.traitBorderTopColor()); } - if (area.getBorderLeftWidth() != 0) { - drawLine(rx, ry, rx, ry - h, area.getBorderLeftWidth(), + if (area.traitBorderStartWidth() != 0) { + drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), Constants.FOVAL_SOLID, area.traitBorderLeftColor()); } - if (area.getBorderRightWidth() != 0) { - drawLine(rx + w, ry, rx + w, ry - h, -area.getBorderRightWidth(), + if (area.traitBorderEndWidth() != 0) { + drawLine(rx + w, ry, rx + w, ry - h, -area.traitBorderEndWidth(), Constants.FOVAL_SOLID, area.traitBorderRightColor()); } - if (area.getBorderBottomWidth() != 0) { - drawLine(rx, ry - h, rx + w, ry - h, area.getBorderBottomWidth(), + if (area.traitBorderAfterWidth() != 0) { + drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), Constants.FOVAL_SOLID, area.traitBorderBottomColor()); } } 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-08-27 21:26:23 UTC (rev 7837) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-27 23:30:49 UTC (rev 7838) @@ -1016,38 +1016,38 @@ final int w = area.crIPD(); final int h = area.crBPD(); - if (area.getBorderTopWidth() != 0) { + if (area.traitBorderBeforeWidth() != 0) { write("newpath"); write(rx + " " + ry + " M"); write(w + " 0 rlineto"); - write(area.getBorderTopWidth() + " setlinewidth"); + write(area.traitBorderBeforeWidth() + " setlinewidth"); write("0 setlinecap"); useColor(area.traitBorderTopColor()); write("stroke"); } - if (area.getBorderLeftWidth() != 0) { + if (area.traitBorderStartWidth() != 0) { write("newpath"); write(rx + " " + ry + " M"); write("0 " + (-h) + " rlineto"); - write(area.getBorderLeftWidth() + " setlinewidth"); + write(area.traitBorderStartWidth() + " setlinewidth"); write("0 setlinecap"); useColor(area.traitBorderLeftColor()); write("stroke"); } - if (area.getBorderRightWidth() != 0) { + if (area.traitBorderEndWidth() != 0) { write("newpath"); write((rx + w) + " " + ry + " M"); write("0 " + (-h) + " rlineto"); - write(area.getBorderRightWidth() + " setlinewidth"); + write(area.traitBorderEndWidth() + " setlinewidth"); write("0 setlinecap"); useColor(area.traitBorderRightColor()); write("stroke"); } - if (area.getBorderBottomWidth() != 0) { + if (area.traitBorderAfterWidth() != 0) { write("newpath"); write(rx + " " + (ry - h) + " M"); write(w + " 0 rlineto"); - write(area.getBorderBottomWidth() + " setlinewidth"); + write(area.traitBorderAfterWidth() + " setlinewidth"); write("0 setlinecap"); useColor(area.traitBorderBottomColor()); write("stroke"); Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 21:26:23 UTC (rev 7837) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 23:30:49 UTC (rev 7838) @@ -309,23 +309,23 @@ final int w = area.crIPD(); final int h = area.crBPD(); - if (area.getBorderTopWidth() != 0) { - drawLine(rx, ry, rx + w, ry, area.getBorderTopWidth(), + if (area.traitBorderBeforeWidth() != 0) { + drawLine(rx, ry, rx + w, ry, area.traitBorderBeforeWidth(), Constants.FOVAL_SOLID, area.traitBorderTopColor()); } - if (area.getBorderLeftWidth() != 0) { - drawLine(rx, ry, rx, ry - h, area.getBorderLeftWidth(), + if (area.traitBorderStartWidth() != 0) { + drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), Constants.FOVAL_DASHED, area.traitBorderLeftColor()); } - if (area.getBorderRightWidth() != 0) { - drawLine(rx + w, ry, rx + w, ry - h, area.getBorderRightWidth(), + if (area.traitBorderEndWidth() != 0) { + drawLine(rx + w, ry, rx + w, ry - h, area.traitBorderEndWidth(), Constants.FOVAL_DASHED, area.traitBorderRightColor()); } - if (area.getBorderBottomWidth() != 0) { - drawLine(rx, ry - h, rx + w, ry - h, area.getBorderBottomWidth(), + if (area.traitBorderAfterWidth() != 0) { + drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), Constants.FOVAL_DASHED, area.traitBorderBottomColor()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-08-27 23:55:19
|
Revision: 7840 Author: victormote Date: 2006-08-27 16:55:08 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7840&view=rev Log Message: ----------- Conform to axsl changes: Using relative instead of absolute traits. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -68,38 +68,6 @@ return this.traitGeneratedBy().traitBackgroundImage(this); } - public int getPaddingTop() { - return this.traitGeneratedBy().traitPaddingTop(this); - } - - public int getPaddingLeft() { - return this.traitGeneratedBy().traitPaddingLeft(this); - } - - public int getPaddingBottom() { - return this.traitGeneratedBy().traitPaddingBottom(this); - } - - public int getPaddingRight() { - return this.traitGeneratedBy().traitPaddingRight(this); - } - - public int getBorderTopWidth() { - return this.traitGeneratedBy().traitBorderTopWidth(this); - } - - public int getBorderRightWidth() { - return this.traitGeneratedBy().traitBorderRightWidth(this); - } - - public int getBorderLeftWidth() { - return this.traitGeneratedBy().traitBorderLeftWidth(this); - } - - public int getBorderBottomWidth() { - return this.traitGeneratedBy().traitBorderBottomWidth(this); - } - public BlockContainerRA getNearestAncestorAreaContainer() { AreaNode areaNode = this.getAreaNodeParent(); while (areaNode != null && !(areaNode instanceof BlockContainerRA)) { @@ -187,20 +155,20 @@ return getPrimaryFont().getFont().getDescender(traitFontSize()); } - public Color traitBorderTopColor() { - return traitGeneratedBy().traitBorderTopColor(this); + public Color traitBorderBeforeColor() { + return traitGeneratedBy().traitBorderBeforeColor(this); } - public Color traitBorderLeftColor() { - return traitGeneratedBy().traitBorderLeftColor(this); + public Color traitBorderStartColor() { + return traitGeneratedBy().traitBorderStartColor(this); } - public Color traitBorderRightColor() { - return traitGeneratedBy().traitBorderRightColor(this); + public Color traitBorderEndColor() { + return traitGeneratedBy().traitBorderEndColor(this); } - public Color traitBorderBottomColor() { - return traitGeneratedBy().traitBorderBottomColor(this); + public Color traitBorderAfterColor() { + return traitGeneratedBy().traitBorderAfterColor(this); } public String traitFontFamily() { Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -62,23 +62,23 @@ final int bottom = area.traitBorderAfterWidth(); // If style is solid, use filled rectangles if (top != 0) { - drawRectangle(rx, ry, w, top, true, area.traitBorderTopColor(), - true, area.traitBorderTopColor()); + drawRectangle(rx, ry, w, top, true, area.traitBorderBeforeColor(), + true, area.traitBorderBeforeColor()); } if (left != 0) { drawRectangle(rx - left, ry - h - bottom, left, h + top + bottom, - true, area.traitBorderLeftColor(), - true, area.traitBorderLeftColor()); + true, area.traitBorderStartColor(), + true, area.traitBorderStartColor()); } if (right != 0) { drawRectangle(rx + w, ry - h - bottom, right, h + top + bottom, - true, area.traitBorderRightColor(), - true, area.traitBorderRightColor()); + true, area.traitBorderEndColor(), + true, area.traitBorderEndColor()); } if (bottom != 0) { drawRectangle(rx, ry - h - bottom, w, bottom, - true, area.traitBorderBottomColor(), - true, area.traitBorderBottomColor()); + true, area.traitBorderAfterColor(), + true, area.traitBorderAfterColor()); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -450,22 +450,22 @@ if (area.traitBorderBeforeWidth() != 0) { drawLine(rx, ry, rx + w, ry, -area.traitBorderBeforeWidth(), - Constants.FOVAL_SOLID, area.traitBorderTopColor()); + Constants.FOVAL_SOLID, area.traitBorderBeforeColor()); } if (area.traitBorderStartWidth() != 0) { drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), - Constants.FOVAL_SOLID, area.traitBorderLeftColor()); + Constants.FOVAL_SOLID, area.traitBorderStartColor()); } if (area.traitBorderEndWidth() != 0) { drawLine(rx + w, ry, rx + w, ry - h, -area.traitBorderEndWidth(), - Constants.FOVAL_SOLID, area.traitBorderRightColor()); + Constants.FOVAL_SOLID, area.traitBorderEndColor()); } if (area.traitBorderAfterWidth() != 0) { drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), - Constants.FOVAL_SOLID, area.traitBorderBottomColor()); + Constants.FOVAL_SOLID, area.traitBorderAfterColor()); } } 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-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -991,7 +991,7 @@ write(w + " 0 rlineto"); write(area.traitBorderBeforeWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderTopColor()); + useColor(area.traitBorderBeforeColor()); write("stroke"); } if (area.traitBorderStartWidth() != 0) { @@ -1000,7 +1000,7 @@ write("0 " + (-h) + " rlineto"); write(area.traitBorderStartWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderLeftColor()); + useColor(area.traitBorderStartColor()); write("stroke"); } if (area.traitBorderEndWidth() != 0) { @@ -1009,7 +1009,7 @@ write("0 " + (-h) + " rlineto"); write(area.traitBorderEndWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderRightColor()); + useColor(area.traitBorderEndColor()); write("stroke"); } if (area.traitBorderAfterWidth() != 0) { @@ -1018,7 +1018,7 @@ write(w + " 0 rlineto"); write(area.traitBorderAfterWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderBottomColor()); + useColor(area.traitBorderAfterColor()); write("stroke"); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -311,22 +311,22 @@ if (area.traitBorderBeforeWidth() != 0) { drawLine(rx, ry, rx + w, ry, area.traitBorderBeforeWidth(), - Constants.FOVAL_SOLID, area.traitBorderTopColor()); + Constants.FOVAL_SOLID, area.traitBorderBeforeColor()); } if (area.traitBorderStartWidth() != 0) { drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), - Constants.FOVAL_DASHED, area.traitBorderLeftColor()); + Constants.FOVAL_DASHED, area.traitBorderStartColor()); } if (area.traitBorderEndWidth() != 0) { drawLine(rx + w, ry, rx + w, ry - h, area.traitBorderEndWidth(), - Constants.FOVAL_DASHED, area.traitBorderRightColor()); + Constants.FOVAL_DASHED, area.traitBorderEndColor()); } if (area.traitBorderAfterWidth() != 0) { drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), - Constants.FOVAL_DASHED, area.traitBorderBottomColor()); + Constants.FOVAL_DASHED, area.traitBorderAfterColor()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
