[FOray-commit] SF.net SVN: foray: [10043] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [10043] trunk/foray
|
From: <vic...@us...> - 2007-07-18 23:44:23
|
Revision: 10043
http://svn.sourceforge.net/foray/?rev=10043&view=rev
Author: victormote
Date: 2007-07-18 16:44:24 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
Conform to axsl changes renaming Character-related classes and making Character extend FoLineText.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -31,9 +31,9 @@
import org.axsl.area.AreaTreeException;
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.common.value.BorderStyle;
-import org.axsl.fo.FoText;
import org.axsl.fo.fo.ExternalGraphic;
import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.Inline;
import org.axsl.fo.fo.InlineContainer;
import org.axsl.fo.fo.InstreamForeignObject;
@@ -220,7 +220,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FoText foText,
+ public TextArea makeTextArea(final CharacterSequence foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -32,9 +32,9 @@
import org.axsl.common.value.LeaderAlignment;
import org.axsl.common.value.LeaderPattern;
import org.axsl.common.value.RuleStyle;
-import org.axsl.fo.FoText;
import org.axsl.fo.fo.ExternalGraphic;
import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.Inline;
import org.axsl.fo.fo.InlineContainer;
import org.axsl.fo.fo.InstreamForeignObject;
@@ -509,7 +509,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FoText foText,
+ public TextArea makeTextArea(final CharacterSequence foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -40,11 +40,11 @@
import org.axsl.common.value.TextAlign;
import org.axsl.common.value.TextAlignLast;
import org.axsl.fo.FoContext;
-import org.axsl.fo.FoText;
-import org.axsl.fo.FoTextContent;
import org.axsl.fo.fo.Block;
+import org.axsl.fo.fo.CharacterContent;
import org.axsl.fo.fo.ExternalGraphic;
import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.Inline;
import org.axsl.fo.fo.InlineContainer;
import org.axsl.fo.fo.InstreamForeignObject;
@@ -961,7 +961,7 @@
* @param context An object that knows how to resolve FO context issues.
* @return True iff a text area should be created for the text item.
*/
- static boolean shouldCreateTextArea(final FoTextContent foText,
+ static boolean shouldCreateTextArea(final CharacterContent foText,
final Area parentArea, final int startOffset, final int sizeInChars,
final boolean isLastItemOnLine, final FoContext context) {
/* If the raw text is empty, don't create the TextArea. */
@@ -1074,7 +1074,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FoText foText,
+ public TextArea makeTextArea(final CharacterSequence foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -35,8 +35,8 @@
import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fo.Fo;
import org.axsl.fo.FoContext;
-import org.axsl.fo.FoTextContent;
import org.axsl.fo.fo.Block;
+import org.axsl.fo.fo.CharacterContent;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.font.Font;
import org.axsl.font.FontUse;
@@ -158,7 +158,7 @@
* will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FoTextContent generatedBy,
+ static TextArea makeTextArea(final CharacterContent generatedBy,
final LineArea parentArea,
final GraftingPoint graftingPoint, final int backingOffset,
final int backingSize, final int progressionDimensionUsed,
@@ -203,7 +203,7 @@
* will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FoTextContent generatedBy,
+ static TextArea makeTextArea(final CharacterContent generatedBy,
final AbstractInlineArea parentArea,
final GraftingPoint graftingPoint, final int backingOffset,
final int backingSize, final int progressionDimensionUsed,
@@ -329,12 +329,12 @@
* Returns the raw value of the text content backing this area.
* @return The text content backing this area.
*/
- public FoTextContent getTextContent() {
+ public CharacterContent getTextContent() {
/* Do NOT use the traitGeneratedBy() method here, because we need the
* raw value, and this class overrides that method. */
final Fo foNode = this.getLinkage().getFONode();
/* Cast verified at construction. */
- return (FoTextContent) foNode;
+ return (CharacterContent) foNode;
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -40,11 +40,9 @@
import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.common.value.WrapOption;
import org.axsl.fo.FoContext;
-import org.axsl.fo.FoLineText;
import org.axsl.fo.ProxyFactory;
-import org.axsl.fo.fo.Block;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.GraftingPoint;
-import org.axsl.fo.fo.Leader;
import org.axsl.fo.fo.Marker;
import org.axsl.font.Font;
import org.axsl.font.FontUse;
@@ -55,7 +53,7 @@
/**
* A text node in the formatting object tree.
*/
-public class FOText extends FObj implements FoLineText, org.axsl.fo.FoText {
+public class FOText extends FObj implements CharacterSequence {
/** Constant indicating that a given character should be discarded. */
public static final char DISCARD_CHAR = 0xFFFF;
@@ -484,67 +482,6 @@
}
/**
- * Returns the next contiguous FOText item that has exactly the same
- * closest ancestor block.
- * @return The next contiguous FOText item. If there is no subsequent
- * FOText item with the same closest ancestor block, or if there is a
- * non-text leaf between, null is returned.
- */
- private FOText getNextContiguousTextInBlock() {
- final FObj nextLeaf = (FObj) this.getNextLeaf();
- return getContiguousTextInBlock(nextLeaf);
- }
-
- /**
- * Returns the previous contiguous FOText item that has exactly the same
- * closest ancestor block.
- * @return The previous contiguous FOText item. If there is no previous
- * FOText item with the same closest ancestor block, or if there is a
- * non-text leaf between, null is returned.
- */
- private FOText getPreviousContiguousTextInBlock() {
- final FObj previousLeaf = (FObj) this.getPreviousLeaf();
- return getContiguousTextInBlock(previousLeaf);
- }
-
- /**
- * Tests a given node to see if it is the next contiguous text item in
- * this text item's block.
- * @param leafToTest The candidate node being tested for contiguity.
- * @return #leafToTest iff all of the following are true: 1) #leafToTest
- * is an FOText instance,
- * 2) #leafToTest has the same ancestor Leader (usually null) as this, and
- * 3) #leafToTest has the same ancestor Block as this.
- * If any of these are not true, null is returned.
- */
- private FOText getContiguousTextInBlock(final FObj leafToTest) {
- final FObj effectiveParent = this.getParent();
- final FoContext context = null;
- if (leafToTest == null) {
- return null;
- }
- if (! (leafToTest instanceof FOText)) {
- return null;
- }
- /* If either is within a Leader, they both need to be in the same one.
- */
- final Leader thisLeader = effectiveParent.getNearestLeader(context);
- final Leader testLeader = leafToTest.effectiveParent(context)
- .getNearestLeader(context);
- if (thisLeader != testLeader) {
- return null;
- }
- final Block thisBlock =
- this.effectiveParent(context).getContainingBlock(context);
- final Block testBlock = leafToTest.effectiveParent(context)
- .getContainingBlock(context);
- if (thisBlock != testBlock) {
- return null;
- }
- return (FOText) leafToTest;
- }
-
- /**
* <p>Filters the raw text as needed to present the text that should appear
* in the area tree. Specifically, this effectively filters for the
* following property:</p>
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -4206,4 +4206,65 @@
}
+ /**
+ * Returns the next contiguous FOText item that has exactly the same
+ * closest ancestor block.
+ * @return The next contiguous FOText item. If there is no subsequent
+ * FOText item with the same closest ancestor block, or if there is a
+ * non-text leaf between, null is returned.
+ */
+ protected FOText getNextContiguousTextInBlock() {
+ final FObj nextLeaf = (FObj) this.getNextLeaf();
+ return getContiguousTextInBlock(nextLeaf);
+ }
+
+ /**
+ * Returns the previous contiguous FOText item that has exactly the same
+ * closest ancestor block.
+ * @return The previous contiguous FOText item. If there is no previous
+ * FOText item with the same closest ancestor block, or if there is a
+ * non-text leaf between, null is returned.
+ */
+ protected FOText getPreviousContiguousTextInBlock() {
+ final FObj previousLeaf = (FObj) this.getPreviousLeaf();
+ return getContiguousTextInBlock(previousLeaf);
+ }
+
+ /**
+ * Tests a given node to see if it is the next contiguous text item in
+ * this text item's block.
+ * @param leafToTest The candidate node being tested for contiguity.
+ * @return #leafToTest iff all of the following are true: 1) #leafToTest
+ * is an FOText instance,
+ * 2) #leafToTest has the same ancestor Leader (usually null) as this, and
+ * 3) #leafToTest has the same ancestor Block as this.
+ * If any of these are not true, null is returned.
+ */
+ private FOText getContiguousTextInBlock(final FObj leafToTest) {
+ final FObj effectiveParent = this.getParent();
+ final FoContext context = null;
+ if (leafToTest == null) {
+ return null;
+ }
+ if (! (leafToTest instanceof FOText)) {
+ return null;
+ }
+ /* If either is within a Leader, they both need to be in the same one.
+ */
+ final Leader thisLeader = effectiveParent.getNearestLeader(context);
+ final Leader testLeader = leafToTest.effectiveParent(context)
+ .getNearestLeader(context);
+ if (thisLeader != testLeader) {
+ return null;
+ }
+ final Block thisBlock =
+ this.effectiveParent(context).getContainingBlock(context);
+ final Block testBlock = leafToTest.effectiveParent(context)
+ .getContainingBlock(context);
+ if (thisBlock != testBlock) {
+ return null;
+ }
+ return (FOText) leafToTest;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -33,9 +33,16 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
+import org.axsl.common.value.Iso3166;
+import org.axsl.common.value.Iso639;
+import org.axsl.common.value.WrapOption;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoTreeException;
import org.axsl.fo.ProxyFactory;
+import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.font.Font;
+import org.axsl.font.FontUse;
+import org.axsl.text.line.LineText;
import java.util.ArrayList;
import java.util.List;
@@ -187,4 +194,272 @@
return this.propertyList;
}
+ /**
+ * {@inheritDoc}
+ */
+ public char[] inlineText() {
+ return this.inlineText(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public char[] inlineText(final FoContext context) {
+ return getAreaTreeText(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public FontUse inlinePrimaryFont() {
+ return this.inlinePrimaryFont(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public FontUse inlinePrimaryFont(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.getPrimaryFont(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public FontUse inlineSecondaryFont(final char c) {
+ return this.inlineSecondaryFont(null, c);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public FontUse inlineSecondaryFont(final FoContext context, final char c) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.getSecondaryFont(context, c);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineFontSize() {
+ return this.inlineFontSize(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineFontSize(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitFontSize(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineLetterSpacingOptimum() {
+ return this.inlineLetterSpacingOptimum(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineLetterSpacingOptimum(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitLetterSpacingOpt(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineWrapOption() {
+ return this.inlineWrapOption(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineWrapOption(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitWrapOption(context)
+ == WrapOption.WRAP;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineHyphenate() {
+ return this.inlineHyphenate(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineHyphenate(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitHyphenate(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iso639 inlineLanguage() {
+ return this.inlineLanguage(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iso639 inlineLanguage(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitLanguage(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iso3166 inlineCountry() {
+ return this.inlineCountry(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iso3166 inlineCountry(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitCountry(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationRemainCount() {
+ return this.inlineHyphenationRemainCount(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationRemainCount(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitHyphenationRemainCharacterCount(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationPushCount() {
+ return this.inlineHyphenationPushCount(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationPushCount(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitHyphenationPushCharacterCount(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationCharacter() {
+ return this.inlineHyphenationCharacter(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineHyphenationCharacter(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.traitHyphenationCharacter(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineIsFauxSmallCaps() {
+ return this.inlineIsFauxSmallCaps(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean inlineIsFauxSmallCaps(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ if (effectiveParent.traitFontVariant(context)
+ != Font.Variant.SMALL_CAPS) {
+ return false;
+ }
+ /*
+ * TODO: The other thing we would like to do here is see whether the
+ * font itself handles small-caps. If so, we should use that instead of
+ * the faux version. Right now, for this to work, the user needs to
+ * select a font with small-caps support and then turn
+ * font-variant="normal".
+ */
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineFauxSmallCapsFontSize() {
+ return this.inlineFauxSmallCapsFontSize(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int inlineFauxSmallCapsFontSize(final FoContext context) {
+ final FObj effectiveParent = effectiveParent(context);
+ return effectiveParent.getFauxSmallCapFontSize(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public LineText nextContiguousLineText() {
+ return getNextContiguousTextInBlock();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public LineText previousContiguousLineText() {
+ return getPreviousContiguousTextInBlock();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLastItemInBlock() {
+ return this.getNextSibling() == null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public org.axsl.fo.FoLineText getContextWrapper(final FoContext context) {
+ final org.axsl.fo.fo.Marker marker = this.ancestorMarker();
+ if (marker == null) {
+ return this;
+ }
+ return new org.foray.fotree.FOLineText(this, context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public org.axsl.fo.FoLineText getWrapped() {
+ /* This is the wrapped item. */
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GraftingPoint getGraftingPoint() {
+ return null;
+ }
+
}
Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -37,9 +37,9 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fo.FoLineNonText;
import org.axsl.fo.FoLineText;
-import org.axsl.fo.FoText;
import org.axsl.fo.fo.ExternalGraphic;
import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.InstreamForeignObject;
import org.axsl.fo.fo.Leader;
import org.axsl.fo.fo.PageNumber;
@@ -149,8 +149,8 @@
if (this.areaStack.size() > 0) {
factory = this.areaStack.peek();
}
- if (textToUse instanceof FoText) {
- final FoText foText = (FoText) textToUse;
+ if (textToUse instanceof CharacterSequence) {
+ final CharacterSequence foText = (CharacterSequence) textToUse;
factory.makeTextArea(foText, sizeInline, startOffset, sizeInChars,
hasDiscretionaryHyphen, hasFauxSmallCaps, isLastItemOnLine,
graftingPoint);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -32,23 +32,23 @@
import org.axsl.area.LineArea;
import org.axsl.area.AreaTreeException;
import org.axsl.fo.FoLineText;
-import org.axsl.fo.FoText;
import org.axsl.fo.fo.GraftingPoint;
+import org.axsl.fo.fo.CharacterSequence;
/**
- * Pioneer Layout for {@link FoText}.
+ * Pioneer Layout for {@link CharacterSequence}.
*/
public class FOTextPL extends FONodePL {
/** The real FONode which this proxy represents. */
- private FoText node;
+ private CharacterSequence node;
/**
* Constructor.
* @param text The FO Tree object which is being laid out.
* @param layout The ancestor layout system.
*/
- public FOTextPL(final FoText text, final PioneerLS layout) {
+ public FOTextPL(final CharacterSequence text, final PioneerLS layout) {
super(text, layout);
this.node = text;
}
@@ -103,7 +103,7 @@
/**
* {@inheritDoc}
*/
- public FoText getFONode() {
+ public CharacterSequence getFONode() {
return this.node;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-07-18 23:03:16 UTC (rev 10042)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-07-18 23:44:24 UTC (rev 10043)
@@ -39,7 +39,6 @@
import org.axsl.area.RegionRefArea;
import org.axsl.area.AreaTreeException;
import org.axsl.fo.Fo;
-import org.axsl.fo.FoText;
import org.axsl.fo.ProxyFactory;
import org.axsl.fo.extension.ContinuedLabel;
import org.axsl.fo.fo.BasicLink;
@@ -56,6 +55,7 @@
import org.axsl.fo.fo.Flow;
import org.axsl.fo.fo.Footnote;
import org.axsl.fo.fo.FootnoteBody;
+import org.axsl.fo.fo.CharacterSequence;
import org.axsl.fo.fo.InitialPropertySet;
import org.axsl.fo.fo.Inline;
import org.axsl.fo.fo.InlineContainer;
@@ -395,7 +395,7 @@
/**
* {@inheritDoc}
*/
- public FOTextPL makeProxy(final FoText node) {
+ public FOTextPL makeProxy(final CharacterSequence node) {
return new FOTextPL(node, this);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
