[FOray-commit] SF.net SVN: foray: [7433] trunk/foray/foray-fotree/src/java/org/foray/fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7433] trunk/foray/foray-fotree/src/java/org/foray/fotree
|
From: <vic...@us...> - 2006-06-06 22:35:41
|
Revision: 7433 Author: victormote Date: 2006-06-06 15:34:18 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7433&view=rev Log Message: ----------- Rename method for clarity. Modified Paths: -------------- 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/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.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/Marker.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/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/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/MaximumRepeats.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/FnFromParent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -43,7 +43,7 @@ super(parent); } - public FObj getFObjParent() { + public FObj realParent() { return (FObj) this.getParent(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -128,7 +128,7 @@ char[] charArray = getPreTextTransformText(); // Now handle text-transform. - short textTransform = getFObjParent().traitTextTransform(); + short textTransform = realParent().traitTextTransform(); if (textTransform != Constants.FOVAL_NONE) { for (int i = 0; i < charArray.length; i++) { charArray[i] = applyTextTransform(charArray, i, textTransform); @@ -166,11 +166,11 @@ /* Must handle white-space-treatment first. */ char[] workArray = applyWhiteSpaceTreatment(this.ca, - getFObjParent().traitWhiteSpaceTreatment()); + realParent().traitWhiteSpaceTreatment()); // Now handle linefeed-treatment. workArray = applyLinefeedTreatment(workArray, - getFObjParent().traitLinefeedTreatment()); + realParent().traitLinefeedTreatment()); /* Update this instance's text with the filtered value and update the * status. */ @@ -444,13 +444,13 @@ } /* If either is within a Leader, they both need to be in the same one. */ - Leader thisLeader = this.getFObjParent().getNearestLeader(); - Leader testLeader = leafToTest.getFObjParent().getNearestLeader(); + Leader thisLeader = this.realParent().getNearestLeader(); + Leader testLeader = leafToTest.realParent().getNearestLeader(); if (thisLeader != testLeader) { return null; } - Block thisBlock = this.getFObjParent().getContainingBlock(); - Block testBlock = leafToTest.getFObjParent().getContainingBlock(); + Block thisBlock = this.realParent().getContainingBlock(); + Block testBlock = leafToTest.realParent().getContainingBlock(); if (thisBlock != testBlock) { return null; } @@ -476,7 +476,7 @@ // Start with the refined FO Tree text char[] returnArray = getRefinedText(); // Apply white-space-collapse. - boolean whiteSpaceCollapse = getFObjParent().traitWhiteSpaceCollapse(); + boolean whiteSpaceCollapse = realParent().traitWhiteSpaceCollapse(); returnArray = applyWhiteSpaceCollapse(returnArray, whiteSpaceCollapse); /* Set the instance text to the more refined value and update the @@ -491,51 +491,51 @@ } public FontUse inlinePrimaryFont() { - return getFObjParent().getPrimaryFont(); + return realParent().getPrimaryFont(); } public FontUse inlineSecondaryFont(char c) { - return getFObjParent().getSecondaryFont(c); + return realParent().getSecondaryFont(c); } public int inlineFontSize() { - return getFObjParent().traitFontSize(); + return realParent().traitFontSize(); } public int inlineLetterSpacingOptimum() { - return getFObjParent().traitLetterSpacingOpt(); + return realParent().traitLetterSpacingOpt(); } public boolean inlineWrapOption() { - return (getFObjParent().traitWrapOption() == Constants.FOVAL_WRAP); + return (realParent().traitWrapOption() == Constants.FOVAL_WRAP); } public boolean inlineHyphenate() { - return getFObjParent().traitHyphenate(); + return realParent().traitHyphenate(); } public String inlineLanguage() { - return getFObjParent().traitLanguage(); + return realParent().traitLanguage(); } public String inlineCountry() { - return getFObjParent().traitCountry(); + return realParent().traitCountry(); } public int inlineHyphenationRemainCount() { - return getFObjParent().traitHyphenationRemainCharacterCount(); + return realParent().traitHyphenationRemainCharacterCount(); } public int inlineHyphenationPushCount() { - return getFObjParent().traitHyphenationPushCharacterCount(); + return realParent().traitHyphenationPushCharacterCount(); } public char inlineHyphenationCharacter() { - return getFObjParent().traitHyphenationCharacter(); + return realParent().traitHyphenationCharacter(); } public boolean inlineIsFauxSmallCaps() { - FObj parent = this.getFObjParent(); + FObj parent = this.realParent(); if (parent.traitFontVariant() != Constants.FOVAL_SMALL_CAPS) { return false; } @@ -550,7 +550,7 @@ } public int inlineFauxSmallCapsFontSize() { - return this.getFObjParent().getFauxSmallCapFontSize(); + return this.realParent().getFauxSmallCapFontSize(); } public LineText nextContiguousLineText() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -143,7 +143,7 @@ // Notify the listeners that this page-sequence is complete. notifyPageSequenceComplete((PageSequence) currentFObj); } - currentFObj = currentFObj.getFObjParent(); + currentFObj = currentFObj.realParent(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -186,10 +186,10 @@ * {@inheritDoc} */ public org.axsl.foR.FObj getNearestAncestorGeneratingRA() { - if (getFObjParent().traitIsReferenceArea()) { - return getFObjParent(); + if (realParent().traitIsReferenceArea()) { + return realParent(); } - return getFObjParent().getNearestAncestorGeneratingRA(); + return realParent().getNearestAncestorGeneratingRA(); } /** @@ -206,7 +206,7 @@ * {@inheritDoc} */ public org.axsl.foR.fo.ListItem getNearestListItem() { - return getFObjParent().getNearestListItem(); + return realParent().getNearestListItem(); } /** @@ -219,21 +219,21 @@ if (getParent() instanceof org.axsl.foR.fo.ListBlock) { return (org.axsl.foR.fo.ListBlock) getParent(); } - return getFObjParent().getNearestAncestorListBlock(); + return realParent().getNearestAncestorListBlock(); } /** * {@inheritDoc} */ public org.axsl.foR.fo.Root getRoot() { - return getFObjParent().getRoot(); + return realParent().getRoot(); } /** * {@inheritDoc} */ public org.axsl.foR.fo.Block getContainingBlock() { - return getFObjParent().getContainingBlock(); + return realParent().getContainingBlock(); } /** @@ -243,43 +243,43 @@ if (getParent() == null) { return null; } - return getFObjParent().getFlow(); + return realParent().getFlow(); } public FOTreeBuilder getFOTreeBuilder() { - return getFObjParent().getFOTreeBuilder(); + return realParent().getFOTreeBuilder(); } public Log getLogger() { - return getFObjParent().getLogger(); + return realParent().getLogger(); } /** * {@inheritDoc} */ public org.axsl.foR.fo.Table getNearestTable() { - return getFObjParent().getNearestTable(); + return realParent().getNearestTable(); } /** * {@inheritDoc} */ public org.axsl.foR.fo.Leader getNearestLeader() { - return getFObjParent().getNearestLeader(); + return realParent().getNearestLeader(); } /** * {@inheritDoc} */ public org.axsl.foR.fo.BasicLink getBasicLink() { - return getFObjParent().getBasicLink(); + return realParent().getBasicLink(); } /** * {@inheritDoc} */ public org.axsl.foR.FObj ancestorListRelatedObject() { - return getFObjParent().ancestorListRelatedObject(); + return realParent().ancestorListRelatedObject(); } /** @@ -1738,17 +1738,17 @@ return this.getBaselineFromScript(); } } else { - return this.getFObjParent().traitDominantBaseline(); + return this.realParent().traitDominantBaseline(); } } case Constants.FOVAL_USE_SCRIPT: { return this.getBaselineFromScript(); } case Constants.FOVAL_NO_CHANGE: { - return this.getFObjParent().traitDominantBaseline(); + return this.realParent().traitDominantBaseline(); } case Constants.FOVAL_RESET_SIZE: { - return this.getFObjParent().traitDominantBaseline(); + return this.realParent().traitDominantBaseline(); } case Constants.FOVAL_IDEOGRAPHIC: { return Constants.BASELINE_IDEOGRAPHIC; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -86,7 +86,7 @@ public Bookmark getParentOutline() { for (FONode node = (FONode) getParent(); - node != null; node = node.getFObjParent()) { + node != null; node = node.realParent()) { if (node instanceof Bookmark) { return (Bookmark)node; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -45,7 +45,7 @@ throwException(getFullName() + " must be descendant of fo:flow."); } // Validate that there is not content before this and other markers. - List siblings = getFObjParent().getChildren(); + List siblings = realParent().getChildren(); for (int i = 0; i < siblings.size(); i++) { FONode sibling = (FONode) siblings.get(i); if ((sibling instanceof Marker) @@ -60,7 +60,7 @@ public void start() throws FOTreeException { // Make sure that no sibling marker has the same 'marker-class-name'. - List siblings = getFObjParent().getChildren(); + List siblings = realParent().getChildren(); for (int i = 0; i < siblings.size(); i++) { if (! (siblings.get(i) instanceof Marker)) { continue; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -76,9 +76,9 @@ * @return The closest non-wrapper ancestor. */ public FObj getNonWrapperAncestor() { - FObj ancestor = this.getFObjParent(); + FObj ancestor = this.realParent(); while (ancestor instanceof Wrapper) { - ancestor = ancestor.getFObjParent(); + ancestor = ancestor.realParent(); } return ancestor; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -102,28 +102,28 @@ case Constants.FOPROP_HEIGHT: case Constants.FOPROP_WIDTH: { if (relativeAxis == Constants.AXIS_BP) { - return fobj.getFObjParent().traitBPDimensionOpt + return fobj.realParent().traitBPDimensionOpt (dimAncestorGenByBlockLevelFO); } - return fobj.getFObjParent().traitIPDimensionOpt + return fobj.realParent().traitIPDimensionOpt (dimAncestorGenByBlockLevelFO); } case Constants.FOPROP_MAX_HEIGHT: case Constants.FOPROP_MAX_WIDTH: { if (relativeAxis == Constants.AXIS_BP) { - return fobj.getFObjParent().traitBPDimensionMax + return fobj.realParent().traitBPDimensionMax (dimAncestorGenByBlockLevelFO); } - return fobj.getFObjParent().traitIPDimensionMax + return fobj.realParent().traitIPDimensionMax (dimAncestorGenByBlockLevelFO); } case Constants.FOPROP_MIN_HEIGHT: case Constants.FOPROP_MIN_WIDTH: { if (relativeAxis == Constants.AXIS_BP) { - return fobj.getFObjParent().traitBPDimensionMin + return fobj.realParent().traitBPDimensionMin (dimAncestorGenByBlockLevelFO); } - return fobj.getFObjParent().traitIPDimensionMin + return fobj.realParent().traitIPDimensionMin (dimAncestorGenByBlockLevelFO); } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -80,7 +80,7 @@ return Constants.ABSOLUTE_POSITION_AUTO; } case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -85,7 +85,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitAlignmentAdjust(); + return fobj.realParent().traitAlignmentAdjust(); } default: { return keyword; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -73,7 +73,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitAlignmentBaseline(); + return fobj.realParent().traitAlignmentBaseline(); } default: { return keyword; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -87,7 +87,7 @@ } public static double getValueNoInstance(FObj fobj, short propertyType) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { switch (propertyType) { case Constants.FOPROP_PITCH_RANGE: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -179,7 +179,7 @@ } public static float getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitAzimuth(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -77,7 +77,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitBackgroundImage(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -205,7 +205,7 @@ return paddingRectangleDimension - backgroundImageDimension; } case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { switch (axis) { case Constants.AXIS_HORIZONTAL: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -79,7 +79,7 @@ case Constants.FOVAL_SUB: { /* TODO: This is the legacy computation. It needs to be * rewritten from the spec. */ - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); int ascender = parent.getPrimaryFont().getFont().getAscender( parent.traitFontSize()); return (int) Math.round(2 * ascender / 3.0); @@ -87,13 +87,13 @@ case Constants.FOVAL_SUPER: { /* TODO: This is the legacy computation. It needs to be * rewritten from the spec. */ - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); int ascender = parent.getPrimaryFont().getFont().getAscender( parent.traitFontSize()); return (int) Math.round(-2 * ascender / 3.0); } case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitBaselineShift(); + return fobj.realParent().traitBaselineShift(); } } } @@ -105,7 +105,7 @@ } if (this.value instanceof DtPercentage) { /* TODO: This base value is almost certainly wrong. */ - int base = fobj.getFObjParent() + int base = fobj.realParent() .propertyList.getLineHeight(OPTIMUM); return Math.round(((DtPercentage) this.value).getValue() * base); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -83,7 +83,7 @@ } public static boolean getValueNoInstance(FObj fobj, short propertyType) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); switch (propertyType) { case Constants.FOPROP_HYPHENATE: { if (parent != null) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -82,7 +82,7 @@ return FORCE_VALUE; } case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { switch (direction) { case Constants.DIRECTION_BEFORE: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -105,7 +105,7 @@ } public static int getValueNoInstance(byte axis, FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return 0; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -120,28 +120,28 @@ } switch (direction) { case Constants.DIRECTION_BEFORE: { - return fobj.getFObjParent().traitBorderBeforeStyle(); + return fobj.realParent().traitBorderBeforeStyle(); } case Constants.DIRECTION_AFTER: { - return fobj.getFObjParent().traitBorderAfterStyle(); + return fobj.realParent().traitBorderAfterStyle(); } case Constants.DIRECTION_START: { - return fobj.getFObjParent().traitBorderStartStyle(); + return fobj.realParent().traitBorderStartStyle(); } case Constants.DIRECTION_END: { - return fobj.getFObjParent().traitBorderEndStyle(); + return fobj.realParent().traitBorderEndStyle(); } case Constants.DIRECTION_LEFT: { - return fobj.getFObjParent().traitBorderLeftStyle(); + return fobj.realParent().traitBorderLeftStyle(); } case Constants.DIRECTION_RIGHT: { - return fobj.getFObjParent().traitBorderRightStyle(); + return fobj.realParent().traitBorderRightStyle(); } case Constants.DIRECTION_TOP: { - return fobj.getFObjParent().traitBorderTopStyle(); + return fobj.realParent().traitBorderTopStyle(); } case Constants.DIRECTION_BOTTOM: { - return fobj.getFObjParent().traitBorderBottomStyle(); + return fobj.realParent().traitBorderBottomStyle(); } } return getValueNoInstance(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -175,28 +175,28 @@ case Constants.FOVAL_INHERIT: { switch (direction) { case Constants.DIRECTION_BEFORE: { - return fobj.getFObjParent().traitBorderBeforeWidth(isOuterEdge); + return fobj.realParent().traitBorderBeforeWidth(isOuterEdge); } case Constants.DIRECTION_AFTER: { - return fobj.getFObjParent().traitBorderAfterWidth(isOuterEdge); + return fobj.realParent().traitBorderAfterWidth(isOuterEdge); } case Constants.DIRECTION_START: { - return fobj.getFObjParent().traitBorderStartWidth(isOuterEdge); + return fobj.realParent().traitBorderStartWidth(isOuterEdge); } case Constants.DIRECTION_END: { - return fobj.getFObjParent().traitBorderEndWidth(isOuterEdge); + return fobj.realParent().traitBorderEndWidth(isOuterEdge); } case Constants.DIRECTION_LEFT: { - return fobj.getFObjParent().traitBorderLeftWidth(); + return fobj.realParent().traitBorderLeftWidth(); } case Constants.DIRECTION_RIGHT: { - return fobj.getFObjParent().traitBorderRightWidth(); + return fobj.realParent().traitBorderRightWidth(); } case Constants.DIRECTION_TOP: { - return fobj.getFObjParent().traitBorderTopWidth(); + return fobj.realParent().traitBorderTopWidth(); } case Constants.DIRECTION_BOTTOM: { - return fobj.getFObjParent().traitBorderBottomWidth(); + return fobj.realParent().traitBorderBottomWidth(); } } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -92,7 +92,7 @@ return CHARACTER_NOT_SPECIFIED; } case Constants.FOPROP_HYPHENATION_CHARACTER: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitHyphenationCharacter(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -74,7 +74,7 @@ return null; } case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitClip(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -98,7 +98,7 @@ } public static java.awt.Color getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getDefaultColor(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -67,7 +67,7 @@ if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitColumnCount(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -72,7 +72,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -86,7 +86,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -86,7 +86,7 @@ } public static String getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitCountry(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -100,7 +100,7 @@ short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { switch (propertyType) { case Constants.FOPROP_CUE_BEFORE: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -66,7 +66,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitDisplayAlign(); + return fobj.realParent().traitDisplayAlign(); } default: { return keyword; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -74,7 +74,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitDominantBaseline(); + return fobj.realParent().traitDominantBaseline(); } default: { return keyword; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -98,7 +98,7 @@ } public static float getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitAzimuth(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -66,7 +66,7 @@ if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return getInheritedValue(parent); } @@ -78,7 +78,7 @@ } public static short getValueNoInstance(short propertyType, FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); switch (propertyType) { case Constants.FOPROP_ABSOLUTE_POSITION: { return Constants.FOVAL_AUTO; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -76,7 +76,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -103,7 +103,7 @@ } public static String[] getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitFontFamily(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -160,7 +160,7 @@ * The base font size comes from the parent object, and is needed * for "em" and percentage computations. */ - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); int baseFontSize = getDefaultFontSize(); if (parent != null) { baseFontSize = parent.traitFontSize(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -88,7 +88,7 @@ } public static double getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (fobj != null) { return parent.traitFontSizeAdjust(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -85,7 +85,7 @@ } public static short getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitFontStretch(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -82,7 +82,7 @@ } public static short getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitFontStyle(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -76,7 +76,7 @@ } public static short getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitFontVariant(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -132,7 +132,7 @@ } public static short getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitFontWeight(); } @@ -144,7 +144,7 @@ } FontUse getInheritedFont(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return null; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -68,7 +68,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitForcePageCount(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -100,7 +100,7 @@ } public static short getValueNoInstance(FObj fobj, byte axis) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { switch (axis) { case Constants.AXIS_HORIZONTAL: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -84,7 +84,7 @@ } public static int getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitHyphLadderCount(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -67,7 +67,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent() + return fobj.realParent() .traitHyphenationPushCharacterCount(); } } @@ -79,7 +79,7 @@ } public static int traitValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return 2; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -68,7 +68,7 @@ short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent() + return fobj.realParent() .traitHyphenationRemainCharacterCount(); } } @@ -80,7 +80,7 @@ } public static int traitValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return 2; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -121,11 +121,11 @@ public static int getValueNoInstance(FObj fobj, byte direction, int ipdContainingRA) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return 0; } - return fobj.getFObjParent().propertyList.getIndent(direction, + return fobj.realParent().propertyList.getIndent(direction, ipdContainingRA); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -70,7 +70,7 @@ short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { InitialPageNumber property = (InitialPageNumber) parent.propertyList.getProperty @@ -106,7 +106,7 @@ if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.getRawInitialPageNumber(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -143,7 +143,7 @@ private static int getValueInherited(short propertyType, int subProperty, FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return org.axsl.foR.Keep.AUTO; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -86,7 +86,7 @@ } public static String getValueNoInstance(FObj fobj) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent != null) { return parent.traitLanguage(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -91,7 +91,7 @@ } public static int getValueNoInstance(FObj fobj, int ipdAncestorBANotLA) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return 0; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -131,13 +131,13 @@ int parentAreaCR_IPD) { switch (subProperty) { case 1: { - return fobj.getFObjParent().traitLeaderLengthMin(parentAreaCR_IPD); + return fobj.realParent().traitLeaderLengthMin(parentAreaCR_IPD); } case 2: { - return fobj.getFObjParent().traitLeaderLengthOpt(parentAreaCR_IPD); + return fobj.realParent().traitLeaderLengthOpt(parentAreaCR_IPD); } case 3: { - return fobj.getFObjParent().traitLeaderLengthMax(parentAreaCR_IPD); + return fobj.realParent().traitLeaderLengthMax(parentAreaCR_IPD); } } return getValueNoInstance(subProperty, fobj, parentAreaCR_IPD); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java 2006-06-06 21:59:57 UTC (rev 7432) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java 2006-06-06 22:34:18 UTC (rev 7433) @@ -91,7 +91,7 @@ } public static int getValueNoInstance(FObj fobj, int ipd_CR_Parent) { - FObj parent = fobj.getFObjParent(); + FObj parent = fobj.realParent(); if (parent == null) { return getValueFromFontMetrics(fobj); } Modified: trunk/foray/foray-fotree/src/java/org/foray... [truncated message content] |
