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

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

Revision: 9948
          http://svn.sourceforge.net/foray/?rev=9948&view=rev
Author:   victormote
Date:     2007-07-07 11:44:38 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
Conform to axsl changes renaming interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
    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-areatree/src/java/org/foray/area/SVGArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java	2007-07-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -36,7 +36,7 @@
  * An SVGArea represents the <em>reference </em> area that contains the
  * content that is in a {@link ForeignObjectArea} <em>viewport </em> area.
  */
-public final class SVGArea implements org.axsl.galley.SvgArea {
+public final class SVGArea implements org.axsl.galley.ForeignContentSvg {
 
     /** The parent of this node. */
     private ForeignObjectArea parent;

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -60,7 +60,7 @@
 import org.axsl.galley.Page;
 import org.axsl.galley.PageCollection;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
 import org.axsl.galley.TextArea;
@@ -430,9 +430,10 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Render the SVG content of a {@link ForeignObjectArea}.
+     * @param svgContent The SVG content to be rendered.
      */
-    public abstract void render(SvgArea area);
+    public abstract void render(ForeignContentSvg svgContent);
 
     /**
      * {@inheritDoc}
@@ -443,8 +444,9 @@
             this.getLogger().warn("Foreign Object Area has no parsed content");
             return;
         }
-        if (foreignContent instanceof SvgArea) {
-            final SvgArea svgArea = (SvgArea) foreignContent;
+        if (foreignContent instanceof ForeignContentSvg) {
+            final ForeignContentSvg svgArea =
+                    (ForeignContentSvg) foreignContent;
             render(svgArea);
         }
     }

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -55,7 +55,7 @@
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.SvgGraphic;
@@ -711,7 +711,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         final ForeignObjectArea foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -48,7 +48,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.SvgGraphic;
@@ -548,7 +548,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         getLogger().debug("PCLRenderer.renderSVGArea(" + area + ")");
 //        int x = area.rrOriginX();
 //        int y = area.rrOriginY();

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -50,7 +50,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicLink;
 import org.axsl.graphic.SvgGraphic;
@@ -279,7 +279,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         final ForeignObjectArea foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -53,7 +53,7 @@
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.graphic.EpsGraphic;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -493,7 +493,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         final ForeignObjectArea foreign = area.getParent();
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(foreign.crOriginX()), toPoints(foreign.crOriginY()),

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -44,7 +44,7 @@
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.LeaderArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.TextArea;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
@@ -559,7 +559,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         final ForeignObjectArea foreign = area.getParent();
         final float x = toPoints(foreign.crOriginX());
         final float y = this.pageHeight - toPoints(foreign.crOriginY());

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-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -39,7 +39,7 @@
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
 import org.axsl.galley.Page;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.graphic.SvgGraphic;
@@ -503,7 +503,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
         getLogger().debug("TXTRenderer.renderSVGArea(" + area + ")");
         /* 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	2007-07-07 18:33:03 UTC (rev 9947)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-07-07 18:44:38 UTC (rev 9948)
@@ -58,7 +58,7 @@
 import org.axsl.galley.NormalBlockArea;
 import org.axsl.galley.Page;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.SvgArea;
+import org.axsl.galley.ForeignContentSvg;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
 import org.axsl.galley.TextArea;
@@ -336,7 +336,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final SvgArea area) {
+    public void render(final ForeignContentSvg area) {
     }
 
     /**


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