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

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

Revision: 12341
          http://sourceforge.net/p/foray/code/12341
Author:   victormote
Date:     2022-01-05 16:16:17 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Rename some interfaces for either clarity or conformity with the XSL-FO Recommendation.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java
    trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FlowPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnoteBodyPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -33,7 +33,7 @@
 import org.axsl.area.Area;
 import org.axsl.area.AreaClass;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockContainerRefArea;
+import org.axsl.area.BlockLevelRa;
 import org.axsl.common.value.AbsoluteAxis;
 import org.axsl.common.value.AbsoluteDirection;
 import org.axsl.common.value.LinkType;
@@ -63,13 +63,13 @@
      * Returns the nearest ancestor area that is a block container.
      * @return The nearest ancestor area that is a block container.
      */
-    public BlockContainerRefArea getNearestAncestorAreaContainer() {
+    public BlockLevelRa getNearestAncestorAreaContainer() {
         AreaNode4a areaNode = this.getParent();
         while (areaNode != null
-                && !(areaNode instanceof BlockContainerRefArea)) {
+                && !(areaNode instanceof BlockLevelRa)) {
             areaNode = areaNode.getParent();
         }
-        return (BlockContainerRefArea) areaNode;
+        return (BlockLevelRa) areaNode;
     }
 
     @Override

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -45,7 +45,7 @@
  * Manages the before-float-reference-area. Its parent should always be an
  * instance of RegionRaBody.
  */
-public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRefArea {
+public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRa {
 
     /** The link to the FO tree. */
     private Link<RegionBody> foLink;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -56,8 +56,7 @@
 /**
  * The container area for the contents of a block-container FO.
  */
-public final class BlockContainerRa extends ContainerRa
-        implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
+public final class BlockContainerRa extends ContainerRa implements BlockContainerAreaG5, org.axsl.area.BlockLevelRa {
 
     /** The link to the FO tree. */
     private Link<BlockContainer> foLink;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -44,7 +44,7 @@
 /**
  * Manages the footnote reference area for a page.
  */
-public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRefArea {
+public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRa {
 
     /** The link to the FO tree. */
     private Link<RegionBody> foLink;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -47,7 +47,7 @@
  * Manages the main-reference-area. Its parent should always be an instance of
  * RegionRaBody, and its children should always be instances of SpanRa.
  */
-public final class MainRa extends AreaFixed implements org.axsl.area.MainRefArea {
+public final class MainRa extends AreaFixed implements org.axsl.area.MainRa {
 
     /** A definitely-not-sacred legacy span safety factor. It appears to be
      * allowing for 2 12-point lines with leading of 30%. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -53,7 +53,7 @@
  * span-reference-areas and normal-flow-reference-areas.
  */
 public final class NormalFlowRa extends ContainerRa
-        implements org.axsl.area.NormalFlowRefArea {
+        implements org.axsl.area.NormalFlowRa {
 
     /** The link to the FO tree. */
     private Link<RegionBody> foLink;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -57,7 +57,7 @@
 /**
  * This class is used to manage a region-reference-area.
  */
-public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
+public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRa {
 
     /** The link to the FO tree. */
     private Link<Region> foLink;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -48,7 +48,7 @@
 /**
  * Area containing a region-body.
  */
-public final class RegionRaBody extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionBodyRefArea {
+public final class RegionRaBody extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionBodyRa {
     /* TODO: Why doesn't this class extend RegionRa? */
 
     /** The link to the FO tree. */

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -47,8 +47,7 @@
  * span-reference-area. The best guess is that it is generated by the
  * region-body fo.
  */
-public final class SpanRa extends ContainerRa
-        implements org.axsl.area.SpanRefArea {
+public final class SpanRa extends ContainerRa implements org.axsl.area.SpanRa {
 
     /** The link to the FO tree. */
     private Link<RegionBody> foLink;

Modified: trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -33,7 +33,7 @@
 import org.axsl.area.LineArea;
 import org.axsl.area.PageArea;
 import org.axsl.area.PageCollection;
-import org.axsl.area.RegionRefArea;
+import org.axsl.area.RegionRa;
 import org.axsl.area.factory.LineContentFactory;
 import org.axsl.fotree.FoLineNonText;
 import org.axsl.fotree.FoLineText;
@@ -111,18 +111,15 @@
 
     /**
      * For a given region, layout the static content for that region.
-     * This method allows PageCollection to generate blank pages as needed, and
-     * to call back to the LayoutStrategy for layout of the static content,
-     * without having to know the specifics of the layout process.
-     * @param pageSequence The page sequence whose static content is being
-     * processed.
+     * This method allows PageCollection to generate blank pages as needed, and to call back to the LayoutStrategy for
+     * layout of the static content, without having to know the specifics of the layout process.
+     * @param pageSequence The page sequence whose static content is being processed.
      * @param region The page region whose static content is being laid out.
-     * @param area The region area into which the static content should be
-     * placed.
+     * @param area The region area into which the static content should be placed.
      * @throws AreaTreeException For errors during layout.
      */
-    public abstract void layoutStaticContent(PageSequence pageSequence,
-            Region region, RegionRefArea area) throws AreaTreeException;
+    public abstract void layoutStaticContent(PageSequence pageSequence, Region region, RegionRa area)
+            throws AreaTreeException;
 
     @Override
     public void handleLineBreakText(final OutputLine lineOutput,

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -30,7 +30,7 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockContainerRefArea;
+import org.axsl.area.BlockLevelRa;
 import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.BlockContainer;
@@ -66,8 +66,7 @@
             setProgress(0);
         }
 
-        final BlockContainerRefArea blockContainer =
-                bcArea.makeBlockContainerArea(this.node);
+        final BlockLevelRa blockContainer = bcArea.makeBlockContainerArea(this.node);
 
         for (int i = this.getProgress(); i < this.node.formattingObjectCount(); i++) {
             final Fo fo = this.node.formattingObjectAt(i);

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FlowPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FlowPnr.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FlowPnr.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -31,7 +31,7 @@
 import org.axsl.area.Area;
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.RegionBodyRefArea;
+import org.axsl.area.RegionBodyRa;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.Flow;
 
@@ -67,7 +67,7 @@
         }
 
         // flow is *always* laid out into a BodyAreaContainer
-        final RegionBodyRefArea bac = (RegionBodyRefArea) areaNode;
+        final RegionBodyRa bac = (RegionBodyRa) areaNode;
 
         boolean prevChildMustKeepWithNext = false;
         final int numChildren = getFONode().formattingObjectCount();

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnoteBodyPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnoteBodyPnr.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnoteBodyPnr.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -30,9 +30,9 @@
 
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
-import org.axsl.area.FootnoteRefArea;
+import org.axsl.area.FootnoteRa;
 import org.axsl.area.PageArea;
-import org.axsl.area.RegionBodyRefArea;
+import org.axsl.area.RegionBodyRa;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.FootnoteBody;
 import org.axsl.fotree.fo.PageSequence;
@@ -61,7 +61,7 @@
         if (getProgress() == FoNodePnr.START) {
             setProgress(0);
         }
-        final FootnoteRefArea referenceArea = (FootnoteRefArea) areaNode;
+        final FootnoteRa referenceArea = (FootnoteRa) areaNode;
 
         final int numChildren = this.node.formattingObjectCount();
         for (int i = getProgress(); i < numChildren; i++) {
@@ -83,8 +83,8 @@
      */
     public boolean layoutFootnote(final PageArea p) {
         /* TODO: This needs to handle multiple body-regions properly. */
-        final RegionBodyRefArea bac = p.getRegionBody("xsl-region-body");
-        final FootnoteRefArea footArea = bac.getFootnoteRefArea();
+        final RegionBodyRa bac = p.getRegionBody("xsl-region-body");
+        final FootnoteRa footArea = bac.getFootnoteRefArea();
         try {
             layoutFootnoteSeparator(bac, footArea);
             final Status status = layout(footArea);
@@ -105,8 +105,7 @@
      * created.
      * @throws AreaTreeException For errors during layout.
      */
-    private void layoutFootnoteSeparator(final RegionBodyRefArea bac,
-            final FootnoteRefArea footArea) throws AreaTreeException {
+    private void layoutFootnoteSeparator(final RegionBodyRa bac, final FootnoteRa footArea) throws AreaTreeException {
         /* TODO: It seems like this logic should be done once when the
          * PageCollection is first started, and cached there for reuse. */
         if (footArea.areaNodeCount() != 0) {

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java	2022-01-05 15:42:24 UTC (rev 12340)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java	2022-01-05 16:16:17 UTC (rev 12341)
@@ -33,11 +33,11 @@
 import org.axsl.area.Area;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.NormalBlockArea;
-import org.axsl.area.NormalFlowRefArea;
+import org.axsl.area.NormalFlowRa;
 import org.axsl.area.PageArea;
 import org.axsl.area.PageCollection;
-import org.axsl.area.RegionBodyRefArea;
-import org.axsl.area.RegionRefArea;
+import org.axsl.area.RegionBodyRa;
+import org.axsl.area.RegionRa;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.FoVisitor;
 import org.axsl.fotree.fo.BasicLink;
@@ -222,7 +222,7 @@
              */
             final FlowPnr flowPL = (FlowPnr) this.getLayoutProxy(flow);
             for (String regionBodyName : regionBodies) {
-                final RegionBodyRefArea bodyArea = currentPage.getRegionBody(
+                final RegionBodyRa bodyArea = currentPage.getRegionBody(
                         regionBodyName);
                 flowPL.layout(bodyArea);
             }
@@ -251,7 +251,7 @@
 
     @Override
     public void layoutStaticContent(final PageSequence pageSequence,
-            final Region region, final RegionRefArea area)
+            final Region region, final RegionRa area)
             throws AreaTreeException {
         if (region == null) {
             return;
@@ -287,7 +287,7 @@
             return Status.OK;
         }
         final BreakBeforePa breakableNode = (BreakBeforePa) node;
-        if (!(area instanceof NormalFlowRefArea)) {
+        if (!(area instanceof NormalFlowRa)) {
             switch (breakableNode.traitBreakBefore(area)) {
             case PAGE:
                 return Status.FORCE_PAGE_BREAK;
@@ -301,7 +301,7 @@
                 return Status.OK;
             }
         }
-        final NormalFlowRefArea colArea = (NormalFlowRefArea) area;
+        final NormalFlowRa colArea = (NormalFlowRa) area;
         switch (breakableNode.traitBreakBefore(area)) {
         case PAGE: {
             // if first ColumnArea, and empty, return OK

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