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

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

Revision: 9935
          http://svn.sourceforge.net/foray/?rev=9935&view=rev
Author:   victormote
Date:     2007-07-05 16:45:26 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Conform to axsl changes removing unnecessary sub-interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
    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-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2007-07-05 23:26:41 UTC (rev 9934)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2007-07-05 23:45:26 UTC (rev 9935)
@@ -34,8 +34,7 @@
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fo.fo.RegionBody;
 import org.axsl.fo.fo.SimplePageMaster;
-import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.RegionBodyArea;
+import org.axsl.galley.RegionArea;
 import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
@@ -45,7 +44,7 @@
 /**
  * Area containing a region-body.
  */
-public final class RegionRABody extends AreaFixed implements RegionBodyArea,
+public final class RegionRABody extends AreaFixed implements RegionArea,
         org.axsl.area.RegionBodyRefArea {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
@@ -110,13 +109,6 @@
     /**
      * {@inheritDoc}
      */
-    public MainReferenceArea getMainReferenceArea() {
-        return mainReferenceArea;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public MainRA getMainRefArea() {
         return mainReferenceArea;
     }

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-05 23:26:41 UTC (rev 9934)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-05 23:45:26 UTC (rev 9935)
@@ -61,7 +61,6 @@
 import org.axsl.galley.PageNumberArea;
 import org.axsl.galley.PageNumberCitationArea;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.RegionBodyArea;
 import org.axsl.galley.SvgArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -406,14 +405,6 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final RegionBodyArea area) {
-        markBackground(area);
-        renderChildren(area);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void render(final RegionArea area) {
         markBackground(area);
         renderChildren(area);

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-05 23:26:41 UTC (rev 9934)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-07-05 23:45:26 UTC (rev 9935)
@@ -59,7 +59,6 @@
 import org.axsl.galley.PageArea;
 import org.axsl.galley.PageNumberCitationArea;
 import org.axsl.galley.RegionArea;
-import org.axsl.galley.RegionBodyArea;
 import org.axsl.galley.SvgArea;
 import org.axsl.galley.TableArea;
 import org.axsl.galley.TableCellArea;
@@ -103,7 +102,7 @@
      * {@inheritDoc}
      */
     public void render(final PageArea page) {
-        final RegionBodyArea body = page.getRegionBody();
+        final RegionArea body = page.getRegionBody();
         final RegionArea before = page.getRegionBefore();
         final RegionArea after = page.getRegionAfter();
         final RegionArea start = page.getRegionStart();
@@ -244,18 +243,6 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final RegionBodyArea area) {
-        final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
-        writeStartTag(area, buffer);
-        outputAllRectangles(area);
-        renderChildren(area);
-        writeEndTag(area);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void render(final MainReferenceArea area) {
         final StringBuilder buffer = new StringBuilder();
         outputGeneratedBy(area, buffer);


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