[FOray-commit] SF.net SVN: foray: [9139] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [9139] trunk/foray
|
From: <vic...@us...> - 2007-04-07 20:24:23
|
Revision: 9139
http://svn.sourceforge.net/foray/?rev=9139&view=rev
Author: victormote
Date: 2007-04-07 13:24:23 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Conform to axsl changes renaming classes.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.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/FObjScaled.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyValue.java
trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java
trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTablePartPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -41,7 +41,7 @@
import org.axsl.common.Overflow;
import org.axsl.common.RelativeAxis;
import org.axsl.common.Scaling;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.Fo;
import org.axsl.foR.WritingMode;
import org.axsl.foR.fo.BasicLink;
@@ -68,7 +68,7 @@
/**
* Returns the background-repeat trait.
* @return The background-repeat trait.
- * @see Fo#traitBackgroundRepeat(FOContext)
+ * @see Fo#traitBackgroundRepeat(FoContext)
*/
public FoValue traitBackgroundRepeat() {
return this.traitGeneratedBy().traitBackgroundRepeat(this);
@@ -77,7 +77,7 @@
/**
* Returns the background-image trait.
* @return The background-image trait.
- * @see Fo#traitBackgroundImage(FOContext)
+ * @see Fo#traitBackgroundImage(FoContext)
*/
public Graphic traitBackgroundImage() {
return this.traitGeneratedBy().traitBackgroundImage(this);
@@ -112,7 +112,7 @@
/**
* Returns the letter-spacing optimum trait.
* @return The letter-spacing optimum trait.
- * @see Fo#traitLetterSpacingOpt(FOContext)
+ * @see Fo#traitLetterSpacingOpt(FoContext)
*/
public int traitLetterSpacingOpt() {
return traitGeneratedBy().traitLetterSpacingOpt(this);
@@ -121,7 +121,7 @@
/**
* Returns the letter-spacing maximum trait.
* @return The letter-spacing maximum trait.
- * @see Fo#traitLetterSpacingMax(FOContext)
+ * @see Fo#traitLetterSpacingMax(FoContext)
*/
public int traitLetterSpacingMax() {
return traitGeneratedBy().traitLetterSpacingMax(this);
@@ -130,7 +130,7 @@
/**
* Returns the letter-spacing minimum trait.
* @return The letter-spacing minimum trait.
- * @see Fo#traitLetterSpacingMin(FOContext)
+ * @see Fo#traitLetterSpacingMin(FoContext)
*/
public int traitLetterSpacingMin() {
return traitGeneratedBy().traitLetterSpacingMin(this);
@@ -150,7 +150,7 @@
/**
* Returns the word-spacing optimum trait.
* @return The word-spacing optimum trait.
- * @see Fo#traitWordSpacingOpt(FOContext)
+ * @see Fo#traitWordSpacingOpt(FoContext)
*/
public int traitWordSpacingOpt() {
return traitGeneratedBy().traitWordSpacingOpt(this);
@@ -159,7 +159,7 @@
/**
* Returns the word-spacing maximum trait.
* @return The word-spacing maximum trait.
- * @see Fo#traitWordSpacingMax(FOContext)
+ * @see Fo#traitWordSpacingMax(FoContext)
*/
public int traitWordSpacingMax() {
return traitGeneratedBy().traitWordSpacingMax(this);
@@ -168,7 +168,7 @@
/**
* Returns the word-spacing minimum trait.
* @return The word-spacing minimum trait.
- * @see Fo#traitWordSpacingMin(FOContext)
+ * @see Fo#traitWordSpacingMin(FoContext)
*/
public int traitWordSpacingMin() {
return traitGeneratedBy().traitWordSpacingMin(this);
@@ -177,7 +177,7 @@
/**
* Returns the font-size trait.
* @return The font-size trait.
- * @see Fo#traitFontSize(FOContext)
+ * @see Fo#traitFontSize(FoContext)
*/
public int traitFontSize() {
return traitGeneratedBy().traitFontSize(this);
@@ -186,7 +186,7 @@
/**
* Returns the end-indent trait.
* @return The end-indent trait.
- * @see Fo#traitEndIndent(FOContext, int)
+ * @see Fo#traitEndIndent(FoContext, int)
*/
public int traitEndIndent() {
final int percentBase = this.getContainingReferenceArea().crIPD();
@@ -196,7 +196,7 @@
/**
* Returns the start-indent trait.
* @return The start-indent trait.
- * @see Fo#traitStartIndent(FOContext, int)
+ * @see Fo#traitStartIndent(FoContext, int)
*/
public int traitStartIndent() {
final Area containingRA = this.getContainingReferenceArea();
@@ -218,7 +218,7 @@
/**
* Returns the primary font for this area.
* @return The primary font for this area.
- * @see Fo#getPrimaryFont(FOContext)
+ * @see Fo#getPrimaryFont(FoContext)
*/
public FontUse getPrimaryFont() {
return traitGeneratedBy().getPrimaryFont(this);
@@ -229,7 +229,7 @@
* @param codePoint The Unicode code point for which the secondary font is
* needed.
* @return A secondary font for this area.
- * @see Fo#getSecondaryFont(FOContext, int)
+ * @see Fo#getSecondaryFont(FoContext, int)
*/
public FontUse getSecondaryFont(final int codePoint) {
return traitGeneratedBy().getSecondaryFont(this, codePoint);
@@ -282,7 +282,7 @@
/**
* Returns the font-family for this area.
* @return The font-family for this area.
- * @see Fo#traitFontFamily(FOContext)
+ * @see Fo#traitFontFamily(FoContext)
*/
public String traitFontFamily() {
return traitGeneratedBy().traitFontFamily(this)[0];
@@ -291,7 +291,7 @@
/**
* Returns the background-color for this area.
* @return The background-color for this area.
- * @see Fo#traitBackgroundColor(FOContext)
+ * @see Fo#traitBackgroundColor(FoContext)
*/
public Color traitBackgroundColor() {
return traitGeneratedBy().traitBackgroundColor(this);
@@ -300,7 +300,7 @@
/**
* Returns the relative-position for this area.
* @return The relative-position for this area.
- * @see Fo#traitRelativePosition(FOContext)
+ * @see Fo#traitRelativePosition(FoContext)
*/
public FoValue traitRelativePosition() {
return traitGeneratedBy().traitRelativePosition(this);
@@ -391,7 +391,7 @@
/**
* Returns the font-variant trait of this area.
* @return The font-variant trait of this area.
- * @see Fo#traitFontVariant(FOContext)
+ * @see Fo#traitFontVariant(FoContext)
*/
public Font.Variant traitFontVariant() {
return traitGeneratedBy().traitFontVariant(this);
@@ -400,7 +400,7 @@
/**
* Returns the underline-score trait of this area.
* @return The underline-score trait of this area.
- * @see Fo#traitUnderlineScore(FOContext)
+ * @see Fo#traitUnderlineScore(FoContext)
*/
public boolean traitUnderlineScore() {
return traitGeneratedBy().traitUnderlineScore(this);
@@ -409,7 +409,7 @@
/**
* Returns the overline-score trait of this area.
* @return The overline-score trait of this area.
- * @see Fo#traitOverlineScore(FOContext)
+ * @see Fo#traitOverlineScore(FoContext)
*/
public boolean traitOverlineScore() {
return traitGeneratedBy().traitOverlineScore(this);
@@ -418,7 +418,7 @@
/**
* Returns the through-score trait of this area.
* @return The through-score trait of this area.
- * @see Fo#traitThroughScore(FOContext)
+ * @see Fo#traitThroughScore(FoContext)
*/
public boolean traitThroughScore() {
return traitGeneratedBy().traitThroughScore(this);
@@ -427,7 +427,7 @@
/**
* Returns the underline-score-color trait of this area.
* @return The underline-score-color trait of this area.
- * @see Fo#traitUnderlineScoreColor(FOContext)
+ * @see Fo#traitUnderlineScoreColor(FoContext)
*/
public Color traitUnderlineScoreColor() {
return traitGeneratedBy().traitUnderlineScoreColor(this);
@@ -436,7 +436,7 @@
/**
* Returns the overline-score-color trait of this area.
* @return The overline-score-color trait of this area.
- * @see Fo#traitOverlineScoreColor(FOContext)
+ * @see Fo#traitOverlineScoreColor(FoContext)
*/
public Color traitOverlineScoreColor() {
return traitGeneratedBy().traitOverlineScoreColor(this);
@@ -445,7 +445,7 @@
/**
* Returns the through-score-color trait of this area.
* @return The through-score-color trait of this area.
- * @see Fo#traitThroughScoreColor(FOContext)
+ * @see Fo#traitThroughScoreColor(FoContext)
*/
public Color traitThroughScoreColor() {
return traitGeneratedBy().traitThroughScoreColor(this);
@@ -897,7 +897,7 @@
/**
* Returns the padding-start trait for this area.
* @return The padding-start trait for this area.
- * @see Fo#traitPaddingStart(FOContext, boolean)
+ * @see Fo#traitPaddingStart(FoContext, boolean)
*/
public int traitPaddingStart() {
return traitGeneratedBy().traitPaddingStart(this, traitIsFirst());
@@ -906,7 +906,7 @@
/**
* Returns the padding-end trait for this area.
* @return The padding-end trait for this area.
- * @see Fo#traitPaddingEnd(FOContext, boolean)
+ * @see Fo#traitPaddingEnd(FoContext, boolean)
*/
public int traitPaddingEnd() {
return traitGeneratedBy().traitPaddingEnd(this, traitIsLast());
@@ -915,7 +915,7 @@
/**
* Returns the padding-before trait for this area.
* @return The padding-before trait for this area.
- * @see Fo#traitPaddingBefore(FOContext, boolean)
+ * @see Fo#traitPaddingBefore(FoContext, boolean)
*/
public int traitPaddingBefore() {
return traitGeneratedBy().traitPaddingBefore(this, traitIsFirst());
@@ -924,7 +924,7 @@
/**
* Returns the padding-after trait for this area.
* @return The padding-after trait for this area.
- * @see Fo#traitPaddingAfter(FOContext, boolean)
+ * @see Fo#traitPaddingAfter(FoContext, boolean)
*/
public int traitPaddingAfter() {
return traitGeneratedBy().traitPaddingAfter(this, traitIsLast());
@@ -933,7 +933,7 @@
/**
* Returns the space-before minimum trait for this area.
* @return The space-before minimum trait for this area.
- * @see Fo#traitSpaceBeforeMinimum(FOContext)
+ * @see Fo#traitSpaceBeforeMinimum(FoContext)
*/
public int traitSpaceBeforeMinimum() {
return traitGeneratedBy().traitSpaceBeforeMinimum(this);
@@ -942,7 +942,7 @@
/**
* Returns the space-before optimum trait for this area.
* @return The space-before optimum trait for this area.
- * @see Fo#traitSpaceBeforeOptimum(FOContext)
+ * @see Fo#traitSpaceBeforeOptimum(FoContext)
*/
public int traitSpaceBeforeOptimum() {
return traitGeneratedBy().traitSpaceBeforeOptimum(this);
@@ -951,7 +951,7 @@
/**
* Returns the space-before maximum trait for this area.
* @return The space-before maximum trait for this area.
- * @see Fo#traitSpaceBeforeMaximum(FOContext)
+ * @see Fo#traitSpaceBeforeMaximum(FoContext)
*/
public int traitSpaceBeforeMaximum() {
return traitGeneratedBy().traitSpaceBeforeMaximum(this);
@@ -960,7 +960,7 @@
/**
* Returns the space-after minimum trait for this area.
* @return The space-after minimum trait for this area.
- * @see Fo#traitSpaceAfterMinimum(FOContext)
+ * @see Fo#traitSpaceAfterMinimum(FoContext)
*/
public int traitSpaceAfterMinumum() {
return traitGeneratedBy().traitSpaceAfterMinimum(this);
@@ -969,7 +969,7 @@
/**
* Returns the space-after optimum trait for this area.
* @return The space-after optimum trait for this area.
- * @see Fo#traitSpaceAfterOptimum(FOContext)
+ * @see Fo#traitSpaceAfterOptimum(FoContext)
*/
public int traitSpaceAfterOptimum() {
return traitGeneratedBy().traitSpaceAfterOptimum(this);
@@ -978,7 +978,7 @@
/**
* Returns the space-after maximum trait for this area.
* @return The space-after maximum trait for this area.
- * @see Fo#traitSpaceAfterMaximum(FOContext)
+ * @see Fo#traitSpaceAfterMaximum(FoContext)
*/
public int traitSpaceAfterMaximum() {
return traitGeneratedBy().traitSpaceAfterMaximum(this);
@@ -987,7 +987,7 @@
/**
* Returns the space-start optimum trait for this area.
* @return The space-start optimum trait for this area.
- * @see Fo#traitSpaceStartOptimum(FOContext, int)
+ * @see Fo#traitSpaceStartOptimum(FoContext, int)
*/
public int traitSpaceStartOptimum() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
@@ -998,7 +998,7 @@
/**
* Returns the space-end optimum trait for this area.
* @return The space-end optimum trait for this area.
- * @see Fo#traitSpaceEndOptimum(FOContext, int)
+ * @see Fo#traitSpaceEndOptimum(FoContext, int)
*/
public int traitSpaceEndOptimum() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
@@ -1008,7 +1008,7 @@
/**
* Returns the bp direction trait for this area.
* @return The bp direction trait for this area.
- * @see Fo#traitBPDirection(FOContext)
+ * @see Fo#traitBPDirection(FoContext)
*/
public AbsoluteDirection traitBPDirection() {
return traitGeneratedBy().traitBPDirection(this);
@@ -1017,7 +1017,7 @@
/**
* Returns the ip direction trait for odd-numbered lines in this area.
* @return The ip direction trait for odd-numbered lines in this area.
- * @see Fo#traitIPDirectionOdd(FOContext)
+ * @see Fo#traitIPDirectionOdd(FoContext)
*/
public AbsoluteDirection traitIPDirectionOdd() {
return traitGeneratedBy().traitIPDirectionOdd(this);
@@ -1026,7 +1026,7 @@
/**
* Returns the ip direction trait for even-numbered lines in this area.
* @return The ip direction trait for even-numbered lines in this area.
- * @see Fo#traitIPDirectionOdd(FOContext)
+ * @see Fo#traitIPDirectionOdd(FoContext)
*/
public AbsoluteDirection traitIPDirectionEven() {
return traitGeneratedBy().traitIPDirectionEven(this);
@@ -1147,7 +1147,7 @@
/**
* Returns the writing-mode for this area.
* @return The writing-mode for this area.
- * @see Fo#getWritingMode(FOContext)
+ * @see Fo#getWritingMode(FoContext)
*/
public WritingMode getWritingMode() {
return traitGeneratedBy().getWritingMode(this);
@@ -1282,7 +1282,7 @@
/**
* Returns the half-leading optimum trait for this area.
* @return The half-leading optimum trait for this area.
- * @see Fo#traitHalfLeadingOpt(FOContext)
+ * @see Fo#traitHalfLeadingOpt(FoContext)
*/
public int traitHalfLeadingOpt() {
return traitGeneratedBy().traitHalfLeadingOpt(this);
@@ -1338,7 +1338,7 @@
/**
* Returns the whitespace-treatment trait for this area.
* @return The whitespace-treatment trait for this area.
- * @see Fo#traitWhiteSpaceTreatment(FOContext)
+ * @see Fo#traitWhiteSpaceTreatment(FoContext)
*/
public FoValue traitWhiteSpaceTreatment() {
return traitGeneratedBy().traitWhiteSpaceTreatment(this);
@@ -1363,7 +1363,7 @@
/**
* Returns the wrap-option trait for this area.
* @return The wrap-option trait for this area.
- * @see Fo#traitWrapOption(FOContext)
+ * @see Fo#traitWrapOption(FoContext)
*/
public FoValue traitWrapOption() {
return traitGeneratedBy().traitWrapOption(this);
@@ -1372,7 +1372,7 @@
/**
* Returns the language trait for this area.
* @return The language trait for this area.
- * @see Fo#traitLanguage(FOContext)
+ * @see Fo#traitLanguage(FoContext)
*/
public String traitLanguage() {
return traitGeneratedBy().traitLanguage(this);
@@ -1388,7 +1388,7 @@
/**
* Returns the text-align trait for this area.
* @return The text-align trait for this area.
- * @see Fo#traitTextAlign(FOContext)
+ * @see Fo#traitTextAlign(FoContext)
*/
public FoValue traitTextAlign() {
return traitGeneratedBy().traitTextAlign(this);
@@ -1397,7 +1397,7 @@
/**
* Returns the alignment-baseline trait for this area.
* @return The alignment-baseline trait for this area.
- * @see Fo#traitAlignmentBaseline(FOContext)
+ * @see Fo#traitAlignmentBaseline(FoContext)
*/
public FoValue traitAlignmentBaseline() {
return traitGeneratedBy().traitAlignmentBaseline(this);
@@ -1413,7 +1413,7 @@
/**
* Returns the ref-id trait for this area.
* @return The ref-id trait for this area.
- * @see Fo#traitRefId(FOContext)
+ * @see Fo#traitRefId(FoContext)
*/
public String traitRefId() {
return traitGeneratedBy().traitRefId(this);
@@ -1422,7 +1422,7 @@
/**
* Returns the hyphenation-character trait for this area.
* @return The hyphenation-character trait for this area.
- * @see Fo#traitWrapOption(FOContext)
+ * @see Fo#traitWrapOption(FoContext)
*/
public int traitHyphenationCharacter() {
return traitGeneratedBy().traitHyphenationCharacter(this);
@@ -1431,7 +1431,7 @@
/**
* Returns the dominant-baseline trait for this area.
* @return The dominant-baseline trait for this area.
- * @see Fo#traitWrapOption(FOContext)
+ * @see Fo#traitWrapOption(FoContext)
*/
public Baseline traitDominantBaseline() {
return traitGeneratedBy().traitDominantBaseline(this);
@@ -1557,7 +1557,7 @@
/**
* Returns the top trait for this area.
* @return The top trait for this area.
- * @see Fo#traitTop(FOContext, int)
+ * @see Fo#traitTop(FoContext, int)
*/
public int traitTop() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
@@ -1567,7 +1567,7 @@
/**
* Returns the bottom trait for this area.
* @return The bottom trait for this area.
- * @see Fo#traitBottom(FOContext, int)
+ * @see Fo#traitBottom(FoContext, int)
*/
public int traitBottom() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
@@ -1577,7 +1577,7 @@
/**
* Returns the left trait for this area.
* @return The left trait for this area.
- * @see Fo#traitLeft(FOContext, int)
+ * @see Fo#traitLeft(FoContext, int)
*/
public int traitLeft() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
@@ -1587,7 +1587,7 @@
/**
* Returns the right trait for this area.
* @return The right trait for this area.
- * @see Fo#traitRight(FOContext, int)
+ * @see Fo#traitRight(FoContext, int)
*/
public int traitRight() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -31,7 +31,7 @@
import org.foray.common.OrderedTreeNode;
import org.axsl.areaW.AreaWException;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.fontR.Font;
@@ -116,7 +116,7 @@
* @param retrieveMarker The ancestor RetrieveMarker, if any.
* @return The linkage item.
*/
- public FOLinkage linkage(final FONode foNode,
+ public FOLinkage linkage(final FoNode foNode,
final RetrieveMarker retrieveMarker) {
if (foNode == null) {
return null;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -34,7 +34,7 @@
import org.axsl.areaW.AreaTreeListener;
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.PageArea;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.Bookmark;
import org.axsl.foR.fo.BookmarkTree;
@@ -367,7 +367,7 @@
* @param node The FONode whose linkage is needed.
* @return The FOLinkage for <code>node</code>, or null if there is none.
*/
- protected FOLinkage getFONodeLinkage(final FONode node) {
+ protected FOLinkage getFONodeLinkage(final FoNode node) {
final int index = node.getSequentialIndex();
if (index < 0) {
throw new IndexOutOfBoundsException("FONode has a negative "
@@ -384,7 +384,7 @@
* @param node The node whose linkage is to be set.
* @param linkage The linkage for <code>node</code>.
*/
- protected void setFONodeLinkage(final FONode node,
+ protected void setFONodeLinkage(final FoNode node,
final FOLinkage linkage) {
final int index = node.getSequentialIndex();
if (index < 0) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -30,7 +30,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.Bookmark;
import org.axsl.foR.fo.BookmarkTitle;
@@ -140,7 +140,7 @@
* @param bookmark The "generated-by" Bookmark.
*/
public void makeChildren(final Bookmark bookmark) {
- final List<? extends FONode> children = bookmark.getChildren();
+ final List<? extends FoNode> children = bookmark.getChildren();
for (int i = 0; i < children.size(); i++) {
final Fo child = (Fo) children.get(i);
if (child instanceof Bookmark) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.fo.RetrieveMarker;
/**
@@ -38,13 +38,13 @@
public abstract class FOLinkage {
/** The FONode for which this linkage tracks Area generation. */
- private FONode foGenerator;
+ private FoNode foGenerator;
/**
* Constructor.
* @param foGenerator The FO node generating this linkage.
*/
- public FOLinkage(final FONode foGenerator) {
+ public FOLinkage(final FoNode foGenerator) {
this.foGenerator = foGenerator;
}
@@ -52,7 +52,7 @@
* Returns the FONode that generated this linkage.
* @return The node that generated this linkage.
*/
- public FONode getFONode() {
+ public FoNode getFONode() {
return this.foGenerator;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -30,7 +30,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.PageArea;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.fo.Marker;
import org.axsl.foR.fo.RetrieveMarker;
@@ -85,7 +85,7 @@
* @throws AreaWException If the <code>foGenerator</code> has no ancestor
* marker.
*/
- public FOLinkageMarker(final FONode foGenerator) throws AreaWException {
+ public FOLinkageMarker(final FoNode foGenerator) throws AreaWException {
super(foGenerator);
final Marker marker = foGenerator.ancestorMarker();
if (marker == null) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.fo.RetrieveMarker;
import java.util.ArrayList;
@@ -53,7 +53,7 @@
* Constructor.
* @param foGenerator The FO node generating this linkage.
*/
- public FOLinkageNormal(final FONode foGenerator) {
+ public FOLinkageNormal(final FoNode foGenerator) {
super(foGenerator);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -35,7 +35,7 @@
import org.axsl.common.Compass;
import org.axsl.foR.fo.FoValue;
import org.axsl.common.RelativeAxis;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.FoText;
import org.axsl.foR.FoTextContent;
import org.axsl.foR.fo.Block;
@@ -952,7 +952,7 @@
*/
static boolean shouldCreateTextArea(final FoTextContent foText,
final Area parentArea, final int startOffset, final int sizeInChars,
- final boolean isLastItemOnLine, final FOContext context) {
+ final boolean isLastItemOnLine, final FoContext context) {
/* If the raw text is empty, don't create the TextArea. */
if (sizeInChars < 1) {
return false;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -35,7 +35,7 @@
import org.axsl.common.BorderModel;
import org.axsl.foR.fo.FoValue;
import org.axsl.common.RelativeAxis;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.Table;
import org.axsl.foR.fo.TableBody;
@@ -145,7 +145,7 @@
/**
* Returns the resolved width of a given column.
* The value returned here can be different from the nominal column-width
- * returned by {@link TableColumn#traitColumnWidth(FOContext, int)}
+ * returned by {@link TableColumn#traitColumnWidth(FoContext, int)}
* because of allocation of excesses or deficiencies in the table width.
* @param columnNumber The column whose resolved width is needed.
* @return The computed column-width, in millipoints.
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -33,7 +33,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.foR.fo.FoValue;
-import org.axsl.foR.FONode;
+import org.axsl.foR.FoNode;
import org.axsl.foR.FoTextContent;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.RetrieveMarker;
@@ -325,7 +325,7 @@
public FoTextContent getTextContent() {
/* Do NOT use the traitGeneratedBy() method here, because we need the
* raw value, and this class overrides that method. */
- final FONode foNode = this.getLinkage().getFONode();
+ final FoNode foNode = this.getLinkage().getFONode();
/* Cast verified at construction. */
return (FoTextContent) foNode;
}
@@ -733,7 +733,7 @@
* FObj can be used instead.
*/
public Fo traitGeneratedBy() {
- final FONode generatedBy = this.getLinkage().getFONode();
+ final FoNode generatedBy = this.getLinkage().getFONode();
if (generatedBy instanceof Fo) {
/* If generated by Character. */
return (Fo) generatedBy;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.fo.RetrieveMarker;
/**
@@ -41,7 +41,7 @@
private org.axsl.foR.FoLineNonText realLineNonText;
/** The FO context for this non-text item. */
- private FOContext context;
+ private FoContext context;
/**
* Constructor.
@@ -49,7 +49,7 @@
* @param context The FO context for this non-text item.
*/
public FOLineNonText(final org.axsl.foR.FoLineNonText realLineNonText,
- final FOContext context) {
+ final FoContext context) {
this.realLineNonText = realLineNonText;
this.context = context;
}
@@ -64,7 +64,7 @@
/**
* {@inheritDoc}
*/
- public int inlineSizeOptimum(final FOContext context,
+ public int inlineSizeOptimum(final FoContext context,
final int lineLength) {
return this.realLineNonText.inlineSizeOptimum(context, lineLength);
}
@@ -79,7 +79,7 @@
/**
* {@inheritDoc}
*/
- public int inlineSizeMinimum(final FOContext context,
+ public int inlineSizeMinimum(final FoContext context,
final int lineLength) {
return this.realLineNonText.inlineSizeMinimum(context, lineLength);
}
@@ -94,7 +94,7 @@
/**
* {@inheritDoc}
*/
- public int inlineSizeMaximum(final FOContext context,
+ public int inlineSizeMaximum(final FoContext context,
final int lineLength) {
return this.realLineNonText.inlineSizeMaximum(context, lineLength);
}
@@ -110,7 +110,7 @@
* {@inheritDoc}
*/
public org.axsl.foR.FoLineNonText getContextWrapper(
- final FOContext context) {
+ final FoContext context) {
/* This *is* the wrapper. */
return this;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.fontR.FontUse;
import org.axsl.text.line.LineText;
@@ -43,7 +43,7 @@
private org.axsl.foR.FoLineText realLineText;
/** The FO context for this text item. */
- private FOContext context;
+ private FoContext context;
/**
* Constructor.
@@ -51,7 +51,7 @@
* @param context The FO context for this text item.
*/
public FOLineText(final org.axsl.foR.FoLineText realLineText,
- final FOContext context) {
+ final FoContext context) {
this.realLineText = realLineText;
this.context = context;
}
@@ -66,7 +66,7 @@
/**
* {@inheritDoc}
*/
- public char[] inlineText(final FOContext context) {
+ public char[] inlineText(final FoContext context) {
return realLineText.inlineText(context);
}
@@ -80,7 +80,7 @@
/**
* {@inheritDoc}
*/
- public FontUse inlinePrimaryFont(final FOContext context) {
+ public FontUse inlinePrimaryFont(final FoContext context) {
return realLineText.inlinePrimaryFont(context);
}
@@ -94,7 +94,7 @@
/**
* {@inheritDoc}
*/
- public FontUse inlineSecondaryFont(final FOContext context, final char c) {
+ public FontUse inlineSecondaryFont(final FoContext context, final char c) {
return realLineText.inlineSecondaryFont(context, c);
}
@@ -108,7 +108,7 @@
/**
* {@inheritDoc}
*/
- public int inlineFontSize(final FOContext context) {
+ public int inlineFontSize(final FoContext context) {
return realLineText.inlineFontSize(context);
}
@@ -122,7 +122,7 @@
/**
* {@inheritDoc}
*/
- public int inlineLetterSpacingOptimum(final FOContext context) {
+ public int inlineLetterSpacingOptimum(final FoContext context) {
return realLineText.inlineLetterSpacingOptimum(context);
}
@@ -136,7 +136,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineWrapOption(final FOContext context) {
+ public boolean inlineWrapOption(final FoContext context) {
return realLineText.inlineWrapOption(context);
}
@@ -150,7 +150,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineHyphenate(final FOContext context) {
+ public boolean inlineHyphenate(final FoContext context) {
return realLineText.inlineHyphenate(context);
}
@@ -164,7 +164,7 @@
/**
* {@inheritDoc}
*/
- public String inlineLanguage(final FOContext context) {
+ public String inlineLanguage(final FoContext context) {
return realLineText.inlineLanguage(context);
}
@@ -178,7 +178,7 @@
/**
* {@inheritDoc}
*/
- public String inlineCountry(final FOContext context) {
+ public String inlineCountry(final FoContext context) {
return realLineText.inlineCountry(context);
}
@@ -192,7 +192,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationRemainCount(final FOContext context) {
+ public int inlineHyphenationRemainCount(final FoContext context) {
return realLineText.inlineHyphenationRemainCount(context);
}
@@ -206,7 +206,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationPushCount(final FOContext context) {
+ public int inlineHyphenationPushCount(final FoContext context) {
return realLineText.inlineHyphenationPushCount(context);
}
@@ -220,7 +220,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationCharacter(final FOContext context) {
+ public int inlineHyphenationCharacter(final FoContext context) {
return realLineText.inlineHyphenationCharacter(context);
}
/**
@@ -233,7 +233,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineIsFauxSmallCaps(final FOContext context) {
+ public boolean inlineIsFauxSmallCaps(final FoContext context) {
return realLineText.inlineIsFauxSmallCaps(context);
}
@@ -247,7 +247,7 @@
/**
* {@inheritDoc}
*/
- public int inlineFauxSmallCapsFontSize(final FOContext context) {
+ public int inlineFauxSmallCapsFontSize(final FoContext context) {
return realLineText.inlineFauxSmallCapsFontSize(context);
}
@@ -275,7 +275,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FoLineText getContextWrapper(final FOContext context) {
+ public org.axsl.foR.FoLineText getContextWrapper(final FoContext context) {
/* This *is* the wrapper. */
return this;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -32,7 +32,7 @@
import org.foray.fotree.fo.obj.Marker;
import org.foray.fotree.fo.obj.Root;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.FoTreeException;
import org.axsl.foR.fo.RetrieveMarker;
@@ -46,7 +46,7 @@
* Base class for nodes in the formatting object tree.
*/
public abstract class FONode extends OrderedTreeNode
- implements org.axsl.foR.FONode {
+ implements org.axsl.foR.FoNode {
/** The parent of this node. */
private FObj parent;
@@ -117,7 +117,7 @@
* issues.
* @return This node's effective parent.
*/
- public FObj effectiveParent(final FOContext context) {
+ public FObj effectiveParent(final FoContext context) {
/* If either this or its parent is a Marker, we want to return that
* Marker's surrogate RetrieveMarker's parent. */
if (this instanceof Marker) {
@@ -136,7 +136,7 @@
* issues.
* @return The parent of the RetrieveMarker instance found in the context.
*/
- private FObj effectiveMarkerParent(final FOContext context) {
+ private FObj effectiveMarkerParent(final FoContext context) {
if (context == null) {
/* TODO: Consider throwing an Exception. This should NOT
* happen. */
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -33,7 +33,7 @@
import org.foray.fotree.fo.obj.BookmarkTitle;
import org.axsl.foR.fo.FoValue;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.FoLineText;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.Block;
@@ -173,7 +173,7 @@
*
* @return The text that should appear in the refined FO tree.
*/
- public char[] getRefinedText(final FOContext context) {
+ public char[] getRefinedText(final FoContext context) {
/* TODO: This needs to come from effectiveParent, with context. */
final FObj effectiveParent = this.getParent();
if (this.filterStatus >= FILTER_REFINED_FO_TREE) {
@@ -217,7 +217,7 @@
* @return The text that should appear in the refined FO tree, except that
* text-transform is not applied.
*/
- private char[] getPreTextTransformText(final FOContext context) {
+ private char[] getPreTextTransformText(final FoContext context) {
final FObj effectiveParent = this.effectiveParent(context);
if (this.filterStatus >= FILTER_PRE_TRANSFORM) {
/* The stored text has already been filtered. Just return it. */
@@ -249,7 +249,7 @@
* @param textTransform The value of the text-transform enumerated property.
* @return The transformed char.
*/
- private char applyTextTransform(final FOContext context,
+ private char applyTextTransform(final FoContext context,
final char[] charArray, final int index,
final FoValue textTransform) {
final char c = charArray[index];
@@ -300,7 +300,7 @@
* @return True iff the character at this location is the start of a new
* word.
*/
- private boolean isStartOfWord(final FOContext context,
+ private boolean isStartOfWord(final FoContext context,
final char[] charArray, final int index) {
final char prevChar = getRelativeCharInBlock(context, charArray,
index, -1);
@@ -435,7 +435,7 @@
* @return the character in the offset position within the block; 0x0000 if
* the offset points to an area outside of the block.
*/
- private char getRelativeCharInBlock(final FOContext context,
+ private char getRelativeCharInBlock(final FoContext context,
final char[] charArray, final int index, final int offset) {
// The easy case is where the desired character is in the same FOText
final int desiredIndex = index + offset;
@@ -509,7 +509,7 @@
*/
private FOText getContiguousTextInBlock(final FONode leafToTest) {
final FObj effectiveParent = this.getParent();
- final FOContext context = null;
+ final FoContext context = null;
if (leafToTest == null) {
return null;
}
@@ -545,7 +545,7 @@
* issues.
* @return The text that should appear in the area tree.
*/
- public char[] getAreaTreeText(final FOContext context) {
+ public char[] getAreaTreeText(final FoContext context) {
final FObj effectiveParent = this.getParent();
if (this.filterStatus >= FILTER_AREA_TREE) {
/* The stored text has already been filtered. Just return it. */
@@ -576,7 +576,7 @@
/**
* {@inheritDoc}
*/
- public char[] inlineText(final FOContext context) {
+ public char[] inlineText(final FoContext context) {
return getAreaTreeText(context);
}
@@ -590,7 +590,7 @@
/**
* {@inheritDoc}
*/
- public FontUse inlinePrimaryFont(final FOContext context) {
+ public FontUse inlinePrimaryFont(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.getPrimaryFont(context);
}
@@ -605,7 +605,7 @@
/**
* {@inheritDoc}
*/
- public FontUse inlineSecondaryFont(final FOContext context, final char c) {
+ public FontUse inlineSecondaryFont(final FoContext context, final char c) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.getSecondaryFont(context, c);
}
@@ -620,7 +620,7 @@
/**
* {@inheritDoc}
*/
- public int inlineFontSize(final FOContext context) {
+ public int inlineFontSize(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitFontSize(context);
}
@@ -635,7 +635,7 @@
/**
* {@inheritDoc}
*/
- public int inlineLetterSpacingOptimum(final FOContext context) {
+ public int inlineLetterSpacingOptimum(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLetterSpacingOpt(context);
}
@@ -650,7 +650,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineWrapOption(final FOContext context) {
+ public boolean inlineWrapOption(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitWrapOption(context)
== FoValue.WRAP;
@@ -666,7 +666,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineHyphenate(final FOContext context) {
+ public boolean inlineHyphenate(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitHyphenate(context);
}
@@ -681,7 +681,7 @@
/**
* {@inheritDoc}
*/
- public String inlineLanguage(final FOContext context) {
+ public String inlineLanguage(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLanguage(context);
}
@@ -696,7 +696,7 @@
/**
* {@inheritDoc}
*/
- public String inlineCountry(final FOContext context) {
+ public String inlineCountry(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitCountry(context);
}
@@ -711,7 +711,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationRemainCount(final FOContext context) {
+ public int inlineHyphenationRemainCount(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitHyphenationRemainCharacterCount(context);
}
@@ -726,7 +726,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationPushCount(final FOContext context) {
+ public int inlineHyphenationPushCount(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitHyphenationPushCharacterCount(context);
}
@@ -741,7 +741,7 @@
/**
* {@inheritDoc}
*/
- public int inlineHyphenationCharacter(final FOContext context) {
+ public int inlineHyphenationCharacter(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitHyphenationCharacter(context);
}
@@ -756,7 +756,7 @@
/**
* {@inheritDoc}
*/
- public boolean inlineIsFauxSmallCaps(final FOContext context) {
+ public boolean inlineIsFauxSmallCaps(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
if (effectiveParent.traitFontVariant(context)
!= Font.Variant.SMALL_CAPS) {
@@ -782,7 +782,7 @@
/**
* {@inheritDoc}
*/
- public int inlineFauxSmallCapsFontSize(final FOContext context) {
+ public int inlineFauxSmallCapsFontSize(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.getFauxSmallCapFontSize(context);
}
@@ -1167,7 +1167,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FoLineText getContextWrapper(final FOContext context) {
+ public org.axsl.foR.FoLineText getContextWrapper(final FoContext context) {
final org.axsl.foR.fo.Marker marker = this.ancestorMarker();
if (marker == null) {
return this;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-07 19:42:21 UTC (rev 9138)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-07 20:24:23 UTC (rev 9139)
@@ -46,7 +46,7 @@
import org.axsl.common.RelativeAxis;
import org.axsl.common.RuleStyle;
import org.axsl.common.Scaling;
-import org.axsl.foR.FOContext;
+import org.axsl.foR.FoContext;
import org.axsl.foR.FoTreeException;
import org.axsl.foR.ShadowEffect;
import org.axsl.foR.Shape;
@@ -300,7 +300,7 @@
* issues.
* @return The nearest ancestor FObj that generates reference areas.
*/
- public FObj ancestorGeneratingRA(final FOContext context) {
+ public FObj ancestorGeneratingRA(final FoContext context) {
if (effectiveParent(context).isRAGenerator()) {
return effectiveParent(context);
}
@@ -313,7 +313,7 @@
* issues.
* @return Self or the nearest ancestor FObj that generates reference areas.
*/
- public FObj nearestGeneratingRA(final FOContext context) {
+ public FObj nearestGeneratingRA(final FoContext context) {
if (this.isRAGenerator()) {
return this;
}
@@ -327,7 +327,7 @@
* @return Self or the nearest ancestor FObj that is a ListItem.
*/
public ListItem getNearestListItem(
- final FOContext context) {
+ final FoContext context) {
return effectiveParent(context).getNearestListItem(context);
}
@@ -338,7 +338,7 @@
* @return The nearest ancestor FObj that is a ListBlock.
*/
public ListBlock getNearestAncestorListBlock(
- final FOContext context) {
+ final FoContext context) {
if (getParent() == null) {
return null;
}
@@ -364,7 +364,7 @@
* the nearest ancestor that is a Block, or null if there is no ancestor
* Block.
*/
- public org.axsl.foR.fo.Block getContainingBlock(final FOContext context) {
+ public org.axsl.foR.fo.Block getContainingBlock(final FoContext context) {
return effectiveParent(context).getContainingBlock(context);
}
@@ -375,7 +375,7 @@
* @return The ancestor {@link Flow}, or null if this object does not
* descend from a {@link Flow}.
*/
- public Flow ancestorFlow(final FOContext context) {
+ public Flow ancestorFlow(final FoContext context) {
if (getParent() == null) {
return null;
}
@@ -389,7 +389,7 @@
* @return The ancestor {@link StaticContent}, or null if this object does
* not descend from a {@link StaticContent}.
*/
- public StaticContent ancestorStaticContent(final FOContext context) {
+ public StaticContent ancestorStaticContent(fina...
[truncated message content] |
