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

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

Revision: 9944
          http://svn.sourceforge.net/foray/?rev=9944&view=rev
Author:   victormote
Date:     2007-07-07 08:20:28 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
Conform to axsl changes for foreign object API.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.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

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-06 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -164,8 +164,12 @@
     /**
      * {@inheritDoc}
      */
-    public AreaNode getContainedForeignObject() {
-        return getFirstChild();
+    public Area getContainedForeignObject() {
+        if (this.children == null
+                || this.children.size() < 1) {
+            return null;
+        }
+        return this.children.get(0);
     }
 
     /**

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-06 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -32,7 +32,6 @@
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.fo.svg.SvgElement;
 import org.axsl.galley.RenderVisitor;
-import org.axsl.graphic.Graphic;
 import org.axsl.graphic.SvgGraphic;
 
 import java.util.Collections;
@@ -78,7 +77,7 @@
     /**
      * {@inheritDoc}
      */
-    public SvgGraphic getSvgGraphic() {
+    public SvgGraphic getGraphic() {
         final SvgElement generatedBy = traitGeneratedBy();
         return generatedBy.getSvgGraphic();
     }
@@ -108,13 +107,6 @@
     /**
      * {@inheritDoc}
      */
-    public Graphic getGraphic() {
-        return this.traitBackgroundImage();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public List<AreaNode> getChildren() {
         return Collections.emptyList();
     }

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 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -715,7 +715,7 @@
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(area.crOriginX()), toPoints(area.crOriginY()),
                 toPoints(area.crIpd()), toPoints(area.crBpd()));
-        renderSVGDocument(area.getSvgGraphic(), contentRectangle, null);
+        renderSVGDocument(area.getGraphic(), contentRectangle, null);
     }
 
     /**

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 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -298,7 +298,7 @@
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(area.crOriginX()), toPoints(area.crOriginY()),
                 toPoints(area.crIpd()), toPoints(area.crBpd()));
-        final SvgGraphic svgGraphic = area.getSvgGraphic();
+        final SvgGraphic svgGraphic = area.getGraphic();
         getContentStream().drawGraphic(svgGraphic,
                 contentRectangle, null, this.getFontConsumer(),
                 getStrokeSVGText());

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 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -504,7 +504,7 @@
         final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
                 toPoints(area.crOriginX()), toPoints(area.crOriginY()),
                 toPoints(area.crIpd()), toPoints(area.crBpd()));
-        renderSVGDocument(area.getSvgGraphic(), contentRectangle, area);
+        renderSVGDocument(area.getGraphic(), contentRectangle, area);
     }
 
     /**

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 21:02:05 UTC (rev 9943)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2007-07-07 15:20:28 UTC (rev 9944)
@@ -562,7 +562,7 @@
     public void render(final SvgArea area) {
         final float x = toPoints(area.crOriginX());
         final float y = this.pageHeight - toPoints(area.crOriginY());
-        final SvgGraphic svgGraphic = area.getSvgGraphic();
+        final SvgGraphic svgGraphic = area.getGraphic();
         renderSVGDocument(svgGraphic, x, y);
     }
 


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