[FOray-commit] SF.net SVN: foray:[12796] trunk/foray/foray-fotree/src
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12796] trunk/foray/foray-fotree/src
|
From: <vic...@us...> - 2022-12-07 11:37:13
|
Revision: 12796
http://sourceforge.net/p/foray/code/12796
Author: victormote
Date: 2022-12-07 11:37:04 +0000 (Wed, 07 Dec 2022)
Log Message:
-----------
Rename enums of property names, for clarity.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/PropertyMakerAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/AxslEnumerated.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/PropertyMakerFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/LayoutMasterSet4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractKeep.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPageDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAbsolutePosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdActiveState.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentBaseline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAllowedHeightScale.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAllowedWidthScale.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAutoRestore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundAttachment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundImage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPositionHorizontal.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPositionVertical.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundRepeat.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBaselineShift.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBlankOrNotBlank.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBlockProgressionDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorder.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderAfterColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderAfterPrecedence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderAfterStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderAfterWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBeforeColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBeforePrecedence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBeforeStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBeforeWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottomColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottomStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottomWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderCollapse.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderEndColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderEndPrecedence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderEndStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderEndWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeftColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeftStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeftWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRightColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRightStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRightWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderSeparation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderSpacing.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStartColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStartPrecedence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStartStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStartWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTopColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTopStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTopWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBreakAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBreakBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCaptionSide.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCaseName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCaseTitle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarClass.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarPlacement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdClear.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdClip.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColorProfileName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnCount.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnNumber.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentType.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCueAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCueBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDestinationPlacementOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDirection.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDisplayAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdEmptyCells.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdEndIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdEndsRow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExternalDestination.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFloat.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFlowMapName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFlowMapReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFlowName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFlowNameReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFont.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontFamily.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSelectionStrategy.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSizeAdjust.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontStretch.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontVariant.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontWeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdForcePageCount.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFormat.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdGlyphOrientationHorizontal.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdGlyphOrientationVertical.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdGroupingSeparator.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdGroupingSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenate.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationKeep.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationLadderCount.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationPushCharacterCount.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationRemainCharacterCount.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdIndexClass.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdIndexKey.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdIndicateDestination.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdInitialPageNumber.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdInlineProgressionDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdInternalDestination.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdIntrinsicScaleValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdIntrusionDisplace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdKeepTogether.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdKeepWithNext.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdKeepWithPrevious.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLanguage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLastLineEndIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderAlignment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderLength.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPattern.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPatternWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterSpacing.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeightShiftAdjustment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineStackingStrategy.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLinefeedTreatment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarkerClassName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMasterName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMasterReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMaxHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMaxWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMaximumRepeats.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMediaUsage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMergePagesAcrossIndexKeyReferences.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMergeRangesAcrossIndexKeyReferences.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMergeSequentialPageNumbers.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMinHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMinWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdNumberColumnsRepeated.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdNumberColumnsSpanned.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdNumberRowsSpanned.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOddOrEven.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOrphans.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOverflow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakInside.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageCitationStrategy.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageNumberTreatment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPagePosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPauseAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPauseBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitch.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitchRange.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPlayDuring.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPrecedence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalDistanceBetweenStarts.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalLabelSeparation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRefId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRefIndexKey.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdReferenceOrientation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRegionName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRegionNameReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRelativeAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRelativePosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRenderingIntent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrieveBoundary.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrieveBoundaryWithinTable.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrieveClassName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrievePosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrievePositionWithinTable.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRichness.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRole.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRuleStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRuleThickness.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScaleOption.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScaling.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScalingMethod.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScoreSpaces.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScript.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdShowDestination.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSourceDocument.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpan.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeak.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakHeader.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakNumeral.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakPunctuation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSrc.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStartIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStartingState.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStartsRow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStress.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSuppressAtLineBreak.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSwitchTo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTableLayout.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTableOmitFooterAtBreak.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTableOmitHeaderAtBreak.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTargetPresentationContext.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTargetProcessingContext.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTargetStylesheet.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAlignLast.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDecoration.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextShadow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextTransform.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTreatAsWordSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdUnicodeBidi.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVerticalAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVisibility.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVoiceFamily.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWhiteSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWhiteSpaceCollapse.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWhiteSpaceTreatment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWidows.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWordSpacing.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWrapOption.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWritingMode.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdZindex.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromParent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnInheritedProp.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnNearestSpecProp.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnSystemFont.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/PropertyMakerXml.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/value/TestFnSystemFont.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslPropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/XmlPropertyId.java
Removed Paths:
-------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/XmlProperty.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-07 11:24:54 UTC (rev 12795)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-07 11:37:04 UTC (rev 12796)
@@ -38,7 +38,7 @@
import org.foray.common.i18n.WritingSystem4a;
import org.foray.common.primitive.UnicodeCharUtils;
import org.foray.common.primitive.XmlCharacterUtils;
-import org.foray.fotree.fo.FoProperty;
+import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.fo.obj.BasicLink4a;
import org.foray.fotree.fo.obj.Block4a;
@@ -3332,7 +3332,7 @@
* @param propertyType The property which is sought.
* @return The requested property, or null if the root node is reached without finding the property.
*/
- public Property ancestorProperty(final FoProperty propertyType) {
+ public Property ancestorProperty(final FoPropertyId propertyType) {
final FoObj parent = getParsedParent();
if (parent == null) {
return null;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-12-07 11:24:54 UTC (rev 12795)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-12-07 11:37:04 UTC (rev 12796)
@@ -30,7 +30,7 @@
import org.foray.common.WellKnownConstants;
import org.foray.common.i18n.Country4a;
-import org.foray.fotree.fo.FoProperty;
+import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.fo.obj.FoScaled4a;
import org.foray.fotree.fo.obj.Region4a;
@@ -228,7 +228,7 @@
import org.foray.fotree.fo.prop.PdZindex;
import org.foray.fotree.value.DtTextDeco;
import org.foray.fotree.value.DtWritingMode;
-import org.foray.fotree.xml.XmlProperty;
+import org.foray.fotree.xml.XmlPropertyId;
import org.foray.fotree.xml.prop.Lang;
import org.axsl.font.Font;
@@ -333,7 +333,7 @@
* @return The text decoration property.
*/
public DtTextDeco getTextDecoration(final FoObj fobj, final FoContext context) {
- final PdTextDecoration property = (PdTextDecoration) getProperty(FoProperty.TEXT_DECORATION);
+ final PdTextDecoration property = (PdTextDecoration) getProperty(FoPropertyId.TEXT_DECORATION);
if (property == null) {
return PdTextDecoration.getValueNoInstance(context, fobj);
}
@@ -405,13 +405,13 @@
*/
public int getAbsoluteMargin(final FoObj fobj, final FoContext context, final AbsoluteCompass absoluteDirection) {
// Try the specific property first (e.g. "margin-top")
- final FoProperty propertyType = AbstractMargin.rawPropertyType(absoluteDirection);
+ final FoPropertyId propertyType = AbstractMargin.rawPropertyType(absoluteDirection);
AbstractMargin property = (AbstractMargin) getProperty(propertyType);
if (property != null) {
return property.getValue(context, fobj);
}
// Now try the shorthand property
- property = (AbstractMargin) getProperty(FoProperty.MARGIN);
+ property = (AbstractMargin) getProperty(FoPropertyId.MARGIN);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -430,12 +430,12 @@
final RelativeCompass relativeDirection) {
final AbsoluteCompass absoluteDirection = getWritingMode(fobj, context)
.getAbsoluteDirection(relativeDirection);
- final FoProperty propertyType = AbstractMargin.rawPropertyType(absoluteDirection);
+ final FoPropertyId propertyType = AbstractMargin.rawPropertyType(absoluteDirection);
AbstractMargin marginProperty = (AbstractMargin) getProperty(propertyType);
if (marginProperty != null) {
return true;
}
- marginProperty = (AbstractMargin) getProperty(FoProperty.MARGIN);
+ marginProperty = (AbstractMargin) getProperty(FoPropertyId.MARGIN);
if (marginProperty != null) {
return true;
}
@@ -489,7 +489,7 @@
* @return The color property.
*/
public java.awt.Color getColor(final FoObj fobj, final FoContext context) {
- final PdColor property = (PdColor) getProperty(FoProperty.COLOR);
+ final PdColor property = (PdColor) getProperty(FoPropertyId.COLOR);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -503,12 +503,12 @@
* @return The wrap-option property.
*/
public FoValue getWrapOption(final FoObj fobj, final FoContext context) {
- final PdWrapOption property = (PdWrapOption) getProperty(FoProperty.WRAP_OPTION);
+ final PdWrapOption property = (PdWrapOption) getProperty(FoPropertyId.WRAP_OPTION);
if (property != null) {
return property.getValue(context, fobj);
}
// Try the shorthand
- final PdWhiteSpace whiteSpace = (PdWhiteSpace) getProperty(FoProperty.WHITE_SPACE);
+ final PdWhiteSpace whiteSpace = (PdWhiteSpace) getProperty(FoPropertyId.WHITE_SPACE);
if (whiteSpace != null) {
switch (whiteSpace.getValue(context, fobj)) {
case NORMAL: return FoValue.WRAP;
@@ -527,12 +527,12 @@
* @return The whitespace-collapse property.
*/
public boolean getWhiteSpaceCollapse(final FoObj fobj, final FoContext context) {
- final PdWhiteSpaceCollapse property = (PdWhiteSpaceCollapse) getProperty(FoProperty.WHITE_SPACE_COLLAPSE);
+ final PdWhiteSpaceCollapse property = (PdWhiteSpaceCollapse) getProperty(FoPropertyId.WHITE_SPACE_COLLAPSE);
if (property != null) {
return property.getValue(context, fobj);
}
// Try the shorthand
- final PdWhiteSpace enumProperty = (PdWhiteSpace) getProperty(FoProperty.WHITE_SPACE);
+ final PdWhiteSpace enumProperty = (PdWhiteSpace) getProperty(FoPropertyId.WHITE_SPACE);
if (enumProperty != null) {
switch (enumProperty.getValue(context, fobj)) {
case NORMAL: return true;
@@ -551,7 +551,7 @@
* @return The writing-mode property.
*/
public DtWritingMode getWritingMode(final FoObj fobj, final FoContext context) {
- final PdWritingMode property = (PdWritingMode) getProperty(FoProperty.WRITING_MODE);
+ final PdWritingMode property = (PdWritingMode) getProperty(FoPropertyId.WRITING_MODE);
if (property == null) {
return PdWritingMode.getValueNoInstance(context, fobj);
}
@@ -563,7 +563,7 @@
* @return The id property.
*/
public String getId() {
- final PdId property = (PdId) getProperty(FoProperty.ID);
+ final PdId property = (PdId) getProperty(FoPropertyId.ID);
if (property != null) {
return property.getValue();
}
@@ -576,7 +576,7 @@
*/
public String getInternalDestination() {
final PdInternalDestination property = (PdInternalDestination)
- getProperty(FoProperty.INTERNAL_DESTINATION);
+ getProperty(FoPropertyId.INTERNAL_DESTINATION);
if (property != null) {
return property.getValue();
}
@@ -588,7 +588,7 @@
* @return The external-destination property.
*/
public URI getExternalDestination() {
- final PdExternalDestination property = (PdExternalDestination) getProperty(FoProperty.EXTERNAL_DESTINATION);
+ final PdExternalDestination property = (PdExternalDestination) getProperty(FoPropertyId.EXTERNAL_DESTINATION);
if (property != null) {
return property.getValue();
}
@@ -608,7 +608,7 @@
* and 7.11.8 (end-indent property). */
/* Find the corresponding absolute margin if it is specified. */
- final FoProperty rawMarginPropertyType =
+ final FoPropertyId rawMarginPropertyType =
AbstractIndent.rawAbsoluteCorrespondingPropertyType(fobj, context, direction);
final AbstractMargin abstractMargin = (AbstractMargin) getProperty(rawMarginPropertyType);
@@ -639,7 +639,7 @@
* indent value and return it. */
AbstractIndent indent = null;
- final FoProperty rawPropertyType = AbstractIndent.rawPropertyType(direction);
+ final FoPropertyId rawPropertyType = AbstractIndent.rawPropertyType(direction);
indent = (AbstractIndent) getProperty(rawPropertyType);
if (indent == null) {
return AbstractIndent.getValueNoInstance(context, fobj, direction);
@@ -654,7 +654,7 @@
* @return The span property.
*/
public FoValue getSpan(final FoObj fobj, final FoContext context) {
- final PdSpan property = (PdSpan) getProperty(FoProperty.SPAN);
+ final PdSpan property = (PdSpan) getProperty(FoPropertyId.SPAN);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -666,7 +666,7 @@
* @return The flow-name property.
*/
public String getFlowName() {
- final AbstractName property = (AbstractName) getProperty(FoProperty.FLOW_NAME);
+ final AbstractName property = (AbstractName) getProperty(FoPropertyId.FLOW_NAME);
if (property != null) {
return property.getValue();
}
@@ -678,7 +678,7 @@
* @return The marker-class-name property.
*/
public String getMarkerClassName() {
- final AbstractName property = (AbstractName) getProperty(FoProperty.MARKER_CLASS_NAME);
+ final AbstractName property = (AbstractName) getProperty(FoPropertyId.MARKER_CLASS_NAME);
if (property != null) {
return property.getValue();
}
@@ -690,7 +690,7 @@
* @return The retrieve-class-name property.
*/
public String getRetrieveClassName() {
- final AbstractName property = (AbstractName) getProperty(FoProperty.RETRIEVE_CLASS_NAME);
+ final AbstractName property = (AbstractName) getProperty(FoPropertyId.RETRIEVE_CLASS_NAME);
if (property != null) {
return property.getValue();
}
@@ -702,7 +702,7 @@
* @return The retrieve-position property.
*/
public FoValue getRetrievePosition() {
- final PdRetrievePosition property = (PdRetrievePosition) getProperty(FoProperty.RETRIEVE_POSITION);
+ final PdRetrievePosition property = (PdRetrievePosition) getProperty(FoPropertyId.RETRIEVE_POSITION);
if (property != null) {
return property.getValue();
}
@@ -714,7 +714,7 @@
* @return Teh retrieve-boundary property.
*/
public FoValue getRetrieveBoundary() {
- final PdRetrieveBoundary property = (PdRetrieveBoundary) getProperty(FoProperty.RETRIEVE_BOUNDARY);
+ final PdRetrieveBoundary property = (PdRetrieveBoundary) getProperty(FoPropertyId.RETRIEVE_BOUNDARY);
if (property != null) {
return property.getValue();
}
@@ -728,7 +728,7 @@
* @return The column-number property.
*/
public int getColumnNumber(final FoObj fobj, final FoContext context) {
- final PdColumnNumber property = (PdColumnNumber) getProperty(FoProperty.COLUMN_NUMBER);
+ final PdColumnNumber property = (PdColumnNumber) getProperty(FoPropertyId.COLUMN_NUMBER);
if (property == null) {
return PdColumnNumber.getValueNoInstance(context, fobj);
}
@@ -741,7 +741,7 @@
*/
public int getNumberColumnsSpanned() {
final PdNumberColumnsSpanned property = (PdNumberColumnsSpanned)
- getProperty(FoProperty.NUMBER_COLUMNS_SPANNED);
+ getProperty(FoPropertyId.NUMBER_COLUMNS_SPANNED);
if (property == null) {
return PdNumberColumnsSpanned.getValueNoInstance();
}
@@ -754,7 +754,7 @@
*/
public int getNumberRowsSpanned() {
final PdNumberRowsSpanned property = (PdNumberRowsSpanned)
- getProperty(FoProperty.NUMBER_ROWS_SPANNED);
+ getProperty(FoPropertyId.NUMBER_ROWS_SPANNED);
if (property == null) {
return PdNumberRowsSpanned.getValueNoInstance();
}
@@ -768,7 +768,7 @@
* @return The border-collapse property.
*/
public FoValue getBorderCollapse(final FoObj fobj, final FoContext context) {
- final PdBorderCollapse property = (PdBorderCollapse) getProperty(FoProperty.BORDER_COLLAPSE);
+ final PdBorderCollapse property = (PdBorderCollapse) getProperty(FoPropertyId.BORDER_COLLAPSE);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -782,7 +782,7 @@
* @return The display-align property.
*/
public FoValue getDisplayAlign(final FoObj fobj, final FoContext context) {
- final PdDisplayAlign property = (PdDisplayAlign) getProperty(FoProperty.DISPLAY_ALIGN);
+ final PdDisplayAlign property = (PdDisplayAlign) getProperty(FoPropertyId.DISPLAY_ALIGN);
if (property == null) {
return PdDisplayAlign.traitValueNoInstance();
}
@@ -796,7 +796,7 @@
* @return The relative-align property.
*/
public FoValue getRelativeAlign(final FoObj fobj, final FoContext context) {
- final PdRelativeAlign property = (PdRelativeAlign) getProperty(FoProperty.RELATIVE_ALIGN);
+ final PdRelativeAlign property = (PdRelativeAlign) getProperty(FoPropertyId.RELATIVE_ALIGN);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -811,9 +811,9 @@
*/
public int getBorderSeparationIPD(final FoObj fobj, final FoContext context) {
PdBorderSeparation property = (PdBorderSeparation)
- getProperty(FoProperty.BORDER_SEPARATION);
+ getProperty(FoPropertyId.BORDER_SEPARATION);
if (property == null) {
- final PdBorderSpacing borderSpacing = (PdBorderSpacing) getProperty(FoProperty.BORDER_SPACING);
+ final PdBorderSpacing borderSpacing = (PdBorderSpacing) getProperty(FoPropertyId.BORDER_SPACING);
property = borderSpacing.getBorderSeparation();
}
if (property != null) {
@@ -830,9 +830,9 @@
*/
public int getBorderSeparationBPD(final FoObj fobj, final FoContext context) {
PdBorderSeparation property = (PdBorderSeparation)
- getProperty(FoProperty.BORDER_SEPARATION);
+ getProperty(FoPropertyId.BORDER_SEPARATION);
if (property == null) {
- final PdBorderSpacing borderSpacing = (PdBorderSpacing) getProperty(FoProperty.BORDER_SPACING);
+ final PdBorderSpacing borderSpacing = (PdBorderSpacing) getProperty(FoPropertyId.BORDER_SPACING);
property = borderSpacing.getBorderSeparation();
}
if (property != null) {
@@ -847,7 +847,7 @@
*/
public int getNumberColumnsRepeated() {
final PdNumberColumnsRepeated property = (PdNumberColumnsRepeated)
- getProperty(FoProperty.NUMBER_COLUMNS_REPEATED);
+ getProperty(FoPropertyId.NUMBER_COLUMNS_REPEATED);
if (property == null) {
return PdNumberColumnsRepeated.getValueNoInstance();
}
@@ -861,7 +861,7 @@
* @return The <em>nominal</em> width.
*/
public int getColumnWidth(final FoObj fobj, final FoContext context) {
- final PdColumnWidth property = (PdColumnWidth) getProperty(FoProperty.COLUMN_WIDTH);
+ final PdColumnWidth property = (PdColumnWidth) getProperty(FoPropertyId.COLUMN_WIDTH);
if (property == null) {
return PdColumnWidth.getValueNoInstance();
}
@@ -873,7 +873,7 @@
* @return The column-width property.
*/
public double getColumnWidthTableUnits() {
- final PdColumnWidth property = (PdColumnWidth) getProperty(FoProperty.COLUMN_WIDTH);
+ final PdColumnWidth property = (PdColumnWidth) getProperty(FoPropertyId.COLUMN_WIDTH);
if (property == null) {
return PdColumnWidth.getValueNoInstance();
}
@@ -887,11 +887,11 @@
* @return The break-after property.
*/
public FoValue getBreakAfter(final FoObj fobj, final FoContext context) {
- final PdBreakAfter property = (PdBreakAfter) getProperty(FoProperty.BREAK_AFTER);
+ final PdBreakAfter property = (PdBreakAfter) getProperty(FoPropertyId.BREAK_AFTER);
if (property != null) {
return property.getValue(context, fobj);
}
- final PdPageBreakAfter pageBreakAfter = (PdPageBreakAfter) getProperty(FoProperty.PAGE_BREAK_AFTER);
+ final PdPageBreakAfter pageBreakAfter = (PdPageBreakAfter) getProperty(FoPropertyId.PAGE_BREAK_AFTER);
if (pageBreakAfter != null) {
switch(pageBreakAfter.getValue(context, fobj)) {
case AUTO: return FoValue.AUTO;
@@ -913,11 +913,11 @@
* @return The keep-together property.
*/
public int getKeepTogether(final FoObj fobj, final FoContext context, final AbstractKeep.Type subProperty) {
- final AbstractKeep property = (AbstractKeep) getProperty(FoProperty.KEEP_TOGETHER);
+ final AbstractKeep property = (AbstractKeep) getProperty(FoPropertyId.KEEP_TOGETHER);
if (property == null) {
- return AbstractKeep.getValueNoInstance(context, FoProperty.KEEP_TOGETHER, subProperty, fobj);
+ return AbstractKeep.getValueNoInstance(context, FoPropertyId.KEEP_TOGETHER, subProperty, fobj);
}
- final PdPageBreakInside enumProperty = (PdPageBreakInside) getProperty(FoProperty.PAGE_BREAK_INSIDE);
+ final PdPageBreakInside enumProperty = (PdPageBreakInside) getProperty(FoPropertyId.PAGE_BREAK_INSIDE);
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: return Integer.MIN_VALUE;
@@ -966,11 +966,11 @@
* @return The keep-with-next property.
*/
public int getKeepWithNext(final FoObj fobj, final FoContext context, final AbstractKeep.Type subProperty) {
- final AbstractKeep property = (AbstractKeep) getProperty(FoProperty.KEEP_WITH_NEXT);
+ final AbstractKeep property = (AbstractKeep) getProperty(FoPropertyId.KEEP_WITH_NEXT);
if (property == null) {
- return AbstractKeep.getValueNoInstance(context, FoProperty.KEEP_WITH_NEXT, subProperty, fobj);
+ return AbstractKeep.getValueNoInstance(context, FoPropertyId.KEEP_WITH_NEXT, subProperty, fobj);
}
- final PdPageBreakAfter enumProperty = (PdPageBreakAfter) getProperty(FoProperty.PAGE_BREAK_AFTER);
+ final PdPageBreakAfter enumProperty = (PdPageBreakAfter) getProperty(FoPropertyId.PAGE_BREAK_AFTER);
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: return Integer.MIN_VALUE;
@@ -1022,11 +1022,11 @@
* @return The keep-with-previous property.
*/
public int getKeepWithPrevious(final FoObj fobj, final FoContext context, final AbstractKeep.Type subProperty) {
- final AbstractKeep property = (AbstractKeep) getProperty(FoProperty.KEEP_WITH_PREVIOUS);
+ final AbstractKeep property = (AbstractKeep) getProperty(FoPropertyId.KEEP_WITH_PREVIOUS);
if (property == null) {
- return AbstractKeep.getValueNoInstance(context, FoProperty.KEEP_WITH_PREVIOUS, subProperty, fobj);
+ return AbstractKeep.getValueNoInstance(context, FoPropertyId.KEEP_WITH_PREVIOUS, subProperty, fobj);
}
- final PdPageBreakBefore enumProperty = (PdPageBreakBefore) getProperty(FoProperty.PAGE_BREAK_BEFORE);
+ final PdPageBreakBefore enumProperty = (PdPageBreakBefore) getProperty(FoPropertyId.PAGE_BREAK_BEFORE);
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: return Integer.MIN_VALUE;
@@ -1075,7 +1075,7 @@
* @return The master-reference property.
*/
public String getMasterReference() {
- final AbstractName property = (AbstractName) getProperty(FoProperty.MASTER_REFERENCE);
+ final AbstractName property = (AbstractName) getProperty(FoPropertyId.MASTER_REFERENCE);
if (property != null) {
return property.getValue();
}
@@ -1088,7 +1088,7 @@
* @return The page-position property.
*/
public PagePosition getPagePosition(final FoObj fobj) {
- final PdPagePosition property = (PdPagePosition) getProperty(FoProperty.PAGE_POSITION);
+ final PdPagePosition property = (PdPagePosition) getProperty(FoPropertyId.PAGE_POSITION);
if (property != null) {
return property.getValue(fobj);
}
@@ -1101,7 +1101,7 @@
* @return The odd-or-even property.
*/
public OddOrEven getOddOrEven(final FoObj fobj) {
- final PdOddOrEven property = (PdOddOrEven) getProperty(FoProperty.ODD_OR_EVEN);
+ final PdOddOrEven property = (PdOddOrEven) getProperty(FoPropertyId.ODD_OR_EVEN);
if (property != null) {
return property.getValue(fobj);
}
@@ -1114,7 +1114,7 @@
* @return The blank-or-not-blank property.
*/
public BlankOrNotBlank getBlankOrNotBlank(final FoObj fobj) {
- final PdBlankOrNotBlank property = (PdBlankOrNotBlank) getProperty(FoProperty.BLANK_OR_NOT_BLANK);
+ final PdBlankOrNotBlank property = (PdBlankOrNotBlank) getProperty(FoPropertyId.BLANK_OR_NOT_BLANK);
if (property != null) {
return property.getValue(null, fobj);
}
@@ -1129,7 +1129,7 @@
* @return The initial-page-number property.
*/
public int getInitialPageNumber(final FoObj fobj, final int lastPageNumberUsed) {
- final PdInitialPageNumber property = (PdInitialPageNumber) getProperty(FoProperty.INITIAL_PAGE_NUMBER);
+ final PdInitialPageNumber property = (PdInitialPageNumber) getProperty(FoPropertyId.INITIAL_PAGE_NUMBER);
if (property != null) {
/* Null context is OK here as this trait is not dependent on
* context. */
@@ -1145,7 +1145,7 @@
* @return The raw initial-page-number property.
*/
public FoValue getRawInitialPageNumber(final FoObj fobj) {
- final PdInitialPageNumber property = (PdInitialPageNumber) getProperty(FoProperty.INITIAL_PAGE_NUMBER);
+ final PdInitialPageNumber property = (PdInitialPageNumber) getProperty(FoPropertyId.INITIAL_PAGE_NUMBER);
if (property != null) {
return property.getRawValue(fobj);
}
@@ -1157,7 +1157,7 @@
* @return The format property.
*/
public String getFormat() {
- final PdFormat property = (PdFormat) getProperty(FoProperty.FORMAT);
+ final PdFormat property = (PdFormat) getProperty(FoPropertyId.FORMAT);
if (property != null) {
return property.getValue();
}
@@ -1169,7 +1169,7 @@
* @return The grouping-separator property.
*/
public int getGroupingSeparator() {
- final PdGroupingSeparator property = (PdGroupingSeparator) getProperty(FoProperty.GROUPING_SEPARATOR);
+ final PdGroupingSeparator property = (PdGroupingSeparator) getProperty(FoPropertyId.GROUPING_SEPARATOR);
if (property != null) {
return property.getValue();
}
@@ -1181,7 +1181,7 @@
* @return The grouping-size property.
*/
public int getGroupingSize() {
- final PdGroupingSize property = (PdGroupingSize) getProperty(FoProperty.GROUPING_SIZE);
+ final PdGroupingSize property = (PdGroupingSize) getProperty(FoPropertyId.GROUPING_SIZE);
if (property != null) {
return property.getValue();
}
@@ -1194,7 +1194,7 @@
* @return The letter-value property.
*/
public LetterValue getLetterValue(final FoObj fobj) {
- final PdLetterValue property = (PdLetterValue) getProperty(FoProperty.LETTER_VALUE);
+ final PdLetterValue property = (PdLetterValue) getProperty(FoPropertyId.LETTER_VALUE);
if (property != null) {
return property.getValue(null, fobj);
}
@@ -1209,7 +1209,7 @@
*/
public FoValue getForcePageCount(final FoObj fobj, final FoContext context) {
final PdForcePageCount property = (PdForcePageCount)
- getProperty(FoProperty.FORCE_PAGE_COUNT);
+ getProperty(FoPropertyId.FORCE_PAGE_COUNT);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -1221,7 +1221,7 @@
* @return The master-name property.
*/
public String getMasterName() {
- final AbstractName property = (AbstractName) getProperty(FoProperty.MASTER_NAME);
+ final AbstractName property = (AbstractName) getProperty(FoPropertyId.MASTER_NAME);
if (property != null) {
return property.getValue();
}
@@ -1234,7 +1234,7 @@
* @return The region-name property.
*/
public String getRegionName(final FoObj fobj) {
- final PdRegionName property = (PdRegionName) getProperty(FoProperty.REGION_NAME);
+ final PdRegionName property = (PdRegionName) getProperty(FoPropertyId.REGION_NAME);
if (property != null) {
return property.getValue();
}
@@ -1250,7 +1250,7 @@
* @return The precedence property.
*/
public boolean getPrecedence(final FoObj fobj) {
- final PdPrecedence property = (PdPrecedence) getProperty(FoProperty.PRECEDENCE);
+ final PdPrecedence property = (PdPrecedence) getProperty(FoPropertyId.PRECEDENCE);
/* Null context is OK, because the object this applies to cannot be
* insider a marker. */
final FoContext context = null;
@@ -1266,7 +1266,7 @@
* @return The extent property.
*/
public int getExtent(final FoObj fobj) {
- final PdExtent property = (PdExtent) getProperty(FoProperty.EXTENT);
+ final PdExtent property = (PdExtent) getProperty(FoPropertyId.EXTENT);
if (property != null) {
return property.getValue(fobj);
}
@@ -1280,7 +1280,7 @@
* @return The column-gap property.
*/
public int getColumnGap(final FoObj fobj, final FoContext context) {
- final PdColumnGap property = (PdColumnGap) getProperty(FoProperty.COLUMN_GAP);
+ final PdColumnGap property = (PdColumnGap) getProperty(FoPropertyId.COLUMN_GAP);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -1294,7 +1294,7 @@
* @return The overflow property.
*/
public FoValue getOverflow(final FoObj fobj, final FoContext context) {
- final PdOverflow property = (PdOverflow) getProperty(FoProperty.OVERFLOW);
+ final PdOverflow property = (PdOverflow) getProperty(FoPropertyId.OVERFLOW);
if (property != null) {
return property.getValue(context, fobj);
}
@@ -1308,7 +1308,7 @@
* @return The column-count property.
*/
public int getColumnCount(final FoObj fobj, final FoContext context) {
- final PdColumnCount property = (PdColumnCount) getProperty(FoProperty.COLUMN_COUNT);
+ final PdColumnCount property = (PdColumnCount) getProperty(FoPropertyId.COLUMN_COUNT);
if (property != null) {
int columnCount = property.getValue(context, fobj);
if ((columnCount > 1)
@@ -1330,7 +1330,7 @@
*/
public int getMaximumRepeats(final FoObj fobj) {
final PdMaximumRepeats property = (PdMaximumRepeats)
- getProperty(FoProperty.MAXIMUM_REPEATS);
+ getProperty(FoPropertyId.MAXIMUM_REPEATS);
if (property != null) {
return property.getValue(fobj);
}
@@ -1344,7 +1344,7 @@
* @return The requested page-dimension.
*/
private int getPageDimension(final FoObj fobj, final AbsoluteAxis axis) {
- final FoProperty propertyType = AbstractPageDimension.rawPropertyType(axis);
+ final FoPropertyId propertyType = AbstractPageDimension.rawPropertyType(axis);
final AbstractPageDimension property = (AbstractPageDimension)
getProperty(propertyType);
if (property != null) {
@@ -1353,7 +1353,7 @@
// Try the shorthand.
/* Null context is OK, because the object can't be inside a marker. */
final FoContext context = null;
- final PdSize sizeProperty = (PdSize) getProperty(FoProperty.SIZE);
+ final PdSize sizeProperty = (PdSize) getProperty(FoPropertyId.SIZE);
if (sizeProperty != null) {
return sizeProperty.getValue(context, fobj, axis);
}
@@ -1385,7 +1385,7 @@
* @return The text-align property.
*/
public FoValue getTextAlign(final FoObj fobj, final FoContext context) {
- final PdTextAlign property = (PdTextAlign) getProperty(FoProperty.TEXT_ALIGN);
+ final PdTextAlign property = (PdTextAlign) getProperty(FoPropertyId.TEXT_ALIGN);
if (property == null) {
return PdTextAlign.getValueNoInstance(context, fobj);
}
@@ -1397,7 +1397,7 @@
* @return The text-align String, or null if there is none.
*/
public String getTextAlignString() {
- final PdTextAlign property = (PdTextAlign) getProperty(FoProperty.TEXT_ALIGN);
+ final PdTextAlign property = (PdTextAlign) getProperty(FoPropertyId.TEXT_ALIGN);
if (property == null) {
return null;
}
@@ -1411,7 +1411,7 @@
* @return The text-align-last property.
*/
public FoValue getTextAlignLast(final FoObj fobj, final FoContext context) {
- final PdTextAlignLast property = (PdTextAlignLast) getProperty(FoProperty.TEXT_ALIGN_LAST);
+ final PdTextAlignLast property = (PdTextAlignLast) getProperty(FoPropertyId.TEXT_ALIGN_LAST);
if (property == null) {
return PdTextAlignLast.getValueNoInstance(context, fobj);
}
@@ -1428,12 +1428,12 @@
* @return The line-height multiplier value, expressed as a float.
*/
public float getLineHeightMultiplier(final FoObj fobj, final FoContext context) {
- PdLineHeight property = (PdLineHeight) getProperty(FoProperty.LINE_HEIGHT);
+ PdLineHeight property = (PdLineHeight) getProperty(FoPropertyId.LINE_HEIGHT);
if (property != null) {
return property.getValueMultiplier(context, fobj);
}
// Try the shorthand
- final PdFont fontProperty = (PdFont) getProperty(FoProperty.FONT);
+ final PdFont fontProperty = (PdFont) getProperty(FoPropertyId.FONT);
if (fontProperty != null) {
property = fontProperty.getLineHeight();
return property.getValueMultiplier(context, fobj);
@@ -1449,12 +1449,12 @@
* @return The line-height, in millipoints.
*/
public int getLineHeight(final FoObj fobj, final FoContext context, final LengthRange rangeID) {
- PdLineHeight property = (PdLineHeight) getProperty(FoProperty.LINE_HEIGHT);
+ PdLineHeight property = (PdLineHeight) getProperty(FoPropertyId.LINE_HEIGHT);
if (property != null) {
return property.getValue(context, rangeID, fobj);
}
// Try the shorthand
- final PdFont fontProperty = (PdFont) getProperty(FoProperty.FONT);
+ final PdFont fontProperty = (PdFont) getProperty(FoPropertyId.FONT);
if (fontProperty != null) {
property = fontProperty.getLineHeight();
return property.getValue(context, rangeID, fobj);
@@ -1469,12 +1469,12 @@
* @return The line-height.conditionality property.
*/
public Conditionality getLineHeightConditionality(final FoObj fobj, final FoContext context) {
- PdLineHeight property = (PdLineHeight) getProperty(FoProperty.LINE_HEIGHT);
+ PdLineHeight property = (PdLineHeight) getProperty(FoPropertyId.LINE_HEIGHT);
if (property != null) {
return property.getConditionality(context, fobj);
}
// Try the shorthand
- final PdFont fontProperty = (PdFont) getProperty(FoProperty.FONT);
+ final PdFont fontProperty = (PdFont) getProperty(FoPropertyId.FONT);
if (fontProperty != null) {
property = fontProperty.getLineHeight();
return property.getConditionality(context, fobj);
@@ -1489,12 +1489,12 @@
* @retur...
[truncated message content] |
