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

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

Revision: 8799
          http://svn.sourceforge.net/foray/?rev=8799&view=rev
Author:   victormote
Date:     2007-03-13 12:34:32 -0700 (Tue, 13 Mar 2007)

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

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
    trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -372,7 +372,7 @@
         PageRA startingPage = null;
         /* TODO: Remove cast on following line. */
         startingPage = (PageRA) getNextPage(Force.NONE, false);
-        final RegionRABody bodyArea = startingPage.getRegionRABody();
+        final RegionRABody bodyArea = startingPage.getRegionBody();
         final MainRA mainRA = bodyArea.getMainRA();
         final RegionBody body = (RegionBody) mainRA.traitGeneratedBy();
         int columnsNeeded = -1;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -29,8 +29,6 @@
 package org.foray.area;
 
 import org.axsl.areaR.PageArea;
-import org.axsl.areaR.RegionArea;
-import org.axsl.areaR.RegionBodyArea;
 import org.axsl.areaR.RenderVisitor;
 import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.PageCollection.Force;
@@ -142,62 +140,38 @@
     /**
      * {@inheritDoc}
      */
-    public RegionArea getRegionAfter() {
+    public RegionRA getRegionAfter() {
         return this.after;
     }
 
     /**
      * {@inheritDoc}
      */
-    public RegionArea getRegionBefore() {
+    public RegionRA getRegionBefore() {
         return this.before;
     }
 
     /**
      * {@inheritDoc}
      */
-    public RegionArea getRegionStart() {
+    public RegionRA getRegionStart() {
         return this.start;
     }
 
     /**
      * {@inheritDoc}
      */
-    public RegionArea getRegionEnd() {
+    public RegionRA getRegionEnd() {
         return this.end;
     }
 
     /**
      * {@inheritDoc}
      */
-    public RegionBodyArea getRegionBody() {
+    public RegionRABody getRegionBody() {
         return this.body;
     }
 
-    public RegionRABody getRegionRABody() {
-        return this.body;
-    }
-
-    public org.axsl.areaW.RegionRABody getWritableRegionBody() {
-        return this.body;
-    }
-
-    public org.axsl.areaW.RegionArea getWritableRegionAfter() {
-        return this.after;
-    }
-
-    public org.axsl.areaW.RegionArea getWritableRegionBefore() {
-        return this.before;
-    }
-
-    public org.axsl.areaW.RegionArea getWritableRegionStart() {
-        return this.start;
-    }
-
-    public org.axsl.areaW.RegionArea getWritableRegionEnd() {
-        return this.end;
-    }
-
     public int getHeight() {
         return traitGeneratedBy().traitPageHeight();
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -202,7 +202,7 @@
     public Area getOverflowArea(final Area childRequesting)
             throws AreaWException {
         final PageRA page = (PageRA) getParentArea().getOverflowArea(this);
-        return page.getRegionRABody();
+        return page.getRegionBody();
     }
 
     public int traitColumnCount() {

Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -218,19 +218,19 @@
 
         // region-before
         layoutStaticContent(pageSeq, simpleMaster.getRegionBefore(),
-                pageArea.getWritableRegionBefore());
+                pageArea.getRegionBefore());
 
         // region-after
         layoutStaticContent(pageSeq, simpleMaster.getRegionAfter(),
-                pageArea.getWritableRegionAfter());
+                pageArea.getRegionAfter());
 
         // region-start
         layoutStaticContent(pageSeq, simpleMaster.getRegionStart(),
-                pageArea.getWritableRegionStart());
+                pageArea.getRegionStart());
 
         // region-end
         layoutStaticContent(pageSeq, simpleMaster.getRegionEnd(),
-                pageArea.getWritableRegionEnd());
+                pageArea.getRegionEnd());
     }
 
 }

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -75,7 +75,7 @@
 
     public boolean layoutFootnote(final PageArea p,
             final RetrieveMarker retrieveMarker) {
-        final RegionRABody bac = p.getWritableRegionBody();
+        final RegionRABody bac = p.getRegionBody();
         final FootnoteRA footArea = bac.getWritableFootnoteRA();
         try {
             layoutFootnoteSeparator(bac, footArea, retrieveMarker);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-03-13 19:21:24 UTC (rev 8798)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-03-13 19:34:32 UTC (rev 8799)
@@ -186,7 +186,7 @@
              * Because of markers, lay out the fo:flow first, then the
              * static content. This is likely also justifiable because of spec.
              */
-            final RegionRABody bodyArea = currentPage.getWritableRegionBody();
+            final RegionRABody bodyArea = currentPage.getRegionBody();
             final FlowPL flowPL = (FlowPL) flow.getProxy();
             flowPL.layout(bodyArea, null);
             this.formatStaticContent(currentPage);


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