foray-commit Mailing List for FOray (Page 63)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(4) |
Dec
|
|
From: <vic...@us...> - 2022-01-03 19:19:00
|
Revision: 12327
http://sourceforge.net/p/foray/code/12327
Author: victormote
Date: 2022-01-03 19:18:57 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Move the "Quality" enumeration from DiscretionaryHyphen to ParaPenalty and combine it with existing constants in that class.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/para/DiscretionaryHyphen4a.java
trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java
trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java
trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java
trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/DiscretionaryHyphen4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/DiscretionaryHyphen4a.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/DiscretionaryHyphen4a.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -36,6 +36,9 @@
import org.axsl.common.para.ParaLeaf;
import org.axsl.common.para.ParaPenalty;
+import java.util.EnumMap;
+import java.util.Map;
+
/**
* FOray implementation of {@link DiscretionaryHyphen}.
* Instances of this class are immutable.
@@ -46,36 +49,37 @@
* 1.*/
public static final int DEFAULT_PENALTY = 50;
+ /** Pre-built "heinous" hyphenation point. */
+ public static final DiscretionaryHyphen4a HEINOUS = new DiscretionaryHyphen4a(ParaPenalty.Quality.INFINITE_PENALTY);
+
/** Pre-built "acceptable" hyphenation point. */
- public static final DiscretionaryHyphen4a ACCEPTABLE =
- new DiscretionaryHyphen4a(DiscretionaryHyphen.Quality.ACCEPTABLE);
+ public static final DiscretionaryHyphen4a ACCEPTABLE = new DiscretionaryHyphen4a(ParaPenalty.Quality.ACCEPTABLE);
/** Pre-built "good" hyphenation point. */
- public static final DiscretionaryHyphen4a GOOD =
- new DiscretionaryHyphen4a(DiscretionaryHyphen.Quality.GOOD);
+ public static final DiscretionaryHyphen4a GOOD = new DiscretionaryHyphen4a(ParaPenalty.Quality.GOOD);
/** Pre-built "best" hyphenation point. */
- public static final DiscretionaryHyphen4a BEST =
- new DiscretionaryHyphen4a(DiscretionaryHyphen.Quality.BEST);
+ public static final DiscretionaryHyphen4a BEST = new DiscretionaryHyphen4a(ParaPenalty.Quality.BEST);
- /** The array of pre-constructed instance, indexed by the numeric value of their quality minus 1. */
- private static final DiscretionaryHyphen4a[] PRE_CONSTRUCTED_POINTS =
- new DiscretionaryHyphen4a[DiscretionaryHyphen.Quality.values().length];
+ /** The array of pre-constructed instances. */
+ private static final Map<ParaPenalty.Quality, DiscretionaryHyphen4a> PRE_CONSTRUCTED_POINTS =
+ new EnumMap<ParaPenalty.Quality, DiscretionaryHyphen4a>(ParaPenalty.Quality.class);
static {
- PRE_CONSTRUCTED_POINTS[DiscretionaryHyphen.Quality.ACCEPTABLE.getNumericValue() - 1] = ACCEPTABLE;
- PRE_CONSTRUCTED_POINTS[DiscretionaryHyphen.Quality.GOOD.getNumericValue() - 1] = GOOD;
- PRE_CONSTRUCTED_POINTS[DiscretionaryHyphen.Quality.BEST.getNumericValue() - 1] = BEST;
+ PRE_CONSTRUCTED_POINTS.put(ParaPenalty.Quality.INFINITE_PENALTY, HEINOUS);
+ PRE_CONSTRUCTED_POINTS.put(ParaPenalty.Quality.ACCEPTABLE, ACCEPTABLE);
+ PRE_CONSTRUCTED_POINTS.put(ParaPenalty.Quality.GOOD, GOOD);
+ PRE_CONSTRUCTED_POINTS.put(ParaPenalty.Quality.BEST, BEST);
}
/** The quality for this instance. */
- private DiscretionaryHyphen.Quality quality;
+ private ParaPenalty.Quality quality;
/**
* Protected constructor. There are only 3 possible normal values, so these are pre-constructed.
- * Use {@link #fromQuality(org.axsl.common.para.DiscretionaryHyphen.Quality)} to obtain an instance of this class.
+ * Use {@link #fromQuality(org.axsl.common.para.ParaPenalty.Quality)} to obtain an instance of this class.
* @param quality The quality for this instance.
*/
- protected DiscretionaryHyphen4a(final DiscretionaryHyphen.Quality quality) {
+ protected DiscretionaryHyphen4a(final ParaPenalty.Quality quality) {
this.quality = quality;
}
@@ -84,12 +88,12 @@
* @param quality The quality for the desired instance.
* @return The instance of this class matching {@code quality}.
*/
- public static DiscretionaryHyphen4a fromQuality(final DiscretionaryHyphen.Quality quality) {
- return DiscretionaryHyphen4a.PRE_CONSTRUCTED_POINTS[quality.getNumericValue() - 1];
+ public static DiscretionaryHyphen4a fromQuality(final ParaPenalty.Quality quality) {
+ return DiscretionaryHyphen4a.PRE_CONSTRUCTED_POINTS.get(quality);
}
@Override
- public DiscretionaryHyphen.Quality getQuality() {
+ public ParaPenalty.Quality getQuality() {
return this.quality;
}
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -44,10 +44,12 @@
public final class ParaPenalty4a extends ParaLeaf4a implements ParaPenalty {
/** A penalty instance indicating that a break cannot be taken here under any circumstances. */
- public static final ParaPenalty4a DISALLOWED_BREAK = new ParaPenalty4a(0, ParaPenalty.INFINITE_PENALTY, false);
+ public static final ParaPenalty4a DISALLOWED_BREAK =
+ new ParaPenalty4a(0, ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue(), false);
/** A penalty instance indicating that a break must be taken here always. */
- public static final ParaPenalty4a FORCED_BREAK = new ParaPenalty4a(0, ParaPenalty.FORCED_BREAK, true);
+ public static final ParaPenalty4a FORCED_BREAK =
+ new ParaPenalty4a(0, ParaPenalty.Quality.FORCED_BREAK.getNumericValue(), true);
/** String format used in {@link #toString()}. */
private static final String TO_STRING_FORMAT = "Penalty (w = %1$d, p = %2$d, f = %3$b)";
Modified: trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -53,7 +53,7 @@
nodeGreatness.addNode(DiscretionaryHyphen4a.GOOD);
nodeGreatness.addNode(new ParaBoxChars("ness"));
- /* Putting "Be" in a branch is unnecessary, but we with to test a branch as the first node. */
+ /* Putting "Be" in a branch is unnecessary, but we wish to test a branch as the first node. */
final ParaBranch4a nodeBe = new ParaBranch4a();
nodeBe.addNode(new ParaBoxChars("B"));
nodeBe.addNode(new ParaBoxChars("e"));
Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -282,7 +282,7 @@
final ParaLeaf leaf = leafIterator.next();
final ParaPenalty penalty = leaf.asParaPenalty();
if (penalty != null
- && penalty.getCost(paraContext) <= ParaPenalty.FORCED_BREAK) {
+ && penalty.getCost(paraContext) <= ParaPenalty.Quality.FORCED_BREAK.getNumericValue()) {
/* This is a forced line break. */
state.addProvisionalNonGlue(leaf);
state.acceptProvisionalWord();
@@ -356,7 +356,7 @@
} else {
/* This is a penalty item. */
/* Are we allowed to break here. */
- if (penalty.getCost(state.paraContext) >= ParaPenalty.INFINITE_PENALTY) {
+ if (penalty.getCost(state.paraContext) >= ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue()) {
}
if (state.minProvisionalLineWidth() - idealWidthToNextLine + penalty.getWidth(state.paraConfig)
Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -197,7 +197,7 @@
}
case PENALTY: {
final ParaPenalty penalty = leaf.asParaPenalty();
- if (penalty.getCost(this.paraContext) != ParaPenalty.INFINITE_PENALTY) {
+ if (penalty.getCost(this.paraContext) != ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue()) {
mainLoop(leafWrapper);
}
break;
@@ -224,8 +224,8 @@
outerLoop:
while (true) {
- Arrays.fill(this.capDarray, ParaPenalty.INFINITE_PENALTY);
- int capD = ParaPenalty.INFINITE_PENALTY;
+ Arrays.fill(this.capDarray, ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue());
+ int capD = ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue();
KpFitnessClass c = null;
innerLoop:
@@ -234,7 +234,7 @@
final int j = a.getLine() + 1;
final double r = computeAdjustmentRatio(a, b, j);
if (r < -1
- || (b.getPenaltyCost(this.paraContext) == ParaPenalty.FORCED_BREAK)) {
+ || (b.getPenaltyCost(this.paraContext) == ParaPenalty.Quality.FORCED_BREAK.getNumericValue())) {
deactivateNode(a, preva, nexta);
} else {
preva = a;
@@ -263,7 +263,7 @@
}
}
- if (capD < ParaPenalty.INFINITE_PENALTY) {
+ if (capD < ParaPenalty.Quality.INFINITE_PENALTY.getNumericValue()) {
/* Insert new active nodes for breaks from A-sub-c to b. */
/* Compute total width, stretchability, and shrinkability for nodes after b. */
@@ -286,7 +286,7 @@
}
case PENALTY: {
final ParaPenalty penalty = leaf.asParaPenalty();
- if (penalty.getCost(this.paraContext) <= ParaPenalty.FORCED_BREAK
+ if (penalty.getCost(this.paraContext) <= ParaPenalty.Quality.FORCED_BREAK.getNumericValue()
&& index > b.getIndex()) {
break computeTotalWidthAfterB;
}
@@ -379,7 +379,7 @@
* Math.pow(Math.abs(adjustmentRatio), WellKnownConstants.CUBED_EXPONENT));
if (penaltyCost >= 0) {
d = Math.pow(adjustmentRatioFactor + penaltyCost, WellKnownConstants.SQUARED_EXPONENT);
- } else if (penaltyCost > ParaPenalty.FORCED_BREAK) {
+ } else if (penaltyCost > ParaPenalty.Quality.FORCED_BREAK.getNumericValue()) {
d = Math.pow(adjustmentRatioFactor, WellKnownConstants.SQUARED_EXPONENT)
- Math.pow(penaltyCost, WellKnownConstants.SQUARED_EXPONENT);
} else {
Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -28,8 +28,8 @@
package org.foray.orthography;
-import org.axsl.common.para.DiscretionaryHyphen.Quality;
import org.axsl.common.para.ParaNode;
+import org.axsl.common.para.ParaPenalty.Quality;
import org.junit.Assert;
import org.junit.BeforeClass;
Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java 2022-01-03 16:31:03 UTC (rev 12326)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java 2022-01-03 19:18:57 UTC (rev 12327)
@@ -28,8 +28,8 @@
package org.foray.orthography;
-import org.axsl.common.para.DiscretionaryHyphen.Quality;
import org.axsl.common.para.ParaNode;
+import org.axsl.common.para.ParaPenalty.Quality;
import org.axsl.orthography.Word;
import org.junit.Assert;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-03 16:31:06
|
Revision: 12326
http://sourceforge.net/p/foray/code/12326
Author: victormote
Date: 2022-01-03 16:31:03 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Improvements toward handline word-based text.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/SegmentDictionaryWord.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java
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 2022-01-03 15:03:22 UTC (rev 12325)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-03 16:31:03 UTC (rev 12326)
@@ -1005,8 +1005,8 @@
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine) {
if (shouldCreateTextArea(foText, this, startOffset, sizeInChars, isLastItemOnLine, this)) {
- final TextArea newTextArea = TextAreaCharacters.makeTextArea(foText, this, startOffset, sizeInChars, ipd,
- hasDiscretionaryHyphen, hasFauxSmallCaps);
+ final TextAreaCharacters newTextArea = TextAreaCharacters.makeTextArea(foText, this, startOffset,
+ sizeInChars, ipd, hasDiscretionaryHyphen, hasFauxSmallCaps);
this.children.add(newTextArea);
return newTextArea;
}
@@ -1016,7 +1016,9 @@
@Override
public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
final int sizeInLeaves, final boolean hasFauxSmallCaps) {
- throw new UnsupportedOperationException();
+ final TextAreaWords newTextArea = TextAreaWords.makeTextArea(paragraph, this, startLeaf, sizeInLeaves);
+ this.children.add(newTextArea);
+ return newTextArea;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-03 15:03:22 UTC (rev 12325)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-03 16:31:03 UTC (rev 12326)
@@ -97,8 +97,9 @@
@Override
public CharSequence getText() {
final StringBuilder builder = new StringBuilder();
- for (int index = this.startingLeafIndex; index < (this.startingLeafIndex + qtyLeaves); index ++) {
- final ParaLeaf leaf = this.foLink.getGenerator().paraLeafAt(index);
+ final FoTextWords words = this.foLink.getGenerator();
+ for (int index = this.startingLeafIndex; index < (this.startingLeafIndex + this.qtyLeaves); index ++) {
+ final ParaLeaf leaf = words.paraLeafAt(index);
builder.append(leaf.getText());
}
return builder.toString();
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/SegmentDictionaryWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/SegmentDictionaryWord.java 2022-01-03 15:03:22 UTC (rev 12325)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/SegmentDictionaryWord.java 2022-01-03 16:31:03 UTC (rev 12326)
@@ -28,7 +28,6 @@
package org.foray.orthography;
-import org.axsl.common.para.ParaLeaf;
import org.axsl.orthography.Word;
import org.axsl.orthography.WordSegment;
@@ -116,9 +115,9 @@
}
@Override
- public ParaLeaf paraLeafAt(final int index) {
- // TODO Auto-generated method stub
- return null;
+ public StringWordSegment paraLeafAt(final int index) {
+ final int dictionaryIndex = this.segments[index];
+ return this.dictionary.getWordSegment(dictionaryIndex);
}
@Override
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java 2022-01-03 15:03:22 UTC (rev 12325)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java 2022-01-03 16:31:03 UTC (rev 12326)
@@ -83,7 +83,7 @@
lastLeafIndex = currentLeafIndex;
}
- throw new UnsupportedOperationException(result.toString());
+ return Status.OK;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-03 15:03:25
|
Revision: 12325
http://sourceforge.net/p/foray/code/12325
Author: victormote
Date: 2022-01-03 15:03:22 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Rename linkage/generator instance variable names for clarity.
Modified Paths:
--------------
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/BookmarkArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.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/LineArea4a.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/MathArea.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/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.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/SvgArea.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
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -65,7 +65,7 @@
/** The initial size at which the linkage map should be created. */
private static final short INITIAL_LINKAGE_MAP_SIZE = 200;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
+ /** The link to the FO tree. */
private FoTree foTree;
/** The children of this node. */
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -45,13 +45,13 @@
public final class BasicLinkArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<BasicLink> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<BasicLink> generatedBy;
-
/**
* Private Constructor for a LineArea parent.
* @param parentArea The parent area.
@@ -76,7 +76,7 @@
*/
static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final LineArea4a parentArea) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
- newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
+ newLinkArea.foLink = newLinkArea.getLink(generatedBy);
newLinkArea.registerLink(generatedBy);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
@@ -92,7 +92,7 @@
*/
static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final AbstractInlineArea parentArea) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
- newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
+ newLinkArea.foLink = newLinkArea.getLink(generatedBy);
newLinkArea.registerLink(generatedBy);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
@@ -121,7 +121,7 @@
@Override
public Link<BasicLink> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,8 +47,8 @@
*/
public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -72,7 +72,7 @@
*/
static BeforeFloatRa makeBeforeFloatArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final BeforeFloatRa newFloatRA = new BeforeFloatRa(parentArea);
- newFloatRA.generatedBy = newFloatRA.getLink(generatedBy);
+ newFloatRA.foLink = newFloatRA.getLink(generatedBy);
newFloatRA.registerLink(generatedBy);
return newFloatRA;
}
@@ -163,7 +163,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -44,13 +44,13 @@
public final class BidiOverrideArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<BidiOverride> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<BidiOverride> generatedBy;
-
/**
* Private Constructor for a LineArea parent.
* @param parentArea The parent area.
@@ -75,7 +75,7 @@
*/
static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final LineArea4a parentArea) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
- newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
+ newBidiArea.foLink = newBidiArea.getLink(generatedBy);
newBidiArea.registerLink(generatedBy);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
@@ -91,7 +91,7 @@
*/
static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final AbstractInlineArea parentArea) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
- newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
+ newBidiArea.foLink = newBidiArea.getLink(generatedBy);
newBidiArea.registerLink(generatedBy);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
@@ -120,7 +120,7 @@
@Override
public Link<BidiOverride> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -59,8 +59,8 @@
public final class BlockContainerRa extends ContainerRa
implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<BlockContainer> generatedBy;
+ /** The link to the FO tree. */
+ private Link<BlockContainer> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -88,7 +88,7 @@
*/
static BlockContainerRa makeBlockContainerArea(final BlockContainer generatedBy, final AreaNode4a parentArea) {
final BlockContainerRa newBcArea = new BlockContainerRa(parentArea);
- newBcArea.generatedBy = newBcArea.getLink(generatedBy);
+ newBcArea.foLink = newBcArea.getLink(generatedBy);
newBcArea.registerLink(generatedBy);
final int initialPD = newBcArea.computeInitialPD();
newBcArea.setProgressionDimension(initialPD);
@@ -201,7 +201,7 @@
@Override
public Link<BlockContainer> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -43,8 +43,8 @@
*/
public final class BookmarkArea extends BookmarkParentArea implements BookmarkG5 {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Bookmark generatedBy;
+ /** The link to the FO tree. */
+ private Bookmark foLink;
/** The parent of this node. */
private BookmarkParentArea parent;
@@ -72,7 +72,7 @@
static BookmarkArea makeBookmarkArea(final Bookmark generatedBy,
final BookmarkParentArea parentArea) {
final BookmarkArea newBookmarkArea = new BookmarkArea(parentArea);
- newBookmarkArea.generatedBy = generatedBy;
+ newBookmarkArea.foLink = generatedBy;
return newBookmarkArea;
}
@@ -125,7 +125,7 @@
* @return The FO Tree bookmark.
*/
public Bookmark traitGeneratedBy() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTitleArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -38,8 +38,8 @@
*/
public final class BookmarkTitleArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private BookmarkTitle generatedBy;
+ /** The link to the FO tree. */
+ private BookmarkTitle foLink;
/** The parent of this node. */
private BookmarkArea parent;
@@ -62,7 +62,7 @@
final BookmarkTitle generatedBy, final BookmarkArea parentArea) {
final BookmarkTitleArea newTitleArea = new BookmarkTitleArea(
parentArea);
- newTitleArea.generatedBy = generatedBy;
+ newTitleArea.foLink = generatedBy;
return newTitleArea;
}
@@ -88,7 +88,7 @@
* @return The FO Tree bookmark-title object that generated this.
*/
public BookmarkTitle traitGeneratedBy() {
- return this.generatedBy;
+ return this.foLink;
}
/**
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
*/
public final class BookmarkTreeArea extends BookmarkParentArea implements BookmarkTreeG5 {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private BookmarkTree generatedBy;
+ /** The link to the FO tree. */
+ private BookmarkTree foLink;
/** The parent of this node. */
private AreaTree4a parent;
@@ -66,7 +66,7 @@
final AreaTree4a parentArea) {
final BookmarkTreeArea newBookmarkTreeArea = new BookmarkTreeArea(
parentArea);
- newBookmarkTreeArea.generatedBy = generatedBy;
+ newBookmarkTreeArea.foLink = generatedBy;
return newBookmarkTreeArea;
}
@@ -93,7 +93,7 @@
* @return The FO Tree node that generated this bookmark tree.
*/
public BookmarkTree getGeneratedBy() {
- return this.generatedBy;
+ return this.foLink;
}
}
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,13 +47,13 @@
public final class ExternalGraphicArea extends AbstractInlineArea implements ExternalGraphicAreaG5,
org.axsl.area.NormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<ExternalGraphic> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ExternalGraphic> generatedBy;
-
/**
* Private Constructor.
* @param parentArea The parent area.
@@ -80,7 +80,7 @@
if (generatedBy.getGraphic(newEgArea) == null) {
throw new IllegalArgumentException("Cannot create an Area for a null Graphic.");
}
- newEgArea.generatedBy = newEgArea.getLink(generatedBy);
+ newEgArea.foLink = newEgArea.getLink(generatedBy);
newEgArea.registerLink(generatedBy);
final int initialPD = newEgArea.computeInitialPD();
newEgArea.setProgressionDimension(initialPD);
@@ -171,7 +171,7 @@
@Override
public Link<ExternalGraphic> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
*/
public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -71,7 +71,7 @@
*/
static FootnoteRa makeFootnoteReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final FootnoteRa footnoteRA = new FootnoteRa(parentArea);
- footnoteRA.generatedBy = footnoteRA.getLink(generatedBy);
+ footnoteRA.foLink = footnoteRA.getLink(generatedBy);
footnoteRA.registerLink(generatedBy);
return footnoteRA;
}
@@ -173,7 +173,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -50,13 +50,13 @@
public final class ForeignObjectArea extends AbstractInlineArea implements ForeignObjectAreaG5,
org.axsl.area.NormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<InstreamForeignObject> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<InstreamForeignObject> generatedBy;
-
/** The foreign content encapsulated inside this area. */
private ForeignContentG5 foreignContent;
@@ -112,7 +112,7 @@
*/
private static void init(final ForeignObjectArea newFoArea, final InstreamForeignObject generatedBy,
final int width) {
- newFoArea.generatedBy = newFoArea.getLink(generatedBy);
+ newFoArea.foLink = newFoArea.getLink(generatedBy);
newFoArea.registerLink(generatedBy);
final int initialPD = newFoArea.computeInitialPD();
newFoArea.setProgressionDimension(initialPD);
@@ -187,7 +187,7 @@
@Override
public Link<InstreamForeignObject> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -44,13 +44,13 @@
public final class IndexPageCitationListArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<IndexPageCitationList> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<IndexPageCitationList> generatedBy;
-
/**
* Private Constructor for a LineArea parent.
* @param parentArea The parent area.
@@ -76,7 +76,7 @@
static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
final LineArea4a parentArea) {
final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
+ newCitationListArea.foLink = newCitationListArea.getLink(generatedBy);
newCitationListArea.registerLink(generatedBy);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
@@ -93,7 +93,7 @@
static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
final AbstractInlineArea parentArea) {
final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
+ newCitationListArea.foLink = newCitationListArea.getLink(generatedBy);
newCitationListArea.registerLink(generatedBy);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
@@ -122,7 +122,7 @@
@Override
public Link<IndexPageCitationList> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,13 +47,13 @@
public final class InlineArea extends AbstractAncestralInlineArea implements InlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<Inline> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<Inline> generatedBy;
-
/**
* Private Constructor for a LineArea parent.
* @param parentArea The parent area.
@@ -78,7 +78,7 @@
*/
static InlineArea makeInlineArea(final Inline generatedBy, final LineArea4a parentArea) {
final InlineArea newInlineArea = new InlineArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+ newInlineArea.foLink = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -94,7 +94,7 @@
*/
static InlineArea makeInlineArea(final Inline generatedBy, final AbstractInlineArea parentArea) {
final InlineArea newInlineArea = new InlineArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+ newInlineArea.foLink = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -128,7 +128,7 @@
@Override
public Link<Inline> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -53,13 +53,13 @@
public final class InlineContainerArea extends AbstractInlineArea
implements org.axsl.area.InlineContainerArea {
+ /** The link to the FO tree. */
+ private Link<InlineContainer> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<InlineContainer> generatedBy;
-
/** The children of this node. */
private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
@@ -87,7 +87,7 @@
*/
static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy, final LineArea4a parentArea) {
final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+ newInlineArea.foLink = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -104,7 +104,7 @@
static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy,
final AbstractInlineArea parentArea) {
final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
- newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
+ newInlineArea.foLink = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
@@ -135,7 +135,7 @@
@Override
public Link<InlineContainer> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -71,13 +71,13 @@
public final class LeaderArea extends AbstractAncestralInlineArea implements LeaderAreaG5,
org.axsl.area.AncestralNormalInlineArea {
+ /** The link to the FO tree. */
+ private Link<Leader> foLink;
+
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<Leader> generatedBy;
-
/**
* Private Constructor.
* @param parentArea The parent area.
@@ -106,7 +106,7 @@
*/
private static void initLeaderArea(final LeaderArea newLeaderArea, final Leader generatedBy,
final int initialProgressionDimension) throws AreaTreeException {
- newLeaderArea.generatedBy = newLeaderArea.getLink(generatedBy);
+ newLeaderArea.foLink = newLeaderArea.getLink(generatedBy);
newLeaderArea.registerLink(generatedBy);
final int initialPD = newLeaderArea.computeInitialPD();
newLeaderArea.setProgressionDimension(initialPD);
@@ -397,7 +397,7 @@
@Override
public Link<Leader> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -76,12 +76,12 @@
*/
public final class LineArea4a extends BlockArea implements LineArea {
+ /** The link to the FO tree. */
+ private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
+
/** The parent of this node. */
private NormalBlockArea4a parent;
- /** The children of this node. */
- private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
-
/** See {@link #getProgressionDimension()} for a description of
* "progression dimension". */
private int progressionDimension = 0;
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
*/
public final class ListBlockArea extends ContainerRa implements ListBlockAreaG5, org.axsl.area.ListBlockArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ListBlock> generatedBy;
+ /** The link to the FO tree. */
+ private Link<ListBlock> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -75,7 +75,7 @@
*/
static ListBlockArea makeListBlockArea(final ListBlock generatedBy, final AreaNode4a parentArea) {
final ListBlockArea newListBlockArea = new ListBlockArea(parentArea);
- newListBlockArea.generatedBy = newListBlockArea.getLink(generatedBy);
+ newListBlockArea.foLink = newListBlockArea.getLink(generatedBy);
newListBlockArea.registerLink(generatedBy);
final int initialPD = newListBlockArea.computeInitialPD();
newListBlockArea.setProgressionDimension(initialPD);
@@ -162,7 +162,7 @@
@Override
public Link<ListBlock> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -48,8 +48,8 @@
public final class ListItemArea extends AreaFlexible
implements org.axsl.area.ListItemArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ListItem> generatedBy;
+ /** The link to the FO tree. */
+ private Link<ListItem> foLink;
/** The parent of this node. */
private ListBlockArea parent;
@@ -78,7 +78,7 @@
*/
static ListItemArea makeListItemArea(final ListItem generatedBy, final ListBlockArea parentArea) {
final ListItemArea newItemArea = new ListItemArea(parentArea);
- newItemArea.generatedBy = newItemArea.getLink(generatedBy);
+ newItemArea.foLink = newItemArea.getLink(generatedBy);
newItemArea.registerLink(generatedBy);
final int initialPD = newItemArea.computeInitialPD();
newItemArea.setProgressionDimension(initialPD);
@@ -201,7 +201,7 @@
@Override
public Link<ListItem> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
public final class ListItemBodyContainer extends AbstractListItemContent
implements org.axsl.area.ListItemBodyContainer {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ListItemBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<ListItemBody> foLink;
/**
* Private Constructor.
@@ -76,7 +76,7 @@
@Override
public Link<ListItemBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
/**
@@ -84,7 +84,7 @@
* @param generatedBy The new "generated by" value.
*/
protected void setGeneratedBy(final Link<ListItemBody> generatedBy) {
- this.generatedBy = generatedBy;
+ this.foLink = generatedBy;
}
}
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -39,8 +39,8 @@
public final class ListItemLabelContainer extends AbstractListItemContent
implements org.axsl.area.ListItemLabelContainer {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ListItemLabel> generatedBy;
+ /** The link to the FO tree. */
+ private Link<ListItemLabel> foLink;
/**
* Private Constructor.
@@ -76,7 +76,7 @@
@Override
public Link<ListItemLabel> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
/**
@@ -84,7 +84,7 @@
* @param generatedBy The new "generated by" value.
*/
protected void setGeneratedBy(final Link<ListItemLabel> generatedBy) {
- this.generatedBy = generatedBy;
+ this.foLink = generatedBy;
}
}
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -56,8 +56,8 @@
// private static final int SPAN_SAFETY_FACTOR = (int) Math.round(
// 2 * 12000 * 1.3);
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -84,7 +84,7 @@
*/
static MainRa makeMainReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final MainRa newMainRA = new MainRa(parentArea);
- newMainRA.generatedBy = newMainRA.getLink(generatedBy);
+ newMainRA.foLink = newMainRA.getLink(generatedBy);
newMainRA.registerLink(generatedBy);
return newMainRA;
}
@@ -353,7 +353,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -38,12 +38,12 @@
*/
public final class MathArea implements ForeignContentMathG5 {
+ /** The link to the FO tree. */
+ private MathElement foLink;
+
/** The parent of this node. */
private ForeignObjectArea parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private MathElement generatedBy;
-
/**
* Construct a MathArea.
* @param parentArea The parent area.
@@ -60,13 +60,13 @@
*/
static MathArea makeMathArea(final MathElement generatedBy, final ForeignObjectArea parentArea) {
final MathArea newMathArea = new MathArea(parentArea);
- newMathArea.generatedBy = generatedBy;
+ newMathArea.foLink = generatedBy;
return newMathArea;
}
@Override
public MathGraphic getGraphic() {
- return this.generatedBy.getMathGraphic();
+ return this.foLink.getMathGraphic();
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -62,8 +62,8 @@
*/
public final class NormalBlockArea4a extends BlockArea implements NormalBlockArea, ParaContext {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<Block> generatedBy;
+ /** The link to the FO tree. */
+ private Link<Block> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -92,7 +92,7 @@
static NormalBlockArea4a makeNormalBlockArea(final Block generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link<Block> linkage = newBlockArea.getLink(generatedBy);
- newBlockArea.generatedBy = linkage;
+ newBlockArea.foLink = linkage;
newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
@@ -103,7 +103,7 @@
static NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link<Block> linkage = newBlockArea.getLink((Block) generatedBy);
- newBlockArea.generatedBy = linkage;
+ newBlockArea.foLink = linkage;
newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
@@ -270,7 +270,7 @@
@Override
public Link<Block> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -55,8 +55,8 @@
public final class NormalFlowRa extends ContainerRa
implements org.axsl.area.NormalFlowRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private SpanRa parent;
@@ -84,7 +84,7 @@
*/
static NormalFlowRa makeNormalFlowRA(final RegionBody generatedBy, final SpanRa parentArea) {
final NormalFlowRa newNormalFlow = new NormalFlowRa(parentArea);
- newNormalFlow.generatedBy = newNormalFlow.getLink(generatedBy);
+ newNormalFlow.foLink = newNormalFlow.getLink(generatedBy);
newNormalFlow.registerLink(generatedBy);
final int initialPD = newNormalFlow.computeInitialPD();
newNormalFlow.setProgressionDimension(initialPD);
@@ -262,7 +262,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -57,8 +57,8 @@
*/
public final class PageCollection extends NonArea implements PageCollectionG5, org.axsl.area.PageCollection {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<PageSequence> generatedBy;
+ /** The link to the FO tree. */
+ private Link<PageSequence> foLink;
/** The parent of this node. */
private AreaTree4a parent;
@@ -101,7 +101,7 @@
static PageCollection makePageCollection(final PageSequence generatedBy, final AreaTree4a parentArea,
final int lastPageNumber) throws AreaTreeException {
final PageCollection newCollection = new PageCollection(parentArea);
- newCollection.generatedBy = newCollection.getLink(generatedBy);
+ newCollection.foLink = newCollection.getLink(generatedBy);
newCollection.registerLink(generatedBy);
newCollection.pageMasterResolver = generatedBy.makePageMasterResolver(
lastPageNumber);
@@ -419,7 +419,7 @@
@Override
public Link<PageSequence> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<PageNumber> generatedBy;
+ /** The link to the FO tree. */
+ private Link<PageNumber> foLink;
/**
* Private Constructor.
@@ -103,7 +103,7 @@
* @param width The width, in millipoints, to set.
*/
private static void init(final PageNumberArea newPnArea, final PageNumber generatedBy, final int width) {
- newPnArea.generatedBy = newPnArea.getLink(generatedBy);
+ newPnArea.foLink = newPnArea.getLink(generatedBy);
newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
@@ -140,7 +140,7 @@
@Override
public Link<PageNumber> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<PageNumberCitation> generatedBy;
+ /** The link to the FO tree. */
+ private Link<PageNumberCitation> foLink;
/**
* Private Constructor.
@@ -104,7 +104,7 @@
*/
private static void init(final PageNumberCitationArea newPncArea, final PageNumberCitation generatedBy,
final int width) {
- newPncArea.generatedBy = newPncArea.getLink(generatedBy);
+ newPncArea.foLink = newPncArea.getLink(generatedBy);
newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
@@ -153,7 +153,7 @@
@Override
public Link<PageNumberCitation> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -49,8 +49,8 @@
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<PageNumberCitationLast> generatedBy;
+ /** The link to the FO tree. */
+ private Link<PageNumberCitationLast> foLink;
/**
* Private Constructor.
@@ -104,7 +104,7 @@
*/
private static void init(final PageNumberCitationLastArea newPncArea, final PageNumberCitationLast generatedBy,
final int width) {
- newPncArea.generatedBy = newPncArea.getLink(generatedBy);
+ newPncArea.foLink = newPncArea.getLink(generatedBy);
newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
@@ -153,7 +153,7 @@
@Override
public Link<PageNumberCitationLast> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -67,8 +67,8 @@
public final class PageRa extends AreaFixed implements PageG5,
org.axsl.area.PageArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<SimplePageMaster> generatedBy;
+ /** The link to the FO tree. */
+ private Link<SimplePageMaster> foLink;
/** The parent of this node. */
private PageCollection parent;
@@ -117,7 +117,7 @@
*/
static PageRa makePageArea(final SimplePageMaster generatedBy, final PageCollection parentArea) {
final PageRa newPage = new PageRa(parentArea);
- newPage.generatedBy = newPage.getLink(generatedBy);
+ newPage.foLink = newPage.getLink(generatedBy);
newPage.registerLink(generatedBy);
newPage.createRegions();
return newPage;
@@ -675,7 +675,7 @@
@Override
public Link<SimplePageMaster> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -59,8 +59,8 @@
*/
public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<Region> generatedBy;
+ /** The link to the FO tree. */
+ private Link<Region> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -84,7 +84,7 @@
*/
static RegionRa makeRegionArea(final Region generatedBy, final PageRa parentArea) {
final RegionRa newRegionArea = new RegionRa(parentArea);
- newRegionArea.generatedBy = newRegionArea.getLink(generatedBy);
+ newRegionArea.foLink = newRegionArea.getLink(generatedBy);
newRegionArea.registerLink(generatedBy);
return newRegionArea;
}
@@ -250,7 +250,7 @@
@Override
public Link<Region> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -51,8 +51,8 @@
public final class RegionRaBody extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionBodyRefArea {
/* TODO: Why doesn't this class extend RegionRa? */
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -93,7 +93,7 @@
*/
static RegionRaBody makeRegionBodyArea(final RegionBody generatedBy, final PageRa parentArea) {
final RegionRaBody regionBody = new RegionRaBody(parentArea);
- regionBody.generatedBy = regionBody.getLink(generatedBy);
+ regionBody.foLink = regionBody.getLink(generatedBy);
regionBody.registerLink(generatedBy);
// create the primary reference areas
@@ -338,7 +338,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
*/
public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private NoGenerationLink<RetrieveMarker> generatedBy;
+ /** The link to the FO tree. */
+ private NoGenerationLink<RetrieveMarker> foLink;
/** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveMarker}. */
private Marker selectedMarker;
@@ -78,7 +78,7 @@
final Marker selectedMarker) {
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
final NoGenerationLink<RetrieveMarker> link = new NoGenerationLink<RetrieveMarker>(generatedBy);
- newRmNode.generatedBy = link;
+ newRmNode.foLink = link;
newRmNode.selectedMarker = selectedMarker;
/* Do not try to register the link as the generator generates no areas. */
// newRmNode.registerLink(generatedBy);
@@ -112,12 +112,12 @@
@Override
public RetrieveMarker traitGeneratedBy() {
- return (RetrieveMarker) this.generatedBy.getGenerator();
+ return (RetrieveMarker) this.foLink.getGenerator();
}
@Override
public NoGenerationLink<RetrieveMarker> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
@@ -127,7 +127,7 @@
@Override
public RetrieveMarker getGraftingPoint() {
- return (RetrieveMarker) this.generatedBy.getGenerator();
+ return (RetrieveMarker) this.foLink.getGenerator();
}
/**
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -46,8 +46,8 @@
*/
public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private NoGenerationLink<RetrieveTableMarker> generatedBy;
+ /** The link to the FO tree. */
+ private NoGenerationLink<RetrieveTableMarker> foLink;
/** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveTableMarker}. */
private Marker selectedMarker;
@@ -78,7 +78,7 @@
final AreaNode4a parent, final Marker selectedMarker) {
final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
final NoGenerationLink<RetrieveTableMarker> link = new NoGenerationLink<RetrieveTableMarker>(generatedBy);
- newRtmNode.generatedBy = link;
+ newRtmNode.foLink = link;
newRtmNode.selectedMarker = selectedMarker;
/* Do not try to register the link as the generator generates no areas. */
// newRtmNode.registerLink(generatedBy);
@@ -112,12 +112,12 @@
@Override
public RetrieveTableMarker traitGeneratedBy() {
- return (RetrieveTableMarker) this.generatedBy.getGenerator();
+ return (RetrieveTableMarker) this.foLink.getGenerator();
}
@Override
public NoGenerationLink<RetrieveTableMarker> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
@@ -127,7 +127,7 @@
@Override
public RetrieveTableMarker getGraftingPoint() {
- return (RetrieveTableMarker) this.generatedBy.getGenerator();
+ return (RetrieveTableMarker) this.foLink.getGenerator();
}
/**
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -53,8 +53,8 @@
* or another {@link AbstractInlineArea}. */
private Area4a parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<ScalingValueCitation> generatedBy;
+ /** The link to the FO tree. */
+ private Link<ScalingValueCitation> foLink;
/**
* Private Constructor.
@@ -108,7 +108,7 @@
*/
private static void init(final ScalingValueCitationArea newPnArea, final ScalingValueCitation generatedBy,
final int width) {
- newPnArea.generatedBy = newPnArea.getLink(generatedBy);
+ newPnArea.foLink = newPnArea.getLink(generatedBy);
newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
@@ -147,7 +147,7 @@
@Override
public Link<ScalingValueCitation> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
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-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -50,8 +50,8 @@
public final class SpanRa extends ContainerRa
implements org.axsl.area.SpanRefArea {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<RegionBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<RegionBody> foLink;
/** The parent of this node. */
private AreaNode4a parent;
@@ -86,7 +86,7 @@
*/
static SpanRa makeSpanArea(final RegionBody generatedBy, final MainRa parentArea, final int numColumns) {
final SpanRa newSpanArea = new SpanRa(parentArea);
- newSpanArea.generatedBy = newSpanArea.getLink(generatedBy);
+ newSpanArea.foLink = newSpanArea.getLink(generatedBy);
newSpanArea.registerLink(generatedBy);
final int initialPD = newSpanArea.computeInitialPD();
newSpanArea.setProgressionDimension(initialPD);
@@ -416,7 +416,7 @@
@Override
public Link<RegionBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -42,8 +42,8 @@
/** The parent of this node. */
private ForeignObjectArea parent;
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private SvgElement generatedBy;
+ /** The link to the FO tree. */
+ private SvgElement foLink;
/**
* Construct an SvgArea.
@@ -61,13 +61,13 @@
*/
static SvgArea makeSvgArea(final SvgElement generatedBy, final ForeignObjectArea parentArea) {
final SvgArea newSvgArea = new SvgArea(parentArea);
- newSvgArea.generatedBy = generatedBy;
+ newSvgArea.foLink = generatedBy;
return newSvgArea;
}
@Override
public SvgGraphic getGraphic() {
- return this.generatedBy.getSvgGraphic();
+ return this.foLink.getSvgGraphic();
}
@Override
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 2022-01-03 14:08:04 UTC (rev 12324)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2022-01-03 15:03:22 UTC (rev 12325)
@@ -47,8 +47,8 @@
public final class TableBodyContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
org.axsl.area.TableBodyContainer {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link<TableBody> generatedBy;
+ /** The link to the FO tree. */
+ private Link<TableBody> foLink;
/**
* Private Constructor.
@@ -68,7 +68,7 @@
*/
static TableBodyContainer makeTableBodyContainer(final TableBody generatedBy, final TableRa parentArea) {
final TableBodyContainer bodyContainer = new TableBodyContainer(parentArea);
- bodyContainer.generatedBy = bodyContainer.getLink(generatedBy);
+ bodyContainer.foLink = bodyContainer.getLink(generatedBy);
bodyContainer.registerLink(generatedBy);
final int initialPD = bodyContainer.computeInitialPD();
bodyContainer.setProgressionDimension(initialPD);
@@ -110,7 +110,7 @@
@Override
public Link<TableBody> getFoLink() {
- return this.generatedBy;
+ return this.foLink;
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org...
[truncated message content] |
|
From: <vic...@us...> - 2022-01-03 14:08:07
|
Revision: 12324
http://sourceforge.net/p/foray/code/12324
Author: victormote
Date: 2022-01-03 14:08:04 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Refactor some method names for clarity and consistency.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
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/BlockArea.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/LineArea4a.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/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.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
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -74,7 +74,7 @@
@Override
public boolean generatedByExists() {
- return getLinkage() != null;
+ return getFoLink() != null;
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -130,7 +130,7 @@
// Remove from the Area Tree
getParent().removeChild(this);
// Remove from the FO-Area Tree cross-reference.
- this.getLinkage().unregisterGeneratedArea(this);
+ this.getFoLink().unregisterGeneratedArea(this);
}
@Override
@@ -166,7 +166,7 @@
* is the first child.
*/
protected AreaNode4a getPreviousChildOfGeneratedBy() {
- return this.getLinkage().getPreviousGeneratedBy(this);
+ return this.getFoLink().getPreviousGeneratedBy(this);
}
/**
@@ -175,12 +175,12 @@
* is the last child.
*/
protected AreaNode4a getNextChildOfGeneratedBy() {
- return this.getLinkage().getNextGeneratedBy(this);
+ return this.getFoLink().getNextGeneratedBy(this);
}
@Override
public boolean isFirstChildOfGeneratedBy() {
- return this.getLinkage().isFirstGeneratedBy(this);
+ return this.getFoLink().isFirstGeneratedBy(this);
}
/**
@@ -188,7 +188,7 @@
* @return True if and only if this is the last child of this area's "generated-by".
*/
protected boolean isLastChildOfGeneratedBy() {
- return this.getLinkage().isLastGeneratedBy(this);
+ return this.getFoLink().isLastGeneratedBy(this);
}
/**
@@ -516,10 +516,10 @@
}
/**
- * Returns the raw "generated by" instance.
- * @return The raw linkage item.
+ * Returns the link to the FO tree for this node.
+ * @return The link to the FO tree for this node.
*/
- public abstract Link<? extends Fo> getLinkage();
+ public abstract Link<? extends Fo> getFoLink();
/**
* This method should be run after layout is complete, allowing cleanup and
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -393,7 +393,7 @@
}
@Override
- public Link<? extends Fo> getLinkage() {
+ public Link<? extends Fo> getFoLink() {
return null;
}
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -120,13 +120,13 @@
}
@Override
- public Link<BasicLink> getLinkage() {
+ public Link<BasicLink> getFoLink() {
return this.generatedBy;
}
@Override
public BasicLink traitGeneratedBy() {
- return (BasicLink) this.getLinkage().getGeneratedBy();
+ return (BasicLink) this.getFoLink().getGenerator();
}
@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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -162,13 +162,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public Fo traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
/**
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -119,13 +119,13 @@
}
@Override
- public Link<BidiOverride> getLinkage() {
+ public Link<BidiOverride> getFoLink() {
return this.generatedBy;
}
@Override
public BidiOverride traitGeneratedBy() {
- return (BidiOverride) this.getLinkage().getGeneratedBy();
+ return (BidiOverride) this.getFoLink().getGenerator();
}
@Override
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -69,11 +69,11 @@
return false;
}
- public abstract Link<Block> getLinkage();
+ public abstract Link<Block> getFoLink();
@Override
public Block traitGeneratedBy() {
- return getLinkage().getGeneratedBy();
+ return getFoLink().getGenerator();
}
/**
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -200,13 +200,13 @@
}
@Override
- public Link<BlockContainer> getLinkage() {
+ public Link<BlockContainer> getFoLink() {
return this.generatedBy;
}
@Override
public BlockContainer traitGeneratedBy() {
- return (BlockContainer) this.getLinkage().getGeneratedBy();
+ return (BlockContainer) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -170,13 +170,13 @@
}
@Override
- public Link<ExternalGraphic> getLinkage() {
+ public Link<ExternalGraphic> getFoLink() {
return this.generatedBy;
}
@Override
public ExternalGraphic traitGeneratedBy() {
- return (ExternalGraphic) this.getLinkage().getGeneratedBy();
+ return (ExternalGraphic) this.getFoLink().getGenerator();
}
@Override
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -172,13 +172,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public Fo traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
/**
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -186,13 +186,13 @@
}
@Override
- public Link<InstreamForeignObject> getLinkage() {
+ public Link<InstreamForeignObject> getFoLink() {
return this.generatedBy;
}
@Override
public InstreamForeignObject traitGeneratedBy() {
- return (InstreamForeignObject) this.getLinkage().getGeneratedBy();
+ return (InstreamForeignObject) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -121,13 +121,13 @@
}
@Override
- public Link<IndexPageCitationList> getLinkage() {
+ public Link<IndexPageCitationList> getFoLink() {
return this.generatedBy;
}
@Override
public IndexPageCitationList traitGeneratedBy() {
- return (IndexPageCitationList) this.getLinkage().getGeneratedBy();
+ return (IndexPageCitationList) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -127,13 +127,13 @@
}
@Override
- public Link<Inline> getLinkage() {
+ public Link<Inline> getFoLink() {
return this.generatedBy;
}
@Override
public Inline traitGeneratedBy() {
- return (Inline) this.getLinkage().getGeneratedBy();
+ return (Inline) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -134,13 +134,13 @@
}
@Override
- public Link<InlineContainer> getLinkage() {
+ public Link<InlineContainer> getFoLink() {
return this.generatedBy;
}
@Override
public Inline traitGeneratedBy() {
- return (Inline) this.getLinkage().getGeneratedBy();
+ return (Inline) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -396,13 +396,13 @@
}
@Override
- public Link<Leader> getLinkage() {
+ public Link<Leader> getFoLink() {
return this.generatedBy;
}
@Override
public Leader traitGeneratedBy() {
- return (Leader) this.getLinkage().getGeneratedBy();
+ return (Leader) this.getFoLink().getGenerator();
}
// @Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -1319,13 +1319,13 @@
}
@Override
- public Link<Block> getLinkage() {
- return this.parent.getLinkage();
+ public Link<Block> getFoLink() {
+ return this.parent.getFoLink();
}
@Override
public Block traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -161,13 +161,13 @@
}
@Override
- public Link<ListBlock> getLinkage() {
+ public Link<ListBlock> getFoLink() {
return this.generatedBy;
}
@Override
public ListBlock traitGeneratedBy() {
- return (ListBlock) this.getLinkage().getGeneratedBy();
+ return (ListBlock) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -200,13 +200,13 @@
}
@Override
- public Link<ListItem> getLinkage() {
+ public Link<ListItem> getFoLink() {
return this.generatedBy;
}
@Override
public ListItem traitGeneratedBy() {
- return (ListItem) this.getLinkage().getGeneratedBy();
+ return (ListItem) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -71,11 +71,11 @@
@Override
public ListItemBody traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
- public Link<ListItemBody> getLinkage() {
+ public Link<ListItemBody> getFoLink() {
return this.generatedBy;
}
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -71,11 +71,11 @@
@Override
public ListItemLabel traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
- public Link<ListItemLabel> getLinkage() {
+ public Link<ListItemLabel> getFoLink() {
return this.generatedBy;
}
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -352,13 +352,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public RegionBody traitGeneratedBy() {
- return (RegionBody) this.getLinkage().getGeneratedBy();
+ return (RegionBody) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -269,7 +269,7 @@
}
@Override
- public Link<Block> getLinkage() {
+ public Link<Block> getFoLink() {
return this.generatedBy;
}
@@ -319,7 +319,7 @@
@Override
public Block traitGeneratedBy() {
- return getLinkage().getGeneratedBy();
+ return getFoLink().getGenerator();
}
@Override
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -261,13 +261,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public Fo traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -418,13 +418,13 @@
}
@Override
- public Link<PageSequence> getLinkage() {
+ public Link<PageSequence> getFoLink() {
return this.generatedBy;
}
@Override
public PageSequence traitGeneratedBy() {
- return (PageSequence) this.getLinkage().getGeneratedBy();
+ return (PageSequence) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -139,13 +139,13 @@
}
@Override
- public Link<PageNumber> getLinkage() {
+ public Link<PageNumber> getFoLink() {
return this.generatedBy;
}
@Override
public PageNumber traitGeneratedBy() {
- return (PageNumber) this.getLinkage().getGeneratedBy();
+ return (PageNumber) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -152,13 +152,13 @@
}
@Override
- public Link<PageNumberCitation> getLinkage() {
+ public Link<PageNumberCitation> getFoLink() {
return this.generatedBy;
}
@Override
public PageNumberCitation traitGeneratedBy() {
- return (PageNumberCitation) this.getLinkage().getGeneratedBy();
+ return (PageNumberCitation) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -152,13 +152,13 @@
}
@Override
- public Link<PageNumberCitationLast> getLinkage() {
+ public Link<PageNumberCitationLast> getFoLink() {
return this.generatedBy;
}
@Override
public PageNumberCitationLast traitGeneratedBy() {
- return (PageNumberCitationLast) this.getLinkage().getGeneratedBy();
+ return (PageNumberCitationLast) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -674,13 +674,13 @@
}
@Override
- public Link<SimplePageMaster> getLinkage() {
+ public Link<SimplePageMaster> getFoLink() {
return this.generatedBy;
}
@Override
public SimplePageMaster traitGeneratedBy() {
- return (SimplePageMaster) this.getLinkage().getGeneratedBy();
+ return (SimplePageMaster) this.getFoLink().getGenerator();
}
/**
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -249,13 +249,13 @@
}
@Override
- public Link<Region> getLinkage() {
+ public Link<Region> getFoLink() {
return this.generatedBy;
}
@Override
public Region traitGeneratedBy() {
- return (Region) this.getLinkage().getGeneratedBy();
+ return (Region) this.getFoLink().getGenerator();
}
@Override
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -337,13 +337,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public RegionBody traitGeneratedBy() {
- return (RegionBody) this.getLinkage().getGeneratedBy();
+ return (RegionBody) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -112,11 +112,11 @@
@Override
public RetrieveMarker traitGeneratedBy() {
- return (RetrieveMarker) this.generatedBy.getGeneratedBy();
+ return (RetrieveMarker) this.generatedBy.getGenerator();
}
@Override
- public NoGenerationLink<RetrieveMarker> getLinkage() {
+ public NoGenerationLink<RetrieveMarker> getFoLink() {
return this.generatedBy;
}
@@ -127,7 +127,7 @@
@Override
public RetrieveMarker getGraftingPoint() {
- return (RetrieveMarker) this.generatedBy.getGeneratedBy();
+ return (RetrieveMarker) this.generatedBy.getGenerator();
}
/**
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -112,11 +112,11 @@
@Override
public RetrieveTableMarker traitGeneratedBy() {
- return (RetrieveTableMarker) this.generatedBy.getGeneratedBy();
+ return (RetrieveTableMarker) this.generatedBy.getGenerator();
}
@Override
- public NoGenerationLink<RetrieveTableMarker> getLinkage() {
+ public NoGenerationLink<RetrieveTableMarker> getFoLink() {
return this.generatedBy;
}
@@ -127,7 +127,7 @@
@Override
public RetrieveTableMarker getGraftingPoint() {
- return (RetrieveTableMarker) this.generatedBy.getGeneratedBy();
+ return (RetrieveTableMarker) this.generatedBy.getGenerator();
}
/**
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -146,13 +146,13 @@
}
@Override
- public Link<ScalingValueCitation> getLinkage() {
+ public Link<ScalingValueCitation> getFoLink() {
return this.generatedBy;
}
@Override
public ScalingValueCitation traitGeneratedBy() {
- return (ScalingValueCitation) this.getLinkage().getGeneratedBy();
+ return (ScalingValueCitation) this.getFoLink().getGenerator();
}
@Override
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-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -415,13 +415,13 @@
}
@Override
- public Link<RegionBody> getLinkage() {
+ public Link<RegionBody> getFoLink() {
return this.generatedBy;
}
@Override
public RegionBody traitGeneratedBy() {
- return (RegionBody) this.getLinkage().getGeneratedBy();
+ return (RegionBody) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -109,13 +109,13 @@
}
@Override
- public Link<TableBody> getLinkage() {
+ public Link<TableBody> getFoLink() {
return this.generatedBy;
}
@Override
public TableBody traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -484,13 +484,13 @@
}
@Override
- public Link<TableCell> getLinkage() {
+ public Link<TableCell> getFoLink() {
return this.generatedBy;
}
@Override
public TableCell traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -112,13 +112,13 @@
}
@Override
- public Link<TableFooter> getLinkage() {
+ public Link<TableFooter> getFoLink() {
return this.generatedBy;
}
@Override
public TableFooter traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -112,13 +112,13 @@
}
@Override
- public Link<TableHeader> getLinkage() {
+ public Link<TableHeader> getFoLink() {
return this.generatedBy;
}
@Override
public TableHeader traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -537,13 +537,13 @@
}
@Override
- public Link<Table> getLinkage() {
+ public Link<Table> getFoLink() {
return this.generatedBy;
}
@Override
public Table traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -212,13 +212,13 @@
}
@Override
- public Link<TableRow> getLinkage() {
+ public Link<TableRow> getFoLink() {
return this.generatedBy;
}
@Override
public TableRow traitGeneratedBy() {
- return (TableRow) this.getLinkage().getGeneratedBy();
+ return (TableRow) this.getFoLink().getGenerator();
}
@Override
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 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -167,7 +167,7 @@
}
@Override
- public Link<FoTextCharacters> getLinkage() {
+ public Link<FoTextCharacters> getFoLink() {
return this.generatedBy;
}
@@ -443,7 +443,7 @@
@Override
public FoTextCharacters traitGeneratedBy() {
- return this.generatedBy.getGeneratedBy();
+ return this.generatedBy.getGenerator();
}
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -90,7 +90,7 @@
}
@Override
- public Link<FoTextWords> getLinkage() {
+ public Link<FoTextWords> getFoLink() {
return this.generatedBy;
}
@@ -98,7 +98,7 @@
public CharSequence getText() {
final StringBuilder builder = new StringBuilder();
for (int index = this.startingLeafIndex; index < (this.startingLeafIndex + qtyLeaves); index ++) {
- final ParaLeaf leaf = this.generatedBy.getGeneratedBy().paraLeafAt(index);
+ final ParaLeaf leaf = this.generatedBy.getGenerator().paraLeafAt(index);
builder.append(leaf.getText());
}
return builder.toString();
@@ -118,7 +118,7 @@
@Override
public FoTextWords traitGeneratedBy() {
- return this.getLinkage().getGeneratedBy();
+ return this.getFoLink().getGenerator();
}
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -42,10 +42,10 @@
* Returns the FONode that generated this linkage.
* @return The node that generated this linkage.
*/
- T getGeneratedBy();
+ T getGenerator();
/**
- * Register a given area node as being generated by {@code generatedArea}.
+ * Register a given area node as being generated by {@link #getGenerator()}.
* @param generatedArea The area node to register.
*/
void registerGeneratedArea(AreaNode4a generatedArea);
@@ -54,46 +54,46 @@
* Unregisters a given area node.
* @param generatedArea The area node to unregister.
* @throws IllegalArgumentException If {@code generatedArea} is not registered as being generated by
- * {@link #getGeneratedBy()}.
+ * {@link #getGenerator()}.
*/
void unregisterGeneratedArea(AreaNode4a generatedArea);
/**
- * Indicates whether a given area generated by {@link #getGeneratedBy()} is the first area generated by
- * {@link #getGeneratedBy()}.
- * @param generatedArea The area generated by {@link #getGeneratedBy()} that is being tested.
- * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGeneratedBy()}.
- * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ * Indicates whether a given area generated by {@link #getGenerator()} is the first area generated by
+ * {@link #getGenerator()}.
+ * @param generatedArea The area generated by {@link #getGenerator()} that is being tested.
+ * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGenerator()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGenerator()}.
*/
boolean isFirstGeneratedBy(AreaNode4a generatedArea);
/**
- * Indicates whether a given area generated by {@link #getGeneratedBy()} is the last area generated by
- * {@link #getGeneratedBy()}.
- * @param generatedArea The area generated by {@link #getGeneratedBy()} that is being tested.
- * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGeneratedBy()}.
- * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ * Indicates whether a given area generated by {@link #getGenerator()} is the last area generated by
+ * {@link #getGenerator()}.
+ * @param generatedArea The area generated by {@link #getGenerator()} that is being tested.
+ * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGenerator()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGenerator()}.
*/
boolean isLastGeneratedBy(AreaNode4a generatedArea);
/**
- * For a given area generated by {@link #getGeneratedBy()}, returns the previous area generated by
- * {@link #getGeneratedBy()}.
- * @param generatedArea The area generated by {@link #getGeneratedBy()} whose previous area is needed.
+ * For a given area generated by {@link #getGenerator()}, returns the previous area generated by
+ * {@link #getGenerator()}.
+ * @param generatedArea The area generated by {@link #getGenerator()} whose previous area is needed.
* @return The previous area, or null, if {@code generatedArea} is the first area generated by
- * {@link #getGeneratedBy()}.
- * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ * {@link #getGenerator()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGenerator()}.
*/
AreaNode4a getPreviousGeneratedBy(AreaNode4a generatedArea);
/**
- * For a given area generated by {@link #getGeneratedBy()}, returns the next area generated by
- * {@link #getGeneratedBy()}.
- * @param generatedArea The area generated by {@link #getGeneratedBy()} whose next area is needed.
+ * For a given area generated by {@link #getGenerator()}, returns the next area generated by
+ * {@link #getGenerator()}.
+ * @param generatedArea The area generated by {@link #getGenerator()} whose next area is needed.
* @return The next area, or null, if {@code generatedArea} is the last area generated by
- * {@link #getGeneratedBy()}.
- * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ * {@link #getGenerator()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGenerator()}.
*/
AreaNode4a getNextGeneratedBy(AreaNode4a generatedArea);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -50,7 +50,7 @@
}
@Override
- public T getGeneratedBy() {
+ public T getGenerator() {
return this.generatedBy;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -46,10 +46,10 @@
private T generatedBy;
/**
- * The ordered list of Area instances generated by {@link Link#getGeneratedBy()}.
+ * The ordered list of Area instances generated by {@link Link#getGenerator()}.
* Index 0 "is-first" and Index size() - 1 "is-last".
* This is currently set up to only store the root node of any subtree that was generated by
- * {@link Link#getGeneratedBy()}.
+ * {@link Link#getGenerator()}.
*/
private List<AreaNode4a> generatedAreas = new ArrayList<AreaNode4a>();
@@ -91,7 +91,7 @@
}
@Override
- public T getGeneratedBy() {
+ public T getGenerator() {
return this.generatedBy;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -287,22 +287,6 @@
return null;
}
- /**
- * Indicates whether a given character is whitespace.
- * @param c The character being examined.
- * @return True if and only if {@link c} is whitespace.
- */
- boolean isWhitespace(final char c) {
- if ((c == ' ')
- || (c == '\n')
- || (c == '\r')
- || (c == '\t')) {
- return true;
- } else {
- return false;
- }
- }
-
@Override
public FontContext inlineFontContext() {
// TODO Auto-generated method stub
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-03 13:51:39 UTC (rev 12323)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-03 14:08:04 UTC (rev 12324)
@@ -580,4 +580,20 @@
*/
public abstract boolean isAllWhiteSpace();
+ /**
+ * Indicates whether a given character is whitespace.
+ * @param c The character being examined.
+ * @return True if and only if {@link c} is whitespace.
+ */
+ boolean isWhitespace(final char c) {
+ if ((c == ' ')
+ || (c == '\n')
+ || (c == '\r')
+ || (c == '\t')) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-03 13:51:41
|
Revision: 12323
http://sourceforge.net/p/foray/code/12323
Author: victormote
Date: 2022-01-03 13:51:39 +0000 (Mon, 03 Jan 2022)
Log Message:
-----------
Cleanup traitGeneratedBy() method for TextArea and subclasses.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2022-01-01 20:02:44 UTC (rev 12322)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2022-01-03 13:51:39 UTC (rev 12323)
@@ -37,6 +37,7 @@
import org.axsl.font.FontUse;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
+import org.axsl.fotree.fo.FoText;
import org.axsl.fotree.fo.FoTextCharacters;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -433,7 +434,7 @@
*/
@Override
public int traitFontSize() {
- final FoTextCharacters generatedBy = this.traitGeneratedBy();
+ final FoText generatedBy = this.traitGeneratedBy();
final int nominalFontSize = generatedBy.traitFontSizeActual(this,
this.getPrimaryFont().getFont());
if (this.hasFauxSmallCaps()) {
@@ -461,9 +462,7 @@
}
@Override
- public FoTextCharacters traitGeneratedBy() {
- return (FoTextCharacters) this.getLinkage().getGeneratedBy();
- }
+ public abstract FoText traitGeneratedBy();
@Override
public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
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 2022-01-01 20:02:44 UTC (rev 12322)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2022-01-03 13:51:39 UTC (rev 12323)
@@ -441,4 +441,9 @@
}
+ @Override
+ public FoTextCharacters traitGeneratedBy() {
+ return this.generatedBy.getGeneratedBy();
+ }
+
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-01 20:02:44 UTC (rev 12322)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-03 13:51:39 UTC (rev 12323)
@@ -31,7 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.fotree.fo.FoTextCharacters;
import org.axsl.fotree.fo.FoTextWords;
public class TextAreaWords extends TextArea {
@@ -118,8 +117,8 @@
}
@Override
- public FoTextCharacters traitGeneratedBy() {
- return (FoTextCharacters) this.getLinkage().getGeneratedBy();
+ public FoTextWords traitGeneratedBy() {
+ return this.getLinkage().getGeneratedBy();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-01 20:02:46
|
Revision: 12322
http://sourceforge.net/p/foray/code/12322
Author: victormote
Date: 2022-01-01 20:02:44 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Roll GenericLink into NormalLink. The distinction is no longer needed.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
Removed Paths:
-------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java 2022-01-01 19:55:27 UTC (rev 12321)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java 2022-01-01 20:02:44 UTC (rev 12322)
@@ -1,55 +0,0 @@
-/*
- * Copyright 2021 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area.link;
-
-import org.axsl.fotree.Fo;
-
-/**
- * Linkage for formatting objects that do not need special handling.
- * @param <T> The subtype of the {@link Fo} that is linked.
- */
-public class GenericLink<T extends Fo> extends NormalLink<T> {
-
- /** The FONode for which this linkage tracks Area generation. */
- private T generatedBy;
-
- /**
- * Constructor.
- * @param foGenerator The Formatting object that generates the areas in this linkage.
- */
- public GenericLink(final T foGenerator) {
- this.generatedBy = foGenerator;
- }
-
- @Override
- public T getGeneratedBy() {
- return this.generatedBy;
- }
-
-}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-01-01 19:55:27 UTC (rev 12321)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-01-01 20:02:44 UTC (rev 12322)
@@ -90,208 +90,208 @@
public class LinkFactory implements FoVisitor<Link<? extends Fo>> {
@Override
- public GenericLink<Fo> visit(final Fo host) {
- return new GenericLink<Fo>(host);
+ public NormalLink<Fo> visit(final Fo host) {
+ return new NormalLink<Fo>(host);
}
@Override
- public GenericLink<BasicLink> visit(final BasicLink host) {
- return new GenericLink<BasicLink>(host);
+ public NormalLink<BasicLink> visit(final BasicLink host) {
+ return new NormalLink<BasicLink>(host);
}
@Override
- public GenericLink<BidiOverride> visit(final BidiOverride host) {
- return new GenericLink<BidiOverride>(host);
+ public NormalLink<BidiOverride> visit(final BidiOverride host) {
+ return new NormalLink<BidiOverride>(host);
}
@Override
- public GenericLink<Block> visit(final Block host) {
- return new GenericLink<Block>(host);
+ public NormalLink<Block> visit(final Block host) {
+ return new NormalLink<Block>(host);
}
@Override
- public GenericLink<BlockContainer> visit(final BlockContainer host) {
- return new GenericLink<BlockContainer>(host);
+ public NormalLink<BlockContainer> visit(final BlockContainer host) {
+ return new NormalLink<BlockContainer>(host);
}
@Override
- public GenericLink<BlockDiscrete> visit(final BlockDiscrete host) {
- return new GenericLink<BlockDiscrete>(host);
+ public NormalLink<BlockDiscrete> visit(final BlockDiscrete host) {
+ return new NormalLink<BlockDiscrete>(host);
}
@Override
- public GenericLink<Bookmark> visit(final Bookmark host) {
- return new GenericLink<Bookmark>(host);
+ public NormalLink<Bookmark> visit(final Bookmark host) {
+ return new NormalLink<Bookmark>(host);
}
@Override
- public GenericLink<BookmarkTitle> visit(final BookmarkTitle host) {
- return new GenericLink<BookmarkTitle>(host);
+ public NormalLink<BookmarkTitle> visit(final BookmarkTitle host) {
+ return new NormalLink<BookmarkTitle>(host);
}
@Override
- public GenericLink<BookmarkTree> visit(final BookmarkTree host) {
- return new GenericLink<BookmarkTree>(host);
+ public NormalLink<BookmarkTree> visit(final BookmarkTree host) {
+ return new NormalLink<BookmarkTree>(host);
}
@Override
- public GenericLink<ColorProfile> visit(final ColorProfile host) {
- return new GenericLink<ColorProfile>(host);
+ public NormalLink<ColorProfile> visit(final ColorProfile host) {
+ return new NormalLink<ColorProfile>(host);
}
@Override
- public GenericLink<Declarations> visit(final Declarations host) {
- return new GenericLink<Declarations>(host);
+ public NormalLink<Declarations> visit(final Declarations host) {
+ return new NormalLink<Declarations>(host);
}
@Override
- public GenericLink<ExternalGraphic> visit(final ExternalGraphic host) {
- return new GenericLink<ExternalGraphic>(host);
+ public NormalLink<ExternalGraphic> visit(final ExternalGraphic host) {
+ return new NormalLink<ExternalGraphic>(host);
}
@Override
- public GenericLink<Float> visit(final Float host) {
- return new GenericLink<Float>(host);
+ public NormalLink<Float> visit(final Float host) {
+ return new NormalLink<Float>(host);
}
@Override
- public GenericLink<Flow> visit(final Flow host) {
- return new GenericLink<Flow>(host);
+ public NormalLink<Flow> visit(final Flow host) {
+ return new NormalLink<Flow>(host);
}
@Override
- public GenericLink<Footnote> visit(final Footnote host) {
- return new GenericLink<Footnote>(host);
+ public NormalLink<Footnote> visit(final Footnote host) {
+ return new NormalLink<Footnote>(host);
}
@Override
- public GenericLink<FootnoteBody> visit(final FootnoteBody host) {
- return new GenericLink<FootnoteBody>(host);
+ public NormalLink<FootnoteBody> visit(final FootnoteBody host) {
+ return new NormalLink<FootnoteBody>(host);
}
@Override
- public GenericLink<FoTextCharacters> visit(final FoTextCharacters host) {
- return new GenericLink<FoTextCharacters>(host);
+ public NormalLink<FoTextCharacters> visit(final FoTextCharacters host) {
+ return new NormalLink<FoTextCharacters>(host);
}
@Override
- public GenericLink<FoTextWords> visit(final FoTextWords host) {
- return new GenericLink<FoTextWords>(host);
+ public NormalLink<FoTextWords> visit(final FoTextWords host) {
+ return new NormalLink<FoTextWords>(host);
}
@Override
- public GenericLink<InitialPropertySet> visit(final InitialPropertySet host) {
- return new GenericLink<InitialPropertySet>(host);
+ public NormalLink<InitialPropertySet> visit(final InitialPropertySet host) {
+ return new NormalLink<InitialPropertySet>(host);
}
@Override
- public GenericLink<Inline> visit(final Inline host) {
- return new GenericLink<Inline>(host);
+ public NormalLink<Inline> visit(final Inline host) {
+ return new NormalLink<Inline>(host);
}
@Override
- public GenericLink<InlineContainer> visit(final InlineContainer host) {
- return new GenericLink<InlineContainer>(host);
+ public NormalLink<InlineContainer> visit(final InlineContainer host) {
+ return new NormalLink<InlineContainer>(host);
}
@Override
- public GenericLink<InstreamForeignObject> visit(final InstreamForeignObject host) {
- return new GenericLink<InstreamForeignObject>(host);
+ public NormalLink<InstreamForeignObject> visit(final InstreamForeignObject host) {
+ return new NormalLink<InstreamForeignObject>(host);
}
@Override
- public GenericLink<Leader> visit(final Leader host) {
- return new GenericLink<Leader>(host);
+ public NormalLink<Leader> visit(final Leader host) {
+ return new NormalLink<Leader>(host);
}
@Override
- public GenericLink<ListBlock> visit(final ListBlock host) {
- return new GenericLink<ListBlock>(host);
+ public NormalLink<ListBlock> visit(final ListBlock host) {
+ return new NormalLink<ListBlock>(host);
}
@Override
- public GenericLink<ListItem> visit(final ListItem host) {
- return new GenericLink<ListItem>(host);
+ public NormalLink<ListItem> visit(final ListItem host) {
+ return new NormalLink<ListItem>(host);
}
@Override
- public GenericLink<ListItemBody> visit(final ListItemBody host) {
- return new GenericLink<ListItemBody>(host);
+ public NormalLink<ListItemBody> visit(final ListItemBody host) {
+ return new NormalLink<ListItemBody>(host);
}
@Override
- public GenericLink<ListItemLabel> visit(final ListItemLabel host) {
- return new GenericLink<ListItemLabel>(host);
+ public NormalLink<ListItemLabel> visit(final ListItemLabel host) {
+ return new NormalLink<ListItemLabel>(host);
}
@Override
- public GenericLink<Marker> visit(final Marker host) {
- return new GenericLink<Marker>(host);
+ public NormalLink<Marker> visit(final Marker host) {
+ return new NormalLink<Marker>(host);
}
@Override
- public GenericLink<MultiCase> visit(final MultiCase host) {
- return new GenericLink<MultiCase>(host);
+ public NormalLink<MultiCase> visit(final MultiCase host) {
+ return new NormalLink<MultiCase>(host);
}
@Override
- public GenericLink<MultiProperties> visit(final MultiProperties host) {
- return new GenericLink<MultiProperties>(host);
+ public NormalLink<MultiProperties> visit(final MultiProperties host) {
+ return new NormalLink<MultiProperties>(host);
}
@Override
- public GenericLink<MultiPropertySet> visit(final MultiPropertySet host) {
- return new GenericLink<MultiPropertySet>(host);
+ public NormalLink<MultiPropertySet> visit(final MultiPropertySet host) {
+ return new NormalLink<MultiPropertySet>(host);
}
@Override
- public GenericLink<MultiSwitch> visit(final MultiSwitch host) {
- return new GenericLink<MultiSwitch>(host);
+ public NormalLink<MultiSwitch> visit(final MultiSwitch host) {
+ return new NormalLink<MultiSwitch>(host);
}
@Override
- public GenericLink<MultiToggle> visit(final MultiToggle host) {
- return new GenericLink<MultiToggle>(host);
+ public NormalLink<MultiToggle> visit(final MultiToggle host) {
+ return new NormalLink<MultiToggle>(host);
}
@Override
- public GenericLink<PageNumber> visit(final PageNumber host) {
- return new GenericLink<PageNumber>(host);
+ public NormalLink<PageNumber> visit(final PageNumber host) {
+ return new NormalLink<PageNumber>(host);
}
@Override
- public GenericLink<PageNumberCitation> visit(final PageNumberCitation host) {
- return new GenericLink<PageNumberCitation>(host);
+ public NormalLink<PageNumberCitation> visit(final PageNumberCitation host) {
+ return new NormalLink<PageNumberCitation>(host);
}
@Override
- public GenericLink<PageSequence> visit(final PageSequence host) {
- return new GenericLink<PageSequence>(host);
+ public NormalLink<PageSequence> visit(final PageSequence host) {
+ return new NormalLink<PageSequence>(host);
}
@Override
- public GenericLink<RegionAfter> visit(final RegionAfter host) {
- return new GenericLink<RegionAfter>(host);
+ public NormalLink<RegionAfter> visit(final RegionAfter host) {
+ return new NormalLink<RegionAfter>(host);
}
@Override
- public GenericLink<RegionBefore> visit(final RegionBefore host) {
- return new GenericLink<RegionBefore>(host);
+ public NormalLink<RegionBefore> visit(final RegionBefore host) {
+ return new NormalLink<RegionBefore>(host);
}
@Override
- public GenericLink<RegionBody> visit(final RegionBody host) {
- return new GenericLink<RegionBody>(host);
+ public NormalLink<RegionBody> visit(final RegionBody host) {
+ return new NormalLink<RegionBody>(host);
}
@Override
- public GenericLink<RegionEnd> visit(final RegionEnd host) {
- return new GenericLink<RegionEnd>(host);
+ public NormalLink<RegionEnd> visit(final RegionEnd host) {
+ return new NormalLink<RegionEnd>(host);
}
@Override
- public GenericLink<RegionStart> visit(final RegionStart host) {
- return new GenericLink<RegionStart>(host);
+ public NormalLink<RegionStart> visit(final RegionStart host) {
+ return new NormalLink<RegionStart>(host);
}
@Override
@@ -305,78 +305,78 @@
}
@Override
- public GenericLink<Root> visit(final Root host) {
- return new GenericLink<Root>(host);
+ public NormalLink<Root> visit(final Root host) {
+ return new NormalLink<Root>(host);
}
@Override
- public GenericLink<SimplePageMaster> visit(final SimplePageMaster host) {
- return new GenericLink<SimplePageMaster>(host);
+ public NormalLink<SimplePageMaster> visit(final SimplePageMaster host) {
+ return new NormalLink<SimplePageMaster>(host);
}
@Override
- public GenericLink<StaticContent> visit(final StaticContent host) {
- return new GenericLink<StaticContent>(host);
+ public NormalLink<StaticContent> visit(final StaticContent host) {
+ return new NormalLink<StaticContent>(host);
}
@Override
- public GenericLink<SvgElement> visit(final SvgElement host) {
- return new GenericLink<SvgElement>(host);
+ public NormalLink<SvgElement> visit(final SvgElement host) {
+ return new NormalLink<SvgElement>(host);
}
@Override
- public GenericLink<Table> visit(final Table host) {
- return new GenericLink<Table>(host);
+ public NormalLink<Table> visit(final Table host) {
+ return new NormalLink<Table>(host);
}
@Override
- public GenericLink<TableAndCaption> visit(final TableAndCaption host) {
- return new GenericLink<TableAndCaption>(host);
+ public NormalLink<TableAndCaption> visit(final TableAndCaption host) {
+ return new NormalLink<TableAndCaption>(host);
}
@Override
- public GenericLink<TableBody> visit(final TableBody host) {
- return new GenericLink<TableBody>(host);
+ public NormalLink<TableBody> visit(final TableBody host) {
+ return new NormalLink<TableBody>(host);
}
@Override
- public GenericLink<TableCaption> visit(final TableCaption host) {
- return new GenericLink<TableCaption>(host);
+ public NormalLink<TableCaption> visit(final TableCaption host) {
+ return new NormalLink<TableCaption>(host);
}
@Override
- public GenericLink<TableCell> visit(final TableCell host) {
- return new GenericLink<TableCell>(host);
+ public NormalLink<TableCell> visit(final TableCell host) {
+ return new NormalLink<TableCell>(host);
}
@Override
- public GenericLink<TableColumn> visit(final TableColumn host) {
- return new GenericLink<TableColumn>(host);
+ public NormalLink<TableColumn> visit(final TableColumn host) {
+ return new NormalLink<TableColumn>(host);
}
@Override
- public GenericLink<TableFooter> visit(final TableFooter host) {
- return new GenericLink<TableFooter>(host);
+ public NormalLink<TableFooter> visit(final TableFooter host) {
+ return new NormalLink<TableFooter>(host);
}
@Override
- public GenericLink<TableHeader> visit(final TableHeader host) {
- return new GenericLink<TableHeader>(host);
+ public NormalLink<TableHeader> visit(final TableHeader host) {
+ return new NormalLink<TableHeader>(host);
}
@Override
- public GenericLink<TableRow> visit(final TableRow host) {
- return new GenericLink<TableRow>(host);
+ public NormalLink<TableRow> visit(final TableRow host) {
+ return new NormalLink<TableRow>(host);
}
@Override
- public GenericLink<Title> visit(final Title host) {
- return new GenericLink<Title>(host);
+ public NormalLink<Title> visit(final Title host) {
+ return new NormalLink<Title>(host);
}
@Override
- public GenericLink<Wrapper> visit(final Wrapper host) {
- return new GenericLink<Wrapper>(host);
+ public NormalLink<Wrapper> visit(final Wrapper host) {
+ return new NormalLink<Wrapper>(host);
}
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2022-01-01 19:55:27 UTC (rev 12321)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2022-01-01 20:02:44 UTC (rev 12322)
@@ -40,8 +40,11 @@
* <p>A "normal" linkage manager, that is, one that simply matches an FONode to the Areas that it has created.</p>
* @param <T> The subtype of the {@link Fo} that is linked.
*/
-public abstract class NormalLink<T extends Fo> implements Link<T> {
+public class NormalLink<T extends Fo> implements Link<T> {
+ /** The FONode for which this linkage tracks Area generation. */
+ private T generatedBy;
+
/**
* The ordered list of Area instances generated by {@link Link#getGeneratedBy()}.
* Index 0 "is-first" and Index size() - 1 "is-last".
@@ -51,6 +54,14 @@
private List<AreaNode4a> generatedAreas = new ArrayList<AreaNode4a>();
/**
+ * Constructor.
+ * @param foGenerator The Formatting object that generates the areas in this linkage.
+ */
+ public NormalLink(final T foGenerator) {
+ this.generatedBy = foGenerator;
+ }
+
+ /**
* Register a given area node as being generated by this linkage.
* @param areaNode The area node to register.
*/
@@ -79,6 +90,11 @@
this.generatedAreas.remove(areaNode);
}
+ @Override
+ public T getGeneratedBy() {
+ return this.generatedBy;
+ }
+
/**
* Returns the first area generated by this linkage, that is, by the FO node in this linkage.
* @return The first area generated.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-01 19:55:29
|
Revision: 12321
http://sourceforge.net/p/foray/code/12321
Author: victormote
Date: 2022-01-01 19:55:27 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Remove no-longer-needed Link implementations.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.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/TextAreaWords.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
Removed Paths:
-------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.foray.area.link.BlockLink;
+import org.foray.area.link.Link;
import org.axsl.common.value.LineStackingStrategy;
import org.axsl.fotree.fo.Block;
@@ -69,7 +69,7 @@
return false;
}
- public abstract BlockLink getLinkage();
+ public abstract Link<Block> getLinkage();
@Override
public Block traitGeneratedBy() {
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 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.foray.area.link.BlockLink;
+import org.foray.area.link.Link;
import org.foray.common.data.OrderedTreeNode;
import org.axsl.area.AreaTreeException;
@@ -1319,7 +1319,7 @@
}
@Override
- public BlockLink getLinkage() {
+ public Link<Block> getLinkage() {
return this.parent.getLinkage();
}
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 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -28,7 +28,6 @@
package org.foray.area;
-import org.foray.area.link.BlockLink;
import org.foray.area.link.Link;
import org.foray.common.para.DiscretionaryHyphen4a;
@@ -64,7 +63,7 @@
public final class NormalBlockArea4a extends BlockArea implements NormalBlockArea, ParaContext {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private BlockLink generatedBy;
+ private Link<Block> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -93,7 +92,7 @@
static NormalBlockArea4a makeNormalBlockArea(final Block generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link<Block> linkage = newBlockArea.getLink(generatedBy);
- newBlockArea.generatedBy = (BlockLink) linkage;
+ newBlockArea.generatedBy = linkage;
newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
@@ -104,7 +103,7 @@
static NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link<Block> linkage = newBlockArea.getLink((Block) generatedBy);
- newBlockArea.generatedBy = (BlockLink) linkage;
+ newBlockArea.generatedBy = linkage;
newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
@@ -270,7 +269,7 @@
}
@Override
- public BlockLink getLinkage() {
+ public Link<Block> getLinkage() {
return this.generatedBy;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.foray.area.link.FoTextWordsLink;
+import org.foray.area.link.Link;
import org.axsl.common.para.ParaLeaf;
import org.axsl.fotree.fo.FoTextCharacters;
@@ -37,7 +37,7 @@
public class TextAreaWords extends TextArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private FoTextWordsLink generatedBy;
+ private Link<FoTextWords> generatedBy;
/** The first leaf index into the backing for {@link #generatedBy} that is part of this text area. */
private int startingLeafIndex;
@@ -54,7 +54,7 @@
* @param qtyLeaves The number of leaf indexes in the backing for {@code #generatedBy} that are part of this text
* area.
*/
- public TextAreaWords(final LineArea4a parentArea, final FoTextWordsLink generatedBy, final int startingLeafIndex,
+ public TextAreaWords(final LineArea4a parentArea, final Link<FoTextWords> generatedBy, final int startingLeafIndex,
final int qtyLeaves) {
super(parentArea);
this.generatedBy = generatedBy;
@@ -67,7 +67,7 @@
* @param parentArea The parent area.
* @param generatedBy The FO tree linkage.
*/
- private TextAreaWords(final AbstractInlineArea parentArea, final FoTextWordsLink generatedBy) {
+ private TextAreaWords(final AbstractInlineArea parentArea, final Link<FoTextWords> generatedBy) {
super(parentArea);
this.generatedBy = generatedBy;
}
@@ -84,7 +84,7 @@
*/
static TextAreaWords makeTextArea(final FoTextWords generatedBy, final LineArea4a parentArea,
final int startingLeafIndex, final int qtyLeaves) {
- final FoTextWordsLink linkage = (FoTextWordsLink) parentArea.getLink(generatedBy);
+ final Link<FoTextWords> linkage = parentArea.getLink(generatedBy);
final TextAreaWords newTextArea = new TextAreaWords(parentArea, linkage, startingLeafIndex, qtyLeaves);
newTextArea.registerLink(generatedBy);
return newTextArea;
@@ -91,7 +91,7 @@
}
@Override
- public FoTextWordsLink getLinkage() {
+ public Link<FoTextWords> getLinkage() {
return this.generatedBy;
}
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2021 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area.link;
-
-import org.axsl.fotree.fo.Block;
-
-/**
- * Linkage for {@link Block} formatting objects.
- */
-public class BlockLink extends NormalLink<Block> {
-
- /** The FONode for which this linkage tracks Area generation. */
- private Block generatedBy;
-
- /**
- * Constructor.
- * @param foGenerator The Formatting object that generates the areas in this linkage.
- */
- BlockLink(final Block foGenerator) {
- this.generatedBy = foGenerator;
- }
-
- @Override
- public Block getGeneratedBy() {
- return this.generatedBy;
- }
-
-}
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2021 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area.link;
-
-import org.axsl.fotree.fo.FoTextWords;
-
-/**
- * Linkage for {@link FoTextWords} formatting objects.
- */
-public class FoTextWordsLink extends NormalLink<FoTextWords> {
-
- /** The FONode for which this linkage tracks Area generation. */
- private FoTextWords generatedBy;
-
- /**
- * Constructor.
- * @param foGenerator The Formatting object that generates the areas in this linkage.
- */
- FoTextWordsLink(final FoTextWords foGenerator) {
- this.generatedBy = foGenerator;
- }
-
- @Override
- public FoTextWords getGeneratedBy() {
- return this.generatedBy;
- }
-
-}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-01-01 19:43:17 UTC (rev 12320)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-01-01 19:55:27 UTC (rev 12321)
@@ -105,8 +105,8 @@
}
@Override
- public BlockLink visit(final Block host) {
- return new BlockLink(host);
+ public GenericLink<Block> visit(final Block host) {
+ return new GenericLink<Block>(host);
}
@Override
@@ -175,8 +175,8 @@
}
@Override
- public FoTextWordsLink visit(final FoTextWords host) {
- return new FoTextWordsLink(host);
+ public GenericLink<FoTextWords> visit(final FoTextWords host) {
+ return new GenericLink<FoTextWords>(host);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-01 19:43:20
|
Revision: 12320
http://sourceforge.net/p/foray/code/12320
Author: victormote
Date: 2022-01-01 19:43:17 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Make Link generic.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
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/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.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
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -28,8 +28,6 @@
package org.foray.area;
-import org.foray.area.link.Link;
-
import org.axsl.area.AreaTreeException;
import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.fotree.fo.Block;
@@ -51,9 +49,6 @@
*/
public abstract class AbstractListItemContent extends NonArea implements BlockLevelAreaFactory {
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
-
/** The parent of this node. */
private ListItemArea parent;
@@ -144,20 +139,7 @@
return newRmNode;
}
- @Override
- public Link getLinkage() {
- return this.generatedBy;
- }
-
/**
- * Sets the "generated by" for this Area.
- * @param generatedBy The new "generated by" value.
- */
- protected void setGeneratedBy(final Link generatedBy) {
- this.generatedBy = generatedBy;
- }
-
- /**
* Computes the total BPD of the child Areas.
* @return The total BPD of the child Areas.
*/
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -29,6 +29,7 @@
package org.foray.area;
import org.foray.area.link.Link;
+import org.foray.area.link.LinkFactory;
import org.foray.common.data.AbstractOrderedTreeNode;
import org.axsl.area.AreaNode;
@@ -70,7 +71,7 @@
* @param generatedBy The {@link Fo} that generated this area.
*/
protected void registerLink(final Fo generatedBy) {
- final Link link = getLink(generatedBy);
+ final Link<Fo> link = getLink(generatedBy);
link.registerGeneratedArea(this);
}
@@ -140,18 +141,21 @@
/**
* Retrieves or creates a linkage item for a given FONode.
* @param foNode The FONode for which linkage is needed.
+ * @param <T> The subtype of {@link Fo} which is encapsulated by the link.
* @return The linkage item.
*/
- public Link getLink(final Fo foNode) {
+ @SuppressWarnings("unchecked")
+ public <T extends Fo> Link<T> getLink(final T foNode) {
if (foNode == null) {
return null;
}
final AreaTree4a areaTree = this.getAreaTree();
- Link linkage = areaTree.getFONodeLinkage(foNode);
+ Link<T> linkage = areaTree.getFONodeLinkage(foNode);
if (linkage != null) {
return linkage;
}
- linkage = foNode.acceptVisitor(this.getAreaTree().getLinkageFactory());
+ final LinkFactory factory = this.getAreaTree().getLinkageFactory();
+ linkage = (Link<T>) foNode.acceptVisitor(factory);
areaTree.setFONodeLinkage(foNode, linkage);
return linkage;
}
@@ -515,7 +519,7 @@
* Returns the raw "generated by" instance.
* @return The raw linkage item.
*/
- public abstract Link getLinkage();
+ public abstract Link<? extends Fo> getLinkage();
/**
* This method should be run after layout is complete, allowing cleanup and
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -94,7 +94,8 @@
/** The list of FoLinkage items for the nodes in the FOTree.
* Each {@link Fo} in the {@link FoTree} has a unique index, which
* indexes into this linkage map. */
- private ArrayList<Link> linkageMap = new ArrayList<Link>(AreaTree4a.INITIAL_LINKAGE_MAP_SIZE);
+ private ArrayList<Link<? extends Fo>> linkageMap =
+ new ArrayList<Link<? extends Fo>>(AreaTree4a.INITIAL_LINKAGE_MAP_SIZE);
/* Checkstyle-IllegalType-On. */
/**
@@ -272,9 +273,9 @@
*/
public Area4a firstNormalAreaReturned(final String id) {
final Fo fobj = retrieveId(id);
- final Link linkage = getLink(fobj);
+ final Link<Fo> linkage = getLink(fobj);
if (linkage instanceof NormalLink) {
- final NormalLink normalLinkage = (NormalLink) linkage;
+ final NormalLink<Fo> normalLinkage = (NormalLink<Fo>) linkage;
return normalLinkage.firstNormalAreaReturned();
}
/* Hopefully we can't reference ids in static content, right? */
@@ -392,9 +393,8 @@
}
@Override
- public Link getLinkage() {
+ public Link<? extends Fo> getLinkage() {
return null;
-// return this.generatedBy;
}
@Override
@@ -406,9 +406,11 @@
/**
* Returns the FoLinkage for a given FONode.
* @param node The FONode whose linkage is needed.
+ * @param <T> The subtype of {@link Fo}.
* @return The FoLinkage for {@code node}, or null if there is none.
*/
- protected Link getFONodeLinkage(final Fo node) {
+ @SuppressWarnings("unchecked")
+ protected <T extends Fo> Link<T> getFONodeLinkage(final T node) {
final int index = node.getSequentialIndex();
if (index < 0) {
throw new IndexOutOfBoundsException("FONode has a negative "
@@ -417,7 +419,7 @@
if (index >= this.linkageMap.size()) {
return null;
}
- return this.linkageMap.get(index);
+ return (Link<T>) this.linkageMap.get(index);
}
/**
@@ -424,9 +426,9 @@
* Sets the linkage for a given FONode.
* @param node The node whose linkage is to be set.
* @param linkage The linkage for {@code node}.
+ * @param <T> The subtype of {@link Fo}.
*/
- protected void setFONodeLinkage(final Fo node,
- final Link linkage) {
+ protected <T extends Fo> void setFONodeLinkage(final T node, final Link<T> linkage) {
final int index = node.getSequentialIndex();
if (index < 0) {
throw new IndexOutOfBoundsException("FONode has a negative "
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -50,7 +50,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<BasicLink> generatedBy;
/**
* Private Constructor for a LineArea parent.
@@ -120,7 +120,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<BasicLink> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -33,6 +33,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.BeforeFloatAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -47,7 +48,7 @@
public final class BeforeFloatRa extends AreaFixed implements BeforeFloatAreaG5, org.axsl.area.BeforeFloatRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -69,7 +70,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static BeforeFloatRa makeBeforeFloatArea(final Fo generatedBy, final RegionRaBody parentArea) {
+ static BeforeFloatRa makeBeforeFloatArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final BeforeFloatRa newFloatRA = new BeforeFloatRa(parentArea);
newFloatRA.generatedBy = newFloatRA.getLink(generatedBy);
newFloatRA.registerLink(generatedBy);
@@ -161,7 +162,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -49,7 +49,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<BidiOverride> generatedBy;
/**
* Private Constructor for a LineArea parent.
@@ -119,7 +119,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<BidiOverride> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -60,7 +60,7 @@
implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<BlockContainer> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -200,7 +200,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<BlockContainer> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -52,7 +52,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<ExternalGraphic> generatedBy;
/**
* Private Constructor.
@@ -170,7 +170,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<ExternalGraphic> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -33,6 +33,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.FootnoteAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -46,7 +47,7 @@
public final class FootnoteRa extends AreaFixed implements FootnoteAreaG5, org.axsl.area.FootnoteRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -68,8 +69,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static FootnoteRa makeFootnoteReferenceArea(final Fo generatedBy,
- final RegionRaBody parentArea) {
+ static FootnoteRa makeFootnoteReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final FootnoteRa footnoteRA = new FootnoteRa(parentArea);
footnoteRA.generatedBy = footnoteRA.getLink(generatedBy);
footnoteRA.registerLink(generatedBy);
@@ -172,7 +172,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -55,7 +55,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<InstreamForeignObject> generatedBy;
/** The foreign content encapsulated inside this area. */
private ForeignContentG5 foreignContent;
@@ -186,7 +186,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<InstreamForeignObject> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -49,7 +49,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<IndexPageCitationList> generatedBy;
/**
* Private Constructor for a LineArea parent.
@@ -121,7 +121,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<IndexPageCitationList> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -52,7 +52,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<Inline> generatedBy;
/**
* Private Constructor for a LineArea parent.
@@ -127,7 +127,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<Inline> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -58,7 +58,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<InlineContainer> generatedBy;
/** The children of this node. */
private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
@@ -134,7 +134,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<InlineContainer> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -76,7 +76,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<Leader> generatedBy;
/**
* Private Constructor.
@@ -396,7 +396,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<Leader> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -47,7 +47,7 @@
public final class ListBlockArea extends ContainerRa implements ListBlockAreaG5, org.axsl.area.ListBlockArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<ListBlock> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -161,7 +161,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<ListBlock> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -49,7 +49,7 @@
implements org.axsl.area.ListItemArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<ListItem> generatedBy;
/** The parent of this node. */
private ListBlockArea parent;
@@ -200,7 +200,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<ListItem> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -28,6 +28,8 @@
package org.foray.area;
+import org.foray.area.link.Link;
+
import org.axsl.fotree.fo.ListItemBody;
/**
@@ -37,6 +39,9 @@
public final class ListItemBodyContainer extends AbstractListItemContent
implements org.axsl.area.ListItemBodyContainer {
+ /** The "generated-by" trait, as defined in Section 6.1.1. */
+ private Link<ListItemBody> generatedBy;
+
/**
* Private Constructor.
* @param parentArea The parent area.
@@ -66,7 +71,20 @@
@Override
public ListItemBody traitGeneratedBy() {
- return (ListItemBody) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
+ @Override
+ public Link<ListItemBody> getLinkage() {
+ return this.generatedBy;
+ }
+
+ /**
+ * Sets the "generated by" for this Area.
+ * @param generatedBy The new "generated by" value.
+ */
+ protected void setGeneratedBy(final Link<ListItemBody> generatedBy) {
+ this.generatedBy = generatedBy;
+ }
+
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -28,6 +28,8 @@
package org.foray.area;
+import org.foray.area.link.Link;
+
import org.axsl.fotree.fo.ListItemLabel;
/**
@@ -37,6 +39,9 @@
public final class ListItemLabelContainer extends AbstractListItemContent
implements org.axsl.area.ListItemLabelContainer {
+ /** The "generated-by" trait, as defined in Section 6.1.1. */
+ private Link<ListItemLabel> generatedBy;
+
/**
* Private Constructor.
* @param parentArea The parent area.
@@ -66,7 +71,20 @@
@Override
public ListItemLabel traitGeneratedBy() {
- return (ListItemLabel) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
+ @Override
+ public Link<ListItemLabel> getLinkage() {
+ return this.generatedBy;
+ }
+
+ /**
+ * Sets the "generated by" for this Area.
+ * @param generatedBy The new "generated by" value.
+ */
+ protected void setGeneratedBy(final Link<ListItemLabel> generatedBy) {
+ this.generatedBy = generatedBy;
+ }
+
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -57,7 +57,7 @@
// 2 * 12000 * 1.3);
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -82,8 +82,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static MainRa makeMainReferenceArea(final RegionBody generatedBy,
- final RegionRaBody parentArea) {
+ static MainRa makeMainReferenceArea(final RegionBody generatedBy, final RegionRaBody parentArea) {
final MainRa newMainRA = new MainRa(parentArea);
newMainRA.generatedBy = newMainRA.getLink(generatedBy);
newMainRA.registerLink(generatedBy);
@@ -91,8 +90,7 @@
}
@Override
- public NormalFlowRa getNormalFlow(final Fo fo)
- throws AreaTreeException {
+ public NormalFlowRa getNormalFlow(final Fo fo) throws AreaTreeException {
/* The next cut of this method should also inspect the FO to see
* whether the area to be returned ought not to be the footnote
* or before-float reference area.*/
@@ -354,7 +352,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -92,7 +92,7 @@
*/
static NormalBlockArea4a makeNormalBlockArea(final Block generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
- final Link linkage = newBlockArea.getLink(generatedBy);
+ final Link<Block> linkage = newBlockArea.getLink(generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
@@ -103,7 +103,7 @@
static NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete generatedBy, final AreaNode4a parentArea) {
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
- final Link linkage = newBlockArea.getLink(generatedBy);
+ final Link<Block> linkage = newBlockArea.getLink((Block) generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
newBlockArea.registerLink(generatedBy);
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -38,6 +38,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.ListBlock;
import org.axsl.fotree.fo.Marker;
+import org.axsl.fotree.fo.RegionBody;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
@@ -55,7 +56,7 @@
implements org.axsl.area.NormalFlowRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private SpanRa parent;
@@ -81,8 +82,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static NormalFlowRa makeNormalFlowRA(final Fo generatedBy,
- final SpanRa parentArea) {
+ static NormalFlowRa makeNormalFlowRA(final RegionBody generatedBy, final SpanRa parentArea) {
final NormalFlowRa newNormalFlow = new NormalFlowRa(parentArea);
newNormalFlow.generatedBy = newNormalFlow.getLink(generatedBy);
newNormalFlow.registerLink(generatedBy);
@@ -261,7 +261,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -58,7 +58,7 @@
public final class PageCollection extends NonArea implements PageCollectionG5, org.axsl.area.PageCollection {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<PageSequence> generatedBy;
/** The parent of this node. */
private AreaTree4a parent;
@@ -91,18 +91,15 @@
/**
* Package-visible factory method.
- * @param generatedBy The "cousin" PageSequence object for which this
- * PageCollection is created.
+ * @param generatedBy The "cousin" PageSequence object for which this PageCollection is created.
* @param parentArea The parent area tree.
- * @param lastPageNumber The last page number that was used by the previous
- * page collection.
+ * @param lastPageNumber The last page number that was used by the previous page collection.
* @return The new instance.
- * @throws AreaTreeException If the FO Tree does not have sufficient
- * information to create the needed pages for padding.
+ * @throws AreaTreeException If the FO Tree does not have sufficient information to create the needed pages for
+ * padding.
*/
- static PageCollection makePageCollection(final PageSequence generatedBy,
- final AreaTree4a parentArea, final int lastPageNumber)
- throws AreaTreeException {
+ static PageCollection makePageCollection(final PageSequence generatedBy, final AreaTree4a parentArea,
+ final int lastPageNumber) throws AreaTreeException {
final PageCollection newCollection = new PageCollection(parentArea);
newCollection.generatedBy = newCollection.getLink(generatedBy);
newCollection.registerLink(generatedBy);
@@ -421,7 +418,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<PageSequence> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.font.FontUse;
-import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.PageNumber;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -51,7 +50,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<PageNumber> generatedBy;
/**
* Private Constructor.
@@ -103,7 +102,7 @@
* @param generatedBy The FO node generating this area.
* @param width The width, in millipoints, to set.
*/
- private static void init(final PageNumberArea newPnArea, final Fo generatedBy, final int width) {
+ private static void init(final PageNumberArea newPnArea, final PageNumber generatedBy, final int width) {
newPnArea.generatedBy = newPnArea.getLink(generatedBy);
newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
@@ -140,7 +139,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<PageNumber> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.font.FontUse;
-import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.PageNumberCitation;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -51,7 +50,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<PageNumberCitation> generatedBy;
/**
* Private Constructor.
@@ -103,7 +102,8 @@
* @param generatedBy The FO node generating this area.
* @param width The width, in millipoints, to set.
*/
- private static void init(final PageNumberCitationArea newPncArea, final Fo generatedBy, final int width) {
+ private static void init(final PageNumberCitationArea newPncArea, final PageNumberCitation generatedBy,
+ final int width) {
newPncArea.generatedBy = newPncArea.getLink(generatedBy);
newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
@@ -152,7 +152,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<PageNumberCitation> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.font.FontUse;
-import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.PageNumberCitationLast;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -51,7 +50,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<PageNumberCitationLast> generatedBy;
/**
* Private Constructor.
@@ -103,7 +102,8 @@
* @param generatedBy The FO node generating this area.
* @param width The width, in millipoints, to set.
*/
- private static void init(final PageNumberCitationLastArea newPncArea, final Fo generatedBy, final int width) {
+ private static void init(final PageNumberCitationLastArea newPncArea, final PageNumberCitationLast generatedBy,
+ final int width) {
newPncArea.generatedBy = newPncArea.getLink(generatedBy);
newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
@@ -152,7 +152,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<PageNumberCitationLast> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -68,7 +68,7 @@
org.axsl.area.PageArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<SimplePageMaster> generatedBy;
/** The parent of this node. */
private PageCollection parent;
@@ -578,7 +578,7 @@
* @return True if the first area returned by marker is on this page.
*/
private boolean startsHere(final Marker marker) {
- final NormalLink normalLinkage = this.markerParentLinkage(marker);
+ final NormalLink<? extends Fo> normalLinkage = this.markerParentLinkage(marker);
if (normalLinkage == null) {
return false;
}
@@ -598,7 +598,7 @@
* @return True if the last area returned by marker is on this page.
*/
private boolean endsHere(final Marker marker) {
- final NormalLink normalLinkage = this.markerParentLinkage(marker);
+ final NormalLink<? extends Fo> normalLinkage = this.markerParentLinkage(marker);
if (normalLinkage == null) {
return false;
}
@@ -617,11 +617,11 @@
* @param marker The marker for which the linkage is needed.
* @return The linkage.
*/
- private NormalLink markerParentLinkage(final Marker marker) {
+ private NormalLink<? extends Fo> markerParentLinkage(final Marker marker) {
final Fo parent = marker.getParent();
- final Link proxy = getLink(parent);
+ final Link<Fo> proxy = getLink(parent);
if (proxy instanceof NormalLink) {
- return (NormalLink) proxy;
+ return (NormalLink<Fo>) proxy;
}
/* This would mean nested markers. Should never happen. */
return null;
@@ -674,7 +674,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<SimplePageMaster> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -60,7 +60,7 @@
public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<Region> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -82,8 +82,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static RegionRa makeRegionArea(final Region generatedBy,
- final PageRa parentArea) {
+ static RegionRa makeRegionArea(final Region generatedBy, final PageRa parentArea) {
final RegionRa newRegionArea = new RegionRa(parentArea);
newRegionArea.generatedBy = newRegionArea.getLink(generatedBy);
newRegionArea.registerLink(generatedBy);
@@ -250,7 +249,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<Region> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -52,7 +52,7 @@
/* TODO: Why doesn't this class extend RegionRa? */
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -91,21 +91,17 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static RegionRaBody makeRegionBodyArea(final RegionBody generatedBy,
- final PageRa parentArea) {
+ static RegionRaBody makeRegionBodyArea(final RegionBody generatedBy, final PageRa parentArea) {
final RegionRaBody regionBody = new RegionRaBody(parentArea);
regionBody.generatedBy = regionBody.getLink(generatedBy);
regionBody.registerLink(generatedBy);
// create the primary reference areas
- regionBody.beforeFloatReferenceArea = BeforeFloatRa.makeBeforeFloatArea(
- generatedBy, regionBody);
+ regionBody.beforeFloatReferenceArea = BeforeFloatRa.makeBeforeFloatArea(generatedBy, regionBody);
regionBody.children.add(regionBody.beforeFloatReferenceArea);
- regionBody.mainReferenceArea = MainRa.makeMainReferenceArea(generatedBy,
- regionBody);
+ regionBody.mainReferenceArea = MainRa.makeMainReferenceArea(generatedBy, regionBody);
regionBody.children.add(regionBody.mainReferenceArea);
- regionBody.footnoteReferenceArea = FootnoteRa.makeFootnoteReferenceArea(
- generatedBy, regionBody);
+ regionBody.footnoteReferenceArea = FootnoteRa.makeFootnoteReferenceArea(generatedBy, regionBody);
regionBody.children.add(regionBody.footnoteReferenceArea);
return regionBody;
}
@@ -341,7 +337,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -47,7 +47,7 @@
public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private NoGenerationLink generatedBy;
+ private NoGenerationLink<RetrieveMarker> generatedBy;
/** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveMarker}. */
private Marker selectedMarker;
@@ -77,7 +77,7 @@
static RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker generatedBy, final AreaNode4a parent,
final Marker selectedMarker) {
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
- final NoGenerationLink link = new NoGenerationLink(generatedBy);
+ final NoGenerationLink<RetrieveMarker> link = new NoGenerationLink<RetrieveMarker>(generatedBy);
newRmNode.generatedBy = link;
newRmNode.selectedMarker = selectedMarker;
/* Do not try to register the link as the generator generates no areas. */
@@ -116,7 +116,7 @@
}
@Override
- public NoGenerationLink getLinkage() {
+ public NoGenerationLink<RetrieveMarker> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -47,7 +47,7 @@
public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private NoGenerationLink generatedBy;
+ private NoGenerationLink<RetrieveTableMarker> generatedBy;
/** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveTableMarker}. */
private Marker selectedMarker;
@@ -77,7 +77,7 @@
static RetrieveTableMarkerNode4a makeRetrieveTableMarkerNode(final RetrieveTableMarker generatedBy,
final AreaNode4a parent, final Marker selectedMarker) {
final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
- final NoGenerationLink link = new NoGenerationLink(generatedBy);
+ final NoGenerationLink<RetrieveTableMarker> link = new NoGenerationLink<RetrieveTableMarker>(generatedBy);
newRtmNode.generatedBy = link;
newRtmNode.selectedMarker = selectedMarker;
/* Do not try to register the link as the generator generates no areas. */
@@ -116,7 +116,7 @@
}
@Override
- public NoGenerationLink getLinkage() {
+ public NoGenerationLink<RetrieveTableMarker> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -34,7 +34,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.font.FontContext;
import org.axsl.font.FontUse;
-import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.ScalingValueCitation;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -55,7 +54,7 @@
private Area4a parent;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<ScalingValueCitation> generatedBy;
/**
* Private Constructor.
@@ -107,7 +106,8 @@
* @param generatedBy The FO node generating this area.
* @param width The width, in millipoints, to set.
*/
- private static void init(final ScalingValueCitationArea newPnArea, final Fo generatedBy, final int width) {
+ private static void init(final ScalingValueCitationArea newPnArea, final ScalingValueCitation generatedBy,
+ final int width) {
newPnArea.generatedBy = newPnArea.getLink(generatedBy);
newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
@@ -146,7 +146,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<ScalingValueCitation> getLinkage() {
return this.generatedBy;
}
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-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -51,7 +51,7 @@
implements org.axsl.area.SpanRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<RegionBody> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -84,8 +84,7 @@
* @param numColumns The number of columns in this span area.
* @return The new instance.
*/
- static SpanRa makeSpanArea(final RegionBody generatedBy,
- final MainRa parentArea, final int numColumns) {
+ static SpanRa makeSpanArea(final RegionBody generatedBy, final MainRa parentArea, final int numColumns) {
final SpanRa newSpanArea = new SpanRa(parentArea);
newSpanArea.generatedBy = newSpanArea.getLink(generatedBy);
newSpanArea.registerLink(generatedBy);
@@ -93,8 +92,7 @@
newSpanArea.setProgressionDimension(initialPD);
newSpanArea.initializeAnteriorSpace();
for (int columnIndex = 0; columnIndex < numColumns; columnIndex++) {
- final NormalFlowRa newNormalFlow = NormalFlowRa.makeNormalFlowRA(
- generatedBy, newSpanArea);
+ final NormalFlowRa newNormalFlow = NormalFlowRa.makeNormalFlowRA(generatedBy, newSpanArea);
newSpanArea.children.add(newNormalFlow);
}
/*
@@ -417,7 +415,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<RegionBody> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -48,7 +48,7 @@
org.axsl.area.TableBodyContainer {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<TableBody> generatedBy;
/**
* Private Constructor.
@@ -109,13 +109,13 @@
}
@Override
- public Link getLinkage() {
+ public Link<TableBody> getLinkage() {
return this.generatedBy;
}
@Override
public TableBody traitGeneratedBy() {
- return (TableBody) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
@Override
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -60,7 +60,7 @@
public final class TableCellRa extends ContainerRa implements TableCellAreaG5, org.axsl.area.TableCellArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<TableCell> generatedBy;
/** The parent of this node. */
private TableRowContainer parent;
@@ -484,13 +484,13 @@
}
@Override
- public Link getLinkage() {
+ public Link<TableCell> getLinkage() {
return this.generatedBy;
}
@Override
public TableCell traitGeneratedBy() {
- return (TableCell) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
@Override
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -51,7 +51,7 @@
org.axsl.area.TableFooterContainer {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<TableFooter> generatedBy;
/**
* Private Constructor.
@@ -112,13 +112,13 @@
}
@Override
- public Link getLinkage() {
+ public Link<TableFooter> getLinkage() {
return this.generatedBy;
}
@Override
public TableFooter traitGeneratedBy() {
- return (TableFooter) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
@Override
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -51,7 +51,7 @@
org.axsl.area.TableHeaderContainer {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<TableHeader> generatedBy;
/**
* Private Constructor.
@@ -112,13 +112,13 @@
}
@Override
- public Link getLinkage() {
+ public Link<TableHeader> getLinkage() {
return this.generatedBy;
}
@Override
public TableHeader traitGeneratedBy() {
- return (TableHeader) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
@Override
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -64,7 +64,7 @@
private static final int MINCOLWIDTH = 10000;
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<Table> generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -537,13 +537,13 @@
}
@Override
- public Link getLinkage() {
+ public Link<Table> getLinkage() {
return this.generatedBy;
}
@Override
public Table traitGeneratedBy() {
- return (Table) this.getLinkage().getGeneratedBy();
+ return this.getLinkage().getGeneratedBy();
}
@Override
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -56,7 +56,7 @@
BackgroundAreaG5 {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<TableRow> generatedBy;
/** The parent of this node. */
private AbstractTablePartContainer parent;
@@ -212,7 +212,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<TableRow> getLinkage() {
return this.generatedBy;
}
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 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -39,7 +39,7 @@
public final class TextAreaCharacters extends TextArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private Link generatedBy;
+ private Link<FoTextCharacters> generatedBy;
/** The resolved textual content of this text area. */
private TextAreaCharSequence charSequence;
@@ -49,7 +49,7 @@
* @param parentArea The parent area.
* @param generatedBy The FO tree linkage.
*/
- private TextAreaCharacters(final LineArea4a parentArea, final Link generatedBy) {
+ private TextAreaCharacters(final LineArea4a parentArea, final Link<FoTextCharacters> generatedBy) {
super(parentArea);
this.generatedBy = generatedBy;
}
@@ -59,7 +59,7 @@
* @param parentArea The parent area.
* @param generatedBy The FO tree linkage.
*/
- private TextAreaCharacters(final AbstractInlineArea parentArea, final Link generatedBy) {
+ private TextAreaCharacters(final AbstractInlineArea parentArea, final Link<FoTextCharacters> generatedBy) {
super(parentArea);
this.generatedBy = generatedBy;
}
@@ -85,7 +85,7 @@
static TextAreaCharacters makeTextArea(final FoTextCharacters generatedBy, final LineArea4a parentArea,
final int backingOffset, final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen, final boolean hasFauxSmallCaps) {
- final Link linkage = parentArea.getLink(generatedBy);
+ final Link<FoTextCharacters> linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
newTextArea.registerLink(generatedBy);
newTextArea.init(parentArea, backingOffset, backingSize,
@@ -121,7 +121,7 @@
static TextAreaCharacters makeTextArea(final FoTextCharacters generatedBy, final AbstractInlineArea parentArea,
final int backingOffset, final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen, final boolean hasFauxSmallCaps) {
- final Link linkage = parentArea.getLink(generatedBy);
+ final Link<FoTextCharacters> linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
newTextArea.registerLink(generatedBy);
newTextArea.init(parentArea, backingOffset, backingSize, progressionDimensionUsed, hasDiscretionaryHyphen,
@@ -167,7 +167,7 @@
}
@Override
- public Link getLinkage() {
+ public Link<FoTextCharacters> getLinkage() {
return this.generatedBy;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java 2022-01-01 16:46:53 UTC (rev 12319)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/BlockLink.java 2022-01-01 19:43:17 UTC (rev 12320)
@@ -33,7 +33,7 @@
/**
* Linkage for {@link Block} formatting objects.
*/
-public class BlockLink extends NormalLink {
+public class BlockLink extends NormalLink<Block> {
/** The FONode for which this linkage tracks Area generation. */
private Block generatedBy;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/FoTextWordsLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/...
[truncated message content] |
|
From: <vic...@us...> - 2022-01-01 16:46:55
|
Revision: 12319
http://sourceforge.net/p/foray/code/12319
Author: victormote
Date: 2022-01-01 16:46:53 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Add factory method for TextAreaWords.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
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 2022-01-01 14:58:57 UTC (rev 12318)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2022-01-01 16:46:53 UTC (rev 12319)
@@ -82,7 +82,7 @@
* If true, all text will be converted to uppercase and a reduced font-size will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FoTextCharacters generatedBy, final LineArea4a parentArea,
+ static TextAreaCharacters makeTextArea(final FoTextCharacters generatedBy, final LineArea4a parentArea,
final int backingOffset, final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen, final boolean hasFauxSmallCaps) {
final Link linkage = parentArea.getLink(generatedBy);
@@ -118,7 +118,7 @@
* will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FoTextCharacters generatedBy, final AbstractInlineArea parentArea,
+ static TextAreaCharacters makeTextArea(final FoTextCharacters generatedBy, final AbstractInlineArea parentArea,
final int backingOffset, final int backingSize, final int progressionDimensionUsed,
final boolean hasDiscretionaryHyphen, final boolean hasFauxSmallCaps) {
final Link linkage = parentArea.getLink(generatedBy);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-01 14:58:57 UTC (rev 12318)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaWords.java 2022-01-01 16:46:53 UTC (rev 12319)
@@ -31,6 +31,8 @@
import org.foray.area.link.FoTextWordsLink;
import org.axsl.common.para.ParaLeaf;
+import org.axsl.fotree.fo.FoTextCharacters;
+import org.axsl.fotree.fo.FoTextWords;
public class TextAreaWords extends TextArea {
@@ -70,6 +72,24 @@
this.generatedBy = generatedBy;
}
+ /**
+ * Package-visible factory method.
+ * @param generatedBy The FO node generating this area.
+ * @param parentArea The parent area.
+ * @param startingLeafIndex The first leaf index into the backing for {@code #generatedBy} that is part of this text
+ * area.
+ * @param qtyLeaves The number of leaf indexes in the backing for {@code #generatedBy} that are part of this text
+ * area.
+ * @return The newly-created TextArea.
+ */
+ static TextAreaWords makeTextArea(final FoTextWords generatedBy, final LineArea4a parentArea,
+ final int startingLeafIndex, final int qtyLeaves) {
+ final FoTextWordsLink linkage = (FoTextWordsLink) parentArea.getLink(generatedBy);
+ final TextAreaWords newTextArea = new TextAreaWords(parentArea, linkage, startingLeafIndex, qtyLeaves);
+ newTextArea.registerLink(generatedBy);
+ return newTextArea;
+ }
+
@Override
public FoTextWordsLink getLinkage() {
return this.generatedBy;
@@ -97,4 +117,9 @@
return false;
}
+ @Override
+ public FoTextCharacters traitGeneratedBy() {
+ return (FoTextCharacters) this.getLinkage().getGeneratedBy();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-01 14:59:00
|
Revision: 12318
http://sourceforge.net/p/foray/code/12318
Author: victormote
Date: 2022-01-01 14:58:57 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Fix error in creation of text content.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-01-01 01:03:34 UTC (rev 12317)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-01-01 14:58:57 UTC (rev 12318)
@@ -44,10 +44,12 @@
import org.foray.fotree.fo.obj.Block4a;
import org.foray.fotree.fo.obj.Flow4a;
import org.foray.fotree.fo.obj.FoScaled4a;
+import org.foray.fotree.fo.obj.FoText4a;
import org.foray.fotree.fo.obj.FoTextCharacters4a;
import org.foray.fotree.fo.obj.Leader4a;
import org.foray.fotree.fo.obj.ListBlock4a;
import org.foray.fotree.fo.obj.ListItem4a;
+import org.foray.fotree.fo.obj.Marker4a;
import org.foray.fotree.fo.obj.Root4a;
import org.foray.fotree.fo.obj.StaticContent4a;
import org.foray.fotree.fo.obj.Table4a;
@@ -3234,6 +3236,34 @@
*/
public abstract boolean canHaveMarkerChildren();
+ /**
+ * Indicates whether it is valid to add fo:marker(s) to this FO.
+ * This method is generally only useful during FO tree construction.
+ * Markers can only be added at the beginning of FOs in which they are valid.
+ * However, if the FO so far contains only whitespace content, we treat that as ignorable whitespace, and
+ * allow markers to be added.
+ * @return True if and only if fo:marker(s) can be added to this FO.
+ */
+ protected boolean canAddMarkers() {
+ if (! canHaveMarkerChildren()) {
+ return false;
+ }
+ for (int index = 0; index < getChildren().size(); index ++) {
+ final FoObj child = getChildren().get(index);
+ if (child instanceof Marker4a) {
+ continue;
+ }
+ if (child instanceof FoText4a) {
+ final FoText4a text = (FoText4a) child;
+ if (text.isAllWhiteSpace()) {
+ continue;
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+
@Override
public int qtyMarkerChildren() {
int qtyMarkers = 0;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-01 01:03:34 UTC (rev 12317)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-01 14:58:57 UTC (rev 12318)
@@ -57,12 +57,6 @@
super(parent);
}
- /**
- * Indicates whether this text item is all whitespace.
- * @return True if and only if all of the text in this item is whitespace.
- */
- public abstract boolean isAllWhiteSpace();
-
@Override
public CharSequence inlineText(final TextModifiers textModifers) {
return inlineText(null);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java 2022-01-01 01:03:34 UTC (rev 12317)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java 2022-01-01 14:58:57 UTC (rev 12318)
@@ -168,63 +168,73 @@
return true;
}
-// @Override
-// public void addChild(final FoObj fobj) throws FoTreeException {
-// if (fobj.isAlwaysBlockContent()) {
-// getChildren().add(fobj);
-// return;
-// }
-// if (fobj instanceof FoText4a) {
-// /* If we are still in a place where an fo:marker can be added (i.e. at the beginning of the block), and
-// * this text is all whitespace, it is not really part of the BlockDiscrete content.
-// * Place it directly into the block content so that fo:marker objecs can be added if needed. */
-// if (getChildren().size() < 1
-// || getChildren().get(getChildren().size() - 1) instanceof Marker4a) {
-// getChildren().add(fobj);
-// } else {
-// addBlockDiscreteContent(fobj);
-// }
-// return;
-// }
-// if (fobj.isAlwaysInlineContent()) {
-// addBlockDiscreteContent(fobj);
-// return;
-// }
-// if (fobj instanceof Marker4a) {
-// getChildren().add(fobj);
-// return;
-// }
-// if (fobj instanceof Footnote4a) {
-// addBlockDiscreteContent(fobj);
-// return;
-// }
-// if (fobj.isNeutralContainer()
-// || fobj.isOutOfLineAnyContent()
-// || fobj.isOutOfLineInlineContent()) {
-// /* If it is capable of containing block-level elements, but does not, it can be a child. */
-// if (! fobj.hasDescendantBlocks()) {
-// addBlockDiscreteContent(fobj);
-// } else {
-// getChildren().add(fobj);
-// }
-// return;
-// }
-// throwException("Unable to handle this kind of mixed content.");
-// }
-//
-// private void addBlockDiscreteContent(final FoObj fobj) throws FoTreeException {
-// final FoObj lastChild = this.getLastChild();
-// BlockDiscrete4a discrete = null;
-// if (lastChild == null) {
-// discrete = new BlockDiscrete4a(this);
-// getChildren().add(discrete);
-// } else if (lastChild instanceof BlockDiscrete4a) {
-// discrete = (BlockDiscrete4a) lastChild;
-// } else {
-// discrete = new BlockDiscrete4a(this);
-// getChildren().add(discrete);
-// }
-// discrete.addChild(fobj);
-// }
+ @Override
+ public void addChild(final FoObj fobj) throws FoTreeException {
+ /* TODO: The following code block should be removed when the BlockDiscrete logic is working properly. */
+ if ("block".equals(getName())) {
+ super.addChild(fobj);
+ return;
+ }
+ if (fobj.isAlwaysBlockContent()) {
+ getChildren().add(fobj);
+ return;
+ }
+ if (fobj instanceof FoText4a) {
+ final FoText4a text = (FoText4a) fobj;
+ /* If we are still in a place where an fo:marker can be added (i.e. at the beginning of the block), and
+ * this text is all whitespace, it is not really part of the BlockDiscrete content.
+ * Place it directly into the block content so that fo:marker objects can be added if needed. */
+ if (text.isAllWhiteSpace()
+ && canAddMarkers()) {
+ getChildren().add(fobj);
+ } else {
+ addBlockDiscreteContent(fobj);
+ }
+ return;
+ }
+ if (fobj.isAlwaysInlineContent()) {
+ addBlockDiscreteContent(fobj);
+ return;
+ }
+ if (fobj instanceof Marker4a) {
+ if (canAddMarkers()) {
+ getChildren().add(fobj);
+ } else {
+ throwExceptionContentModelViolation();
+ }
+ return;
+ }
+ if (fobj instanceof Footnote4a) {
+ addBlockDiscreteContent(fobj);
+ return;
+ }
+ if (fobj.isNeutralContainer()
+ || fobj.isOutOfLineAnyContent()
+ || fobj.isOutOfLineInlineContent()) {
+ /* If it is capable of containing block-level elements, but does not, it can be a child. */
+ if (! fobj.hasDescendantBlocks()) {
+ addBlockDiscreteContent(fobj);
+ } else {
+ getChildren().add(fobj);
+ }
+ return;
+ }
+ throwException("Unable to handle this kind of mixed content.");
+ }
+ private void addBlockDiscreteContent(final FoObj fobj) throws FoTreeException {
+ final FoObj lastChild = this.getLastChild();
+ BlockDiscrete4a discrete = null;
+ if (lastChild == null) {
+ discrete = new BlockDiscrete4a(this);
+ getChildren().add(discrete);
+ } else if (lastChild instanceof BlockDiscrete4a) {
+ discrete = (BlockDiscrete4a) lastChild;
+ } else {
+ discrete = new BlockDiscrete4a(this);
+ getChildren().add(discrete);
+ }
+ discrete.addChild(fobj);
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-01 01:03:34 UTC (rev 12317)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-01 14:58:57 UTC (rev 12318)
@@ -574,4 +574,10 @@
return newStringBuilder;
}
+ /**
+ * Indicates whether this text item is all whitespace.
+ * @return True if and only if all of the text in this item is whitespace.
+ */
+ public abstract boolean isAllWhiteSpace();
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-01 01:03:37
|
Revision: 12317
http://sourceforge.net/p/foray/code/12317
Author: victormote
Date: 2022-01-01 01:03:34 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Remove GraftingPoint from most Area Tree methods. The Grafting Point is now drawn from the tree itself.
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/AbstractTablePartContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.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/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/LineArea4a.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/MathArea.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/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/RegionRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.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
trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractTablePartPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ExternalGraphicPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FlowPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoNodePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoObjPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnoteBodyPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FootnotePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InstreamForeignObjectPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/LeaderPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListItemBodyPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListItemLabelPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListItemPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/MarkerPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/NoLayoutPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PageNumberCitationPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PageNumberPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/StaticContentPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TableCellPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TableRowPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/WrapperPnr.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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -39,7 +39,6 @@
import org.axsl.fotree.fo.ExternalGraphic;
import org.axsl.fotree.fo.FoTextCharacters;
import org.axsl.fotree.fo.FoTextWords;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.IndexPageCitationList;
import org.axsl.fotree.fo.Inline;
import org.axsl.fotree.fo.InlineContainer;
@@ -71,12 +70,8 @@
}
@Override
- public BidiOverrideArea makeBidiOverrideArea(
- final BidiOverride bidiOverride,
- final GraftingPoint graftingPoint) {
- final BidiOverrideArea newBidiArea =
- BidiOverrideArea.makeBidiOverrideArea(bidiOverride, this,
- graftingPoint);
+ public BidiOverrideArea makeBidiOverrideArea(final BidiOverride bidiOverride) {
+ final BidiOverrideArea newBidiArea = BidiOverrideArea.makeBidiOverrideArea(bidiOverride, this);
this.children.add(newBidiArea);
return newBidiArea;
}
@@ -85,12 +80,10 @@
public TextArea makeGlyphAreaSequence(final FoTextCharacters foText,
final int startOffset, final int sizeInChars, final int ipd,
final boolean hasDiscretionaryHyphen,
- final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
- final GraftingPoint graftingPoint) {
+ final boolean hasFauxSmallCaps, final boolean isLastItemOnLine) {
if (LineArea4a.shouldCreateTextArea(foText, this, startOffset,
sizeInChars, isLastItemOnLine, this)) {
- final TextArea newTextArea = TextAreaCharacters.makeTextArea(foText, this,
- graftingPoint, startOffset, sizeInChars, ipd,
+ final TextArea newTextArea = TextAreaCharacters.makeTextArea(foText, this, startOffset, sizeInChars, ipd,
hasDiscretionaryHyphen, hasFauxSmallCaps);
this.children.add(newTextArea);
return newTextArea;
@@ -100,37 +93,27 @@
@Override
public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
- final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
+ final int sizeInLeaves, final boolean hasFauxSmallCaps) {
throw new UnsupportedOperationException();
}
@Override
- public ExternalGraphicArea makeExternalGraphicArea(
- final ExternalGraphic ifo, final int ipd,
- final GraftingPoint graftingPoint) {
- final ExternalGraphicArea newEgArea
- = ExternalGraphicArea.makeExternalGraphicArea(ifo, this,
- graftingPoint, ipd);
+ public ExternalGraphicArea makeExternalGraphicArea(final ExternalGraphic ifo, final int ipd) {
+ final ExternalGraphicArea newEgArea = ExternalGraphicArea.makeExternalGraphicArea(ifo, this, ipd);
this.children.add(newEgArea);
return newEgArea;
}
@Override
- public ForeignObjectArea makeForeignObjectArea(
- final InstreamForeignObject ifo, final int ipd,
- final GraftingPoint graftingPoint) {
- final ForeignObjectArea newForeignArea
- = ForeignObjectArea.makeForeignObjectArea(ifo, this,
- graftingPoint, ipd);
+ public ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject ifo, final int ipd) {
+ final ForeignObjectArea newForeignArea = ForeignObjectArea.makeForeignObjectArea(ifo, this, ipd);
this.children.add(newForeignArea);
return newForeignArea;
}
@Override
- public InlineArea makeInlineArea(final Inline inline,
- final GraftingPoint graftingPoint) {
- final InlineArea newInlineArea = InlineArea.makeInlineArea(inline, this,
- graftingPoint);
+ public InlineArea makeInlineArea(final Inline inline) {
+ final InlineArea newInlineArea = InlineArea.makeInlineArea(inline, this);
this.children.add(newInlineArea);
return newInlineArea;
}
@@ -137,11 +120,9 @@
@Override
public InlineContainerArea makeInlineContainerArea(
- final InlineContainer inlineContainer,
- final GraftingPoint graftingPoint) {
+ final InlineContainer inlineContainer) {
final InlineContainerArea newInlineContainerArea =
- InlineContainerArea.makeInlineContainerArea(inlineContainer,
- this, graftingPoint);
+ InlineContainerArea.makeInlineContainerArea(inlineContainer, this);
this.children.add(newInlineContainerArea);
return newInlineContainerArea;
}
@@ -148,10 +129,8 @@
@Override
public LeaderArea makeLeaderArea(
- final Leader leader, final int ipd,
- final GraftingPoint graftingPoint) throws AreaTreeException {
- final LeaderArea newLeaderArea = LeaderArea.makeLeaderArea(leader, this,
- graftingPoint, ipd);
+ final Leader leader, final int ipd) throws AreaTreeException {
+ final LeaderArea newLeaderArea = LeaderArea.makeLeaderArea(leader, this, ipd);
this.children.add(newLeaderArea);
return newLeaderArea;
}
@@ -158,11 +137,8 @@
@Override
public PageNumberArea makePageNumberArea(
- final PageNumber pageNumber, final int ipd,
- final GraftingPoint graftingPoint) {
- final PageNumberArea newPageNumberArea
- = PageNumberArea.makePageNumberArea(pageNumber, this,
- graftingPoint, ipd);
+ final PageNumber pageNumber, final int ipd) {
+ final PageNumberArea newPageNumberArea = PageNumberArea.makePageNumberArea(pageNumber, this, ipd);
this.children.add(newPageNumberArea);
return newPageNumberArea;
}
@@ -169,11 +145,9 @@
@Override
public PageNumberCitationArea makePageNumberCitationArea(
- final PageNumberCitation citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ final PageNumberCitation citation, final int ipd) {
final PageNumberCitationArea newCitationArea =
- PageNumberCitationArea.makePageNumberCitationArea(citation,
- this, graftingPoint, ipd);
+ PageNumberCitationArea.makePageNumberCitationArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@@ -180,38 +154,32 @@
@Override
public PageNumberCitationLastArea makePageNumberCitationLastArea(
- final PageNumberCitationLast citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ final PageNumberCitationLast citation, final int ipd) {
final PageNumberCitationLastArea newCitationArea =
- PageNumberCitationLastArea.makePageNumberCitationLastArea(
- citation, this, graftingPoint, ipd);
+ PageNumberCitationLastArea.makePageNumberCitationLastArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@Override
- public ScalingValueCitationArea makeScalingValueCitationArea(
- final ScalingValueCitation citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ public ScalingValueCitationArea makeScalingValueCitationArea(final ScalingValueCitation citation, final int ipd) {
final ScalingValueCitationArea newCitationArea =
- ScalingValueCitationArea.makeScalingValueCitationArea(
- citation, this, graftingPoint, ipd);
+ ScalingValueCitationArea.makeScalingValueCitationArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@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 BasicLinkArea newLinkArea = BasicLinkArea.makeBasicLinkArea(basicLink, this);
this.children.add(newLinkArea);
return newLinkArea;
}
@Override
- public IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList indexPcl,
- final GraftingPoint graftingPoint) {
- final IndexPageCitationListArea newIpclArea = IndexPageCitationListArea.makeIndexPageCitationListArea(indexPcl,
- this, graftingPoint);
+ public IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList indexPcl) {
+ final IndexPageCitationListArea newIpclArea =
+ IndexPageCitationListArea.makeIndexPageCitationListArea(indexPcl, this);
this.children.add(newIpclArea);
return newIpclArea;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -35,7 +35,6 @@
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.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
@@ -102,46 +101,36 @@
}
@Override
- public TableRa makeTableArea(final Table table,
- final GraftingPoint graftingPoint) {
- final TableRa newTable = TableRa.makeTableRA(table, this,
- graftingPoint);
+ public TableRa makeTableArea(final Table table) {
+ final TableRa newTable = TableRa.makeTableRA(table, this);
this.children.add(newTable);
return newTable;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final Block block,
- final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(
- block, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final Block block) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(block, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete, final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public BlockContainerRa makeBlockContainerArea(
- final BlockContainer blockContainer,
- final GraftingPoint graftingPoint) {
- final BlockContainerRa newBcArea
- = BlockContainerRa.makeBlockContainerArea(blockContainer, this,
- graftingPoint);
+ public BlockContainerRa makeBlockContainerArea(final BlockContainer blockContainer) {
+ final BlockContainerRa newBcArea = BlockContainerRa.makeBlockContainerArea(blockContainer, this);
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 ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(listBlock, this);
this.children.add(newListBlockArea);
return newListBlockArea;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2021-12-31 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -30,7 +30,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.RelativeAxis;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.TableRow;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.graphic.Graphic;
@@ -64,11 +63,8 @@
}
@Override
- public TableRowContainer makeTableRowContainer(final TableRow node,
- final GraftingPoint graftingPoint) {
- final TableRowContainer newRow =
- TableRowContainer.makeTableRowContainer(node, this,
- graftingPoint);
+ public TableRowContainer makeTableRowContainer(final TableRow node) {
+ final TableRowContainer newRow = TableRowContainer.makeTableRowContainer(node, this);
this.children.add(newRow);
return newRow;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -33,7 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.BorderStyle;
import org.axsl.fotree.fo.BasicLink;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GeneralInlineAreaG5;
@@ -73,12 +72,9 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint) {
+ static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final LineArea4a parentArea) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
newLinkArea.registerLink(generatedBy);
@@ -92,13 +88,9 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint) {
+ static BasicLinkArea makeBasicLinkArea(final BasicLink generatedBy, final AbstractInlineArea parentArea) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
newLinkArea.registerLink(generatedBy);
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fotree.fo.BidiOverride;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GeneralInlineAreaG5;
@@ -72,12 +71,9 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint) {
+ static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final LineArea4a parentArea) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
newBidiArea.registerLink(generatedBy);
@@ -91,13 +87,9 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint) {
+ static BidiOverrideArea makeBidiOverrideArea(final BidiOverride generatedBy, final AbstractInlineArea parentArea) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
newBidiArea.registerLink(generatedBy);
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -39,7 +39,6 @@
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.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
@@ -85,13 +84,9 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static BlockContainerRa makeBlockContainerArea(
- final BlockContainer generatedBy,
- final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
+ static BlockContainerRa makeBlockContainerArea(final BlockContainer generatedBy, final AreaNode4a parentArea) {
final BlockContainerRa newBcArea = new BlockContainerRa(parentArea);
newBcArea.generatedBy = newBcArea.getLink(generatedBy);
newBcArea.registerLink(generatedBy);
@@ -215,41 +210,36 @@
}
@Override
- public TableRa makeTableArea(final Table table,
- final GraftingPoint graftingPoint) {
- final TableRa newTable = TableRa.makeTableRA(table, this,
- graftingPoint);
+ public TableRa makeTableArea(final Table table) {
+ final TableRa newTable = TableRa.makeTableRA(table, this);
this.children.add(newTable);
return newTable;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final Block block,
- final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(
- block, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final Block block) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(block, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete, final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public BlockContainerRa makeBlockContainerArea(final BlockContainer blockContainer,
- final GraftingPoint graftingPoint) {
- final BlockContainerRa newBcArea = BlockContainerRa.makeBlockContainerArea(blockContainer, this, graftingPoint);
+ public BlockContainerRa makeBlockContainerArea(final BlockContainer blockContainer) {
+ final BlockContainerRa newBcArea = BlockContainerRa.makeBlockContainerArea(blockContainer, this);
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 ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(listBlock, this);
this.children.add(newListBlockArea);
return newListBlockArea;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fotree.fo.ExternalGraphic;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -75,17 +74,11 @@
* Initializes the graphic.
* @param newEgArea The newly-created ExternalGraphicArea instance.
* @param generatedBy The FO node generating this area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of the graphic.
*/
- private static void init(final ExternalGraphicArea newEgArea,
- final ExternalGraphic generatedBy,
- final GraftingPoint graftingPoint,
- final int width) {
+ private static void init(final ExternalGraphicArea newEgArea, final ExternalGraphic generatedBy, final int width) {
if (generatedBy.getGraphic(newEgArea) == null) {
- throw new IllegalArgumentException("Cannot create an Area for a "
- + "null Graphic.");
+ throw new IllegalArgumentException("Cannot create an Area for a null Graphic.");
}
newEgArea.generatedBy = newEgArea.getLink(generatedBy);
newEgArea.registerLink(generatedBy);
@@ -103,18 +96,13 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of this Area.
* @return The new instance.
*/
- static ExternalGraphicArea makeExternalGraphicArea(
- final ExternalGraphic generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint,
+ static ExternalGraphicArea makeExternalGraphicArea(final ExternalGraphic generatedBy, final LineArea4a parentArea,
final int width) {
- final ExternalGraphicArea newEgArea = new ExternalGraphicArea(
- parentArea);
- ExternalGraphicArea.init(newEgArea, generatedBy, graftingPoint, width);
+ final ExternalGraphicArea newEgArea = new ExternalGraphicArea(parentArea);
+ ExternalGraphicArea.init(newEgArea, generatedBy, width);
return newEgArea;
}
@@ -122,18 +110,13 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of this Area.
* @return The new instance.
*/
- static ExternalGraphicArea makeExternalGraphicArea(
- final ExternalGraphic generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint, final int width) {
- final ExternalGraphicArea newEgArea = new ExternalGraphicArea(
- parentArea);
- ExternalGraphicArea.init(newEgArea, generatedBy, graftingPoint, width);
+ static ExternalGraphicArea makeExternalGraphicArea(final ExternalGraphic generatedBy,
+ final AbstractInlineArea parentArea, final int width) {
+ final ExternalGraphicArea newEgArea = new ExternalGraphicArea(parentArea);
+ ExternalGraphicArea.init(newEgArea, generatedBy, width);
return newEgArea;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fotree.FoForeignXml;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.InstreamForeignObject;
import org.axsl.fotree.foreign.MathElement;
import org.axsl.fotree.foreign.SvgElement;
@@ -81,17 +80,13 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of the Area.
* @return The new instance.
*/
- static ForeignObjectArea makeForeignObjectArea(
- final InstreamForeignObject generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint,
- final int width) {
+ static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject generatedBy,
+ final LineArea4a parentArea, final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
- ForeignObjectArea.init(newFoArea, generatedBy, graftingPoint, width);
+ ForeignObjectArea.init(newFoArea, generatedBy, width);
return newFoArea;
}
@@ -99,17 +94,13 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of the Area.
* @return The new instance.
*/
- static ForeignObjectArea makeForeignObjectArea(
- final InstreamForeignObject generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint, final int width) {
+ static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject generatedBy,
+ final AbstractInlineArea parentArea, final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
- ForeignObjectArea.init(newFoArea, generatedBy, graftingPoint, width);
+ ForeignObjectArea.init(newFoArea, generatedBy, width);
return newFoArea;
}
@@ -117,13 +108,9 @@
* Initialize the size of this area.
* @param generatedBy The FO node generating this area.
* @param newFoArea The newly-created ForeignObjectArea instance.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param width The width, in millipoints, of the Area.
*/
- private static void init(final ForeignObjectArea newFoArea,
- final InstreamForeignObject generatedBy,
- final GraftingPoint graftingPoint,
+ private static void init(final ForeignObjectArea newFoArea, final InstreamForeignObject generatedBy,
final int width) {
newFoArea.generatedBy = newFoArea.getLink(generatedBy);
newFoArea.registerLink(generatedBy);
@@ -139,13 +126,11 @@
final FoForeignXml foreign = generatedBy.getForeignXml();
if (foreign instanceof SvgElement) {
final SvgElement svgElement = (SvgElement) foreign;
- final SvgArea svgArea = SvgArea.makeSvgArea(svgElement, newFoArea,
- graftingPoint);
+ final SvgArea svgArea = SvgArea.makeSvgArea(svgElement, newFoArea);
newFoArea.foreignContent = svgArea;
} else if (foreign instanceof MathElement) {
final MathElement mathElement = (MathElement) foreign;
- final MathArea mathArea = MathArea.makeMathArea(mathElement,
- newFoArea, graftingPoint);
+ final MathArea mathArea = MathArea.makeMathArea(mathElement, newFoArea);
newFoArea.foreignContent = mathArea;
}
newFoArea.ancestorLineArea().lineContentChanged();
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -31,7 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.IndexPageCitationList;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -72,17 +71,12 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static IndexPageCitationListArea makeIndexPageCitationListArea(
- final IndexPageCitationList generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint) {
- final IndexPageCitationListArea newCitationListArea =
- new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.getLink(
- generatedBy);
+ static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
+ final LineArea4a parentArea) {
+ final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
+ newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
newCitationListArea.registerLink(generatedBy);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
@@ -94,18 +88,12 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static IndexPageCitationListArea makeIndexPageCitationListArea(
- final IndexPageCitationList generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint) {
- final IndexPageCitationListArea newCitationListArea =
- new IndexPageCitationListArea(parentArea);
- newCitationListArea.generatedBy = newCitationListArea.getLink(
- generatedBy);
+ static IndexPageCitationListArea makeIndexPageCitationListArea(final IndexPageCitationList generatedBy,
+ final AbstractInlineArea parentArea) {
+ final IndexPageCitationListArea newCitationListArea = new IndexPageCitationListArea(parentArea);
+ newCitationListArea.generatedBy = newCitationListArea.getLink(generatedBy);
newCitationListArea.registerLink(generatedBy);
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -33,7 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.common.value.BorderStyle;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Inline;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -75,12 +74,9 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static InlineArea makeInlineArea(final Inline generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint) {
+ static InlineArea makeInlineArea(final Inline generatedBy, final LineArea4a parentArea) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
@@ -94,13 +90,9 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static InlineArea makeInlineArea(final Inline generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint) {
+ static InlineArea makeInlineArea(final Inline generatedBy, final AbstractInlineArea parentArea) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -34,7 +34,6 @@
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.Inline;
import org.axsl.fotree.fo.InlineContainer;
import org.axsl.fotree.fo.ListBlock;
@@ -84,15 +83,10 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static InlineContainerArea makeInlineContainerArea(
- final InlineContainer generatedBy,
- final LineArea4a parentArea, final GraftingPoint graftingPoint) {
- final InlineContainerArea newInlineArea = new InlineContainerArea(
- parentArea);
+ static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy, final LineArea4a parentArea) {
+ final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
@@ -105,16 +99,11 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @return The new instance.
*/
- static InlineContainerArea makeInlineContainerArea(
- final InlineContainer generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint) {
- final InlineContainerArea newInlineArea = new InlineContainerArea(
- parentArea);
+ static InlineContainerArea makeInlineContainerArea(final InlineContainer generatedBy,
+ final AbstractInlineArea parentArea) {
+ final InlineContainerArea newInlineArea = new InlineContainerArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
@@ -245,46 +234,37 @@
}
@Override
- public TableRa makeTableArea(final Table table,
- final GraftingPoint graftingPoint) {
- final TableRa newTable = TableRa.makeTableRA(table, this,
- graftingPoint);
+ public TableRa makeTableArea(final Table table) {
+ final TableRa newTable = TableRa.makeTableRA(table, this);
this.children.add(newTable);
return newTable;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final Block block,
- final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(
- block, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final Block block) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(block, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete, final GraftingPoint graftingPoint) {
- final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this, graftingPoint);
+ public NormalBlockArea4a makeNormalBlockArea(final BlockDiscrete blockDiscrete) {
+ final NormalBlockArea4a nbArea = NormalBlockArea4a.makeNormalBlockArea(blockDiscrete, this);
this.children.add(nbArea);
return nbArea;
}
@Override
- public BlockContainerRa makeBlockContainerArea(
- final BlockContainer blockContainer,
- final GraftingPoint graftingPoint) {
+ public BlockContainerRa makeBlockContainerArea(final BlockContainer blockContainer) {
final BlockContainerRa newBcArea
- = BlockContainerRa.makeBlockContainerArea(blockContainer, this,
- graftingPoint);
+ = BlockContainerRa.makeBlockContainerArea(blockContainer, this);
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 ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(listBlock, this);
this.children.add(newListBlockArea);
return newListBlockArea;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -35,7 +35,6 @@
import org.axsl.common.value.LeaderPattern;
import org.axsl.common.value.RuleStyle;
import org.axsl.font.FontUse;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Leader;
import org.axsl.fotree.fo.prop.LeaderAlignmentPa;
import org.axsl.fotree.fo.prop.LeaderPatternPa;
@@ -99,8 +98,6 @@
* Static method with shared initialization code.
* @param newLeaderArea The new LeaderArea to be initialized.
* @param generatedBy The FO node generating this area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
* @param initialProgressionDimension The initial size, in millipoints,
* of this Area.
* @throws AreaTreeException If the minimum length is greater than the
@@ -107,10 +104,8 @@
* optimum length, or if the optimum length is greater than the maximum
* length.
*/
- private static void initLeaderArea(final LeaderArea newLeaderArea,
- final Leader generatedBy, final GraftingPoint graftingPoint,
- final int initialProgressionDimension)
- throws AreaTreeException {
+ private static void initLeaderArea(final LeaderArea newLeaderArea, final Leader generatedBy,
+ final int initialProgressionDimension) throws AreaTreeException {
newLeaderArea.generatedBy = newLeaderArea.getLink(generatedBy);
newLeaderArea.registerLink(generatedBy);
final int initialPD = newLeaderArea.computeInitialPD();
@@ -136,23 +131,15 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
- * @param initialProgressionDimension The initial size, in millipoints,
- * of this Area.
+ * @param initialProgressionDimension The initial size, in millipoints, of this Area.
* @return The new instance.
- * @throws AreaTreeException If the minimum length is greater than the
- * optimum length, or if the optimum length is greater than the maximum
- * length.
+ * @throws AreaTreeException If the minimum length is greater than the optimum length, or if the optimum length is
+ * greater than the maximum length.
*/
- static LeaderArea makeLeaderArea(final Leader generatedBy,
- final LineArea4a parentArea,
- final GraftingPoint graftingPoint,
- final int initialProgressionDimension)
- throws AreaTreeException {
+ static LeaderArea makeLeaderArea(final Leader generatedBy, final LineArea4a parentArea,
+ final int initialProgressionDimension) throws AreaTreeException {
final LeaderArea newLeaderArea = new LeaderArea(parentArea);
- LeaderArea.initLeaderArea(newLeaderArea, generatedBy, graftingPoint,
- initialProgressionDimension);
+ LeaderArea.initLeaderArea(newLeaderArea, generatedBy, initialProgressionDimension);
return newLeaderArea;
}
@@ -160,23 +147,15 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param graftingPoint The ancestor retrieve-marker, if any, for this
- * area.
- * @param initialProgressionDimension The initial size, in millipoints,
- * of this Area.
+ * @param initialProgressionDimension The initial size, in millipoints, of this Area.
* @return The new instance.
- * @throws AreaTreeException If the minimum length is greater than the
- * optimum length, or if the optimum length is greater than the maximum
- * length.
+ * @throws AreaTreeException If the minimum length is greater than the optimum length, or if the optimum length is
+ * greater than the maximum length.
*/
- static LeaderArea makeLeaderArea(final Leader generatedBy,
- final AbstractInlineArea parentArea,
- final GraftingPoint graftingPoint,
- final int initialProgressionDimension)
- throws AreaTreeException {
+ static LeaderArea makeLeaderArea(final Leader generatedBy, final AbstractInlineArea parentArea,
+ final int initialProgressionDimension) throws AreaTreeException {
final LeaderArea newLeaderArea = new LeaderArea(parentArea);
- LeaderArea.initLeaderArea(newLeaderArea, generatedBy, graftingPoint,
- initialProgressionDimension);
+ LeaderArea.initLeaderArea(newLeaderArea, generatedBy, initialProgressionDimension);
return newLeaderArea;
}
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 23:08:16 UTC (rev 12316)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-01 01:03:34 UTC (rev 12317)
@@ -992,12 +992,9 @@
}
@Override
- public BidiOverrideArea makeBidiOverrideArea(
- final BidiOverride bidiOverride,
- final GraftingPoint graftingPoint) {
+ public BidiOverrideArea makeBidiOverrideArea(final BidiOverride bidiOverride) {
final BidiOverrideArea newBidiArea =
- BidiOverrideArea.makeBidiOverrideArea(bidiOverride, this,
- graftingPoint);
+ BidiOverrideArea.makeBidiOverrideArea(bidiOverride, this);
this.children.add(newBidiArea);
return newBidiArea;
}
@@ -1006,12 +1003,9 @@
public TextArea makeGlyphAreaSequence(final FoTextCharacters foText,
final int startOffset, final int sizeInChars, final int ipd,
final boolean hasDiscretionaryHyphen,
- final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
- final GraftingPoint graftingPoint) {
- if (shouldCreateTextArea(foText, this, startOffset, sizeInChars,
- isLastItemOnLine, this)) {
- final TextArea newTextArea = TextAreaCharacters.makeTextArea(foText, this,
- graftingPoint, startOffset, sizeInChars, ipd,
+ final boolean hasFauxSmallCaps, final boolean isLastItemOnLine) {
+ if (shouldCreateTextArea(foText, this, startOffset, sizeInChars, isLastItemOnLine, this)) {
+ final TextArea newTextArea = TextAreaCharacters.makeTextArea(foText, this, startOffset, sizeInChars, ipd,
hasDiscretionaryHyphen, hasFauxSmallCaps);
this.children.add(newTextArea);
return newTextArea;
@@ -1021,121 +1015,92 @@
@Override
public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
- final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
+ final int sizeInLeaves, final boolean hasFauxSmallCaps) {
throw new UnsupportedOperationException();
}
@Override
- public ExternalGraphicArea makeExternalGraphicArea(
- final ExternalGraphic ifo, final int ipd,
- final GraftingPoint graftingPoint) {
+ public ExternalGraphicArea makeExternalGraphicArea(final ExternalGraphic ifo, final int ipd) {
final ExternalGraphicArea newEgArea
- = ExternalGraphicArea.makeExternalGraphicArea(ifo, this,
- graftingPoint, ipd);
+ = ExternalGraphicArea.makeExternalGraphicArea(ifo, this, ipd);
this.children.add(newEgArea);
return newEgArea;
}
@Override
- public ForeignObjectArea makeForeignObjectArea(
- final InstreamForeignObject ifo, final int ipd,
- final GraftingPoint graftingPoint) {
+ public ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject ifo, final int ipd) {
final ForeignObjectArea newForeignArea
- = ForeignObjectArea.makeForeignObjectArea(ifo, this,
- graftingPoint, ipd);
+ = ForeignObjectArea.makeForeignObjectArea(ifo, this, ipd);
this.children.add(newForeignArea);
return newForeignArea;
}
@Override
- public InlineArea makeInlineArea(final Inline inline,
- final GraftingPoint graftingPoint) {
- final InlineArea newInlineArea = InlineArea.makeInlineArea(inline, this,
- graftingPoint);
+ public InlineArea makeInlineArea(final Inline inline) {
+ final InlineArea newInlineArea = InlineArea.makeInlineArea(inline, this);
this.children.add(newInlineArea);
return newInlineArea;
}
@Override
- public InlineContainerArea makeInlineContainerArea(
- final InlineContainer inlineContainer,
- final GraftingPoint graftingPoint) {
+ public InlineContainerArea makeInlineContainerArea(final InlineContainer inlineContainer) {
final InlineContainerArea newInlineContainerArea =
- InlineContainerArea.makeInlineContainerArea(inlineContainer,
- this, graftingPoint);
+ InlineContainerArea.makeInlineContainerArea(inlineContainer, this);
this.children.add(newInlineContainerArea);
return newInlineContainerArea;
}
@Override
- public LeaderArea makeLeaderArea(final Leader leader, final int ipd,
- final GraftingPoint graftingPoint) throws AreaTreeException {
- final LeaderArea newLeaderArea = LeaderArea.makeLeaderArea(leader, this,
- graftingPoint, ipd);
+ public LeaderArea makeLeaderArea(final Leader leader, final int ipd) throws AreaTreeException {
+ final LeaderArea newLeaderArea = LeaderArea.makeLeaderArea(leader, this, ipd);
this.children.add(newLeaderArea);
return newLeaderArea;
}
@Override
- public PageNumberArea makePageNumberArea(
- final PageNumber pageNumber, final int ipd,
- final GraftingPoint graftingPoint) {
+ public PageNumberArea makePageNumberArea(final PageNumber pageNumber, final int ipd) {
final PageNumberArea newPageNumberArea
- = PageNumberArea.makePageNumberArea(pageNumber, this,
- graftingPoint, ipd);
+ = PageNumberArea.makePageNumberArea(pageNumber, this, ipd);
this.children.add(newPageNumberArea);
return newPageNumberArea;
}
@Override
- public PageNumberCitationArea makePageNumberCitationArea(
- final PageNumberCitation citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ public PageNumberCitationArea makePageNumberCitationArea(final PageNumberCitation citation, final int ipd) {
final PageNumberCitationArea newCitationArea =
- PageNumberCitationArea.makePageNumberCitationArea(citation,
- this, graftingPoint, ipd);
+ PageNumberCitationArea.makePageNumberCitationArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@Override
- public PageNumberCitationLastArea makePageNumberCitationLastArea(
- final PageNumberCitationLast citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ public PageNumberCitationLastArea makePageNumberCitationLastArea(final PageNumberCitationLast citation,
+ final int ipd) {
final PageNumberCitationLastArea newCitationArea =
- PageNumberCitationLastArea.makePageNumberCitationLastArea(
- citation, this, graftingPoint, ipd);
+ PageNumberCitationLastArea.makePageNumberCitationLastArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@Override
- public ScalingValueCitationArea makeScalingValueCitationArea(
- final ScalingValueCitation citation, final int ipd,
- final GraftingPoint graftingPoint) {
+ public ScalingValueCitationArea makeScalingValueCitationArea(final ScalingValueCitation citation, final int ipd) {
final ScalingValueCitationArea newCitationArea =
- ScalingValueCitationArea.makeScalingValueCitationArea(
- citation, this, graftingPoint, ipd);
+ ScalingValueCitationArea.makeScalingValueCitationArea(citation, this, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@Override
- public BasicLinkArea makeBasicLinkArea(final BasicLink basicLink,
- final GraftingPoint graftingPoint) {
- final BasicLinkArea newLinkArea = BasicLinkArea.makeBasicLinkArea(
- basicLink, this, graftingPoint);
+ public BasicLinkArea makeBasicLinkArea(final BasicLink bas...
[truncated message content] |
|
From: <vic...@us...> - 2021-12-31 23:08:18
|
Revision: 12316
http://sourceforge.net/p/foray/code/12316
Author: victormote
Date: 2021-12-31 23:08:16 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Complete rename of axsl-area project to axsl-areatree.
Modified Paths:
--------------
trunk/foray/foray-areatree/build.gradle
trunk/foray/foray-core/build.gradle
Modified: trunk/foray/foray-areatree/build.gradle
===================================================================
--- trunk/foray/foray-areatree/build.gradle 2021-12-31 22:44:18 UTC (rev 12315)
+++ trunk/foray/foray-areatree/build.gradle 2021-12-31 23:08:16 UTC (rev 12316)
@@ -2,11 +2,11 @@
dependencies {
- /* Do *** NOT *** add a dependency on axsl-galley, as axsl-area should be a superset of axsl-galley. If not, fix
+ /* Do *** NOT *** add a dependency on axsl-galley, as axsl-areatree should be a superset of axsl-galley. If not, fix
that instead. */
api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- api group: 'org.axsl', name: 'axsl-area', version: axslVersion
+ api group: 'org.axsl', name: 'axsl-areatree', version: axslVersion
api project(':foray-common')
Modified: trunk/foray/foray-core/build.gradle
===================================================================
--- trunk/foray/foray-core/build.gradle 2021-12-31 22:44:18 UTC (rev 12315)
+++ trunk/foray/foray-core/build.gradle 2021-12-31 23:08:16 UTC (rev 12316)
@@ -4,7 +4,7 @@
api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
api group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion
- api group: 'org.axsl', name: 'axsl-area', version: axslVersion
+ api group: 'org.axsl', name: 'axsl-areatree', version: axslVersion
api group: 'org.axsl', name: 'axsl-common', version: axslVersion
api group: 'org.axsl', name: 'axsl-font', version: axslVersion
api group: 'org.axsl', name: 'axsl-galley', version: axslVersion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 22:44:21
|
Revision: 12315
http://sourceforge.net/p/foray/code/12315
Author: victormote
Date: 2021-12-31 22:44:18 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Confor to aXSL change: Move the factory interfaces to their own package.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java
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 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,7 +31,7 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
import org.axsl.fotree.fo.BlockDiscrete;
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 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -33,7 +33,7 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.common.value.LinefeedTreatment;
import org.axsl.common.value.TextTransform;
import org.axsl.common.value.WhiteSpaceTreatment;
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 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -33,8 +33,8 @@
import org.foray.common.para.DiscretionaryHyphen4a;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.common.para.DiscretionaryHyphen;
import org.axsl.common.para.ParaContext;
import org.axsl.common.value.BackgroundRepeat;
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 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-layout/src/main/java/org/foray/layout/LayoutStrategy.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,10 +31,10 @@
import org.axsl.area.AreaTree;
import org.axsl.area.AreaTreeException;
import org.axsl.area.LineArea;
-import org.axsl.area.LineContentFactory;
import org.axsl.area.PageArea;
import org.axsl.area.PageCollection;
import org.axsl.area.RegionRefArea;
+import org.axsl.area.factory.LineContentFactory;
import org.axsl.fotree.FoLineNonText;
import org.axsl.fotree.FoLineText;
import org.axsl.fotree.fo.ExternalGraphic;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractMixedInlinePnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,10 +31,10 @@
import org.axsl.area.AncestralNormalInlineArea;
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.LineArea;
-import org.axsl.area.LineContentFactory;
import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
+import org.axsl.area.factory.LineContentFactory;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.GraftingPoint;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BasicLinkPnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
package org.foray.pioneer;
import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
import org.axsl.fotree.fo.BasicLink;
import org.axsl.fotree.fo.GraftingPoint;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BidiOverridePnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
package org.foray.pioneer;
import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
import org.axsl.fotree.fo.BidiOverride;
import org.axsl.fotree.fo.GraftingPoint;
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 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockContainerPnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -31,7 +31,7 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
import org.axsl.area.BlockContainerRefArea;
-import org.axsl.area.BlockLevelAreaFactory;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.BlockContainer;
import org.axsl.fotree.fo.GraftingPoint;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.LineArea;
import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.common.para.ParaBranch;
import org.axsl.common.para.ParaConfig;
import org.axsl.common.para.ParaNode;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockPnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.LineArea;
import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.GraftingPoint;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InlinePnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -29,7 +29,7 @@
package org.foray.pioneer;
import org.axsl.area.AncestralNormalInlineArea;
-import org.axsl.area.LineContentFactory;
+import org.axsl.area.factory.LineContentFactory;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Inline;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/ListBlockPnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,9 +30,9 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.ListBlockArea;
import org.axsl.area.NormalBlockArea;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
import org.axsl.fotree.fo.ListItem;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java 2021-12-31 22:03:05 UTC (rev 12314)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java 2021-12-31 22:44:18 UTC (rev 12315)
@@ -30,11 +30,11 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.area.BlockLevelAreaFactory;
import org.axsl.area.NormalBlockArea;
import org.axsl.area.TableArea;
import org.axsl.area.TableFooterContainer;
import org.axsl.area.TableHeaderContainer;
+import org.axsl.area.factory.BlockLevelAreaFactory;
import org.axsl.common.value.Break;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.GraftingPoint;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 22:03:07
|
Revision: 12314
http://sourceforge.net/p/foray/code/12314
Author: victormote
Date: 2021-12-31 22:03:05 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Capture the selected Marker as nodes for RetrieveMarker are created.
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
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-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -45,6 +45,7 @@
import org.axsl.fotree.fo.InlineContainer;
import org.axsl.fotree.fo.InstreamForeignObject;
import org.axsl.fotree.fo.Leader;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.PageNumber;
import org.axsl.fotree.fo.PageNumberCitation;
import org.axsl.fotree.fo.PageNumberCitationLast;
@@ -216,8 +217,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -37,6 +37,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
@@ -146,8 +147,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -41,6 +41,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.fotree.fo.prop.CommonPositionPa;
@@ -254,8 +255,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -38,6 +38,7 @@
import org.axsl.fotree.fo.Inline;
import org.axsl.fotree.fo.InlineContainer;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
@@ -289,8 +290,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -57,6 +57,7 @@
import org.axsl.fotree.fo.InlineContainer;
import org.axsl.fotree.fo.InstreamForeignObject;
import org.axsl.fotree.fo.Leader;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.PageNumber;
import org.axsl.fotree.fo.PageNumberCitation;
import org.axsl.fotree.fo.PageNumberCitationLast;
@@ -1140,8 +1141,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -47,6 +47,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
@@ -321,8 +322,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -38,6 +38,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
@@ -239,8 +240,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -38,6 +38,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.Region;
import org.axsl.fotree.fo.RegionAfter;
import org.axsl.fotree.fo.RegionBefore;
@@ -230,8 +231,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -32,6 +32,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveMarkerNode;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -48,6 +49,9 @@
/** The "generated-by" trait, as defined in Section 6.1.1. */
private NoGenerationLink generatedBy;
+ /** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveMarker}. */
+ private Marker selectedMarker;
+
/** The parent of this node. */
private AreaNode4a parent;
@@ -67,12 +71,15 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parent The parent area.
+ * @param selectedMarker The {@link Marker} instance whose content is grafted onto {@code generatedBy}.
* @return The new instance.
*/
- static RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker generatedBy, final AreaNode4a parent) {
+ static RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker generatedBy, final AreaNode4a parent,
+ final Marker selectedMarker) {
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRmNode.generatedBy = link;
+ newRmNode.selectedMarker = selectedMarker;
/* Do not try to register the link as the generator generates no areas. */
// newRmNode.registerLink(generatedBy);
return newRmNode;
@@ -123,4 +130,12 @@
return (RetrieveMarker) this.generatedBy.getGeneratedBy();
}
+ /**
+ * Returns the {@link Marker} whose content is grafted onto the encapsulated {@link #getGraftingPoint()}.
+ * @return The selected {@link Marker}.
+ */
+ public Marker getMarker() {
+ return this.selectedMarker;
+ }
+
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -32,6 +32,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -48,6 +49,9 @@
/** The "generated-by" trait, as defined in Section 6.1.1. */
private NoGenerationLink generatedBy;
+ /** The {@link Marker} instance whose content is grafted onto the encapsulated {@link RetrieveTableMarker}. */
+ private Marker selectedMarker;
+
/** The parent of this node. */
private AreaNode4a parent;
@@ -67,14 +71,17 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parent The parent area.
+ * @param selectedMarker The {@link Marker} instance whose content is grafted onto {@code generatedBy}.
* @return The new instance.
*/
static RetrieveTableMarkerNode4a makeRetrieveTableMarkerNode(final RetrieveTableMarker generatedBy,
- final AreaNode4a parent) {
+ final AreaNode4a parent, final Marker selectedMarker) {
final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRtmNode.generatedBy = link;
- newRtmNode.registerLink(generatedBy);
+ newRtmNode.selectedMarker = selectedMarker;
+ /* Do not try to register the link as the generator generates no areas. */
+// newRtmNode.registerLink(generatedBy);
return newRtmNode;
}
@@ -123,4 +130,12 @@
return (RetrieveTableMarker) this.generatedBy.getGeneratedBy();
}
+ /**
+ * Returns the {@link Marker} whose content is grafted onto the encapsulated {@link #getGraftingPoint()}.
+ * @return The selected {@link Marker}.
+ */
+ public Marker getMarker() {
+ return this.selectedMarker;
+ }
+
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -41,6 +41,7 @@
import org.axsl.fotree.fo.BlockDiscrete;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.ListBlock;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.fotree.fo.TableCell;
@@ -437,8 +438,10 @@
}
@Override
- public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker) {
- final RetrieveMarkerNode4a newRmNode = RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this);
+ public RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker retrieveMarker,
+ final Marker selectedMarker) {
+ final RetrieveMarkerNode4a newRmNode =
+ RetrieveMarkerNode4a.makeRetrieveMarkerNode(retrieveMarker, this, selectedMarker);
this.children.add(newRmNode);
return newRmNode;
}
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -34,6 +34,7 @@
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.TableFooter;
import org.axsl.galley.BackgroundAreaG5;
@@ -181,9 +182,10 @@
}
@Override
- public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
+ final Marker selectedMarker) {
// final RetrieveTableMarkerNode4a newRtmNode =
-// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
// this.children.add(newRtmNode);
// return newRtmNode;
return null;
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -34,6 +34,7 @@
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.TableHeader;
import org.axsl.galley.BackgroundAreaG5;
@@ -181,9 +182,10 @@
}
@Override
- public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
+ final Marker selectedMarker) {
// final RetrieveTableMarkerNode4a newRtmNode =
-// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
// this.children.add(newRtmNode);
// return newRtmNode;
return null;
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 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -38,6 +38,7 @@
import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.fotree.fo.TableBody;
@@ -767,9 +768,10 @@
}
@Override
- public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
+ final Marker selectedMarker) {
// final RetrieveTableMarkerNode4a newRtmNode =
-// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
// this.children.add(newRtmNode);
// return newRtmNode;
return null;
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 19:01:02 UTC (rev 12313)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 22:03:05 UTC (rev 12314)
@@ -66,15 +66,15 @@
"child of " + areaNode.getClass().getName();
throw new AreaTreeException(message);
}
-
- final RetrieveMarkerNodeFactory factory = (RetrieveMarkerNodeFactory) areaNode;
- final RetrieveMarkerNode retrieveMarkerNode = factory.makeRetrieveMarkerNode(this.node);
-
final PageArea containingPage = areaNode.getPage();
final Marker bestMarker = containingPage.bestMarker(this.node);
if (bestMarker == null) {
return Status.OK;
}
+
+ final RetrieveMarkerNodeFactory factory = (RetrieveMarkerNodeFactory) areaNode;
+ final RetrieveMarkerNode retrieveMarkerNode = factory.makeRetrieveMarkerNode(this.node, bestMarker);
+
final MarkerPnr markerPL = (MarkerPnr) this.getLayoutProxy(bestMarker);
// Necessary because the marker may get used multiple times.
markerPL.resetProgress();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 19:01:04
|
Revision: 12313
http://sourceforge.net/p/foray/code/12313
Author: victormote
Date: 2021-12-31 19:01:02 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
1. Conform to aXSL change: Clean up which area tree nodes can make nodes for retrieve-marker and retrieve-table-marker. 2. During layout, add RetrieveMarkerNode to the area tree.
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/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-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -50,7 +49,6 @@
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;
@@ -225,14 +223,6 @@
}
@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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractListItemContent.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -32,7 +32,6 @@
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;
@@ -39,7 +38,6 @@
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;
@@ -155,14 +153,6 @@
}
@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;
}
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -43,7 +42,6 @@
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;
@@ -262,14 +260,6 @@
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -40,7 +39,6 @@
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;
@@ -298,14 +296,6 @@
}
@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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -33,7 +33,6 @@
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;
@@ -62,7 +61,6 @@
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;
@@ -1149,14 +1147,6 @@
}
@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;
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -35,7 +35,6 @@
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;
@@ -49,7 +48,6 @@
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;
@@ -330,14 +328,6 @@
}
@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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -40,7 +39,6 @@
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;
@@ -248,14 +246,6 @@
}
@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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -45,7 +44,6 @@
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;
@@ -239,14 +237,6 @@
}
@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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -73,7 +73,8 @@
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRmNode.generatedBy = link;
- newRmNode.registerLink(generatedBy);
+ /* Do not try to register the link as the generator generates no areas. */
+// newRmNode.registerLink(generatedBy);
return newRmNode;
}
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,7 +31,6 @@
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;
@@ -43,7 +42,6 @@
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;
@@ -446,14 +444,6 @@
}
@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);
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,8 +31,10 @@
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.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.TableFooter;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.GalleyVisitor;
@@ -178,4 +180,14 @@
return 0;
}
+ @Override
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+// final RetrieveTableMarkerNode4a newRtmNode =
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// this.children.add(newRtmNode);
+// return newRtmNode;
+ return null;
+ }
+
+
}
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,8 +31,10 @@
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.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.TableHeader;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.GalleyVisitor;
@@ -178,4 +180,14 @@
return 0;
}
+ @Override
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+// final RetrieveTableMarkerNode4a newRtmNode =
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// this.children.add(newRtmNode);
+// return newRtmNode;
+ return null;
+ }
+
+
}
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 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -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;
@@ -37,6 +38,7 @@
import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.fotree.fo.Table;
import org.axsl.fotree.fo.TableBody;
import org.axsl.fotree.fo.TableColumn;
@@ -764,4 +766,14 @@
return -1;
}
+ @Override
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker) {
+// final RetrieveTableMarkerNode4a newRtmNode =
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this);
+// this.children.add(newRtmNode);
+// return newRtmNode;
+ return null;
+ }
+
+
}
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 17:54:07 UTC (rev 12312)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 19:01:02 UTC (rev 12313)
@@ -31,6 +31,8 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
import org.axsl.area.PageArea;
+import org.axsl.area.RetrieveMarkerNode;
+import org.axsl.area.factory.RetrieveMarkerNodeFactory;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Marker;
@@ -58,6 +60,16 @@
public Status layout(final AreaNode areaNode, final GraftingPoint graftingPoint) throws AreaTreeException {
/* RetrieveMarker can only exist in static content, so we don't care about tracking or setting progress at all.
* It either fits or it doesn't. */
+
+ if (! (areaNode instanceof RetrieveMarkerNodeFactory)) {
+ final String message = "Unable to create " + RetrieveMarkerNode.class.getName() + " instance as " +
+ "child of " + areaNode.getClass().getName();
+ throw new AreaTreeException(message);
+ }
+
+ final RetrieveMarkerNodeFactory factory = (RetrieveMarkerNodeFactory) areaNode;
+ final RetrieveMarkerNode retrieveMarkerNode = factory.makeRetrieveMarkerNode(this.node);
+
final PageArea containingPage = areaNode.getPage();
final Marker bestMarker = containingPage.bestMarker(this.node);
if (bestMarker == null) {
@@ -69,7 +81,7 @@
markerPL.setProgress(0);
for (int i = 0; i < bestMarker.formattingObjectCount(); i++) {
final Fo fo = bestMarker.formattingObjectAt(i);
- getLayoutProxy(fo).layout(areaNode, this.node);
+ getLayoutProxy(fo).layout(retrieveMarkerNode, this.node);
}
return Status.OK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 17:54:09
|
Revision: 12312
http://sourceforge.net/p/foray/code/12312
Author: victormote
Date: 2021-12-31 17:54:07 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
1. Conform to aXSL change: Add visitor method for fo:retrieve-table-marker. 2. Add some layout code for fo:retrieve-marker and fo:retrieve-table-marker.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java
Added Paths:
-----------
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2021-12-31 17:30:12 UTC (rev 12311)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2021-12-31 17:54:07 UTC (rev 12312)
@@ -70,6 +70,7 @@
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.Root;
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.fotree.fo.StaticContent;
@@ -294,11 +295,16 @@
}
@Override
- public GenericLink visit(final RetrieveMarker host) {
- return new GenericLink(host);
+ public NoGenerationLink visit(final RetrieveMarker host) {
+ return new NoGenerationLink(host);
}
@Override
+ public NoGenerationLink visit(final RetrieveTableMarker host) {
+ return new NoGenerationLink(host);
+ }
+
+ @Override
public GenericLink visit(final Root host) {
return new GenericLink(host);
}
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 2021-12-31 17:30:12 UTC (rev 12311)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java 2021-12-31 17:54:07 UTC (rev 12312)
@@ -82,6 +82,7 @@
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.Root;
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.fotree.fo.StaticContent;
@@ -538,6 +539,11 @@
}
@Override
+ public RetrieveTableMarkerPnr visit(final RetrieveTableMarker node) {
+ return new RetrieveTableMarkerPnr(node, this);
+ }
+
+ @Override
public StaticContentPnr visit(final StaticContent node) {
return new StaticContentPnr(node, this);
}
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 17:30:12 UTC (rev 12311)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveMarkerPnr.java 2021-12-31 17:54:07 UTC (rev 12312)
@@ -49,18 +49,15 @@
* @param retrieve The FO Tree object which is being laid out.
* @param layout The ancestor layout system.
*/
- public RetrieveMarkerPnr(final RetrieveMarker retrieve,
- final PioneerLayoutStrategy layout) {
+ public RetrieveMarkerPnr(final RetrieveMarker retrieve, final PioneerLayoutStrategy layout) {
super(retrieve, layout);
this.node = retrieve;
}
@Override
- public Status layout(final AreaNode areaNode,
- final GraftingPoint graftingPoint) throws AreaTreeException {
- /* RetrieveMarker can only exist in static content, so we don't care
- * about tracking or setting progress at all. It either fits or it
- * doesn't. */
+ public Status layout(final AreaNode areaNode, final GraftingPoint graftingPoint) throws AreaTreeException {
+ /* RetrieveMarker can only exist in static content, so we don't care about tracking or setting progress at all.
+ * It either fits or it doesn't. */
final PageArea containingPage = areaNode.getPage();
final Marker bestMarker = containingPage.bestMarker(this.node);
if (bestMarker == null) {
Added: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java (rev 0)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java 2021-12-31 17:54:07 UTC (rev 12312)
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.pioneer;
+
+import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
+import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.RetrieveMarker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
+
+/**
+ * Pioneer Layout for {@link RetrieveMarker}.
+ */
+public class RetrieveTableMarkerPnr extends FoObjPnr {
+
+ /** The real FONode which this proxy represents. */
+ private RetrieveTableMarker node;
+
+ /**
+ * Constructor.
+ * @param retrieve The FO Tree object which is being laid out.
+ * @param layout The ancestor layout system.
+ */
+ public RetrieveTableMarkerPnr(final RetrieveTableMarker retrieve, final PioneerLayoutStrategy layout) {
+ super(retrieve, layout);
+ this.node = retrieve;
+ }
+
+ @Override
+ public Status layout(final AreaNode areaNode, final GraftingPoint graftingPoint) throws AreaTreeException {
+ /* RetrieveMarker can only exist in static content, so we don't care
+ * about tracking or setting progress at all. It either fits or it
+ * doesn't. */
+// final PageArea containingPage = areaNode.getPage();
+// final Marker bestMarker = containingPage.bestMarker(this.node);
+// if (bestMarker == null) {
+ return Status.OK;
+// }
+// final MarkerPnr markerPL = (MarkerPnr) this.getLayoutProxy(bestMarker);
+// // Necessary because the marker may get used multiple times.
+// markerPL.resetProgress();
+// markerPL.setProgress(0);
+// for (int i = 0; i < bestMarker.formattingObjectCount(); i++) {
+// final Fo fo = bestMarker.formattingObjectAt(i);
+// getLayoutProxy(fo).layout(areaNode, this.node);
+// }
+// return Status.OK;
+ }
+
+ @Override
+ public RetrieveTableMarker getFONode() {
+ return this.node;
+ }
+
+}
Property changes on: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/RetrieveTableMarkerPnr.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 17:30:15
|
Revision: 12311
http://sourceforge.net/p/foray/code/12311
Author: victormote
Date: 2021-12-31 17:30:12 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Clean up some linkage problems.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.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/LineArea4a.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/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.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
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
Removed Paths:
-------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -28,9 +28,7 @@
package org.foray.area;
-import org.foray.area.link.GraftingPointLink;
import org.foray.area.link.Link;
-import org.foray.area.link.NormalLink;
import org.foray.common.data.AbstractOrderedTreeNode;
import org.axsl.area.AreaNode;
@@ -69,12 +67,11 @@
/**
* Creates the linkage to the FO Tree for this area.
- * @param graftingPoint The ancestor grafting point, if any.
+ * @param generatedBy The {@link Fo} that generated this area.
*/
- protected void registerWithLinkage(final GraftingPoint graftingPoint) {
- final NormalLink normalLinkage = this.getNormalLinkage(
- graftingPoint);
- normalLinkage.registerGeneratedArea(this);
+ protected void registerLink(final Fo generatedBy) {
+ final Link link = getLink(generatedBy);
+ link.registerGeneratedArea(this);
}
@Override
@@ -132,7 +129,7 @@
// Remove from the Area Tree
getParent().removeChild(this);
// Remove from the FO-Area Tree cross-reference.
- this.getNormalLinkage().unregisterGeneratedArea(this);
+ this.getLinkage().unregisterGeneratedArea(this);
}
@Override
@@ -160,51 +157,12 @@
}
/**
- * Returns the normal linkage associated with this Area.
- * @return The normal linkage associated with this Area.
- */
- public NormalLink getNormalLinkage() {
- if (this.getLinkage() instanceof NormalLink) {
- return (NormalLink) this.getLinkage();
- }
- if (this.getLinkage() instanceof GraftingPointLink) {
- final GraftingPointLink linkageMarker = (GraftingPointLink)
- this.getLinkage();
- final GraftingPoint graftingPoint = this.getGraftingPoint();
- return linkageMarker.getNormalLinkage(graftingPoint);
- }
- /* TODO: Consider throwing an Exception. This shouldn't happen. */
- return null;
- }
-
- /**
- * Use this overloaded version when we haven't yet gotten the
- * RetrieveMarker instance stashed in the FoLinkageMarker, especially
- * during AreaNode construction.
- * @param graftingPoint The retrieve-marker.
- * @return The normal linkage associated with this Area.
- */
- public NormalLink getNormalLinkage(
- final GraftingPoint graftingPoint) {
- final Link linkage = this.getLinkage();
- if (linkage instanceof NormalLink) {
- return (NormalLink) linkage;
- }
- if (linkage instanceof GraftingPointLink) {
- final GraftingPointLink linkageMarker = (GraftingPointLink) linkage;
- return linkageMarker.getNormalLinkage(graftingPoint);
- }
- /* TODO: Consider throwing an Exception. This shouldn't happen. */
- return null;
- }
-
- /**
* Returns the previous child of this area's "generated-by".
* @return The previous child of this area's "generated-by", or null if this
* is the first child.
*/
protected AreaNode4a getPreviousChildOfGeneratedBy() {
- return this.getNormalLinkage().getPreviousGeneratedBy(this);
+ return this.getLinkage().getPreviousGeneratedBy(this);
}
/**
@@ -213,12 +171,12 @@
* is the last child.
*/
protected AreaNode4a getNextChildOfGeneratedBy() {
- return this.getNormalLinkage().getNextGeneratedBy(this);
+ return this.getLinkage().getNextGeneratedBy(this);
}
@Override
public boolean isFirstChildOfGeneratedBy() {
- return this.getNormalLinkage().isFirstGeneratedBy(this);
+ return this.getLinkage().isFirstGeneratedBy(this);
}
/**
@@ -226,7 +184,7 @@
* @return True if and only if this is the last child of this area's "generated-by".
*/
protected boolean isLastChildOfGeneratedBy() {
- return this.getNormalLinkage().isLastGeneratedBy(this);
+ return this.getLinkage().isLastGeneratedBy(this);
}
/**
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -81,7 +81,7 @@
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
- newLinkArea.registerWithLinkage(graftingPoint);
+ newLinkArea.registerLink(generatedBy);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
newLinkArea.initializeAnteriorSpace();
@@ -101,7 +101,7 @@
final GraftingPoint graftingPoint) {
final BasicLinkArea newLinkArea = new BasicLinkArea(parentArea);
newLinkArea.generatedBy = newLinkArea.getLink(generatedBy);
- newLinkArea.registerWithLinkage(graftingPoint);
+ newLinkArea.registerLink(generatedBy);
final int initialPD = newLinkArea.computeInitialPD();
newLinkArea.setProgressionDimension(initialPD);
newLinkArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -69,11 +69,10 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static BeforeFloatRa makeBeforeFloatArea(final Fo generatedBy,
- final RegionRaBody parentArea) {
+ static BeforeFloatRa makeBeforeFloatArea(final Fo generatedBy, final RegionRaBody parentArea) {
final BeforeFloatRa newFloatRA = new BeforeFloatRa(parentArea);
newFloatRA.generatedBy = newFloatRA.getLink(generatedBy);
- newFloatRA.registerWithLinkage(null);
+ newFloatRA.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -80,7 +80,7 @@
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
- newBidiArea.registerWithLinkage(graftingPoint);
+ newBidiArea.registerLink(generatedBy);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
newBidiArea.initializeAnteriorSpace();
@@ -100,7 +100,7 @@
final GraftingPoint graftingPoint) {
final BidiOverrideArea newBidiArea = new BidiOverrideArea(parentArea);
newBidiArea.generatedBy = newBidiArea.getLink(generatedBy);
- newBidiArea.registerWithLinkage(graftingPoint);
+ newBidiArea.registerLink(generatedBy);
final int initialPD = newBidiArea.computeInitialPD();
newBidiArea.setProgressionDimension(initialPD);
newBidiArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -95,7 +95,7 @@
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final BlockContainerRa newBcArea = new BlockContainerRa(parentArea);
newBcArea.generatedBy = newBcArea.getLink(generatedBy);
- newBcArea.registerWithLinkage(graftingPoint);
+ newBcArea.registerLink(generatedBy);
final int initialPD = newBcArea.computeInitialPD();
newBcArea.setProgressionDimension(initialPD);
newBcArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -88,7 +88,7 @@
+ "null Graphic.");
}
newEgArea.generatedBy = newEgArea.getLink(generatedBy);
- newEgArea.registerWithLinkage(graftingPoint);
+ newEgArea.registerLink(generatedBy);
final int initialPD = newEgArea.computeInitialPD();
newEgArea.setProgressionDimension(initialPD);
newEgArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -72,7 +72,7 @@
final RegionRaBody parentArea) {
final FootnoteRa footnoteRA = new FootnoteRa(parentArea);
footnoteRA.generatedBy = footnoteRA.getLink(generatedBy);
- footnoteRA.registerWithLinkage(null);
+ footnoteRA.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -126,7 +126,7 @@
final GraftingPoint graftingPoint,
final int width) {
newFoArea.generatedBy = newFoArea.getLink(generatedBy);
- newFoArea.registerWithLinkage(graftingPoint);
+ newFoArea.registerLink(generatedBy);
final int initialPD = newFoArea.computeInitialPD();
newFoArea.setProgressionDimension(initialPD);
newFoArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -83,7 +83,7 @@
new IndexPageCitationListArea(parentArea);
newCitationListArea.generatedBy = newCitationListArea.getLink(
generatedBy);
- newCitationListArea.registerWithLinkage(graftingPoint);
+ newCitationListArea.registerLink(generatedBy);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
newCitationListArea.initializeAnteriorSpace();
@@ -106,7 +106,7 @@
new IndexPageCitationListArea(parentArea);
newCitationListArea.generatedBy = newCitationListArea.getLink(
generatedBy);
- newCitationListArea.registerWithLinkage(graftingPoint);
+ newCitationListArea.registerLink(generatedBy);
final int initialPD = newCitationListArea.computeInitialPD();
newCitationListArea.setProgressionDimension(initialPD);
newCitationListArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -83,7 +83,7 @@
final LineArea4a parentArea, final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
- newInlineArea.registerWithLinkage(graftingPoint);
+ newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
newInlineArea.initializeAnteriorSpace();
@@ -103,7 +103,7 @@
final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
- newInlineArea.registerWithLinkage(graftingPoint);
+ newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
newInlineArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineContainerArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -95,7 +95,7 @@
final InlineContainerArea newInlineArea = new InlineContainerArea(
parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
- newInlineArea.registerWithLinkage(graftingPoint);
+ newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
newInlineArea.initializeAnteriorSpace();
@@ -117,7 +117,7 @@
final InlineContainerArea newInlineArea = new InlineContainerArea(
parentArea);
newInlineArea.generatedBy = newInlineArea.getLink(generatedBy);
- newInlineArea.registerWithLinkage(graftingPoint);
+ newInlineArea.registerLink(generatedBy);
final int initialPD = newInlineArea.computeInitialPD();
newInlineArea.setProgressionDimension(initialPD);
newInlineArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -112,7 +112,7 @@
final int initialProgressionDimension)
throws AreaTreeException {
newLeaderArea.generatedBy = newLeaderArea.getLink(generatedBy);
- newLeaderArea.registerWithLinkage(graftingPoint);
+ newLeaderArea.registerLink(generatedBy);
final int initialPD = newLeaderArea.computeInitialPD();
newLeaderArea.setProgressionDimension(initialPD);
newLeaderArea.initializeAnteriorSpace();
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 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -107,7 +107,7 @@
*/
static LineArea4a makeLineArea(final NormalBlockArea4a parentArea, final GraftingPoint graftingPoint) {
final LineArea4a newLineArea = new LineArea4a(parentArea);
- newLineArea.registerWithLinkage(graftingPoint);
+ newLineArea.registerLink(parentArea.getAreaParent().traitGeneratedBy());
newLineArea.computeInitialPD();
final int initialPD = newLineArea.computeInitialPD();
newLineArea.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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -80,7 +80,7 @@
final AreaNode4a parentArea, final GraftingPoint graftingPoint) {
final ListBlockArea newListBlockArea = new ListBlockArea(parentArea);
newListBlockArea.generatedBy = newListBlockArea.getLink(generatedBy);
- newListBlockArea.registerWithLinkage(graftingPoint);
+ newListBlockArea.registerLink(generatedBy);
final int initialPD = newListBlockArea.computeInitialPD();
newListBlockArea.setProgressionDimension(initialPD);
newListBlockArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -84,7 +84,7 @@
final GraftingPoint graftingPoint) {
final ListItemArea newItemArea = new ListItemArea(parentArea);
newItemArea.generatedBy = newItemArea.getLink(generatedBy);
- newItemArea.registerWithLinkage(graftingPoint);
+ newItemArea.registerLink(generatedBy);
final int initialPD = newItemArea.computeInitialPD();
newItemArea.setProgressionDimension(initialPD);
newItemArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemBodyContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -61,7 +61,7 @@
final ListItemBodyContainer newContainer = new ListItemBodyContainer(
parentArea);
newContainer.setGeneratedBy(newContainer.getLink(generatedBy));
- newContainer.registerWithLinkage(graftingPoint);
+ newContainer.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemLabelContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -61,7 +61,7 @@
final ListItemLabelContainer newContainer = new ListItemLabelContainer(
parentArea);
newContainer.setGeneratedBy(newContainer.getLink(generatedBy));
- newContainer.registerWithLinkage(graftingPoint);
+ newContainer.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -86,7 +86,7 @@
final RegionRaBody parentArea) {
final MainRa newMainRA = new MainRa(parentArea);
newMainRA.generatedBy = newMainRA.getLink(generatedBy);
- newMainRA.registerWithLinkage(null);
+ newMainRA.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -99,7 +99,7 @@
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link linkage = newBlockArea.getLink(generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
- newBlockArea.registerWithLinkage(graftingPoint);
+ newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
newBlockArea.initializeAnteriorSpace();
@@ -111,7 +111,7 @@
final NormalBlockArea4a newBlockArea = new NormalBlockArea4a(parentArea);
final Link linkage = newBlockArea.getLink(generatedBy);
newBlockArea.generatedBy = (BlockLink) linkage;
- newBlockArea.registerWithLinkage(graftingPoint);
+ newBlockArea.registerLink(generatedBy);
final int initialPD = newBlockArea.computeInitialPD();
newBlockArea.setProgressionDimension(initialPD);
newBlockArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -87,7 +87,7 @@
final SpanRa parentArea) {
final NormalFlowRa newNormalFlow = new NormalFlowRa(parentArea);
newNormalFlow.generatedBy = newNormalFlow.getLink(generatedBy);
- newNormalFlow.registerWithLinkage(null);
+ newNormalFlow.registerLink(generatedBy);
final int initialPD = newNormalFlow.computeInitialPD();
newNormalFlow.setProgressionDimension(initialPD);
newNormalFlow.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -105,7 +105,7 @@
throws AreaTreeException {
final PageCollection newCollection = new PageCollection(parentArea);
newCollection.generatedBy = newCollection.getLink(generatedBy);
- newCollection.registerWithLinkage(null);
+ newCollection.registerLink(generatedBy);
newCollection.pageMasterResolver = generatedBy.makePageMasterResolver(
lastPageNumber);
return newCollection;
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -116,7 +116,7 @@
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
newPnArea.generatedBy = newPnArea.getLink(generatedBy);
- newPnArea.registerWithLinkage(graftingPoint);
+ newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
newPnArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -122,7 +122,7 @@
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
newPncArea.generatedBy = newPncArea.getLink(generatedBy);
- newPncArea.registerWithLinkage(graftingPoint);
+ newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
newPncArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -122,7 +122,7 @@
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
newPncArea.generatedBy = newPncArea.getLink(generatedBy);
- newPncArea.registerWithLinkage(graftingPoint);
+ newPncArea.registerLink(generatedBy);
final int initialPD = newPncArea.computeInitialPD();
newPncArea.setProgressionDimension(initialPD);
newPncArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -118,7 +118,7 @@
static PageRa makePageArea(final SimplePageMaster generatedBy, final PageCollection parentArea) {
final PageRa newPage = new PageRa(parentArea);
newPage.generatedBy = newPage.getLink(generatedBy);
- newPage.registerWithLinkage(null);
+ newPage.registerLink(generatedBy);
newPage.createRegions();
return newPage;
}
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -88,7 +88,7 @@
final PageRa parentArea) {
final RegionRa newRegionArea = new RegionRa(parentArea);
newRegionArea.generatedBy = newRegionArea.getLink(generatedBy);
- newRegionArea.registerWithLinkage(null);
+ newRegionArea.registerLink(generatedBy);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -95,7 +95,7 @@
final PageRa parentArea) {
final RegionRaBody regionBody = new RegionRaBody(parentArea);
regionBody.generatedBy = regionBody.getLink(generatedBy);
- regionBody.registerWithLinkage(null);
+ regionBody.registerLink(generatedBy);
// create the primary reference areas
regionBody.beforeFloatReferenceArea = BeforeFloatRa.makeBeforeFloatArea(
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 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -73,7 +73,7 @@
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRmNode.generatedBy = link;
- newRmNode.registerWithLinkage(null);
+ newRmNode.registerLink(generatedBy);
return newRmNode;
}
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 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -74,7 +74,7 @@
final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRtmNode.generatedBy = link;
- newRtmNode.registerWithLinkage(null);
+ newRtmNode.registerLink(generatedBy);
return newRtmNode;
}
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -126,7 +126,7 @@
final Fo generatedBy, final GraftingPoint graftingPoint,
final int width) {
newPnArea.generatedBy = newPnArea.getLink(generatedBy);
- newPnArea.registerWithLinkage(graftingPoint);
+ newPnArea.registerLink(generatedBy);
final int initialPD = newPnArea.computeInitialPD();
newPnArea.setProgressionDimension(initialPD);
newPnArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -88,7 +88,7 @@
final MainRa parentArea, final int numColumns) {
final SpanRa newSpanArea = new SpanRa(parentArea);
newSpanArea.generatedBy = newSpanArea.getLink(generatedBy);
- newSpanArea.registerWithLinkage(null);
+ newSpanArea.registerLink(generatedBy);
final int initialPD = newSpanArea.computeInitialPD();
newSpanArea.setProgressionDimension(initialPD);
newSpanArea.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -74,7 +74,7 @@
final TableBodyContainer bodyContainer = new TableBodyContainer(
parentArea);
bodyContainer.generatedBy = bodyContainer.getLink(generatedBy);
- bodyContainer.registerWithLinkage(graftingPoint);
+ bodyContainer.registerLink(generatedBy);
final int initialPD = bodyContainer.computeInitialPD();
bodyContainer.setProgressionDimension(initialPD);
bodyContainer.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -113,7 +113,7 @@
final GraftingPoint graftingPoint) {
final TableCellRa newCell = new TableCellRa(parentArea);
newCell.generatedBy = newCell.getLink(generatedBy);
- newCell.registerWithLinkage(graftingPoint);
+ newCell.registerLink(generatedBy);
/* Do not set any area dimensions here. The IPD is controlled by the
* table and columns. The BPD is controlled by the TableRowContainer,
* which get input from each cell about the BPD of its contents.*/
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -74,7 +74,7 @@
final TableFooterContainer footerContainer = new TableFooterContainer(
parentArea);
footerContainer.generatedBy = footerContainer.getLink(generatedBy);
- footerContainer.registerWithLinkage(graftingPoint);
+ footerContainer.registerLink(generatedBy);
final int initialPD = footerContainer.computeInitialPD();
footerContainer.setProgressionDimension(initialPD);
footerContainer.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -74,7 +74,7 @@
final TableHeaderContainer headerContainer = new TableHeaderContainer(
parentArea);
headerContainer.generatedBy = headerContainer.getLink(generatedBy);
- headerContainer.registerWithLinkage(graftingPoint);
+ headerContainer.registerLink(generatedBy);
final int initialPD = headerContainer.computeInitialPD();
headerContainer.setProgressionDimension(initialPD);
headerContainer.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -103,7 +103,7 @@
final GraftingPoint graftingPoint) {
final TableRa newTable = new TableRa(parentArea);
newTable.generatedBy = newTable.getLink(generatedBy);
- newTable.registerWithLinkage(graftingPoint);
+ newTable.registerLink(generatedBy);
final int initialPD = newTable.computeInitialPD();
newTable.setProgressionDimension(initialPD);
newTable.initializeAnteriorSpace();
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -91,7 +91,7 @@
final GraftingPoint graftingPoint) {
final TableRowContainer newRow = new TableRowContainer(parentArea);
newRow.generatedBy = newRow.getLink(generatedBy);
- newRow.registerWithLinkage(graftingPoint);
+ newRow.registerLink(generatedBy);
/* Non-standard initialization of progression dimension. */
int startingPD = generatedBy.traitBpDimensionMin(newRow);
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:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextAreaCharacters.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -92,7 +92,7 @@
final boolean hasFauxSmallCaps) {
final Link linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
- newTextArea.registerWithLinkage(graftingPoint);
+ newTextArea.registerLink(generatedBy);
newTextArea.init(parentArea, backingOffset, backingSize,
progressionDimensionUsed,
hasDiscretionaryHyphen, hasFauxSmallCaps);
@@ -133,7 +133,7 @@
final boolean hasFauxSmallCaps) {
final Link linkage = parentArea.getLink(generatedBy);
final TextAreaCharacters newTextArea = new TextAreaCharacters(parentArea, linkage);
- newTextArea.registerWithLinkage(graftingPoint);
+ newTextArea.registerLink(generatedBy);
newTextArea.init(parentArea, backingOffset, backingSize, progressionDimensionUsed, hasDiscretionaryHyphen,
hasFauxSmallCaps);
return newTextArea;
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -1,133 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area.link;
-
-import org.foray.area.AreaNode4a;
-
-import org.axsl.area.AreaTreeException;
-import org.axsl.area.PageArea;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.fotree.fo.Marker;
-import org.axsl.fotree.fo.RetrieveMarker;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>Handles linkage to the FO Tree for the specialized case of fo:marker descendants, which can be laid out multiple
- * times in the AreaTree.</p>
- */
-public class GraftingPointLink implements Link {
-
- /** The FONode for which this linkage tracks Area generation. */
- private GraftingPoint generatedBy;
-
- /**
- * <p>Map whose key is a {@link GraftingPoint} instance, and whose value is an {@link NormalLink} instance.</p>
- *
- * <p>An fo:marker can be grafted to multiple fo:retrieve-marker instances, and can therefore be laid out in the
- * Area Tree multiple times.
- * Similarly, an fo:retrieve-marker instance may be conceptually replaced by multiple fo:marker instances.
- * So there is a many-to-many relationship between fo:marker and fo:retrieve-marker.
- * We need the ability to track the Areas generated by each unique combination of {@link Marker} and
- * {@link RetrieveMarker}.
- * (Although the content resulting from the marker/retrieve-marker combination may appear on multiple pages, it only
- * gets laid out once into the static-content flow, and therefore there is no need for the {@link PageArea} to be
- * part of the key).</p>
- *
- * <p>Since the conceptual key is the combination of marker and retrieve-marker, we must explain why only the
- * {@link RetrieveMarker} is used as the key to this Map.
- * Answer: it is unnecessary, because the {@link Marker} instance is implied in this's
- * {@link Link#getGeneratedBy()}.</p>
- *
- * <p>The value of the Map is an {@link NormalLink} just as would be used to store the linkage information for
- * non-marker content.
- * So the net effect is that we have forced a {@link RetrieveMarker} into the key that tracks this content.</p>
- */
- private Map<GraftingPoint, NormalLink> map = new HashMap<GraftingPoint, NormalLink>();
- /* TODO: Since the typical case presumably has the marker being used with
- * only one retrieve-marker, a HashMap is probably overkill. We should
- * probably use parallel arrays of size 1 for this information, and just
- * do the array copy if it is needed. Alternatively, use parallel ArrayLists
- * with an initial value of 1. */
-
- /**
- * Constructor.
- * @param foGenerator The FO node generating this linkage.
- * @throws AreaTreeException If the {@code foGenerator} has no ancestor marker.
- */
- public GraftingPointLink(final GraftingPoint foGenerator) throws AreaTreeException {
- this.generatedBy = foGenerator;
- final Marker marker = foGenerator.ancestorMarker();
- if (marker == null) {
- throw new AreaTreeException("(FOray) FoLinkageMarker "
- + "construction attempted for object\n"
- + " not descended from an fo:marker:\n"
- + foGenerator.getContextMessage());
- }
- }
-
- /**
- * Returns the FONode that generated this linkage.
- * @return The node that generated this linkage.
- */
- public GraftingPoint getGeneratedBy() {
- return this.generatedBy;
- }
-
- /**
- * Returns the normal linkage for a given RetrieveMarker.
- * @param graftingPoint The RetrieveMarker for which the linkage is needed.
- * @return The normal linkage.
- */
- public NormalLink getNormalLinkage(final GraftingPoint graftingPoint) {
- if (graftingPoint == null) {
- return null;
- }
- final Link object = this.map.get(graftingPoint);
- if (object != null) {
- return (NormalLink) object;
- }
- final NormalLink newLinkage = new GenericLink(this.getGeneratedBy());
- this.map.put(graftingPoint, newLinkage);
- return newLinkage;
- }
-
- public GraftingPoint getGraftingPoint(final AreaNode4a areaNode) {
- for (Map.Entry<GraftingPoint, NormalLink> entry
- : this.map.entrySet()) {
- final NormalLink normalLinkage = entry.getValue();
- if (normalLinkage.contains(areaNode)) {
- return entry.getKey();
- }
- }
- return null;
- }
-
-}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2021-12-31 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -28,6 +28,8 @@
package org.foray.area.link;
+import org.foray.area.AreaNode4a;
+
import org.axsl.fotree.Fo;
/**
@@ -41,4 +43,57 @@
*/
Fo getGeneratedBy();
+ /**
+ * Register a given area node as being generated by {@code generatedArea}.
+ * @param generatedArea The area node to register.
+ */
+ void registerGeneratedArea(AreaNode4a generatedArea);
+
+ /**
+ * Unregisters a given area node.
+ * @param generatedArea The area node to unregister.
+ * @throws IllegalArgumentException If {@code generatedArea} is not registered as being generated by
+ * {@link #getGeneratedBy()}.
+ */
+ void unregisterGeneratedArea(AreaNode4a generatedArea);
+
+ /**
+ * Indicates whether a given area generated by {@link #getGeneratedBy()} is the first area generated by
+ * {@link #getGeneratedBy()}.
+ * @param generatedArea The area generated by {@link #getGeneratedBy()} that is being tested.
+ * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGeneratedBy()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ */
+ boolean isFirstGeneratedBy(AreaNode4a generatedArea);
+
+ /**
+ * Indicates whether a given area generated by {@link #getGeneratedBy()} is the last area generated by
+ * {@link #getGeneratedBy()}.
+ * @param generatedArea The area generated by {@link #getGeneratedBy()} that is being tested.
+ * @return True if and only if {@code generatedArea} is the first Area generated by {@link #getGeneratedBy()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ */
+ boolean isLastGeneratedBy(AreaNode4a generatedArea);
+
+
+ /**
+ * For a given area generated by {@link #getGeneratedBy()}, returns the previous area generated by
+ * {@link #getGeneratedBy()}.
+ * @param generatedArea The area generated by {@link #getGeneratedBy()} whose previous area is needed.
+ * @return The previous area, or null, if {@code generatedArea} is the first area generated by
+ * {@link #getGeneratedBy()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ */
+ AreaNode4a getPreviousGeneratedBy(AreaNode4a generatedArea);
+
+ /**
+ * For a given area generated by {@link #getGeneratedBy()}, returns the next area generated by
+ * {@link #getGeneratedBy()}.
+ * @param generatedArea The area generated by {@link #getGeneratedBy()} whose next area is needed.
+ * @return The next area, or null, if {@code generatedArea} is the last area generated by
+ * {@link #getGeneratedBy()}.
+ * @throws IllegalArgumentException If {@code generatedArea} was not generated by {@link #getGeneratedBy()}.
+ */
+ AreaNode4a getNextGeneratedBy(AreaNode4a generatedArea);
+
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java 2021-12-31 16:30:29 UTC (rev 12310)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java 2021-12-31 17:30:12 UTC (rev 12311)
@@ -28,6 +28,8 @@
package org.foray.area.link;
+import org.foray.area.AreaNode4a;
+
import org.axsl.fotree.Fo;
/**
@@ -51,4 +53,40 @@
return this.generatedBy;
}
+ @Override
+ public void registerGeneratedArea(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public void unregisterGeneratedArea(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public boolean isFirstGeneratedBy(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public boolean isLastGeneratedBy(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public AreaNode4a getPreviousGeneratedBy(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public AreaNode4a getNextGeneratedBy(final AreaNode4a generatedArea) {
+ /* There are no generated areas. This is an error. */
+ throw new IllegalArgumentException();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <vic...@us...> - 2021-12-31 16:23:06
|
Revision: 12309
http://sourceforge.net/p/foray/code/12309
Author: victormote
Date: 2021-12-31 16:23:03 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Add and use link class for Fo instances that generate no areas.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
Added Paths:
-----------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
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 15:00:05 UTC (rev 12308)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 16:23:03 UTC (rev 12309)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.foray.area.link.GenericLink;
+import org.foray.area.link.NoGenerationLink;
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveMarkerNode;
@@ -46,7 +46,7 @@
public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private GenericLink generatedBy;
+ private NoGenerationLink generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -71,7 +71,7 @@
*/
static RetrieveMarkerNode4a makeRetrieveMarkerNode(final RetrieveMarker generatedBy, final AreaNode4a parent) {
final RetrieveMarkerNode4a newRmNode = new RetrieveMarkerNode4a(parent);
- final GenericLink link = new GenericLink(generatedBy);
+ final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRmNode.generatedBy = link;
newRmNode.registerWithLinkage(null);
return newRmNode;
@@ -108,7 +108,7 @@
}
@Override
- public GenericLink getLinkage() {
+ public NoGenerationLink getLinkage() {
return this.generatedBy;
}
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 15:00:05 UTC (rev 12308)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 16:23:03 UTC (rev 12309)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.foray.area.link.GenericLink;
+import org.foray.area.link.NoGenerationLink;
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
@@ -46,7 +46,7 @@
public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private GenericLink generatedBy;
+ private NoGenerationLink generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -72,7 +72,7 @@
static RetrieveTableMarkerNode4a makeRetrieveTableMarkerNode(final RetrieveTableMarker generatedBy,
final AreaNode4a parent) {
final RetrieveTableMarkerNode4a newRtmNode = new RetrieveTableMarkerNode4a(parent);
- final GenericLink link = new GenericLink(generatedBy);
+ final NoGenerationLink link = new NoGenerationLink(generatedBy);
newRtmNode.generatedBy = link;
newRtmNode.registerWithLinkage(null);
return newRtmNode;
@@ -109,7 +109,7 @@
}
@Override
- public GenericLink getLinkage() {
+ public NoGenerationLink getLinkage() {
return this.generatedBy;
}
Added: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java 2021-12-31 16:23:03 UTC (rev 12309)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area.link;
+
+import org.axsl.fotree.Fo;
+
+/**
+ * Links for {@link Fo} objects that generate no areas.
+ */
+public class NoGenerationLink implements Link {
+
+ /** The FONode for which this linkage tracks Area generation. */
+ private Fo generatedBy;
+
+ /**
+ * Constructor.
+ * @param foGenerator The Formatting object that generates the areas in this linkage.
+ */
+ public NoGenerationLink(final Fo foGenerator) {
+ this.generatedBy = foGenerator;
+ }
+
+ @Override
+ public Fo getGeneratedBy() {
+ return this.generatedBy;
+ }
+
+}
Property changes on: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NoGenerationLink.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 15:00:08
|
Revision: 12308
http://sourceforge.net/p/foray/code/12308
Author: victormote
Date: 2021-12-31 15:00:05 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Remove GraftingPoint concept from the main Link interface.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 14:52:58 UTC (rev 12307)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 15:00:05 UTC (rev 12308)
@@ -119,7 +119,6 @@
return newLinkage;
}
- @Override
public GraftingPoint getGraftingPoint(final AreaNode4a areaNode) {
for (Map.Entry<GraftingPoint, NormalLink> entry
: this.map.entrySet()) {
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2021-12-31 14:52:58 UTC (rev 12307)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/Link.java 2021-12-31 15:00:05 UTC (rev 12308)
@@ -28,10 +28,7 @@
package org.foray.area.link;
-import org.foray.area.AreaNode4a;
-
import org.axsl.fotree.Fo;
-import org.axsl.fotree.fo.GraftingPoint;
/**
* Interface for classes that handle the linkage between the FO Tree and the Area Tree.
@@ -44,11 +41,4 @@
*/
Fo getGeneratedBy();
- /**
- * Retrieves the GraftingPoint, if any, for a given area node.
- * @param areaNode The area node for which the retrieve marker is needed.
- * @return The GraftingPoint generating the area, or null.
- */
- GraftingPoint getGraftingPoint(AreaNode4a areaNode);
-
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2021-12-31 14:52:58 UTC (rev 12307)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/NormalLink.java 2021-12-31 15:00:05 UTC (rev 12308)
@@ -31,8 +31,6 @@
import org.foray.area.Area4a;
import org.foray.area.AreaNode4a;
-import org.axsl.fotree.fo.RetrieveMarker;
-
import java.util.ArrayList;
import java.util.List;
@@ -226,11 +224,6 @@
return null;
}
- @Override
- public RetrieveMarker getGraftingPoint(final AreaNode4a areaNode) {
- return null;
- }
-
/**
* Indicates whether a given area was generated by this linkage.
* @param areaNode The node to be tested.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 14:53:01
|
Revision: 12307
http://sourceforge.net/p/foray/code/12307
Author: victormote
Date: 2021-12-31 14:52:58 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Improvements to handling of GraftingPoints.
Modified Paths:
--------------
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/link/GenericLink.java
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 14:29:57 UTC (rev 12306)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 14:52:58 UTC (rev 12307)
@@ -28,12 +28,10 @@
package org.foray.area;
-import org.foray.area.link.GraftingPointLink;
+import org.foray.area.link.GenericLink;
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveMarkerNode;
-import org.axsl.fotree.Fo;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -48,7 +46,7 @@
public final class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private GraftingPointLink generatedBy;
+ private GenericLink generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -73,9 +71,9 @@
*/
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);
+ final GenericLink link = new GenericLink(generatedBy);
+ newRmNode.generatedBy = link;
+ newRmNode.registerWithLinkage(null);
return newRmNode;
}
@@ -105,12 +103,12 @@
}
@Override
- public Fo traitGeneratedBy() {
- return this.generatedBy.getGeneratedBy();
+ public RetrieveMarker traitGeneratedBy() {
+ return (RetrieveMarker) this.generatedBy.getGeneratedBy();
}
@Override
- public GraftingPointLink getLinkage() {
+ public GenericLink getLinkage() {
return this.generatedBy;
}
@@ -120,8 +118,8 @@
}
@Override
- public GraftingPoint getGraftingPoint() {
- return this.getParent().getGraftingPoint();
+ public RetrieveMarker getGraftingPoint() {
+ return (RetrieveMarker) this.generatedBy.getGeneratedBy();
}
}
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 14:29:57 UTC (rev 12306)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 14:52:58 UTC (rev 12307)
@@ -28,12 +28,10 @@
package org.foray.area;
-import org.foray.area.link.GraftingPointLink;
+import org.foray.area.link.GenericLink;
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
-import org.axsl.fotree.Fo;
-import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -48,7 +46,7 @@
public final class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
/** The "generated-by" trait, as defined in Section 6.1.1. */
- private GraftingPointLink generatedBy;
+ private GenericLink generatedBy;
/** The parent of this node. */
private AreaNode4a parent;
@@ -74,9 +72,9 @@
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);
+ final GenericLink link = new GenericLink(generatedBy);
+ newRtmNode.generatedBy = link;
+ newRtmNode.registerWithLinkage(null);
return newRtmNode;
}
@@ -106,12 +104,12 @@
}
@Override
- public Fo traitGeneratedBy() {
- return this.generatedBy.getGeneratedBy();
+ public RetrieveTableMarker traitGeneratedBy() {
+ return (RetrieveTableMarker) this.generatedBy.getGeneratedBy();
}
@Override
- public GraftingPointLink getLinkage() {
+ public GenericLink getLinkage() {
return this.generatedBy;
}
@@ -121,8 +119,8 @@
}
@Override
- public GraftingPoint getGraftingPoint() {
- return this.generatedBy.getGeneratedBy();
+ public RetrieveTableMarker getGraftingPoint() {
+ return (RetrieveTableMarker) this.generatedBy.getGeneratedBy();
}
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java 2021-12-31 14:29:57 UTC (rev 12306)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GenericLink.java 2021-12-31 14:52:58 UTC (rev 12307)
@@ -42,7 +42,7 @@
* Constructor.
* @param foGenerator The Formatting object that generates the areas in this linkage.
*/
- GenericLink(final Fo foGenerator) {
+ public GenericLink(final Fo foGenerator) {
this.generatedBy = foGenerator;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 14:29:58
|
Revision: 12306
http://sourceforge.net/p/foray/code/12306
Author: victormote
Date: 2021-12-31 14:29:57 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Use area nodes related to GraftingPoint instances to handle marker content.
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/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.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 04:09:45 UTC (rev 12305)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2021-12-31 14:29:57 UTC (rev 12306)
@@ -155,22 +155,7 @@
if (linkage != null) {
return linkage;
}
- if (graftingPoint == null) {
- /* Use the visitor pattern a little upside-down here to make sure that foNode is cast as its {@link Fo}
- * subtype instead of as {@link Fo}. */
- linkage = foNode.acceptVisitor(this.getAreaTree().getLinkageFactory());
- } else {
- try {
- final GraftingPointLink markerLinkage = new GraftingPointLink(
- foNode);
- markerLinkage.getNormalLinkage(graftingPoint);
- linkage = markerLinkage;
- } catch (final AreaTreeException e) {
- /* This should never happen as we have already tested for the condition that causes the exception, i.e.
- * that foNode has no ancestor marker. */
- throw new IllegalStateException(e);
- }
- }
+ linkage = foNode.acceptVisitor(this.getAreaTree().getLinkageFactory());
areaTree.setFONodeLinkage(foNode, linkage);
return linkage;
}
@@ -564,14 +549,9 @@
return false;
}
-// @Override
-// public boolean getAllowsChildren() {
-// return true;
-// }
-
@Override
public GraftingPoint getGraftingPoint() {
- return this.getLinkage().getGraftingPoint(this);
+ return this.getParent().getGraftingPoint();
}
/**
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 04:09:45 UTC (rev 12305)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java 2021-12-31 14:29:57 UTC (rev 12306)
@@ -41,6 +41,7 @@
import org.axsl.fotree.FoTree;
import org.axsl.fotree.fo.Bookmark;
import org.axsl.fotree.fo.BookmarkTree;
+import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.PageSequence;
import org.axsl.fotree.fo.Root;
@@ -486,4 +487,9 @@
return this.linkageFactory;
}
+ @Override
+ public GraftingPoint getGraftingPoint() {
+ return null;
+ }
+
}
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 04:09:45 UTC (rev 12305)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 14:29:57 UTC (rev 12306)
@@ -33,6 +33,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveMarkerNode;
import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.RetrieveMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -118,4 +119,9 @@
return false;
}
+ @Override
+ public GraftingPoint getGraftingPoint() {
+ return this.getParent().getGraftingPoint();
+ }
+
}
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 04:09:45 UTC (rev 12305)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 14:29:57 UTC (rev 12306)
@@ -33,6 +33,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.fotree.Fo;
+import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.RetrieveTableMarker;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -119,4 +120,9 @@
return false;
}
+ @Override
+ public GraftingPoint getGraftingPoint() {
+ return this.generatedBy.getGeneratedBy();
+ }
+
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 04:09:45 UTC (rev 12305)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/GraftingPointLink.java 2021-12-31 14:29:57 UTC (rev 12306)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.PageArea;
-import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveMarker;
@@ -47,7 +46,7 @@
public class GraftingPointLink implements Link {
/** The FONode for which this linkage tracks Area generation. */
- private Fo generatedBy;
+ private GraftingPoint generatedBy;
/**
* <p>Map whose key is a {@link GraftingPoint} instance, and whose value is an {@link NormalLink} instance.</p>
@@ -83,7 +82,7 @@
* @param foGenerator The FO node generating this linkage.
* @throws AreaTreeException If the {@code foGenerator} has no ancestor marker.
*/
- public GraftingPointLink(final Fo foGenerator) throws AreaTreeException {
+ public GraftingPointLink(final GraftingPoint foGenerator) throws AreaTreeException {
this.generatedBy = foGenerator;
final Marker marker = foGenerator.ancestorMarker();
if (marker == null) {
@@ -98,7 +97,7 @@
* Returns the FONode that generated this linkage.
* @return The node that generated this linkage.
*/
- public Fo getGeneratedBy() {
+ public GraftingPoint getGeneratedBy() {
return this.generatedBy;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 04:09:48
|
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.
|
|
From: <vic...@us...> - 2021-12-31 01:16:29
|
Revision: 12304
http://sourceforge.net/p/foray/code/12304
Author: victormote
Date: 2021-12-31 01:16:28 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Conform to aXSL change: Add interfaces for nodes in the area tree as placemarkers for GraftingPoints.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
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 00:16:30 UTC (rev 12303)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 01:16:28 UTC (rev 12304)
@@ -28,9 +28,10 @@
package org.foray.area;
-import org.foray.area.link.Link;
+import org.foray.area.link.GraftingPointLink;
import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveMarkerNode;
import org.axsl.fotree.Fo;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -42,10 +43,13 @@
* 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 {
+public class RetrieveMarkerNode4a extends AreaNode4a implements RetrieveMarkerNode {
+ /** The "generated-by" trait, as defined in Section 6.1.1. */
+ private GraftingPointLink generatedBy;
+
/** The parent of this node. */
- private Area4a parent;
+ private AreaNode4a parent;
/** The children of this node. */
private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
@@ -61,14 +65,13 @@
}
@Override
- public Area4a getParent() {
+ public AreaNode4a getParent() {
return this.parent;
}
@Override
public void setParent(final AreaNode4a node) throws AreaTreeException {
- // TODO Auto-generated method stub
-
+ this.parent = node;
}
@Override
@@ -78,14 +81,12 @@
@Override
public Fo traitGeneratedBy() {
- // TODO Auto-generated method stub
- return null;
+ return this.generatedBy.getGeneratedBy();
}
@Override
- public Link getLinkage() {
- // TODO Auto-generated method stub
- return null;
+ public GraftingPointLink getLinkage() {
+ return this.generatedBy;
}
@Override
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 00:16:30 UTC (rev 12303)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 01:16:28 UTC (rev 12304)
@@ -28,9 +28,10 @@
package org.foray.area;
-import org.foray.area.link.Link;
+import org.foray.area.link.GraftingPointLink;
import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.fotree.Fo;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
@@ -42,10 +43,13 @@
* 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 {
+public class RetrieveTableMarkerNode4a extends AreaNode4a implements RetrieveTableMarkerNode {
+ /** The "generated-by" trait, as defined in Section 6.1.1. */
+ private GraftingPointLink generatedBy;
+
/** The parent of this node. */
- private Area4a parent;
+ private AreaNode4a parent;
/** The children of this node. */
private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
@@ -61,14 +65,13 @@
}
@Override
- public Area4a getParent() {
+ public AreaNode4a getParent() {
return this.parent;
}
@Override
public void setParent(final AreaNode4a node) throws AreaTreeException {
- // TODO Auto-generated method stub
-
+ this.parent = node;
}
@Override
@@ -78,14 +81,12 @@
@Override
public Fo traitGeneratedBy() {
- // TODO Auto-generated method stub
- return null;
+ return this.generatedBy.getGeneratedBy();
}
@Override
- public Link getLinkage() {
- // TODO Auto-generated method stub
- return null;
+ public GraftingPointLink getLinkage() {
+ return this.generatedBy;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2021-12-31 00:16:31
|
Revision: 12303
http://sourceforge.net/p/foray/code/12303
Author: victormote
Date: 2021-12-31 00:16:30 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
Add area tree classes as placeholders for retrieve-marker and retrieve-table-marker.
Added Paths:
-----------
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
Added: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java 2021-12-31 00:16:30 UTC (rev 12303)
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2021 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.fotree.Fo;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 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 {
+
+ /** The parent of this node. */
+ private Area4a parent;
+
+ /** The children of this node. */
+ private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
+
+ @Override
+ public String getAreaName() {
+ return "retrieve-marker-node";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public Area4a getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public void setParent(final AreaNode4a node) throws AreaTreeException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public List<? extends AreaNode4a> getChildren() {
+ return this.children;
+ }
+
+ @Override
+ public Fo traitGeneratedBy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Link getLinkage() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected boolean optimize() {
+ return false;
+ }
+
+}
Property changes on: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveMarkerNode4a.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java 2021-12-31 00:16:30 UTC (rev 12303)
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2021 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.fotree.Fo;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 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 {
+
+ /** The parent of this node. */
+ private Area4a parent;
+
+ /** The children of this node. */
+ private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
+
+ @Override
+ public String getAreaName() {
+ return "retrieve-table-marker-node";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public Area4a getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public void setParent(final AreaNode4a node) throws AreaTreeException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public List<? extends AreaNode4a> getChildren() {
+ return this.children;
+ }
+
+ @Override
+ public Fo traitGeneratedBy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Link getLinkage() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected boolean optimize() {
+ return false;
+ }
+
+}
Property changes on: trunk/foray/foray-areatree/src/main/java/org/foray/area/RetrieveTableMarkerNode4a.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
10 messages has been excluded from this view by a project administrator.
