[FOray-commit] SF.net SVN: foray:[12305] trunk/foray/foray-areatree/src/main/java/org/ foray/area

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

Revision: 12305
          http://sourceforge.net/p/foray/code/12305
Author:   victormote
Date:     2021-12-31 04:09:45 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Add methods for creation of area nodes for GraftingPoint instances.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.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/RetrieveMarkerNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.common.FontContext4a;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.para.ParaBranch;
 import org.axsl.common.para.ParaLeaf;
 import org.axsl.font.FontContext;
@@ -48,6 +49,8 @@
 import org.axsl.fotree.fo.PageNumber;
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.fotree.fo.PageNumberCitationLast;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GlyphAreaSequenceG5;
 
@@ -61,11 +64,10 @@
         implements org.axsl.area.AncestralNormalInlineArea {
 
     /** The children of this node. */
-    private List<AbstractInlineArea> children
-            = new ArrayList<AbstractInlineArea>();
+    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
     @Override
-    public List<AbstractInlineArea> getChildren() {
+    public List<AreaNode4a> getChildren() {
         return this.children;
     }
 
@@ -200,26 +202,37 @@
     }
 
     @Override
-    public BasicLinkArea makeBasicLinkArea(final BasicLink basicLink,
-            final GraftingPoint graftingPoint) {
-        final BasicLinkArea newLinkArea = BasicLinkArea.makeBasicLinkArea(
-                basicLink, this, graftingPoint);
+    public BasicLinkArea makeBasicLinkArea(final BasicLink basicLink, final GraftingPoint graftingPoint) {
+        final BasicLinkArea newLinkArea = BasicLinkArea.makeBasicLinkArea(basicLink, this, graftingPoint);
         this.children.add(newLinkArea);
         return newLinkArea;
     }
 
     @Override
-    public IndexPageCitationListArea makeIndexPageCitationListArea(
-            final IndexPageCitationList indexPcl,
+    public IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList indexPcl,
             final GraftingPoint graftingPoint) {
-        final IndexPageCitationListArea newIpclArea =
-                IndexPageCitationListArea.makeIndexPageCitationListArea(
-                        indexPcl, this, graftingPoint);
+        final IndexPageCitationListArea newIpclArea = IndexPageCitationListArea.makeIndexPageCitationListArea(indexPcl,
+                this, graftingPoint);
         this.children.add(newIpclArea);
         return newIpclArea;
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public void addParaLeaf(final ParaLeaf leaf) {
         /* TODO: Fix this. */
         throw new UnsupportedOperationException();

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -32,11 +32,14 @@
 
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.BlockContainer;
 import org.axsl.fotree.fo.BlockDiscrete;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -57,7 +60,7 @@
     private ListItemArea parent;
 
     /** The children of this node. */
-    private List<Area4a> children = new ArrayList<Area4a>();
+    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
     /**
      * Private Constructor.
@@ -89,7 +92,7 @@
     }
 
     @Override
-    public List<Area4a> getChildren() {
+    public List<AreaNode4a> getChildren() {
         return this.children;
     }
 
@@ -145,6 +148,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public Link getLinkage() {
         return this.generatedBy;
     }
@@ -163,10 +181,12 @@
      */
     public int getProgressionDimension() {
         int pd = 0;
-        for (Area4a area : this.children) {
+        for (AreaNode4a area : this.children) {
             /* TODO: This is not right. We need the space-before, etc.
              * considered also. */
-            pd += area.brBpd();
+            if (area instanceof Area4a) {
+                pd += ((Area4a) area).brBpd();
+            }
         }
         return pd;
     }

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	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.value.AbsolutePosition;
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.common.value.BorderStyle;
@@ -41,6 +42,8 @@
 import org.axsl.fotree.fo.BlockDiscrete;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.prop.CommonPositionPa;
 import org.axsl.galley.BlockContainerAreaG5;
@@ -238,25 +241,35 @@
     }
 
     @Override
-    public BlockContainerRa makeBlockContainerArea(
-            final BlockContainer blockContainer,
+    public BlockContainerRa makeBlockContainerArea(final BlockContainer blockContainer,
             final GraftingPoint graftingPoint) {
-        final BlockContainerRa newBcArea
-                = BlockContainerRa.makeBlockContainerArea(blockContainer, this,
-                        graftingPoint);
+        final BlockContainerRa newBcArea = BlockContainerRa.makeBlockContainerArea(blockContainer, this, graftingPoint);
         this.children.add(newBcArea);
         return newBcArea;
     }
 
     @Override
-    public ListBlockArea makeListBlockArea(final ListBlock listBlock,
-            final GraftingPoint graftingPoint) {
-        final ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(
-                listBlock, this, graftingPoint);
+    public ListBlockArea makeListBlockArea(final ListBlock listBlock, final GraftingPoint graftingPoint) {
+        final ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(listBlock, this, graftingPoint);
         this.children.add(newListBlockArea);
         return newListBlockArea;
     }
 
+    @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
     /**
      * Returns the "absolute-position" trait for this Area.
      * @return The "absolute-position" trait.

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.fotree.fo.Block;
 import org.axsl.fotree.fo.BlockContainer;
 import org.axsl.fotree.fo.BlockDiscrete;
@@ -38,6 +39,8 @@
 import org.axsl.fotree.fo.Inline;
 import org.axsl.fotree.fo.InlineContainer;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -60,7 +63,7 @@
     private Link generatedBy;
 
     /** The children of this node. */
-    private List<Area4a> children = new ArrayList<Area4a>();
+    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
     /**
      * Private Constructor for a LineArea parent.
@@ -134,7 +137,7 @@
     }
 
     @Override
-    public List<Area4a> getChildren() {
+    public List<AreaNode4a> getChildren() {
         return this.children;
     }
 
@@ -290,6 +293,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public int traitIPDimensionOpt() {
         return traitGeneratedBy().traitIpDimensionOpt(this);
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -33,6 +33,7 @@
 
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.LineArea;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.para.ParaBranch;
 import org.axsl.common.para.ParaLeaf;
 import org.axsl.common.value.Conditionality;
@@ -60,6 +61,8 @@
 import org.axsl.fotree.fo.PageNumber;
 import org.axsl.fotree.fo.PageNumberCitation;
 import org.axsl.fotree.fo.PageNumberCitationLast;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.ScalingValueCitation;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -78,7 +81,7 @@
     private NormalBlockArea4a parent;
 
     /** The children of this node. */
-    private List<AbstractInlineArea> children = new ArrayList<AbstractInlineArea>();
+    private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
     /** See {@link #getProgressionDimension()} for a description of
      * "progression dimension". */
@@ -702,10 +705,12 @@
     public int lineContentLengthUsed() {
         int dimension = 0;
         // For each child, accumulate the ipd used.
-        final List<AbstractInlineArea> children = getChildren();
+        final List<AreaNode4a> children = getChildren();
         for (int i = 0; i < children.size(); i++) {
-            final AbstractInlineArea child = children.get(i);
-            dimension += child.getProgressionDimension();
+            final AreaNode4a child = children.get(i);
+            if (child instanceof Area4a) {
+                dimension += ((Area4a) child).getProgressionDimension();
+            }
         }
         return dimension;
     }
@@ -1137,6 +1142,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public void addParaLeaf(final ParaLeaf leaf) {
         if (leaf == null) {
             return;
@@ -1312,7 +1332,7 @@
     }
 
     @Override
-    public List<AbstractInlineArea> getChildren() {
+    public List<AreaNode4a> getChildren() {
         return this.children;
     }
 

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -35,6 +35,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockLevelAreaFactory;
 import org.axsl.area.NormalBlockArea;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.para.DiscretionaryHyphen;
 import org.axsl.common.para.ParaContext;
 import org.axsl.common.value.BackgroundRepeat;
@@ -47,6 +48,8 @@
 import org.axsl.fotree.fo.BlockDiscrete;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -320,6 +323,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public Block traitGeneratedBy() {
         return getLinkage().getGeneratedBy();
     }

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	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.Fo;
 import org.axsl.fotree.fo.Block;
@@ -38,6 +39,8 @@
 import org.axsl.fotree.fo.BlockDiscrete;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -238,6 +241,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public void setProgressionDimension(final int progressionDimension) {
         setParentPD(progressionDimension);
         this.progressionDimension = progressionDimension;

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	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.common.value.RelativeAxis;
 import org.axsl.fotree.fo.Block;
@@ -43,6 +44,8 @@
 import org.axsl.fotree.fo.RegionBefore;
 import org.axsl.fotree.fo.RegionEnd;
 import org.axsl.fotree.fo.RegionStart;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
@@ -229,6 +232,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public AreaNode4a getParent() {
         return this.parent;
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -33,6 +33,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.RetrieveMarkerNode;
 import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
@@ -43,7 +44,7 @@
  * A node in the {@link AreaTree4a} that is not an {@link Area4a}, but which is a placeholder for an fo:retrieve-marker
  * that triggered the creation of its children.
  */
-public class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
+public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private GraftingPointLink generatedBy;
@@ -54,6 +55,29 @@
     /** The children of this node. */
     private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
+    /**
+     * Private constructor.
+     * Use {@link #makeRetrieveMarkerNode(RetrieveMarker, AreaNode4a)} to create an instance.
+     * @param parent The parent area.
+     */
+    private RetrieveMarkerNode4a(final AreaNode4a parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * Package-visible factory method.
+     * @param generatedBy The FO node generating this area.
+     * @param parent The parent area.
+     * @return The new instance.
+     */
+    static RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker generatedBy, final AreaNode4a parent) {
+        final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
+//        final GraftingPointLink link = parent.linkage(generatedBy, null);
+//        newRmNode.generatedBy = newRmNode.linkage(generatedBy);
+//        newCitationListArea.registerWithLinkage(graftingPoint);
+        return newRmNode;
+    }
+
     @Override
     public String getAreaName() {
         return "retrieve-marker-node";

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -33,6 +33,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
@@ -43,7 +44,7 @@
  * A node in the {@link AreaTree4a} that is not an {@link Area4a}, but which is a placeholder for an
  * fo:retrieve-table-marker that triggered the creation of its children.
  */
-public class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
+public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private GraftingPointLink generatedBy;
@@ -54,6 +55,30 @@
     /** The children of this node. */
     private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
 
+    /**
+     * Provate constructor.
+     * Use {@link #makeRetrieveTableMarkerNode(RetrieveTableMarker, AreaNode4a)} to create an instance.
+     * @param parent The parent area.
+     */
+    private RetrieveTableMarkerNode4a(final AreaNode4a parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * Package-visible factory method.
+     * @param generatedBy The FO node generating this area.
+     * @param parent The parent area.
+     * @return The new instance.
+     */
+    static RetrieveTableMarkerNode4a makeRetrieveTableMarkerNode(final RetrieveTableMarker generatedBy,
+            final AreaNode4a parent) {
+        final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
+//        final GraftingPointLink link = parent.linkage(generatedBy, null);
+//        newRmNode.generatedBy = newRmNode.linkage(generatedBy);
+//        newCitationListArea.registerWithLinkage(graftingPoint);
+        return newRtmNode;
+    }
+
     @Override
     public String getAreaName() {
         return "retrieve-table-marker-node";

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-31 01:16:28 UTC (rev 12304)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java	2021-12-31 04:09:45 UTC (rev 12305)
@@ -31,6 +31,7 @@
 import org.foray.area.link.Link;
 
 import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
 import org.axsl.common.value.BackgroundRepeat;
 import org.axsl.common.value.BorderModel;
 import org.axsl.common.value.BorderStyle;
@@ -41,6 +42,8 @@
 import org.axsl.fotree.fo.BlockDiscrete;
 import org.axsl.fotree.fo.GraftingPoint;
 import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
 import org.axsl.fotree.fo.Table;
 import org.axsl.fotree.fo.TableCell;
 import org.axsl.galley.GalleyVisitor;
@@ -436,6 +439,21 @@
     }
 
     @Override
+    public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
+        final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+        this.children.add(newRmNode);
+        return newRmNode;
+    }
+
+    @Override
+    public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+        final RetrieveTableMarkerNode4a newRtmNode =
+                RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+        this.children.add(newRtmNode);
+        return newRtmNode;
+    }
+
+    @Override
     public Area4a getOverflowArea(final Area4a childRequesting)
             throws AreaTreeException {
         return ancestorArea().getOverflowArea(this);

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