[FOray-commit] SF.net SVN: foray: [9942] trunk/foray

[<vic...@us...>]

Revision: 9942
          http://svn.sourceforge.net/foray/?rev=9942&view=rev
Author:   victormote
Date:     2007-07-06 13:49:01 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
Conform to axsl change renaming PageArea to Page.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.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-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -47,7 +47,7 @@
 import org.axsl.fo.fo.RegionStart;
 import org.axsl.fo.fo.RetrieveMarker;
 import org.axsl.fo.fo.SimplePageMaster;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.RenderVisitor;
 
 import java.util.ArrayList;
@@ -56,7 +56,7 @@
 /**
  * Area containing a page.
  */
-public final class PageRA extends AreaFixed implements PageArea,
+public final class PageRA extends AreaFixed implements Page,
         org.axsl.area.PageArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -298,7 +298,7 @@
      * {@inheritDoc}
      */
     public void pageComplete(final AreaTreeEvent event) {
-        final org.axsl.galley.PageArea page = event.getPage();
+        final org.axsl.galley.Page page = event.getPage();
         final Renderer renderer = (Renderer) this.outputTarget;
         try {
             renderer.render(page);

Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -56,7 +56,7 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.PageCollection;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.SvgArea;
@@ -116,7 +116,7 @@
     /**
      * {@inheritDoc}
      */
-    public abstract void render(PageArea page) throws OutputException;
+    public abstract void render(Page page) throws OutputException;
 
     /**
      * Marks the border, if any, for the given area.
@@ -375,7 +375,7 @@
      * Render a page's region areas.
      * @param page The page whose regions should be rendered.
      */
-    protected void renderRegions(final PageArea page) {
+    protected void renderRegions(final Page page) {
         render(page.getRegionBody());
         if (page.getRegionBefore() != null) {
             render(page.getRegionBefore());

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -30,7 +30,7 @@
 
 import org.foray.output.OutputConfig;
 
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.output.OutputException;
 
 import org.apache.commons.logging.Log;
@@ -122,7 +122,7 @@
     /**
      * {@inheritDoc}
      */
-    public void renderPage(final PageArea page) {
+    public void renderPage(final Page page) {
         setPageWidth((int) toPoints(page.getWidth()));
         setPageHeight((int) toPoints(page.getHeight()));
         super.renderPage(page);

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -54,7 +54,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
@@ -105,7 +105,7 @@
     private int pageNumber = 0;
 
     /** The list of pages processed. */
-    private Vector<PageArea> pageList = new Vector<PageArea>();
+    private Vector<Page> pageList = new Vector<Page>();
 
     /** A color cached during processing. This could conceivably become a
      * local variable, but is an instance variable in the hope of reducing
@@ -400,7 +400,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) throws OutputException {
+    public void render(final Page page) throws OutputException {
         pageWidth = Math.round(toPoints(page.getWidth()));
         pageHeight = Math.round(toPoints(page.getHeight()));
 
@@ -429,7 +429,7 @@
      * Renders a given page.
      * @param page The page to be rendered.
      */
-    protected void renderPage(final PageArea page) {
+    protected void renderPage(final Page page) {
         this.currentFont = null;
         this.currentFontSize = 0;
         renderRegions(page);
@@ -769,7 +769,7 @@
         graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
                                    RenderingHints.VALUE_FRACTIONALMETRICS_ON);
 
-        final PageArea aPage = pageList.get(pageIndex);
+        final Page aPage = pageList.get(pageIndex);
         renderPage(aPage);
         graphics = oldGraphics;
 
@@ -791,7 +791,7 @@
             return null;
         }
 
-        final PageArea page = pageList.get(pageIndex);
+        final Page page = pageList.get(pageIndex);
         final PageFormat pageFormat = new PageFormat();
         final Paper paper = new Paper();
 

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -48,7 +48,7 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -739,7 +739,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) throws OutputException {
+    public void render(final Page page) throws OutputException {
         getLogger().debug("PCLRenderer.renderPage() page.Height() = "
                 + page.getHeight());
 

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -49,7 +49,7 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicLink;
@@ -443,7 +443,7 @@
     /**
      * Render page to PDF. {@inheritDoc}
      */
-    public void render(final PageArea page) throws OutputException {
+    public void render(final Page page) throws OutputException {
         getLogger().debug("Rendering single page to PDF.");
         final float w = page.getWidth();
         final float h = page.getHeight();

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -52,7 +52,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
@@ -1227,7 +1227,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) {
+    public void render(final Page page) {
         writeSetup();
         this.pagecount++;
 

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -43,7 +43,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
@@ -252,7 +252,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) {
+    public void render(final Page page) {
         this.pageNumber++;
         final int lastWidth = this.pageWidth;
         final int lastHeight = this.pageHeight;

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -39,7 +39,7 @@
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.SvgArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -582,7 +582,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) {
+    public void render(final Page page) {
         if (this.firstPage) {
             this.firstPage = false;
         } else {

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	2007-07-06 20:35:07 UTC (rev 9941)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-07-06 20:49:01 UTC (rev 9942)
@@ -56,7 +56,7 @@
 import org.axsl.galley.LineArea;
 import org.axsl.galley.MainReferenceArea;
 import org.axsl.galley.NormalBlockArea;
-import org.axsl.galley.PageArea;
+import org.axsl.galley.Page;
 import org.axsl.galley.RegionArea;
 import org.axsl.galley.SvgArea;
 import org.axsl.galley.TableArea;
@@ -100,7 +100,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final PageArea page) {
+    public void render(final Page page) {
         final RegionArea body = page.getRegionBody();
         final RegionArea before = page.getRegionBefore();
         final RegionArea after = page.getRegionAfter();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.