|
From: <vic...@us...> - 2021-12-31 16:30:31
|
Revision: 12310
http://sourceforge.net/p/foray/code/12310
Author: victormote
Date: 2021-12-31 16:30:29 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Rename method that retrieves/creates the link for an area, and remove GraftingPoint from signature, as that is now obtained a differen way.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.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/PageCollection.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.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/ScalingValueCitationArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -143,10 +143,9 @@
/**
* Retrieves or creates a linkage item for a given FONode.
* @param foNode The FONode for which linkage is needed.
- * @param graftingPoint The ancestor RetrieveMarker, if any.
* @return The linkage item.
*/
- public Link linkage(final Fo foNode, final GraftingPoint graftingPoint) {
+ public Link getLink(final Fo foNode) {
if (foNode == null) {
return null;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -272,7 +272,7 @@
*/
public Area4a firstNormalAreaReturned(final String id) {
final Fo fobj = retrieveId(id);
- final Link linkage = linkage(fobj, null);
+ final Link linkage = getLink(fobj);
if (linkage instanceof NormalLink) {
final NormalLink normalLinkage = (NormalLink) linkage;
return normalLinkage.firstNormalAreaReturned();
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -80,8 +80,7 @@
static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy,
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
- newLinkArea.generatedBy = newLinkArea.linkage(generatedBy,
- graftingPoint);
+ newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
newLinkArea.registerWithLinkage(graftingPoint);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
@@ -101,8 +100,7 @@
final AbstractInlineArea parentArea,
final GraftingPoint graftingPoint) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
- newLinkArea.generatedBy = newLinkArea.linkage(generatedBy,
- graftingPoint);
+ newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
newLinkArea.registerWithLinkage(graftingPoint);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
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 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -72,7 +72,7 @@
static BeforeFloatRa makeBeforeFloatArea(final Fo generatedBy,
final RegionRaBody parentArea) {
final BeforeFloatRa newFloatRA = new BeforeFloatRa(parentArea);
- newFloatRA.generatedBy = newFloatRA.linkage(generatedBy, null);
+ newFloatRA.generatedBy = newFloatRA.getLink(generatedBy);
newFloatRA.registerWithLinkage(null);
return newFloatRA;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -79,8 +79,7 @@
static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy,
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
- newBidiArea.generatedBy = newBidiArea.linkage(generatedBy,
- graftingPoint);
+ newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
newBidiArea.registerWithLinkage(graftingPoint);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
@@ -100,8 +99,7 @@
final AbstractInlineArea parentArea,
final GraftingPoint graftingPoint) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
- newBidiArea.generatedBy = newBidiArea.linkage(generatedBy,
- graftingPoint);
+ newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
newBidiArea.registerWithLinkage(graftingPoint);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -94,7 +94,7 @@
final BlockContainer generatedBy,
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final BlockContainerRa newBcArea = new BlockContainerRa(parentArea);
- newBcArea.generatedBy = newBcArea.linkage(generatedBy, graftingPoint);
+ newBcArea.generatedBy = newBcArea.getLink(generatedBy);
newBcArea.registerWithLinkage(graftingPoint);
final int initialPD = newBcArea.computeInitialPD();
newBcArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -87,7 +87,7 @@
throw new IllegalArgumentException("Cannot create an Area for a "
+ "null Graphic.");
}
- newEgArea.generatedBy = newEgArea.linkage(generatedBy, graftingPoint);
+ newEgArea.generatedBy = newEgArea.getLink(generatedBy);
newEgArea.registerWithLinkage(graftingPoint);
final int initialPD = newEgArea.computeInitialPD();
newEgArea.setProgressionDimension(initialPD);
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 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -71,7 +71,7 @@
static FootnoteRa makeFootnoteReferenceArea(final Fo generatedBy,
final RegionRaBody parentArea) {
final FootnoteRa footnoteRA = new FootnoteRa(parentArea);
- footnoteRA.generatedBy = footnoteRA.linkage(generatedBy, null);
+ footnoteRA.generatedBy = footnoteRA.getLink(generatedBy);
footnoteRA.registerWithLinkage(null);
return footnoteRA;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -125,7 +125,7 @@
final InstreamForeignObject generatedBy,
final GraftingPoint graftingPoint,
final int width) {
- newFoArea.generatedBy = newFoArea.linkage(generatedBy, graftingPoint);
+ newFoArea.generatedBy = newFoArea.getLink(generatedBy);
newFoArea.registerWithLinkage(graftingPoint);
final int initialPD = newFoArea.computeInitialPD();
newFoArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -81,8 +81,8 @@
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final IndexPageCitationListArea newCitationListArea =
new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.linkage(
- generatedBy, graftingPoint);
+ newCitationListArea.generatedBy = newCitationListArea.getLink(
+ generatedBy);
newCitationListArea.registerWithLinkage(graftingPoint);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
@@ -104,8 +104,8 @@
final GraftingPoint graftingPoint) {
final IndexPageCitationListArea newCitationListArea =
new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.linkage(
- generatedBy, graftingPoint);
+ newCitationListArea.generatedBy = newCitationListArea.getLink(
+ generatedBy);
newCitationListArea.registerWithLinkage(graftingPoint);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -82,8 +82,7 @@
static InlineArea makeInlineArea(final Inline generatedBy,
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- graftingPoint);
+ newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerWithLinkage(graftingPoint);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -103,8 +102,7 @@
final AbstractInlineArea parentArea,
final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- graftingPoint);
+ newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerWithLinkage(graftingPoint);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -94,8 +94,7 @@
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final InlineContainerArea newInlineArea = new InlineContainerArea(
parentArea);
- newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- graftingPoint);
+ newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerWithLinkage(graftingPoint);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -117,8 +116,7 @@
final GraftingPoint graftingPoint) {
final InlineContainerArea newInlineArea = new InlineContainerArea(
parentArea);
- newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- graftingPoint);
+ newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerWithLinkage(graftingPoint);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -111,8 +111,7 @@
final Leader generatedBy, final GraftingPoint graftingPoint,
final int initialProgressionDimension)
throws AreaTreeException {
- newLeaderArea.generatedBy = newLeaderArea.linkage(generatedBy,
- graftingPoint);
+ newLeaderArea.generatedBy = newLeaderArea.getLink(generatedBy);
newLeaderArea.registerWithLinkage(graftingPoint);
final int initialPD = newLeaderArea.computeInitialPD();
newLeaderArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -79,8 +79,7 @@
static ListBlockArea makeListBlockArea(final ListBlock generatedBy,
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final ListBlockArea newListBlockArea = new ListBlockArea(parentArea);
- newListBlockArea.generatedBy = newListBlockArea.linkage(generatedBy,
- graftingPoint);
+ newListBlockArea.generatedBy = newListBlockArea.getLink(generatedBy);
newListBlockArea.registerWithLinkage(graftingPoint);
final int initialPD = newListBlockArea.computeInitialPD();
newListBlockArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -83,8 +83,7 @@
final ListBlockArea parentArea,
final GraftingPoint graftingPoint) {
final ListItemArea newItemArea = new ListItemArea(parentArea);
- newItemArea.generatedBy = newItemArea.linkage(generatedBy,
- graftingPoint);
+ newItemArea.generatedBy = newItemArea.getLink(generatedBy);
newItemArea.registerWithLinkage(graftingPoint);
final int initialPD = newItemArea.computeInitialPD();
newItemArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -60,8 +60,7 @@
final GraftingPoint graftingPoint) {
final ListItemBodyContainer newContainer = new ListItemBodyContainer(
parentArea);
- newContainer.setGeneratedBy(newContainer.linkage(generatedBy,
- graftingPoint));
+ newContainer.setGeneratedBy(newContainer.getLink(generatedBy));
newContainer.registerWithLinkage(graftingPoint);
return newContainer;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -60,8 +60,7 @@
final GraftingPoint graftingPoint) {
final ListItemLabelContainer newContainer = new ListItemLabelContainer(
parentArea);
- newContainer.setGeneratedBy(newContainer.linkage(generatedBy,
- graftingPoint));
+ newContainer.setGeneratedBy(newContainer.getLink(generatedBy));
newContainer.registerWithLinkage(graftingPoint);
return newContainer;
}
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 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -85,7 +85,7 @@
static MainRa makeMainReferenceArea(final RegionBody generatedBy,
final RegionRaBody parentArea) {
final MainRa newMainRA = new MainRa(parentArea);
- newMainRA.generatedBy = newMainRA.linkage(generatedBy, null);
+ newMainRA.generatedBy = newMainRA.getLink(generatedBy);
newMainRA.registerWithLinkage(null);
return newMainRA;
}
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -97,7 +97,7 @@
static NormalBlockArea4a makeNormalBlockArea(final Block generatedBy,
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
- final Link linkage = newBlockArea.linkage(generatedBy, graftingPoint);
+ final Link linkage = newBlockArea.getLink(generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
newBlockArea.registerWithLinkage(graftingPoint);
final int initialPD = newBlockArea.computeInitialPD();
@@ -109,7 +109,7 @@
static NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete generatedBy,
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
- final Link linkage = newBlockArea.linkage(generatedBy, graftingPoint);
+ final Link linkage = newBlockArea.getLink(generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
newBlockArea.registerWithLinkage(graftingPoint);
final int initialPD = newBlockArea.computeInitialPD();
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -86,7 +86,7 @@
static NormalFlowRa makeNormalFlowRA(final Fo generatedBy,
final SpanRa parentArea) {
final NormalFlowRa newNormalFlow = new NormalFlowRa(parentArea);
- newNormalFlow.generatedBy = newNormalFlow.linkage(generatedBy, null);
+ newNormalFlow.generatedBy = newNormalFlow.getLink(generatedBy);
newNormalFlow.registerWithLinkage(null);
final int initialPD = newNormalFlow.computeInitialPD();
newNormalFlow.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -104,7 +104,7 @@
final AreaTree4a parentArea, final int lastPageNumber)
throws AreaTreeException {
final PageCollection newCollection = new PageCollection(parentArea);
- newCollection.generatedBy = newCollection.linkage(generatedBy, null);
+ newCollection.generatedBy = newCollection.getLink(generatedBy);
newCollection.registerWithLinkage(null);
newCollection.pageMasterResolver = generatedBy.makePageMasterResolver(
lastPageNumber);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -115,7 +115,7 @@
private static void init(final PageNumberArea newPnArea,
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
- newPnArea.generatedBy = newPnArea.linkage(generatedBy, graftingPoint);
+ newPnArea.generatedBy = newPnArea.getLink(generatedBy);
newPnArea.registerWithLinkage(graftingPoint);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -121,8 +121,7 @@
private static void init(final PageNumberCitationArea newPncArea,
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
- newPncArea.generatedBy = newPncArea.linkage(generatedBy,
- graftingPoint);
+ newPncArea.generatedBy = newPncArea.getLink(generatedBy);
newPncArea.registerWithLinkage(graftingPoint);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -121,8 +121,7 @@
private static void init(final PageNumberCitationLastArea newPncArea,
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
- newPncArea.generatedBy = newPncArea.linkage(generatedBy,
- graftingPoint);
+ newPncArea.generatedBy = newPncArea.getLink(generatedBy);
newPncArea.registerWithLinkage(graftingPoint);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -117,7 +117,7 @@
*/
static PageRa makePageArea(final SimplePageMaster generatedBy, final PageCollection parentArea) {
final PageRa newPage = new PageRa(parentArea);
- newPage.generatedBy = newPage.linkage(generatedBy, null);
+ newPage.generatedBy = newPage.getLink(generatedBy);
newPage.registerWithLinkage(null);
newPage.createRegions();
return newPage;
@@ -619,7 +619,7 @@
*/
private NormalLink markerParentLinkage(final Marker marker) {
final Fo parent = marker.getParent();
- final Link proxy = linkage(parent, null);
+ final Link proxy = getLink(parent);
if (proxy instanceof NormalLink) {
return (NormalLink) proxy;
}
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -87,7 +87,7 @@
static RegionRa makeRegionArea(final Region generatedBy,
final PageRa parentArea) {
final RegionRa newRegionArea = new RegionRa(parentArea);
- newRegionArea.generatedBy = newRegionArea.linkage(generatedBy, null);
+ newRegionArea.generatedBy = newRegionArea.getLink(generatedBy);
newRegionArea.registerWithLinkage(null);
return newRegionArea;
}
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 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -94,7 +94,7 @@
static RegionRaBody makeRegionBodyArea(final RegionBody generatedBy,
final PageRa parentArea) {
final RegionRaBody regionBody = new RegionRaBody(parentArea);
- regionBody.generatedBy = regionBody.linkage(generatedBy, null);
+ regionBody.generatedBy = regionBody.getLink(generatedBy);
regionBody.registerWithLinkage(null);
// create the primary reference areas
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -125,7 +125,7 @@
private static void init(final ScalingValueCitationArea newPnArea,
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
- newPnArea.generatedBy = newPnArea.linkage(generatedBy, graftingPoint);
+ newPnArea.generatedBy = newPnArea.getLink(generatedBy);
newPnArea.registerWithLinkage(graftingPoint);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
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 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -87,7 +87,7 @@
static SpanRa makeSpanArea(final RegionBody generatedBy,
final MainRa parentArea, final int numColumns) {
final SpanRa newSpanArea = new SpanRa(parentArea);
- newSpanArea.generatedBy = newSpanArea.linkage(generatedBy, null);
+ newSpanArea.generatedBy = newSpanArea.getLink(generatedBy);
newSpanArea.registerWithLinkage(null);
final int initialPD = newSpanArea.computeInitialPD();
newSpanArea.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -73,8 +73,7 @@
final TableRa parentArea, final GraftingPoint graftingPoint) {
final TableBodyContainer bodyContainer = new TableBodyContainer(
parentArea);
- bodyContainer.generatedBy = bodyContainer.linkage(generatedBy,
- graftingPoint);
+ bodyContainer.generatedBy = bodyContainer.getLink(generatedBy);
bodyContainer.registerWithLinkage(graftingPoint);
final int initialPD = bodyContainer.computeInitialPD();
bodyContainer.setProgressionDimension(initialPD);
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 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -112,7 +112,7 @@
final TableRowContainer parentArea,
final GraftingPoint graftingPoint) {
final TableCellRa newCell = new TableCellRa(parentArea);
- newCell.generatedBy = newCell.linkage(generatedBy, graftingPoint);
+ newCell.generatedBy = newCell.getLink(generatedBy);
newCell.registerWithLinkage(graftingPoint);
/* Do not set any area dimensions here. The IPD is controlled by the
* table and columns. The BPD is controlled by the TableRowContainer,
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -73,8 +73,7 @@
final TableRa parentArea, final GraftingPoint graftingPoint) {
final TableFooterContainer footerContainer = new TableFooterContainer(
parentArea);
- footerContainer.generatedBy = footerContainer.linkage(generatedBy,
- graftingPoint);
+ footerContainer.generatedBy = footerContainer.getLink(generatedBy);
footerContainer.registerWithLinkage(graftingPoint);
final int initialPD = footerContainer.computeInitialPD();
footerContainer.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -73,8 +73,7 @@
final TableRa parentArea, final GraftingPoint graftingPoint) {
final TableHeaderContainer headerContainer = new TableHeaderContainer(
parentArea);
- headerContainer.generatedBy = headerContainer.linkage(generatedBy,
- graftingPoint);
+ headerContainer.generatedBy = headerContainer.getLink(generatedBy);
headerContainer.registerWithLinkage(graftingPoint);
final int initialPD = headerContainer.computeInitialPD();
headerContainer.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -102,7 +102,7 @@
final AreaNode4a parentArea,
final GraftingPoint graftingPoint) {
final TableRa newTable = new TableRa(parentArea);
- newTable.generatedBy = newTable.linkage(generatedBy, graftingPoint);
+ newTable.generatedBy = newTable.getLink(generatedBy);
newTable.registerWithLinkage(graftingPoint);
final int initialPD = newTable.computeInitialPD();
newTable.setProgressionDimension(initialPD);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -90,7 +90,7 @@
final AbstractTablePartContainer parentArea,
final GraftingPoint graftingPoint) {
final TableRowContainer newRow = new TableRowContainer(parentArea);
- newRow.generatedBy = newRow.linkage(generatedBy, graftingPoint);
+ newRow.generatedBy = newRow.getLink(generatedBy);
newRow.registerWithLinkage(graftingPoint);
/* Non-standard initialization of progression dimension. */
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2021-12-31 16:23:03 UTC (rev 12309)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2021-12-31 16:30:29 UTC (rev 12310)
@@ -90,7 +90,7 @@
final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps) {
- final Link linkage = parentArea.linkage(generatedBy, graftingPoint);
+ final Link linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
newTextArea.registerWithLinkage(graftingPoint);
newTextArea.init(parentArea, backingOffset, backingSize,
@@ -131,7 +131,7 @@
final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps) {
- final Link linkage = parentArea.linkage(generatedBy, graftingPoint);
+ final Link linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
newTextArea.registerWithLinkage(graftingPoint);
newTextArea.init(parentArea, backingOffset, backingSize, progressionDimensionUsed, hasDiscretionaryHyphen,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
