foray-commit Mailing List for FOray (Page 38)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(2) |
Dec
|
|
From: <vic...@us...> - 2022-12-25 03:30:16
|
Revision: 12951
http://sourceforge.net/p/foray/code/12951
Author: victormote
Date: 2022-12-25 03:30:06 +0000 (Sun, 25 Dec 2022)
Log Message:
-----------
Simplify API for most property constructors.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.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/AbstractAbsoluteDimension.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/AbstractAllowedAxisScale.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/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.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/AbstractBorderPrecedence.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/AbstractCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.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/AbstractGlyphOrientation.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/AbstractMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMergeIndex.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractName.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/AbstractRelativeDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractString.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/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/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/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/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/PdLetterValue.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/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/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/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/test/java/org/foray/fotree/fo/prop/AbsolutePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ActiveStateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AlignmentAdjustTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AlignmentBaselineTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AllowedHeightScaleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AllowedWidthScaleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AutoRestoreTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AzimuthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundAttachmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundImageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionHorizontalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionVerticalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundRepeatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BaselineShiftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BlankOrNotBlankTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BlockProgressionDimensionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforePrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderCollapseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderSpacingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BreakAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BreakBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaptionSideTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaseNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaseTitleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarClassTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarOffsetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarPlacementTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CharacterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ClearTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ClipTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColorProfileNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnGapTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnNumberTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentTypeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DestinationPlacementOffsetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DirectionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DisplayAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ElevationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EmptyCellsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EndIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EndsRowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ExtentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ExternalDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FloatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowMapNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowMapReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowNameReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontFamilyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSelectionStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSizeAdjustTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontStretchTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontVariantTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontWeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ForcePageCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FormatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GlyphOrientationHorizontalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GlyphOrientationVerticalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GroupingSeparatorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GroupingSizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationCharacterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationKeepTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationLadderCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationPushCharacterCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationRemainCharacterCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IdTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndexClassTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndexKeyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndicateDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InitialPageNumberTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InlineProgressionDimensionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InternalDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IntrinsicScaleValueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IntrusionDisplaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LastLineEndIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderAlignmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderPatternTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderPatternWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LetterValueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LineHeightShiftAdjustmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LineStackingStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LinefeedTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginTopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarkerClassNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MasterNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MasterReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaxHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaxWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaximumRepeatsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MediaUsageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergePagesAcrossIndexKeyReferencesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergeRangesAcrossIndexKeyReferencesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergeSequentialPageNumbersTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MinHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MinWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberColumnsRepeatedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberColumnsSpannedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberRowsSpannedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OddOrEvenTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OrphansTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OverflowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingEndTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingStartTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingTopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakInsideTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageCitationStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageNumberTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PagePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PitchRangeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PitchTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PlayDuringTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStartsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RefIdTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RefIndexKeyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ReferenceOrientationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RegionNameReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RegionNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RelativeAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RelativePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RenderingIntentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveBoundaryTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveBoundaryWithinTableTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveClassNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrievePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrievePositionWithinTableTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RichnessTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RoleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RuleStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RuleThicknessTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScaleOptionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScalingMethodTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScalingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScoreSpacesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ShowDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SourceDocumentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpanTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakHeaderTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakNumeralTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakPunctuationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeechRateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SrcTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartingStateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartsRowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StressTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SuppressAtLineBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SwitchToTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableLayoutTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableOmitFooterAtBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableOmitHeaderAtBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetPresentationContextTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetProcessingContextTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetStylesheetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAlignLastTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAltitudeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextDecorationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextDepthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextShadowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextTransformTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TreatAsWordSpaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/UnicodeBidiTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VerticalAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VisibilityTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VoiceFamilyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VolumeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceCollapseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WidowsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WrapOptionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WritingModeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ZindexTests.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-25 00:36:11 UTC (rev 12950)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-25 03:30:06 UTC (rev 12951)
@@ -186,6 +186,7 @@
import org.foray.fotree.fo.prop.PdChangeBarPlacement;
import org.foray.fotree.fo.prop.PdChangeBarStyle;
import org.foray.fotree.fo.prop.PdChangeBarWidth;
+import org.foray.fotree.fo.prop.PdCharacter;
import org.foray.fotree.fo.prop.PdClear;
import org.foray.fotree.fo.prop.PdClip;
import org.foray.fotree.fo.prop.PdColor;
@@ -211,6 +212,7 @@
import org.foray.fotree.fo.prop.PdEndsRow;
import org.foray.fotree.fo.prop.PdExtent;
import org.foray.fotree.fo.prop.PdExternalDestination;
+import org.foray.fotree.fo.prop.PdFloat;
import org.foray.fotree.fo.prop.PdFlowMapName;
import org.foray.fotree.fo.prop.PdFlowMapReference;
import org.foray.fotree.fo.prop.PdFlowName;
@@ -789,400 +791,400 @@
}
switch (enumeration) {
case ABSOLUTE_POSITION: {
- return new PdAbsolutePosition(attributeName, attributeValue);
+ return new PdAbsolutePosition(attributeValue);
}
case ACTIVE_STATE: {
- return new PdActiveState(attributeName, attributeValue);
+ return new PdActiveState(attributeValue);
}
case ALIGNMENT_ADJUST: {
- return new PdAlignmentAdjust(attributeName, attributeValue);
+ return new PdAlignmentAdjust(attributeValue);
}
case ALIGNMENT_BASELINE: {
- return new PdAlignmentBaseline(attributeName, attributeValue);
+ return new PdAlignmentBaseline(attributeValue);
}
case ALLOWED_HEIGHT_SCALE: {
- return new PdAllowedHeightScale(attributeName, attributeValue);
+ return new PdAllowedHeightScale(attributeValue);
}
case ALLOWED_WIDTH_SCALE: {
- return new PdAllowedWidthScale(attributeName, attributeValue);
+ return new PdAllowedWidthScale(attributeValue);
}
case AUTO_RESTORE: {
- return new PdAutoRestore(attributeName, attributeValue);
+ return new PdAutoRestore(attributeValue);
}
case AZIMUTH: {
- return new PdAzimuth(attributeName, attributeValue);
+ return new PdAzimuth(attributeValue);
}
case BACKGROUND: {
return new PdBackground(attributeName, attributeValue);
}
case BACKGROUND_ATTACHMENT: {
- return new PdBackgroundAttachment(attributeName, attributeValue);
+ return new PdBackgroundAttachment(attributeValue);
}
case BACKGROUND_COLOR: {
- return new PdBackgroundColor(attributeName, attributeValue);
+ return new PdBackgroundColor(attributeValue);
}
case BACKGROUND_IMAGE: {
- return new PdBackgroundImage(attributeName, attributeValue);
+ return new PdBackgroundImage(attributeValue);
}
case BACKGROUND_POSITION: {
- return new PdBackgroundPosition(attributeName, attributeValue);
+ return new PdBackgroundPosition(attributeValue);
}
case BACKGROUND_POSITION_HORIZONTAL: {
- return new PdBackgroundPositionHorizontal(attributeName, attributeValue);
+ return new PdBackgroundPositionHorizontal(attributeValue);
}
case BACKGROUND_POSITION_VERTICAL: {
- return new PdBackgroundPositionVertical(attributeName, attributeValue);
+ return new PdBackgroundPositionVertical(attributeValue);
}
case BACKGROUND_REPEAT: {
- return new PdBackgroundRepeat(attributeName, attributeValue);
+ return new PdBackgroundRepeat(attributeValue);
}
case BASELINE_SHIFT: {
- return new PdBaselineShift(attributeName, attributeValue);
+ return new PdBaselineShift(attributeValue);
}
case BLANK_OR_NOT_BLANK: {
- return new PdBlankOrNotBlank(attributeName, attributeValue);
+ return new PdBlankOrNotBlank(attributeValue);
}
case BLOCK_PROGRESSION_DIMENSION: {
- return new PdBlockProgressionDimension(attributeName, attributeValue);
+ return new PdBlockProgressionDimension(attributeValue);
}
case BORDER: {
- return new PdBorder(attributeName, attributeValue);
+ return new PdBorder(attributeValue);
}
case BORDER_AFTER_COLOR: {
- return new PdBorderAfterColor(attributeName, attributeValue);
+ return new PdBorderAfterColor(attributeValue);
}
case BORDER_AFTER_PRECEDENCE: {
- return new PdBorderAfterPrecedence(attributeName, attributeValue);
+ return new PdBorderAfterPrecedence(attributeValue);
}
case BORDER_AFTER_STYLE: {
- return new PdBorderAfterStyle(attributeName, attributeValue);
+ return new PdBorderAfterStyle(attributeValue);
}
case BORDER_AFTER_WIDTH: {
- return new PdBorderAfterWidth(attributeName, attributeValue);
+ return new PdBorderAfterWidth(attributeValue);
}
case BORDER_BEFORE_COLOR: {
- return new PdBorderBeforeColor(attributeName, attributeValue);
+ return new PdBorderBeforeColor(attributeValue);
}
case BORDER_BEFORE_PRECEDENCE: {
- return new PdBorderBeforePrecedence(attributeName, attributeValue);
+ return new PdBorderBeforePrecedence(attributeValue);
}
case BORDER_BEFORE_STYLE: {
- return new PdBorderBeforeStyle(attributeName, attributeValue);
+ return new PdBorderBeforeStyle(attributeValue);
}
case BORDER_BEFORE_WIDTH: {
- return new PdBorderBeforeWidth(attributeName, attributeValue);
+ return new PdBorderBeforeWidth(attributeValue);
}
case BORDER_BOTTOM: {
- return new PdBorderBottom(attributeName, attributeValue);
+ return new PdBorderBottom(attributeValue);
}
case BORDER_BOTTOM_COLOR: {
- return new PdBorderBottomColor(attributeName, attributeValue);
+ return new PdBorderBottomColor(attributeValue);
}
case BORDER_BOTTOM_STYLE: {
- return new PdBorderBottomStyle(attributeName, attributeValue);
+ return new PdBorderBottomStyle(attributeValue);
}
case BORDER_BOTTOM_WIDTH: {
- return new PdBorderBottomWidth(attributeName, attributeValue);
+ return new PdBorderBottomWidth(attributeValue);
}
case BORDER_COLLAPSE: {
- return new PdBorderCollapse(attributeName, attributeValue);
+ return new PdBorderCollapse(attributeValue);
}
case BORDER_COLOR: {
- return new PdBorderColor(attributeName, attributeValue);
+ return new PdBorderColor(attributeValue);
}
case BORDER_END_COLOR: {
- return new PdBorderEndColor(attributeName, attributeValue);
+ return new PdBorderEndColor(attributeValue);
}
case BORDER_END_PRECEDENCE: {
- return new PdBorderEndPrecedence(attributeName, attributeValue);
+ return new PdBorderEndPrecedence(attributeValue);
}
case BORDER_END_STYLE: {
- return new PdBorderEndStyle(attributeName, attributeValue);
+ return new PdBorderEndStyle(attributeValue);
}
case BORDER_END_WIDTH: {
- return new PdBorderEndWidth(attributeName, attributeValue);
+ return new PdBorderEndWidth(attributeValue);
}
case BORDER_LEFT: {
- return new PdBorderLeft(attributeName, attributeValue);
+ return new PdBorderLeft(attributeValue);
}
case BORDER_LEFT_COLOR: {
- return new PdBorderLeftColor(attributeName, attributeValue);
+ return new PdBorderLeftColor(attributeValue);
}
case BORDER_LEFT_STYLE: {
- return new PdBorderLeftStyle(attributeName, attributeValue);
+ return new PdBorderLeftStyle(attributeValue);
}
case BORDER_LEFT_WIDTH: {
- return new PdBorderLeftWidth(attributeName, attributeValue);
+ return new PdBorderLeftWidth(attributeValue);
}
case BORDER_RIGHT: {
- return new PdBorderRight(attributeName, attributeValue);
+ return new PdBorderRight(attributeValue);
}
case BORDER_RIGHT_COLOR: {
- return new PdBorderRightColor(attributeName, attributeValue);
+ return new PdBorderRightColor(attributeValue);
}
case BORDER_RIGHT_STYLE: {
- return new PdBorderRightStyle(attributeName, attributeValue);
+ return new PdBorderRightStyle(attributeValue);
}
case BORDER_RIGHT_WIDTH: {
- return new PdBorderRightWidth(attributeName, attributeValue);
+ return new PdBorderRightWidth(attributeValue);
}
case BORDER_SEPARATION: {
return new PdBorderSeparation(attributeName, attributeValue);
}
case BORDER_SPACING: {
- return new PdBorderSpacing(attributeName, attributeValue);
+ return new PdBorderSpacing(attributeValue);
}
case BORDER_START_COLOR: {
- return new PdBorderStartColor(attributeName, attributeValue);
+ return new PdBorderStartColor(attributeValue);
}
case BORDER_START_PRECEDENCE: {
- return new PdBorderStartPrecedence(attributeName, attributeValue);
+ return new PdBorderStartPrecedence(attributeValue);
}
case BORDER_START_STYLE: {
- return new PdBorderStartStyle(attributeName, attributeValue);
+ return new PdBorderStartStyle(attributeValue);
}
case BORDER_START_WIDTH: {
- return new PdBorderStartWidth(attributeName, attributeValue);
+ return new PdBorderStartWidth(attributeValue);
}
case BORDER_STYLE: {
- return new PdBorderStyle(attributeName, attributeValue);
+ return new PdBorderStyle(attributeValue);
}
case BORDER_TOP: {
- return new PdBorderTop(attributeName, attributeValue);
+ return new PdBorderTop(attributeValue);
}
case BORDER_TOP_COLOR: {
- return new PdBorderTopColor(attributeName, attributeValue);
+ return new PdBorderTopColor(attributeValue);
}
case BORDER_TOP_STYLE: {
- return new PdBorderTopStyle(attributeName, attributeValue);
+ return new PdBorderTopStyle(attributeValue);
}
case BORDER_TOP_WIDTH: {
- return new PdBorderTopWidth(attributeName, attributeValue);
+ return new PdBorderTopWidth(attributeValue);
}
case BORDER_WIDTH: {
- return new PdBorderWidth(attributeName, attributeValue);
+ return new PdBorderWidth(attributeValue);
}
case BOTTOM: {
- return new PdBottom(attributeName, attributeValue);
+ return new PdBottom(attributeValue);
}
case BREAK_AFTER: {
- return new PdBreakAfter(attributeName, attributeValue);
+ return new PdBreakAfter(attributeValue);
}
case BREAK_BEFORE: {
...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-25 00:36:13
|
Revision: 12950
http://sourceforge.net/p/foray/code/12950
Author: victormote
Date: 2022-12-25 00:36:11 +0000 (Sun, 25 Dec 2022)
Log Message:
-----------
Roll up internal methods that aren't adding any value.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-25 00:16:43 UTC (rev 12949)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-25 00:36:11 UTC (rev 12950)
@@ -75,7 +75,7 @@
*/
public FoObj parseElement(final String localName, final FoObj currentFObj, final PropertyList list,
final Locator locator, final ErrorHandler errorHandler) throws FoTreeException {
- final FoObj fobj = parseElementForNS(localName, currentFObj, list, locator);
+ final FoObj fobj = parseElementForNS(localName, currentFObj, list);
if (fobj == null
&& errorHandler != null) {
errorHandler.processUnknownElement(this, localName);
@@ -88,12 +88,11 @@
* @param localName The local name of the element.
* @param currentFObj The current FoObj, that is, the parent of the one being parsed.
* @param list The property list into which properties for the new FoObj should be placed.
- * @param locator The SAX locator.
* @return The newly-created FoObj instance.
* @throws FoTreeException For parsing errors.
*/
- protected abstract FoObj parseElementForNS(String localName, FoObj currentFObj, PropertyList list,
- Locator locator) throws FoTreeException;
+ protected abstract FoObj parseElementForNS(String localName, FoObj currentFObj, PropertyList list)
+ throws FoTreeException;
/**
* Reads through the list of attributes and returns an array that contains the order in which they should be
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-25 00:16:43 UTC (rev 12949)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-25 00:36:11 UTC (rev 12950)
@@ -41,8 +41,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Locator;
-
/**
* This class manages the namespace that is used for aXSL extensions to XSL-FO.
*/
@@ -61,30 +59,6 @@
return XmlConstants.AXSL_NS_URI;
}
- @Override
- public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
- final Locator locator) throws FoTreeException {
- return makeObject(localName, currentFObj, list, locator);
- }
-
- @Override
- public Property parseAttributeForNS(final String attributeName, final String attributeValue,
- final FoTreeCreator creator) throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName(attributeName);
- final AxslPropertyId enumeration = enumeratePropertyName(basePropertyName);
- if (enumeration == null) {
- throw new PropertyException("Invalid property for axsl namespace: " + attributeName);
- }
- switch (enumeration) {
- case METADATA_KEY: {
- return new MetadataKey(attributeValue);
- }
- default: {
- return null;
- }
- }
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
@@ -96,18 +70,10 @@
return NamespaceAxsl.theInstance;
}
- /**
- * Converts an unparsed extension element into an FoObj instance that can be
- * added to the FO Tree.
- * @param objectName The unparsed extension element name.
- * @param parent The parent FoObj.
- * @param propertyList The property list of the parent FoObj.
- * @param locator The SAX Locator object.
- * @return The new FoObj instance for this extension element.
- */
- public FoObj makeObject(final String objectName, final FoObj parent, final PropertyList propertyList,
- final Locator locator) {
- final AxslObjectId enumeration = AxslObjectId.extensionValueOf(objectName);
+ @Override
+ public FoObj parseElementForNS(final String localName, final FoObj parent, final PropertyList propertyList)
+ throws FoTreeException {
+ final AxslObjectId enumeration = AxslObjectId.extensionValueOf(localName);
switch (enumeration) {
case METADATA: {
if (parent instanceof Declarations4a) {
@@ -122,6 +88,24 @@
}
}
+ @Override
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
+ final String basePropertyName = Property.getBasePropertyName(attributeName);
+ final AxslPropertyId enumeration = enumeratePropertyName(basePropertyName);
+ if (enumeration == null) {
+ throw new PropertyException("Invalid property for axsl namespace: " + attributeName);
+ }
+ switch (enumeration) {
+ case METADATA_KEY: {
+ return new MetadataKey(attributeValue);
+ }
+ default: {
+ return null;
+ }
+ }
+ }
+
/**
* Converts a property name to its integral equivalent.
* @param inputPropertyName The property name to be enumerated.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-25 00:16:43 UTC (rev 12949)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-25 00:36:11 UTC (rev 12950)
@@ -390,8 +390,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Locator;
-
/**
* This class manages the namespace that is used for XSL-FO elements.
*/
@@ -410,19 +408,6 @@
return XmlConstants.XSLFO_NS_URI;
}
- @Override
- public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
- final Locator locator) throws FoTreeException {
- return makeObject(localName, currentFObj, list, locator);
- }
-
- @Override
- public Property parseAttributeForNS(final String attributeName, final String attributeValue,
- final FoTreeCreator creator) throws PropertyException {
- final Property property = makeProperty(attributeName, attributeValue, creator);
- return property;
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
@@ -434,18 +419,10 @@
return NamespaceFo.theInstance;
}
- /**
- * Converts an unparsed XSL-FO element into an FoObj instance that can be added to the FO Tree.
- * @param elementName The unparsed XSL-FO element name.
- * @param parent The parent FoObj.
- * @param propertyList The property list of the parent FoObj.
- * @param locator The SAX Locator object.
- * @return The new FoObj instance for this XSL-FO element.
- * @throws FoTreeException For errors during Fo construction.
- */
- public FoObj makeObject(final String elementName, final FoObj parent, final PropertyList propertyList,
- final Locator locator) throws FoTreeException {
- final FoObjectId enumeration = FoObjectId.xslValueOf(elementName);
+ @Override
+ public FoObj parseElementForNS(final String localName, final FoObj parent, final PropertyList propertyList)
+ throws FoTreeException {
+ final FoObjectId enumeration = FoObjectId.xslValueOf(localName);
if (FoObjectId.ROOT == enumeration) {
throw new IllegalStateException("The root element must be processed manually.");
}
@@ -750,8 +727,7 @@
final AbstractTablePart tablePart = (AbstractTablePart) parent;
return new TableCell4a(tablePart, propertyList);
}
- throwException(locator, "fo:" + enumeration.toXslFo()
- + " must be child of fo:table-row, fo:table-body, " +
+ throwException("fo:" + enumeration.toXslFo() + " must be child of fo:table-row, fo:table-body, " +
"fo:table-header, or fo:table-footer.");
return null;
}
@@ -799,15 +775,8 @@
return enumerated;
}
- /**
- * Makes a property in this namespace.
- * @param attributeName The unparsed property name.
- * @param attributeValue The unparsed property value.
- * @param creator The FO Tree creation context.
- * @return The parsed Property instance.
- * @throws PropertyException For errors in the property or its value.
- */
- public Property makeProperty(final String attributeName, final String attributeValue,
+ @Override
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
final String basePropertyName = Property.getBasePropertyName(attributeName);
final FoPropertyId enumeration = enumeratePropertyName(basePropertyName);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-25 00:16:43 UTC (rev 12949)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-25 00:36:11 UTC (rev 12950)
@@ -37,8 +37,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Locator;
-
/**
* This class manages the namespace that is used for FOray extensions to XSL-FO.
*/
@@ -60,18 +58,6 @@
return FORAY_NS_URI;
}
- @Override
- public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
- final Locator locator) throws FoTreeException {
- return makeObject(localName, currentFObj, list);
- }
-
- @Override
- public Property parseAttributeForNS(final String attributeName, final String attributeValue,
- final FoTreeCreator creator) throws PropertyException {
- return null;
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
@@ -83,18 +69,10 @@
return NamespaceForay.theInstance;
}
- /**
- * Converts an unparsed extension element into an FoObj instance that can be
- * added to the FO Tree.
- * @param objectName The unparsed extension element name.
- * @param parent The parent FoObj.
- * @param propertyList The property list of the parent FoObj.
- * @return The new FoObj instance for this extension element.
- */
- public FoObj makeObject(final String objectName, final FoObj parent,
- final PropertyList propertyList) {
- final ForayObjectId enumeration = ForayObjectId.extensionValueOf(
- objectName);
+ @Override
+ public FoObj parseElementForNS(final String localName, final FoObj parent, final PropertyList propertList)
+ throws FoTreeException {
+ final ForayObjectId enumeration = ForayObjectId.extensionValueOf(localName);
switch (enumeration) {
default: {
return null;
@@ -102,4 +80,10 @@
}
}
+ @Override
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
+ return null;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-25 00:16:43 UTC (rev 12949)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-25 00:36:11 UTC (rev 12950)
@@ -38,8 +38,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Locator;
-
import javax.xml.XMLConstants;
/**
@@ -61,9 +59,20 @@
return XMLConstants.XML_NS_URI;
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton instance of this class.
+ */
+ public static NamespaceXml getInstance() {
+ if (NamespaceXml.theInstance == null) {
+ NamespaceXml.theInstance = new NamespaceXml();
+ }
+ return NamespaceXml.theInstance;
+ }
+
@Override
- public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
- final Locator locator) throws FoTreeException {
+ public FoObj parseElementForNS(final String localName, final FoObj parent, final PropertyList propertyList)
+ throws FoTreeException {
// This isn't needed for the xml: namespace.
return null;
}
@@ -87,17 +96,6 @@
}
/**
- * Returns the singleton instance of this class.
- * @return The singleton instance of this class.
- */
- public static NamespaceXml getInstance() {
- if (NamespaceXml.theInstance == null) {
- NamespaceXml.theInstance = new NamespaceXml();
- }
- return NamespaceXml.theInstance;
- }
-
- /**
* Converts a property name to its integral equivalent.
* @param inputPropertyName The property name to be enumerated.
* @return The enumerated value of the property name.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-25 00:16:46
|
Revision: 12949
http://sourceforge.net/p/foray/code/12949
Author: victormote
Date: 2022-12-25 00:16:43 +0000 (Sun, 25 Dec 2022)
Log Message:
-----------
For parent casting errors, throw the exception without the locator. If location is needed, the catcher should add.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.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-24 18:49:26 UTC (rev 12948)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-25 00:16:43 UTC (rev 12949)
@@ -3669,4 +3669,18 @@
return null;
}
+ /**
+ * Convenience method that casts this as another (probably more specific) type of {@link FoObj}.
+ * @param <C> The class to which this will be cast, if possible.
+ * @param theClass The class to which this will be cast, if possible.
+ * @return This cast as a {@code theClass}, or null if that is not possible.
+ */
+ public <C extends FoObj> C asFoType(final Class<C> theClass) {
+ if (theClass.isInstance(this)) {
+ return theClass.cast(this);
+ } else {
+ return null;
+ }
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2022-12-24 18:49:26 UTC (rev 12948)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2022-12-25 00:16:43 UTC (rev 12949)
@@ -106,4 +106,14 @@
FoObj.throwException(contextMessage, message);
}
+ /**
+ * Throws an exception because the object cannot be constructed.
+ * @param message The substantive message describing the error.
+ * @throws FoTreeException Always. That is the purpose of this method.
+ */
+ protected void throwException(final String message) throws FoTreeException {
+ throw new FoTreeException(message);
+
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 18:49:26 UTC (rev 12948)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-25 00:16:43 UTC (rev 12949)
@@ -500,32 +500,45 @@
return new Float4a(parent, propertyList);
}
case FLOW: {
- final PageSequence4a pageSequence = parentPageSequence(enumeration,
- parent, locator);
+ final PageSequence4a pageSequence = parent.asFoType(PageSequence4a.class);
+ if (pageSequence == null) {
+ throwException("fo:flow must be child of fo:page-sequence.");
+ }
return new Flow4a(pageSequence, propertyList);
}
case FLOW_ASSIGNMENT: {
- final FlowMap4a flowMap = parentFlowMap(enumeration, parent, locator);
+ final FlowMap4a flowMap = parent.asFoType(FlowMap4a.class);
+ if (flowMap == null) {
+ throwException("fo:flow-assignment must be child of fo:flow-map.");
+ }
return new FlowAssignment4a(flowMap, propertyList);
}
case FLOW_MAP: {
- final LayoutMasterSet4a layoutMasterSet = parentLayoutMasterSet(
- enumeration, parent, locator);
+ final LayoutMasterSet4a layoutMasterSet = parent.asFoType(LayoutMasterSet4a.class);
+ if (layoutMasterSet == null) {
+ throwException("fo:flow-map must be child of fo:layout-master-set.");
+ }
return new FlowMap4a(layoutMasterSet, propertyList);
}
case FLOW_NAME_SPECIFIER: {
- final FlowSourceList4a flowSourceList = parentFlowSourceList(
- enumeration, parent, locator);
+ final FlowSourceList4a flowSourceList = parent.asFoType(FlowSourceList4a.class);
+ if (flowSourceList == null) {
+ throwException("fo:flow-name-specifier must be child of fo:flow-source-list.");
+ }
return new FlowNameSpecifier4a(flowSourceList, propertyList);
}
case FLOW_SOURCE_LIST: {
- final FlowAssignment4a flowAssignment = parentFlowAssignment(
- enumeration, parent, locator);
+ final FlowAssignment4a flowAssignment = parent.asFoType(FlowAssignment4a.class);
+ if (flowAssignment == null) {
+ throwException("fo:flow-source-list must be child of fo:flow-assignment.");
+ }
return new FlowSourceList4a(flowAssignment, propertyList);
}
case FLOW_TARGET_LIST: {
- final FlowAssignment4a flowAssignment = parentFlowAssignment(
- enumeration, parent, locator);
+ final FlowAssignment4a flowAssignment = parent.asFoType(FlowAssignment4a.class);
+ if (flowAssignment == null) {
+ throwException("fo:flow-source-list must be child of fo:flow-assignment.");
+ }
return new FlowTargetList4a(flowAssignment, propertyList);
}
case FOLIO_PREFIX: {
@@ -577,7 +590,10 @@
return new InstreamForeignObject4a(parent, propertyList);
}
case LAYOUT_MASTER_SET: {
- final Root4a root = parentRoot(enumeration, parent, locator);
+ final Root4a root = parent.asFoType(Root4a.class);
+ if (root == null) {
+ throwException("fo:layout-master-set must be child of fo:root.");
+ }
return new LayoutMasterSet4a(root, propertyList);
}
case LEADER: {
@@ -623,7 +639,10 @@
return new PageNumberCitationLast4a(parent, propertyList);
}
case PAGE_SEQUENCE: {
- final Root4a root = parentRoot(enumeration, parent, locator);
+ final Root4a root = parent.asFoType(Root4a.class);
+ if (root == null) {
+ throwException("fo:page-sequence must be child of fo:root.");
+ }
return new PageSequence4a(root, propertyList);
}
case PAGE_SEQUENCE_MASTER: {
@@ -633,33 +652,45 @@
return new PageSequenceWrapper4a(parent, propertyList);
}
case REGION_AFTER: {
- final SimplePageMaster4a simplePageMaster = parentSimplePageMaster(
- enumeration, parent, locator);
+ final SimplePageMaster4a simplePageMaster = parent.asFoType(SimplePageMaster4a.class);
+ if (simplePageMaster == null) {
+ throwException("fo:region-after must be child of fo:simple-page-master.");
+ }
return new RegionAfter4a(simplePageMaster, propertyList);
}
case REGION_BEFORE: {
- final SimplePageMaster4a simplePageMaster = parentSimplePageMaster(
- enumeration, parent, locator);
+ final SimplePageMaster4a simplePageMaster = parent.asFoType(SimplePageMaster4a.class);
+ if (simplePageMaster == null) {
+ throwException("fo:region-before must be child of fo:simple-page-master.");
+ }
return new RegionBefore4a(simplePageMaster, propertyList);
}
case REGION_BODY: {
- final SimplePageMaster4a simplePageMaster = parentSimplePageMaster(
- enumeration, parent, locator);
+ final SimplePageMaster4a simplePageMaster = parent.asFoType(SimplePageMaster4a.class);
+ if (simplePageMaster == null) {
+ throwException("fo:region-body must be child of fo:simple-page-master.");
+ }
return new RegionBody4a(simplePageMaster, propertyList);
}
case REGION_END: {
- final SimplePageMaster4a simplePageMaster = parentSimplePageMaster(
- enumeration, parent, locator);
+ final SimplePageMaster4a simplePageMaster = parent.asFoType(SimplePageMaster4a.class);
+ if (simplePageMaster == null) {
+ throwException("fo:region-end must be child of fo:simple-page-master.");
+ }
return new RegionEnd4a(simplePageMaster, propertyList);
}
case REGION_NAME_SPECIFIER: {
- final FlowTargetList4a flowTargetList = parentFlowTargetList(
- enumeration, parent, locator);
+ final FlowTargetList4a flowTargetList = parent.asFoType(FlowTargetList4a.class);
+ if (flowTargetList == null) {
+ throwException("fo:region-name-specifier must be child of fo:flow-target-list.");
+ }
return new RegionNameSpecifier4a(flowTargetList, propertyList);
}
case REGION_START: {
- final SimplePageMaster4a simplePageMaster = parentSimplePageMaster(
- enumeration, parent, locator);
+ final SimplePageMaster4a simplePageMaster = parent.asFoType(SimplePageMaster4a.class);
+ if (simplePageMaster == null) {
+ throwException("fo:region-startr must be child of fo:simple-page-master.");
+ }
return new RegionStart4a(simplePageMaster, propertyList);
}
case REPEATABLE_PAGE_MASTER_ALTERNATIVES: {
@@ -678,8 +709,10 @@
return new ScalingValueCitation4a(parent, propertyList);
}
case SIMPLE_PAGE_MASTER: {
- final LayoutMasterSet4a layoutMasterSet = parentLayoutMasterSet(
- enumeration, parent, locator);
+ final LayoutMasterSet4a layoutMasterSet = parent.asFoType(LayoutMasterSet4a.class);
+ if (layoutMasterSet == null) {
+ throwException("fo:simple-page-master must be child of fo:layout-master-set.");
+ }
return new SimplePageMaster4a(layoutMasterSet, propertyList);
}
case SINGLE_PAGE_MASTER_REFERENCE: {
@@ -686,8 +719,10 @@
return new SinglePageMasterReference4a(parent, propertyList);
}
case STATIC_CONTENT: {
- final PageSequence4a pageSequence = parentPageSequence(enumeration,
- parent, locator);
+ final PageSequence4a pageSequence = parent.asFoType(PageSequence4a.class);
+ if (pageSequence == null) {
+ throwException("fo:static-content must be child of fo:page-sequence.");
+ }
return new StaticContent4a(pageSequence, propertyList);
}
case TABLE: {
@@ -697,7 +732,10 @@
return new TableAndCaption4a(parent, propertyList);
}
case TABLE_BODY: {
- final Table4a table = parentTable(enumeration, parent, locator);
+ final Table4a table = parent.asFoType(Table4a.class);
+ if (table == null) {
+ throwException("fo:table-body must be child of fo:table.");
+ }
return new TableBody4a(table, propertyList);
}
case TABLE_CAPTION: {
@@ -721,11 +759,17 @@
return new TableColumn4a(parent, propertyList);
}
case TABLE_FOOTER: {
- final Table4a table = parentTable(enumeration, parent, locator);
+ final Table4a table = parent.asFoType(Table4a.class);
+ if (table == null) {
+ throwException("fo:table-footer must be child of fo:table.");
+ }
return new TableFooter4a(table, propertyList);
}
case TABLE_HEADER: {
- final Table4a table = parentTable(enumeration, parent, locator);
+ final Table4a table = parent.asFoType(Table4a.class);
+ if (table == null) {
+ throwException("fo:table-header must be child of fo:table.");
+ }
return new TableHeader4a(table, propertyList);
}
case TABLE_ROW: {
@@ -745,200 +789,6 @@
}
/**
- * Converts the parent object to a {@link Table4a} if it can, or throws an
- * exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link Table4a}.
- * @throws FoTreeException If parent cannot be converted to a {@link Table4a}.
- */
- private Table4a parentTable(final FoObjectId newObject,
- final FoObj parent, final Locator locator) throws FoTreeException {
- if (parent instanceof Table4a) {
- return (Table4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:table.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link PageSequence4a} if it can, or throws
- * an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link PageSequence4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link PageSequence4a}.
- */
- private PageSequence4a parentPageSequence(final FoObjectId newObject,
- final FoObj parent, final Locator locator) throws FoTreeException {
- if (parent instanceof PageSequence4a) {
- return (PageSequence4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:page-sequence.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link Root4a} if it can, or throws
- * an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link Root4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link Root4a}.
- */
- private Root4a parentRoot(final FoObjectId newObject,
- final FoObj parent, final Locator locator) throws FoTreeException {
- if (parent instanceof Root4a) {
- return (Root4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:root.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link SimplePageMaster4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link SimplePageMaster4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link SimplePageMaster4a}.
- */
- private SimplePageMaster4a parentSimplePageMaster(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof SimplePageMaster4a) {
- return (SimplePageMaster4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:simple-page-master.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link LayoutMasterSet4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link LayoutMasterSet4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link LayoutMasterSet4a}.
- */
- private LayoutMasterSet4a parentLayoutMasterSet(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof LayoutMasterSet4a) {
- return (LayoutMasterSet4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:layout-master-set.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link FlowMap4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link FlowMap4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link FlowMap4a}.
- */
- private FlowMap4a parentFlowMap(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof FlowMap4a) {
- return (FlowMap4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:flow-map.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link FlowTargetList4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link FlowTargetList4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link FlowTargetList4a}.
- */
- private FlowAssignment4a parentFlowAssignment(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof FlowAssignment4a) {
- return (FlowAssignment4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:flow-assignment.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link FlowTargetList4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link FlowTargetList4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link FlowTargetList4a}.
- */
- private FlowTargetList4a parentFlowTargetList(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof FlowTargetList4a) {
- return (FlowTargetList4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:flow-target-list.");
- return null;
- }
-
- /**
- * Converts the parent object to a {@link FlowSourceList4a} if it can, or
- * throws an exception otherwise.
- * @param newObject The type of the new object to be created.
- * @param parent The parent object.
- * @param locator The SAX locator describing the location of the object
- * that is trying to be constructed.
- * @return The parent object cast as a {@link FlowSourceList4a}.
- * @throws FoTreeException If parent cannot be converted to a
- * {@link FlowSourceList4a}.
- */
- private FlowSourceList4a parentFlowSourceList(
- final FoObjectId newObject, final FoObj parent, final Locator locator)
- throws FoTreeException {
- if (parent instanceof FlowSourceList4a) {
- return (FlowSourceList4a) parent;
- }
- throwException(locator, "fo:" + newObject.toXslFo()
- + " must be child of fo:flow-source-list.");
- return null;
- }
-
- /**
* Converts a property name to its integral equivalent.
* @param inputPropertyName The property name to be enumerated.
* @return The enumerated value of the property name.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 18:49:40
|
Revision: 12948
http://sourceforge.net/p/foray/code/12948
Author: victormote
Date: 2022-12-24 18:49:26 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove FoTree instance from the API for parsing an element.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -349,10 +349,11 @@
foTree.setRootFo(root);
fobj = root;
} else {
- throw new SAXException("fo:root must be first element parsed");
+ final QName qname = new QName(NamespaceFo.getInstance().getNamespaceURI(), "root");
+ throw new SAXException("The first element parsed must be: " + qname.toString());
}
} else {
- fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
+ fobj = nativeNamespace.parseElement(localName, this.currentFObj, list, getLocator(), this);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -65,7 +65,6 @@
/**
* Parse an element in this namespace.
- * @param foTree The parent FO Tree.
* @param localName The local name of the element.
* @param currentFObj The current FoObj, that is, the parent of the one being parsed.
* @param list The property list into which properties for the new FoObj should be placed.
@@ -74,10 +73,9 @@
* @return The newly-created FoObj instance.
* @throws FoTreeException For parsing errors.
*/
- public FoObj parseElement(final FoTree4a foTree, final String localName, final FoObj currentFObj,
- final PropertyList list, final Locator locator, final ErrorHandler errorHandler)
- throws FoTreeException {
- final FoObj fobj = parseElementForNS(foTree, localName, currentFObj, list, locator);
+ public FoObj parseElement(final String localName, final FoObj currentFObj, final PropertyList list,
+ final Locator locator, final ErrorHandler errorHandler) throws FoTreeException {
+ final FoObj fobj = parseElementForNS(localName, currentFObj, list, locator);
if (fobj == null
&& errorHandler != null) {
errorHandler.processUnknownElement(this, localName);
@@ -87,7 +85,6 @@
/**
* The namespace-specific logic for parsing an element.
- * @param foTree The parent FO Tree.
* @param localName The local name of the element.
* @param currentFObj The current FoObj, that is, the parent of the one being parsed.
* @param list The property list into which properties for the new FoObj should be placed.
@@ -95,7 +92,7 @@
* @return The newly-created FoObj instance.
* @throws FoTreeException For parsing errors.
*/
- protected abstract FoObj parseElementForNS(FoTree4a foTree, String localName, FoObj currentFObj, PropertyList list,
+ protected abstract FoObj parseElementForNS(String localName, FoObj currentFObj, PropertyList list,
Locator locator) throws FoTreeException;
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -29,7 +29,6 @@
package org.foray.fotree.axsl;
import org.foray.fotree.FoObj;
-import org.foray.fotree.FoTree4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -63,8 +62,8 @@
}
@Override
- public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
- final PropertyList list, final Locator locator) throws FoTreeException {
+ public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
+ final Locator locator) throws FoTreeException {
return makeObject(localName, currentFObj, list, locator);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -29,7 +29,6 @@
package org.foray.fotree.fo;
import org.foray.fotree.FoObj;
-import org.foray.fotree.FoTree4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -412,9 +411,9 @@
}
@Override
- public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
- final PropertyList list, final Locator locator) throws FoTreeException {
- return makeObject(foTree, localName, currentFObj, list, locator);
+ public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
+ final Locator locator) throws FoTreeException {
+ return makeObject(localName, currentFObj, list, locator);
}
@Override
@@ -437,8 +436,7 @@
/**
* Converts an unparsed XSL-FO element into an FoObj instance that can be added to the FO Tree.
- * @param foTree The parent FO Tree.
- * @param objectName The unparsed XSL-FO element name.
+ * @param elementName The unparsed XSL-FO element name.
* @param parent The parent FoObj.
* @param propertyList The property list of the parent FoObj.
* @param locator The SAX Locator object.
@@ -445,14 +443,16 @@
* @return The new FoObj instance for this XSL-FO element.
* @throws FoTreeException For errors during Fo construction.
*/
- public FoObj makeObject(final FoTree4a foTree, final String objectName, final FoObj parent,
- final PropertyList propertyList, final Locator locator)
- throws FoTreeException {
- final FoObjectId enumeration = FoObjectId.xslValueOf(objectName);
- if (enumeration != FoObjectId.ROOT
- && parent == null) {
+ public FoObj makeObject(final String elementName, final FoObj parent, final PropertyList propertyList,
+ final Locator locator) throws FoTreeException {
+ final FoObjectId enumeration = FoObjectId.xslValueOf(elementName);
+ if (FoObjectId.ROOT == enumeration) {
+ throw new IllegalStateException("The root element must be processed manually.");
+ }
+ if (parent == null) {
throw new NullPointerException("Parent object cannot be null");
}
+
switch (enumeration) {
case BASIC_LINK: {
return new BasicLink4a(parent, propertyList);
@@ -674,9 +674,6 @@
case RETRIEVE_TABLE_MARKER: {
return new RetrieveTableMarker4a(parent, propertyList);
}
- case ROOT: {
- throw new IllegalStateException("The fo:root element is not processed in this code branch.");
- }
case SCALING_VALUE_CITATION: {
return new ScalingValueCitation4a(parent, propertyList);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -29,7 +29,6 @@
package org.foray.fotree.foray;
import org.foray.fotree.FoObj;
-import org.foray.fotree.FoTree4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -62,8 +61,8 @@
}
@Override
- public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
- final PropertyList list, final Locator locator) throws FoTreeException {
+ public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
+ final Locator locator) throws FoTreeException {
return makeObject(localName, currentFObj, list);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 18:31:29 UTC (rev 12947)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 18:49:26 UTC (rev 12948)
@@ -29,7 +29,6 @@
package org.foray.fotree.xml;
import org.foray.fotree.FoObj;
-import org.foray.fotree.FoTree4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -63,8 +62,8 @@
}
@Override
- public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
- final PropertyList list, final Locator locator) throws FoTreeException {
+ public FoObj parseElementForNS(final String localName, final FoObj currentFObj, final PropertyList list,
+ final Locator locator) throws FoTreeException {
// This isn't needed for the xml: namespace.
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 18:31:31
|
Revision: 12947
http://sourceforge.net/p/foray/code/12947
Author: victormote
Date: 2022-12-24 18:31:29 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Pull parsing of Root outside of the normal flow, to simplify the API for the other elements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 17:51:26 UTC (rev 12946)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 18:31:29 UTC (rev 12947)
@@ -28,6 +28,7 @@
package org.foray.fotree;
+import org.foray.fotree.fo.NamespaceFo;
import org.foray.fotree.fo.obj.BookmarkTitle4a;
import org.foray.fotree.fo.obj.FoTextCharacters4a;
import org.foray.fotree.fo.obj.FoTextWords4a;
@@ -328,12 +329,9 @@
/* Before creating the new object, allow an existing FoObjMixed to capture any text that has accumulated, so
* that the text will be a sibling of the new object. */
finalizeText();
- if (this.currentFObj == null) {
- if (! "root".equals(localName)) {
- throw new SAXException("fo:root must be first element parsed");
- }
- }
+
+
/*
* ******* IMPORTANT *******
* Parse the attributes/properties first, as they are independent of the elements/objects.
@@ -341,8 +339,23 @@
* validation tasks until we join them up with the object to which they will be attached. */
final PropertyList list = nativeNamespace.parseAttributes(attlist, this);
- /* Now parse the element/object itself. */
- fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
+
+ /* Now parse the element/object itself. Root gets handled specially because it doesn't have an FoObj
+ * parent. */
+ if (this.currentFObj == null) {
+ if (NamespaceFo.getInstance() == nativeNamespace
+ && "root".equals(localName)) {
+ final Root4a root = new Root4a(foTree, list);
+ foTree.setRootFo(root);
+ fobj = root;
+ } else {
+ throw new SAXException("fo:root must be first element parsed");
+ }
+ } else {
+ fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
+ }
+
+
if (getLocator() != null) {
final Locator locator = getLocator();
fobj.setLocation(locator.getSystemId(), locator.getLineNumber(), locator.getColumnNumber());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:51:26 UTC (rev 12946)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 18:31:29 UTC (rev 12947)
@@ -675,9 +675,7 @@
return new RetrieveTableMarker4a(parent, propertyList);
}
case ROOT: {
- final Root4a root = new Root4a(foTree, propertyList);
- foTree.setRootFo(root);
- return root;
+ throw new IllegalStateException("The fo:root element is not processed in this code branch.");
}
case SCALING_VALUE_CITATION: {
return new ScalingValueCitation4a(parent, propertyList);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 17:51:28
|
Revision: 12946
http://sourceforge.net/p/foray/code/12946
Author: victormote
Date: 2022-12-24 17:51:26 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Rename parameter for clarity.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:41:05 UTC (rev 12945)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:51:26 UTC (rev 12946)
@@ -956,836 +956,836 @@
/**
* Makes a property in this namespace.
- * @param propertyFullName The unparsed property name.
+ * @param attributeName The unparsed property name.
* @param attributeValue The unparsed property value.
* @param creator The FO Tree creation context.
* @return The parsed Property instance.
* @throws PropertyException For errors in the property or its value.
*/
- public Property makeProperty(final String propertyFullName, final String attributeValue,
+ public Property makeProperty(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName(propertyFullName);
+ final String basePropertyName = Property.getBasePropertyName(attributeName);
final FoPropertyId enumeration = enumeratePropertyName(basePropertyName);
-// final Property property = checkCompoundProperty(fobj, enumeration, propertyFullName, attributeValue);
+// final Property property = checkCompoundProperty(fobj, enumeration, attributeName, attributeValue);
// if (property != null) {
// return property;
// }
if (enumeration == null) {
- throw new PropertyException("Invalid property for fo namespace: " + propertyFullName);
+ throw new PropertyException("Invalid property for fo namespace: " + attributeName);
}
switch (enumeration) {
case ABSOLUTE_POSITION: {
- return new PdAbsolutePosition(propertyFullName, attributeValue);
+ return new PdAbsolutePosition(attributeName, attributeValue);
}
case ACTIVE_STATE: {
- return new PdActiveState(propertyFullName, attributeValue);
+ return new PdActiveState(attributeName, attributeValue);
}
case ALIGNMENT_ADJUST: {
- return new PdAlignmentAdjust(propertyFullName, attributeValue);
+ return new PdAlignmentAdjust(attributeName, attributeValue);
}
case ALIGNMENT_BASELINE: {
- return new PdAlignmentBaseline(propertyFullName, attributeValue);
+ return new PdAlignmentBaseline(attributeName, attributeValue);
}
case ALLOWED_HEIGHT_SCALE: {
- return new PdAllowedHeightScale(propertyFullName, attributeValue);
+ return new PdAllowedHeightScale(attributeName, attributeValue);
}
case ALLOWED_WIDTH_SCALE: {
- return new PdAllowedWidthScale(propertyFullName, attributeValue);
+ return new PdAllowedWidthScale(attributeName, attributeValue);
}
case AUTO_RESTORE: {
- return new PdAutoRestore(propertyFullName, attributeValue);
+ return new PdAutoRestore(attributeName, attributeValue);
}
case AZIMUTH: {
- return new PdAzimuth(propertyFullName, attributeValue);
+ return new PdAzimuth(attributeName, attributeValue);
}
case BACKGROUND: {
- return new PdBackground(propertyFullName, attributeValue);
+ return new PdBackground(attributeName, attributeValue);
}
case BACKGROUND_ATTACHMENT: {
- return new PdBackgroundAttachment(propertyFullName, attributeValue);
+ return new PdBackgroundAttachment(attributeName, attributeValue);
}
case BACKGROUND_COLOR: {
- return new PdBackgroundColor(propertyFullName, attributeValue);
+ return new PdBackgroundColor(attributeName, attributeValue);
}
case BACKGROUND_IMAGE: {
- return new PdBackgroundImage(propertyFullName, attributeValue);
+ return new PdBackgroundImage(attributeName, attributeValue);
}
case BACKGROUND_POSITION: {
- return new PdBackgroundPosition(propertyFullName, attributeValue);
+ return new PdBackgroundPosition(attributeName, attributeValue);
}
case BACKGROUND_POSITION_HORIZONTAL: {
- return new PdBackgroundPositionHorizontal(propertyFullName, attributeValue);
+ return new PdBackgroundPositionHorizontal(attributeName, attributeValue);
}
case BACKGROUND_POSITION_VERTICAL: {
- return new PdBackgroundPositionVertical(propertyFullName, attributeValue);
+ return new PdBackgroundPositionVertical(attributeName, attributeValue);
}
case BACKGROUND_REPEAT: {
- return new PdBackgroundRepeat(propertyFullName, attributeValue);
+ return new PdBackgroundRepeat(attributeName, attributeValue);
}
case BASELINE_SHIFT: {
- return new PdBaselineShift(propertyFullName, attributeValue);
+ return new PdBaselineShift(attributeName, attributeValue);
}
case BLANK_OR_NOT_BLANK: {
- return new PdBlankOrNotBlank(propertyFullName, attributeValue);
+ return new PdBlankOrNotBlank(attributeName, attributeValue);
}
case BLOCK_PROGRESSION_DIMENSION: {
- return new PdBlockProgressionDimension(propertyFullName, attributeValue);
+ return new PdBlockProgressionDimension(attributeName, attributeValue);
}
case BORDER: {
- return new PdBorder(propertyFullName, attributeValue);
+ return new PdBorder(attributeName, attributeValue);
}
case BORDER_AFTER_COLOR: {
- return new PdBorderAfterColor(propertyFullName, attributeValue);
+ return new PdBorderAfterColor(attributeName, attributeValue);
}
case BORDER_AFTER_PRECEDENCE: {
- return new PdBorderAfterPrecedence(propertyFullName, attributeValue);
+ return new PdBorderAfterPrecedence(attributeName, attributeValue);
}
case BORDER_AFTER_STYLE: {
- return new PdBorderAfterStyle(propertyFullName, attributeValue);
+ return new PdBorderAfterStyle(attributeName, attributeValue);
}
case BORDER_AFTER_WIDTH: {
- return new PdBorderAfterWidth(propertyFullName, attributeValue);
+ return new PdBorderAfterWidth(attributeName, attributeValue);
}
case BORDER_BEFORE_COLOR: {
- return new PdBorderBeforeColor(propertyFullName, attributeValue);
+ return new PdBorderBeforeColor(attributeName, attributeValue);
}
case BORDER_BEFORE_PRECEDENCE: {
- return new PdBorderBeforePrecedence(propertyFullName, attributeValue);
+ return new PdBorderBeforePrecedence(attributeName, attributeValue);
}
case BORDER_BEFORE_STYLE: {
- return new PdBorderBeforeStyle(propertyFullName, attributeValue);
+ return new PdBorderBeforeStyle(attributeName, attributeValue);
}
case BORDER_BEFORE_WIDTH: {
- return new PdBorderBeforeWidth(propertyFullName, attributeValue);
+ return new PdBorderBeforeWidth(attributeName, attributeValue);
}
case BORDER_BOTTOM: {
- return new PdBorderBottom(propertyFullName, attributeValue);
+ return new PdBorderBottom(attributeName, attributeValue);
}
case BORDER_BOTTOM_COLOR: {
- return new PdBorderBottomColor(propertyFullName, attributeValue);
+ return new PdBorderBottomColor(attributeName, attributeValue);
}
case BORDER_BOTTOM_STYLE: {
- return new PdBorderBottomStyle(propertyFullName, attributeValue);
+ return new PdBorderBottomStyle(attributeName, attributeValue);
}
case BORDER_BOTTOM_WIDTH: {
- return new PdBorderBottomWidth(propertyFullName, attributeValue);
+ return new PdBorderBottomWidth(attributeName, attributeValue);
}
case BORDER_COLLAPSE: {
- return new PdBorderCollapse(propertyFullName, attributeValue);
+ return new PdBorderCollapse(attributeName, attributeValue);
}
case BORDER_COLOR: {
- return new PdBorderColor(propertyFullName, attributeValue);
+ return new PdBorderColor(attributeName, attributeValue);
}
case BORDER_END_COLOR: {
- return new PdBorderEndColor(propertyFullName, attributeValue);
+ return new PdBorderEndColor(attributeName, attributeValue);
}
case BORDER_END_PRECEDENCE: {
- return new PdBorderEndPrecedence(propertyFullName, attributeValue);
+ return new PdBorderEndPrecedence(attributeName, attributeValue);
}
case BORDER_END_STYLE: {
- return new PdBorderEndStyle(propertyFullName, attributeValue);
+ return new PdBorderEndStyle(attributeName, attributeValue);
}
case BORDER_END_WIDTH: {
- return new PdBorderEndWidth(propertyFullName, attributeValue);
+ return new PdBorderEndWidth(attributeName, attributeValue);
}
case BORDER_LEFT: {
- return new PdBorderLeft(propertyFullName, attributeValue);
+ return new PdBorderLeft(attributeName, attributeValue);
}
case BORDER_LEFT_COLOR: {
- return new PdBorderLeftColor(propertyFullName, attributeValue);
+ return new PdBorderLeftColor(attributeName, attributeValue);
}
case BORDER_LEFT_STYLE: {
- return new PdBorderLeftStyle(propertyFullName, attributeValue);
+ return new PdBorderLeftStyle(attributeName, attributeValue);
}
case BORDER_LEFT_WIDTH: {
- return new PdBorderLeftWidth(propertyFullName, attributeValue);
+ return new PdBorderLeftWidth(attributeName, attributeValue);
}
case BORDER_RIGHT: {
- return new PdBorderRight(propertyFullName, attributeValue);
+ return new PdBorderRight(attributeName, attributeValue);
}
case BORDER_RIGHT_COLOR: {
- return new PdBorderRightColor(propertyFullName, attributeValue);
+ return new PdBorderRightColor(attributeName, attributeValue);
}
case BORDER_RIGHT_STYLE: {
- return new PdBorderRightStyle(propertyFullName, attributeValue);
+ return new PdBorderRightStyle(attributeName, attributeValue);
}
case BORDER_RIGHT_WIDTH: {
- return new PdBorderRightWidth(propertyFullName, attributeValue);
+ return new PdBorderRightWidth(attributeName, attributeValue);
}
case BORDER_SEPARATION: {
- return new PdBorderSeparation(propertyFullName, attributeValue);
+ return new PdBorderSeparation(attributeName, attributeValue);
}
case BORDER_SPACING: {
- return new PdBorderSpacing(propertyFullName, attributeValue);
+ return new PdBorderSpacing(attributeName, attributeValue);
}
case BORDER_START_COLOR: {
- return new PdBorderStartColor(propertyFullName, attributeValue);
+ return new PdBorderStartColor(attributeName, attributeValue);
}
case BORDER_START_PRECEDENCE: {
- return new PdBorderStartPrecedence(propertyFullName, attributeValue);
+ return new PdBorderStartPrecedence(attributeName, attributeValue);
}
case BORDER_START_STYLE: {
- return new PdBorderStartStyle(propertyFullName, attributeValue);
+ return new PdBorderStartStyle(attributeName, attributeValue);
}
case BORDER_START_WIDTH: {
- return new PdBorderStartWidth(propertyFullName, attributeValue);
+ return new PdBorderStartWidth(attributeName, attributeValue);
}
case BORDER_STYLE: {
- return new PdBorderStyle(propertyFullName, attributeValue);
+ return new PdBorderStyle(attributeName, attributeValue);
}
case BORDER_TOP: {
- return new PdBorderTop(propertyFullName, attributeValue);
+ return new PdBorderTop(attributeName, attributeValue);
}
case BORDER_TOP_COLOR: {
- return new PdBorderTopColor(propertyFullName, attributeValue);
+ return new PdBorderTopColor(attributeName, attributeValue);
}
case BORDER_TOP_STYLE: {
- return new PdBorderTopStyle(propertyFullName, attributeValue);
+ return new PdBorderTopStyle(attributeName, attributeValue);
}
case BORDER_TOP_WIDTH: {
- return new PdBorderTopWidth(propertyFullName, attributeValue);
+ return new PdBorderTopWidth(attributeName, attributeValue);
}
case BORDER_WIDTH: {
- return new PdBorderWidth(propertyFullName, attributeValue);
+ return new PdBorderWidth(attributeName, attributeValue);
}
case BOTTOM: {
- return new PdBottom(propertyFullName, attributeValue);
+ return new PdBottom(attributeName, attributeValue);
}
case BREAK_AFTER: {
- return new PdBreakAfter(propertyFullName, attributeValue);
+ return new PdBreakAfter(attributeName, attributeValue);
}
case BREAK_BEFORE: {
- return new PdBreakBefore(propertyFullName, attributeValue);
+ return new PdBreakBefore(attributeName, attributeValue);
}
case CAPTION_SIDE: {
- return new PdCaptionSide(propertyFullName, attributeValue);
+ return new PdCaptionSide(attributeName, attributeValue);
}
case CASE_NAME: {
- return new PdCaseName(propertyFullName, attributeValue);
+ return new PdCaseName(attributeName, attributeValue);
}
case CASE_TITLE: {
- return new PdCaseTitle(propertyFullName, attributeValue);
+ return new PdCaseTitle(attributeName, attributeValue);
}
case CHANGE_BAR_CLASS: {
- return new PdChangeBarClass(propertyFullName, attributeValue);
+ return new PdChangeBarClass(attributeName, attributeValue);
}
case CHANGE_BAR_COLOR: {
- return new PdChangeBarColor(propertyFullName, attributeValue);
+ return new PdChangeBarColor(attributeName, attributeValue);
}
case CHANGE_BAR_OFFSET: {
- return new PdChangeBarOffset(propertyFullName, attributeValue);
+ return new PdChangeBarOffset(attributeName, attributeValue);
}
case CHANGE_BAR_PLACEMENT: {
- return new PdChangeBarPlacement(propertyFullName, attributeValue);
+ return new PdChangeBarPlacement(attributeName, attributeValue);
}
case CHANGE_BAR_STYLE: {
- return new PdChangeBarStyle(propertyFullName, attributeValue);
+ return new PdChangeBarStyle(attributeName, attributeValue);
}
case CHANGE_BAR_WIDTH: {
- return new PdChangeBarWidth(propertyFullName, attributeValue);
+ return new PdChangeBarWidth(attributeName, attributeValue);
}
case CHARACTER: {
- return new org.foray.fotree.fo.prop.PdCharacter(propertyFullName, attributeValue);
+ return new org.foray.fotree.fo.prop.PdCharacter(attributeName, attributeValue);
}
case CLEAR: {
- return new PdClear(propertyFullName, attributeValue);
+ return new PdClear(attributeName, attributeValue);
}
case CLIP: {
- return new PdClip(propertyFullName, attributeValue);
+ return new PdClip(attributeName, attributeValue);
}
case COLOR: {
- return new PdColor(propertyFullName, attributeValue);
+ return new PdColor(attributeName, attributeValue);
}
case COLOR_PROFILE_NAME: {
- return new PdColorProfileName(propertyFullName, attributeValue);
+ return new PdColorProfileName(attributeName, attributeValue);
}
case COLUMN_COUNT: {
- return new PdColumnCount(propertyFullName, attributeValue);
+ return new PdColumnCount(attributeName, attributeValue);
}
case COLUMN_GAP: {
- return new PdColumnGap(propertyFullName, attributeValue);
+ return new PdColumnGap(attributeName, attributeValue);
}
case COLUMN_NUMBER: {
- return new PdColumnNumber(propertyFullName, attributeValue);
+ return new PdColumnNumber(attributeName, attributeValue);
}
case COLUMN_WIDTH: {
- return new PdColumnWidth(propertyFullName, attributeValue);
+ return new PdColumnWidth(attributeName, attributeValue);
}
case CONTENT_HEIGHT: {
- return new PdContentHeight(propertyFullName, attributeValue);
+ return new PdContentHeight(attributeName, attributeValue);
}
case CONTENT_TYPE: {
- return new PdContentType(propertyFullName, attributeValue);
+ return new PdContentType(attributeName, attributeValue);
}
case CONTENT_WIDTH: {
- return new PdContentWidth(propertyFullName, attributeValue);
+ return new PdContentWidth(attributeName, attributeValue);
}
case COUNTRY: {
return new PdCountry(attributeValue);
}
case CUE: {
- return new PdCue(propertyFullName, attributeValue);
+ return new PdCue(attributeName, attributeValue);
}
case CUE_AFTER: {
- return new PdCueAfter(propertyFullName, attributeValue);
+ return new PdCueAfter(attributeName, attributeValue);
}
case CUE_BEFORE: {
- return new PdCueBefore(propertyFullName, attributeValue);
+ return new PdCueBefore(attributeName, attributeValue);
}
case DESTINATION_PLACEMENT_OFFSET: {
- return new PdDestinationPlacementOffset(propertyFullName, attributeValue);
+ return new PdDestinationPlacementOffset(attributeName, attributeValue);
}
case DIRECTION: {
- return new PdDirection(propertyFullName, attributeValue);
+ return new PdDirection(attributeName, attributeValue);
}
case DISPLAY_ALIGN: {
- return new PdDisplayAlign(propertyFullName, attributeValue);
+ return new PdDisplayAlign(attributeName, attributeValue);
}
case DOMINANT_BASELINE: {
return PdDominantBaseline.getInstance(attributeValue);
}
case ELEVATION: {
- return new PdElevation(propertyFullName, attributeValue);
+ return new PdElevation(attributeName, attributeValue);
}
case EMPTY_CELLS: {
- return new PdEmptyCells(propertyFullName, attributeValue);
+ return new PdEmptyCells(attributeName, attributeValue);
}
case END_INDENT: {
- return new PdEndIndent(propertyFullName, attributeValue);
+ return new PdEndIndent(attributeName, attributeValue);
}
case ENDS_ROW: {
- return new PdEndsRow(propertyFullName, attributeValue);
+ return new PdEndsRow(attributeName, attributeValue);
}
case EXTENT: {
- return new PdExtent(propertyFullName, attributeValue);
+ return new PdExtent(attributeName, attributeValue);
}
case EXTERNAL_DESTINATION: {
- return new PdExternalDestination(propertyFullName, attributeValue, creator);
+ return new PdExternalDestination(attributeName, attributeValue, creator);
}
case FLOAT: {
- return new org.foray.fotree.fo.prop.PdFloat(propertyFullName, attributeValue);
+ return new org.foray.fotree.fo.prop.PdFloat(attributeName, attributeValue);
}
case FLOW_MAP_NAME: {
- return new PdFlowMapName(propertyFullName, attributeValue);
+ return new PdFlowMapName(attributeName, attributeValue);
}
case FLOW_MAP_REFERENCE: {
- return new PdFlowMapReference(propertyFullName, attributeValue);
+ return new PdFlowMapReference(attributeName, attributeValue);
}
case FLOW_NAME: {
- return new PdFlowName(propertyFullName, attributeValue);
+ return new PdFlowName(attributeName, attributeValue);
}
case FLOW_NAME_REFERENCE: {
- return new PdFlowNameReference(propertyFullName, attributeValue);
+ return new PdFlowNameReference(attributeName, attributeValue);
}
case FONT: {
- return new PdFont(propertyFullName, attributeValue);
+ return new PdFont(attributeName, attributeValue);
}
case FONT_FAMILY: {
- return new PdFontFamily(propertyFullName, attributeValue);
+ return new PdFontFamily(attributeName, attributeValue);
}
case FONT_SELECTION_STRATEGY: {
- return new PdFontSelectionStrategy(propertyFullName, attributeValue);
+ return new PdFontSelectionStrategy(attributeName, attributeValue);
}
case FONT_SIZE: {
- return new PdFontSize(propertyFullName, attributeValue);
+ return new PdFontSize(attributeName, attributeValue);
}
case FONT_SIZE_ADJUST: {
- return new PdFontSizeAdjust(propertyFullName, attributeValue);
+ return new PdFontSizeAdjust(attributeName, attributeValue);
}
case FONT_STRETCH: {
- return new PdFontStretch(propertyFullName, attributeValue);
+ return new PdFontStretch(attributeName, attributeValue);
}
case FONT_STYLE: {
- return new PdFontStyle(propertyFullName, attributeValue);
+ return new PdFontStyle(attributeName, attributeValue);
}
case FONT_VARIANT: {
- return new PdFontVariant(propertyFullName, attributeValue);
+ return new PdFontVariant(attributeName, attributeValue);
}
case FONT_WEIGHT: {
- return new PdFontWeight(propertyFullName, attributeValue);
+ return new PdFontWeight(attributeName, attributeValue);
}
case FORCE_PAGE_COUNT: {
- return new PdForcePageCount(propertyFullName, attributeValue);
+ return new PdForcePageCount(attributeName, attributeValue);
}
case FORMAT: {
- return new PdFormat(propertyFullName, attributeValue);
+ return new PdFormat(attributeName, attributeValue);
}
case GLYPH_ORIENTATION_HORIZONTAL: {
- return new PdGlyphOrientationHorizontal(propertyFullName, attributeValue);
+ return new PdGlyphOrientationHorizontal(attributeName, attributeValue);
}
case GLYPH_ORIENTATION_VERTICAL: {
- return new PdGlyphOrientationVertical(propertyFullName, attributeValue);
+ return new PdGlyphOrientationVertical(attributeName, attributeValue);
}
case GROUPING_SEPARATOR: {
- return new PdGroupingSeparator(propertyFullName, attributeValue);
+ return new PdGroupingSeparator(attributeName, attributeValue);
}
case GROUPING_SIZE: {
- return new PdGroupingSize(propertyFullName, attributeValue);
+ return new PdGroupingSize(attributeName, attributeValue);
}
case HEIGHT: {
- return new PdHeight(propertyFullName, attributeValue);
+ return new PdHeight(attributeName, attributeValue);
}
case HYPHENATE: {
- return new PdHyphenate(propertyFullName, attributeValue);
+ return new PdHyphenate(attributeName, attributeValue);
}
case HYPHENATION_CHARACTER: {
- return new PdHyphenationCharacter(propertyFullName, attributeValue);
+ return new PdHyphenationCharacter(attributeName, attributeValue);
}
case HYPHENATION_KEEP: {
- return new PdHyphenationKeep(propertyFullName, attributeValue);
+ return new PdHyphenationKeep(attributeName, attributeValue);
}
case HYPHENATION_LADDER_COUNT: {
- return new PdHyphenationLadderCount(propertyFullName, attributeValue);
+ return new PdHyphenationLadderCount(attributeName, attributeValue);
}
case HYPHENATION_PUSH_CHARACTER_COUNT: {
- return new PdHyphenationPushCharacterCount(propertyFullName, attributeValue);
+ return new PdHyphenationPushCharacterCount(attributeName, attributeValue);
}
case HYPHENATION_REMAIN_CHARACTER_COUNT: {
- return new PdHyphenationRemainCharacterCount(propertyFullName, attributeValue);
+ return new PdHyphenationRemainCharacterCount(attributeName, attributeValue);
}
case ID: {
- return new PdId(propertyFullName, attributeValue);
+ return new PdId(attributeName, attributeValue);
}
case INDEX_CLASS: {
- return new PdIndexClass(propertyFullName, attributeValue);
+ return new PdIndexClass(attributeName, attributeValue);
}
case INDEX_KEY: {
- return new PdIndexKey(propertyFullName, attributeValue);
+ return new PdIndexKey(attributeName, attributeValue);
}
case INDICATE_DESTINATION: {
- return new PdIndicateDestination(propertyFullName, attributeValue);
+ return new PdIndicateDestination(attributeName, attributeValue);
}
case INITIAL_PAGE_NUMBER: {
- return new PdInitialPageNumber(propertyFullName, attributeValue);
+ return new PdInitialPageNumber(attributeName, attributeValue);
}
case INLINE_PROGRESSION_DIMENSION: {
- return new PdInlineProgressionDimension(propertyFullName, attributeValue);
+ return new PdInlineProgressionDimension(attributeName, attributeValue);
}
case INTERNAL_DESTINATION: {
- return new PdInternalDestination(propertyFullName, attributeValue);
+ return new PdInternalDestination(attributeName, attributeValue);
}
case INTRINSIC_SCALE_VALUE: {
- return new PdIntrinsicScaleValue(propertyFullName, attributeValue);
+ return new PdIntrinsicScaleValue(attributeName, attributeValue);
}
case INTRUSION_DISPLACE: {
- return new PdIntrusionDisplace(propertyFullName, attributeValue);
+ return new PdIntrusionDisplace(attributeName, attributeValue);
}
case KEEP_TOGETHER: {
- return new PdKeepTogether(propertyFullName, attributeValue);
+ return new PdKeepTogether(attributeName, attributeValue);
}
case KEEP_WITH_NEXT: {
- return new PdKeepWithNext(propertyFullName, attributeValue);
+ return new PdKeepWithNext(attributeName, attributeValue);
}
case KEEP_WITH_PREVIOUS: {
- return new PdKeepWithPrevious(propertyFullName, attributeValue);
+ return new PdKeepWithPrevious(attributeName, attributeValue);
}
case LANGUAGE: {
return new PdLanguage(attributeValue);
}
case LAST_LINE_END_INDENT: {
- return new PdLastLineEndIndent(propertyFullName, attributeValue);
+ return new PdLastLineEndIndent(attributeName, attributeValue);
}
case LEADER_ALIGNMENT: {
- return new PdLeaderAlignment(propertyFullName, attributeValue);
+ return new PdLeaderAlignment(attributeName, attributeValue);
}
case LEADER_LENGTH: {
- return new PdLeaderLength(propertyFullName, attributeValue);
+ return new PdLeaderLength(attributeName, attributeValue);
}
case LEADER_PATTERN: {
- return new PdLeaderPattern(propertyFullName, attributeValue);
+ return new PdLeaderPattern(attributeName, attributeValue);
}
case LEADER_PATTERN_WIDTH: {
- return new PdLeaderPatternWidth(propertyFullName, attributeValue);
+ return new PdLeaderPatternWidth(attributeName, attributeValue);
}
case LEFT: {
- return new PdLeft(propertyFullName, attributeValue);
+ return new PdLeft(attributeName, attributeValue);
}
case LETTER_SPACING: {
- return new PdLetterSpacing(propertyFullName, attributeValue);
+ return new PdLetterSpacing(attributeName, attributeValue);
}
case LETTER_VALUE: {
- return new PdLetterValue(propertyFullName, attributeValue);
+ return new PdLetterValue(attributeName, attributeValue);
}
case LINE_HEIGHT: {
- return new PdLineHeight(propertyFullName, attributeValue);
+ return new PdLineHeight(attributeName, attributeValue);
}
case LINE_HEIGHT_SHIFT_ADJUSTMENT: {
- return new PdLineHeightShiftAdjustment(propertyFullName, attributeValue);
+ return new PdLineHeightShiftAdjustment(attributeName, attributeValue);
}
case LINE_STACKING_STRATEGY: {
- return new PdLineStackingStrategy(propertyFullName, attributeValue);
+ return new PdLineStackingStrategy(attributeName, attributeValue);
}
case LINEFEED_TREATMENT: {
- return new PdLinefeedTreatment(propertyFullName, attributeValue);
+ return new PdLinefeedTreatment(attributeName, attributeValue);
}
case MARGIN: {
- return new PdMargin(propertyFullName, attributeValue);
+ return new PdMargin(attributeName, attributeValue);
}
case MARGIN_BOTTOM: {
- return new PdMarginBottom(propertyFullName, attributeValue);
+ return new PdMarginBottom(attributeName, attributeValue);
}
case MARGIN_LEFT: {
- return new PdMarginLeft(propertyFullName, attributeValue);
+ return new PdMarginLeft(attributeName, attributeValue);
}
case MARGIN_RIGHT: {
- return new PdMarginRight(propertyFullName, attributeValue);
+ return new PdMarginRight(attributeName, attributeValue);
}
case MARGIN_TOP: {
- return new PdMarginTop(propertyFullName, attributeValue);
+ return new PdMarginTop(attributeName, attributeValue);
}
case MARKER_CLASS_NAME: {
- return new PdMarkerClassName(propertyFullName, attributeValue);
+ return new PdMarkerClassName(attributeName, attributeValue);
}
case MASTER_NAME: {
- return new PdMasterName(propertyFullName, attributeValue);
+ return new PdMasterName(attributeName, attributeValue);
}
case MASTER_REFERENCE: {
- return new PdMasterReference(propertyFullName, attributeValue);
+ return new PdMasterReference(attributeName, attributeValue);
}
case MAX_HEIGHT: {
- return new PdMaxHeight(propertyFullName, attributeValue);
+ return new PdMaxHeight(attributeName, attributeValue);
}
case MAX_WIDTH: {
- return new PdMaxWidth(propertyFullName, attributeValue);
+ return new PdMaxWidth(attributeName, attributeValue);
}
case MAXIMUM_REPEATS: {
- return new PdMaximumRepeats(propertyFullName, attributeValue);
+ return new PdMaximumRepeats(attributeName, attributeValue);
}
case MEDIA_USAGE: {
- return new PdMediaUsage(propertyFullName, attributeValue);
+ return new PdMediaUsage(attributeName, attributeValue);
}
case MERGE_PAGES_ACROSS_INDEX_KEY_REFERENCES: {
- return new PdMergePagesAcrossIndexKeyReferences(propertyFullName, attributeValue);
+ return new PdMergePagesAcrossIndexKeyReferences(attributeName, attributeValue);
}
case MERGE_RANGES_ACROSS_INDEX_KEY_REFERENCES: {
- return new PdMergeRangesAcrossIndexKeyReferences(propertyFullName, attributeValue);
+ return new PdMergeRangesAcrossIndexKeyReferences(attributeName, attributeValue);
}
case MERGE_SEQUENTIAL_PAGE_NUMBERS: {
- return new PdMergeSequentialPageNumbers(propertyFullName, attributeValue);
+ return new PdMergeSequentialPageNumbers(attributeName, attributeValue);
}
case MIN_HEIGHT: {
- return new PdMinHeight(propertyFullName, attributeValue);
+ return new PdMinHeight(attributeName, attributeValue);
}
case MIN_WIDTH: {
- return new PdMinWidth(propertyFullName, attributeValue);
+ return new PdMinWidth(attributeName, attributeValue);
}
case NUMBER_COLUMNS_REPEATED: {
- return new PdNumberColumnsRepeated(propertyFullName, attributeValue);
+ return new PdNumberColumnsRepeated(attributeName, attributeValue);
}
case NUMBER_COLUMNS_SPANNED: {
- return new PdNumberColumnsSpanned(propertyFullName, attributeValue);
+ return new PdNumberColumnsSpanned(attributeName, attributeValue);
}
case NUMBER_ROWS_SPANNED: {
- return new PdNumberRowsSpanned(propertyFullName, attributeValue);
+ return new PdNumberRowsSpanned(attributeName, attributeValue);
}
case ODD_OR_EVEN: {
- return new PdOddOrEven(propertyFullName, attributeValue);
+ return new PdOddOrEven(attributeName, attributeValue);
}
case ORPHANS: {
- return new PdOrphans(propertyFullName, attributeValue);
+ return new PdOrphans(attributeName, attributeValue);
}
case OVERFLOW: {
- return new PdOverflow(propertyFullName, attributeValue);
+ return new PdOverflow(attributeName, attributeValue);
}
case PADDING: {
- return new PdPadding(propertyFullName, attributeValue);
+ return new PdPadding(attributeName, attributeValue);
}
case PADDING_AFTER: {
- return new PdPaddingAfter(propertyFullName, attributeValue);
+ return new PdPaddingAfter(attributeName, attributeValue);
}
case PADDING_BEFORE: {
- return new PdPaddingBefore(propertyFullName, attributeValue);
+ return new PdPaddingBefore(attributeName, attributeValue);
}
case PADDING_BOTTOM: {
- return new PdPaddingBottom(propertyFullName, attributeValue);
+ return new PdPaddingBottom(attributeName, attributeValue);
}
case PADDING_END: {
- return new PdPaddingEnd(propertyFullName, attributeValue);
+ return new PdPaddingEnd(attributeName, attributeValue);
}
case PADDING_LEFT: {
- return new PdPaddingLeft(propertyFullName, attributeValue);
+ return new PdPaddingLeft(attributeName, attributeValue);
}
case PADDING_RIGHT: {
- return new PdPaddingRight(propertyFullName, attributeValue);
+ return new PdPaddingRight(attributeName, attributeValue);
}
case PADDING_START: {
- return new PdPaddingStart(propertyFullName, attributeValue);
+ return new PdPaddingStart(attributeName, attributeValue);
}
case PADDING_TOP: {
- return new PdPaddingTop(propertyFullName, attributeValue);
+ return new PdPaddingTop(attributeName, attributeValue);
}
case PAGE_BREAK_AFTER: {
- return new PdPageBreakAfter(propertyFullName, attributeValue);
+ return new PdPageBreakAfter(attributeName, attributeValue);
}
case PAGE_BREAK_BEFORE: {
- return new PdPageBreakBefore(propertyFullName, attributeValue);
+ return new PdPageBreakBefore(attributeName, attributeValue);
}
case PAGE_BREAK_INSIDE: {
- return new PdPageBreakInside(propertyFullName, attributeValue);
+ return new PdPageBreakInside(attributeName, attributeValue);
}
case PAGE_CITATION_STRATEGY: {
- return new PdPageCitationStrategy(propertyFullName, attributeValue);
+ return new PdPageCitationStrategy(attributeName, attributeValue);
}
case PAGE_HEIGHT: {
- return new PdPageHeight(propertyFullName, attributeValue);
+ return new PdPageHeight(attributeName, attributeValue);
}
case PAGE_NUMBER_TREATMENT: {
- return new PdPageNumberTreatment(propertyFullName, attributeValue);
+ return new PdPageNumberTreatment(attributeName, attributeValue);
}
case PAGE_POSITION: {
- return new PdPagePosition(propertyFullName, attributeValue);
+ return new PdPagePosition(attributeName, attributeValue);
}
case PAGE_WIDTH: {
- return new PdPageWidth(propertyFullName, attributeValue);
+ return new PdPageWidth(attributeName, attributeValue);
}
case PAUSE: {
- return new PdPause(propertyFullName, attributeValue);
+ return new PdPause(attributeName, attributeValue);
}
case PAUSE_AFTER: {
- return new PdPauseAfter(propertyFullName, attributeValue);
+ return new PdPauseAfter(attributeName, attributeValue);
}
case PAUSE_BEFORE: {
- return new PdPauseBefore(propertyFullName, attributeValue);
+ return new PdPauseBefore(attributeName, attributeValue);
}
case PITCH: {
- return new PdPitch(propertyFullName, attributeValue);
+ return new PdPitch(attributeName, attributeValue);
}
case PITCH_RANGE: {
- return new PdPitchRange(propertyFullName, attributeValue);
+ return new PdPitchRange(attributeName, attributeValue);
}
case PLAY_DURING: {
- return new PdPlayDuring(propertyFullName, attributeValue);
+ return new PdPlayDuring(attributeName, attributeValue);
}
case POSITION: {
- return new PdPosition(propertyFullName, attributeValue);
+ return new PdPosition(attributeName, attributeValue);
}
case PRECEDENCE: {
- return new PdPrecedence(propertyFullName, attributeValue);
+ return new PdPrecedence(attributeName, attributeValue);
}
case PROVISIONAL_DISTANCE_BETWEEN_STARTS: {
- return new PdProvisionalDistanceBetweenStarts(propertyFullName, attributeValue);
+ return new PdProvisionalDistanceBetweenStarts(attributeName, attributeValue);
}
case PROVISIONAL_LABEL_SEPARATION: {
- return new PdProvisionalLabelSeparation(propertyFullName, attributeValue);
+ return new PdProvisionalLabelSeparation(attributeName, attributeValue);
}
case REF_ID: {
- return new PdRefId(propertyFullName, attributeValue);
+ return new PdRefId(attributeName, attributeValue);
}
case REF_INDEX_KEY: {
- return new PdRefIndexKey(propertyFullName, attributeValue);
+ return new PdRefIndexKey(attributeName, attributeValue);
}
case REFERENCE_ORIENTATION: {
- return new PdReferenceOrientation(propertyFullName, attributeValue);
+ return new PdReferenceOrientation(attributeName, attributeValue);
}
case REGION_NAME: {
- return new PdRegionName(propertyFullName, attributeValue);
+ return new PdRegionName(attributeName, attributeValue);
}
case REGION_NAME_REFERENCE: {
- return new PdRegionNameReference(propertyFullName, attributeValue);
+ return new PdRegionNameReference(attributeName, attributeValue);
}
case RELATIVE_ALIGN: {
- return new PdRelativeAlign(propertyFullName, attributeValue);
+ return new PdRelativeAlign(attributeName, attributeValue);
}
case RELATIVE_POSITION: {
- return new PdRelativePosition(propertyFullName, attributeValue);
+ return new PdRelativePosition(attributeName, attributeValue);
}
case RENDERING_INTENT: {
- return new PdRenderingIntent(propertyFullName, attributeValue);
+ return new PdRenderingIntent(attributeName, attributeValue);
}
case RETRIEVE_BOUNDARY: {
- return new PdRetrieveBoundary(propertyFullName, attributeValue);
+ return new PdRetrieveBoundary(attributeName, attributeValue);
}
case RETRIEVE_BOUNDARY_WITHIN_TABLE: {
- return new PdRetrieveBoundaryWithinTable(propertyFullName, attributeValue);
+ return new PdRetrieveBoundaryWithinTable(attributeName, attributeValue);
}
case RETRIEVE_CLASS_NAME: {
- return new PdRetrieveClassName(propertyFullName, attributeValue);
+ return new PdRetrieveClassName(attributeName, attributeValue);
}
case RETRIEVE_POSITION: {
- return new PdRetrievePosition(propertyFullName, attributeValue);
+ return new PdRetrievePosition(attributeName, attributeValue);
}
case RETRIEVE_POSITION_WITHIN_TABLE: {
- return new PdRetrievePositionWithinTable(propertyFullName, attributeValue);
+ return new PdRetrievePositionWithinTable(attributeName, attributeValue);
}
case RICHNESS: {
- return new PdRichness(propertyFullName, attributeValue);
+ return new PdRichness(attributeName, attributeValue);
}
case RIGHT: {
- return new PdRight(propertyFullName, attributeValue);
+ return new PdRight(attributeName, attributeValue);
}
case ROLE: {
- return new PdRole(propertyFullName, attributeValue, creator);
+ return new PdRole(attributeName, attributeValue, creator);
}
case RULE_STYLE: {
- return new PdRuleStyle(propertyFullName, attributeValue);
+ return new PdRuleStyle(attributeName, attributeValue);
}
case RULE_THICKNESS: {
- return new PdRuleThickness(propertyFullName, attributeValue);
+ return new PdRuleThickness(attributeName, attributeValue);
}
case SCALE_OPTION: {
- return new PdScaleOption(propertyFullName, attributeValue);
+ return new PdScaleOption(attributeName, attributeValue);
}
case SCALING: {
- return new PdScaling(propertyFullName, attributeValue);
+ return new PdScaling(attributeName, attributeValue);
}
case SCALING_METHOD: {
- return new PdScalingMethod(propertyFullName, attributeValue);
+ return new PdScalingMethod(attributeName, attributeValue);
}
case SCORE_SPACES: {
- return new PdScoreSpaces(propertyFullName, attributeValue);
+ return new PdScoreSpaces(attributeName, attributeValue);
}
case SCRIPT: {
return new PdScript(attributeValue);
}
case SHOW_DESTINATION: {
- return new PdShowDestination(propertyFullName, attributeValue);
+ return new PdShowDestination(attributeName, attributeValue);
}
case SIZE: {
- return new PdSize(propertyFullName, attributeValue);
+ return new PdSize(attributeName, attributeValue);
}
case SOURCE_DOCUMENT: {
- return new PdSourceDocument(propertyFullName, attributeValue, creator);
+ return new PdSourceDocument(attributeName, attributeValue, creator);
}
case SPACE_AFTER: {
- return new PdSpaceAfter(propertyFullName, attributeValue);
+ return new PdSpaceAfter(attributeName, attributeValue);
}
case SPACE_BEFORE: {
- return new PdSpaceBefore(propertyFullName, attributeValue);
+ return new PdSpaceBefore(attributeName, attributeValue);
}
case SPACE_END: {
- return new PdSpaceEnd(propertyFullName, attributeValue);
+ return new PdSpaceEnd(attributeName, attributeValue);
}
case SPACE_START: {
- return new PdSpaceStart(propertyFullName, attributeValue);
+ return new PdSpaceStart(attributeName, attributeValue);
}
case SPAN: {
- return new PdSpan(propertyFullName, attributeValue);
+ return new PdSpan(attributeName, attributeValue);
}
case SPEAK: {
- return new PdSpeak(propertyFullName, attributeValue);
+ return new PdSpeak(attributeName, attributeValue);
}
case SPEAK_HEADER: {
- return new PdSpeakHeader(propertyFullName, attributeValue);
+ return new PdSpeakHeader(attributeName, attributeValue);
}
case SPEAK_NUMERAL: {
- return new PdSpeakNumeral(propertyFullName, attributeValue);
+ return new PdSpeakNumeral(attributeName, attributeValue);
}
case SPEAK_PUNCTUATION: {
- return new PdSpeakPunctuation(propertyFullName, attributeValue);
+ return new PdSpeakPunctuation(attributeName, attributeValue);
}
case SPEECH_RATE: {
- return new PdSpeechRate(propertyFullName, attributeValue);
+ return new PdSpeechRate(attributeName, attributeValue);
}
case SRC: {
- return new PdSrc(propertyFullName, attributeValue, creator);
+ return new PdSrc(attributeName, attributeValue, creator);
}
case START_INDENT: {
- return new PdStartIndent(propertyFullName, attributeValue);
+ return new PdStartIndent(attributeName, attributeValue);
}
case STARTING_STATE: {
- return new PdStartingState(propertyFullName, attributeValue);
+ return new PdStartingState(attributeName, attributeValue);
}
case STARTS_ROW: {
- return new PdStartsRow(propertyFullName, attributeValue);
+ return new PdStartsRow(attributeName, attributeValue);
}
case STRESS: {
- return new PdStress(propertyFullName, attributeValue);
+ return new PdStress(attributeName, attributeValue);
}
case SUPPRESS_AT_LINE_BREAK: {
- return new PdSuppressAtLineBreak(propertyFullName, attributeValue);
+ return new PdSuppressAtLineBreak(attributeName, attributeValue);
}
case SWITCH_TO: {
- return new PdSwitchTo(propertyFullName, attributeValue);
+ return new PdSwitchTo(attributeName, attributeValue);
}
case TABLE_LAYOUT: {
- return new PdTableLayout(propertyFullName, attributeValue);
+ return new PdTableLayout(attributeName, attributeValue);
}
case TABLE_OMIT_FOOTER_AT_BREAK: {
- return new PdTableOmitFooterAtBreak(propertyFullName, attributeValue);
+ return new PdTableOmitFooterAtBreak(attributeName, attributeValue);
}
case TABLE_OMIT_HEADER_AT_BREAK: {
- return new PdTableOmitHeaderAtBreak(propertyFullName, attributeValue);
+ return new PdTableOmitHeaderAtBreak(attributeName, attributeValue);
}
case TARGET_PRESENTATION_CONTEXT: {
- return new PdTargetPresentationContext(propertyFullName, attributeValue, creator);
+ return new PdTargetPresentationContext(attributeName, attributeValue, creator);
}
case TARGET_PROCESSING_CONTEXT: {
- return new PdTargetProcessingContext(propertyFullName, attributeValue, creator);
+ return new PdTargetProcessingContext(attributeName, attributeValue, creator);
}
case TARGET_STYLESHEET: {
- return new PdTargetStylesheet(propertyFullName, attributeValue, creator);
+ return new PdTargetStylesheet(attributeName, attributeValue, creator);
}
case TEXT_ALIGN: {
- return new PdTextAlign(propertyFullName, attributeValue);
+ return new PdTextAlign(attributeName, attributeValue);
}
case TEXT_ALIGN_LAST: {
- return new PdTextAlignLast(propertyFullName, attributeValue);
+ return new PdTextAlignLast(attributeName, attributeValue);
}
case TEXT_ALTITUDE: {
- return new PdTextAltitude(propertyFullName, attributeValue);
+ return new PdTextAltitude(attributeName, attributeValue);
}
case TEXT_DECORATION: {
- return new PdTextDecoration(propertyFullName, attributeValue);
+ return new PdTextDecoration(attributeName, attributeValue);
}
case TEXT_DEPTH: {
- return new PdTextDepth(propertyFullName, attributeValue);
+ return new PdTextDepth(attributeName, attributeValue);
}
case TEXT_INDENT: {
- return new PdTextIndent(propertyFullName, attributeValue);
+ return new PdTextIndent(attributeName, attributeValue);
}
case TEXT_SHADOW: {
- return new PdTextShadow(propertyFullName, attributeValue);
+ return new PdTextShadow(attributeName, attributeValue);
}
case TEXT_TRANSFORM: {
- return new PdTextTransform(propertyFullName, attributeValue);
+ return new PdTextTransform(attributeName, attributeValue);
}
case TOP: {
- return new PdTop(propertyFullName, attributeValue);
+ return new PdTop(attributeName, attributeValue);
}
case TREAT_AS_WORD_SPACE: {
- return new PdTreatAsWordSpace(propertyFullName, attributeValue);
+ return new PdTreatAsWordSpace(attributeName, attributeValue);
}
case UNICODE_BIDI: {
- return new PdUnicodeBidi(propertyFullName, attributeValue);
+ return new PdUnicodeBidi(attributeName, attributeValue);
}
case VERTICAL_ALIGN: {
- return new PdVerticalAlign(propertyFullName, attributeValue);
+ return new PdVerticalAlign(attributeName, attributeValue);
}
case VISIBILITY: {
- return new PdVisibility(propertyFullName, attributeValue);
+ return new PdVisibility(attributeName, attributeValue);
}
case VOICE_FAMILY: {
- return new PdVoiceFamily(propertyFullName, attributeValue);
+ return new PdVoiceFamily(attributeName, attributeValue);
}
case VOLUME: {
- return new PdVolume(propertyFullName, attributeValue);
+ return new PdVolume(attributeName, attributeValue);
}
case WHITE_SPACE: {
- return new PdWhiteSpace(propertyFullName, attributeValue);
+ return new PdWhiteSpace(attributeName, attributeValue);
}
case WHITE_SPACE_COLLAPSE: {
- return new PdWhiteSpaceCollapse(propertyFullName, attributeValue);
+ return new PdWhiteSpaceCollapse(attributeName, attributeValue);
}
case WHITE_SPACE_TREATMENT: {
- return new PdWhiteSpaceTreatment(propertyFullName, attributeValue);
+ return new PdWhiteSpaceTreatment(attributeName, attributeValue);
}
case WIDOWS: {
- return new PdWidows(propertyFullName, attributeValue);
+ return new PdWidows(attributeName, attributeValue);
}
case WIDTH: {
- return new PdWidth(propertyFullName, attributeValue);
+ return new PdWidth(attributeName, attributeValue);
}
case WORD_SPACING: {
- return new PdWordSpacing(propertyFullName, attributeValue);
+ return new PdWordSpacing(attributeName, attributeValue);
}
case WRAP_OPTION: {
- return new PdWrapOption(propertyFullName, attributeValue);
+ return new PdWrapOption(attributeName, attributeValue);
}
case WRITING_MODE: {
- return new PdWritingMode(propertyFullName, attributeValue);
+ return new PdWritingMode(attributeName, attributeValue);
}
case Z_INDEX: {
- return new PdZindex(propertyFullName, attributeValue);
+ return new PdZindex(attributeName, attributeValue);
}
default: {
return null;
@@ -1805,7 +1805,7 @@
* if it is a compound property, sets the value for this component.
* @param fobj The FoObj to which this property belongs.
* @param enumeration The parsed property type.
- * @param propertyFullName The full unparsed name of the property.
+ * @param attributeName The full unparsed name of the property.
* @param attributeValue The unparsed property value.
* @return The parsed property.
* @throws PropertyException For errors in the property or its value.
@@ -1812,7 +1812,7 @@
*/
Property checkCompoundProperty(
final FoObj fobj, final FoPropertyId enumeration,
- final String propertyFullName, final String attributeValue)
+ final String attributeName, final String attributeValue)
throws PropertyException {
if (enumeration == null) {
return null;
@@ -1823,7 +1823,7 @@
if (property == null) {
return null;
}
- ((PdBlockProgressionDimension) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdBlockProgressionDimension) property).addComponent(fobj, attributeName, attributeValue);
return property;
}
case INLINE_PROGRESSION_DIMENSION: {
@@ -1831,7 +1831,7 @@
if (property == null) {
return null;
}
- ((PdInlineProgressionDimension) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdInlineProgressionDimension) property).addComponent(fobj, attributeName, attributeValue);
return property;
}
case SPACE_AFTER: {
@@ -1841,7 +1841,7 @@
}
if (property instanceof PdSpaceAfter) {
final PdSpaceAfter spaceAfter = (PdSpaceAfter) property;
- spaceAfter.addComponent(fobj, propertyFullName, attributeValue);
+ spaceAfter.addComponent(fobj, attributeName, attributeValue);
return property;
} else {
throw new IllegalStateException("space-after instance is of an unexpected type.");
@@ -1854,7 +1854,7 @@
}
if (property instanceof PdSpaceBefore) {
final PdSpaceBefore spaceBefore = (PdSpaceBefore) property;
- spaceBefore.addComponent(fobj, propertyFullName, attributeValue);
+ spaceBefore.addComponent(fobj, attributeName, attributeValue);
return property;
} else {
throw new IllegalStateException("space-before instance is of an unexpected type.");
@@ -1867,7 +1867,7 @@
}
if (property instanceof PdSpaceEnd) {
final PdSpaceEnd spaceEnd = (PdSpaceEnd) property;
- spaceEnd.addComponent(fobj, propertyFullName, attributeValue);
+ spaceEnd.addComponent(fobj, attributeName, attributeValue);
return property;
} else {
throw new IllegalStateException("space-end instance is of an unexpected type.");
@@ -1880,7 +1880,7 @@
}
if (property instanceof PdSpaceStart) {
final PdSpaceStart spaceStart = (PdSpaceStart) property;
- spaceStart.addComponent(fobj, propertyFullName, attributeValue);
+ spaceStart.addComponent(fobj, attributeName, attributeValue);
return property;
} else {
throw new IllegalStateException("space-start instance is of an unexpected type.");
@@ -1892,7 +1892,7 @@
return null;
}
assert property instanceof PdBorderSeparation : "border-separation must be a BorderSeparation";
- ((PdBorderSeparation) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdBorderSeparation) property).addComponent(fobj, attributeName, attributeValue);
return property;
}
case LETTER_SPACING: {
@@ -1901,7 +1901,7 @@
return null;
}
assert property instanceof PdLetterSpacing : "letter-spacing must be a LetterSpacing";
- ((PdLetterSpacing) property).addComponent(propertyFullName, attributeValue);
+ ((PdLetterSpacing) property).addComponent(attributeName, attributeValue);
return property;
}
case WORD_SPACING: {
@@ -1910,7 +1910,7 @@
return null;
}
assert property instanceof PdWordSpacing : "word-spacing must be a WordSpacing";
- ((PdWordSpacing) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdWordSpacing) property).addComponent(fobj, attributeName, attributeValue);
return property;
}
case KEEP_TOGETHER: {
@@ -1919,7 +1919,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-together must be a Keep";
- ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(attributeName, attributeValue);
return property;
}
case KEEP_WITH_NEXT: {
@@ -1928,7 +1928,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-with-next must be a Keep";
- ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(attributeName, attributeValue);
return property;
}
case KEEP_WITH_PREVIOUS: {
@@ -1937,7 +1937,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-with-previous must be a Keep";
- ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(attributeName, attributeValue);
return property;
}
case LINE_HEIGHT: {
@@ -1946,7 +1946,7 @@
return null;
}
assert property instanceof PdLineHeight : "line-height must be a LineHeight";
- ((PdLineHeight) property).addComponent(propertyFullName, attributeValue);
+ ((PdLineHeight) property).addComponent(attributeName, attributeValue);
return property;
}
case LEADER_LENGTH: {
@@ -1955,7 +1955,7 @@
return null;
}
assert property instanceof PdLeaderLength : "leader-length must be a LeaderLength";
- ((PdLeaderLength) property).addComponent(propertyFullName, attributeValue);
+ ((PdLeaderLength) property).addComponent(attri...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-24 17:41:08
|
Revision: 12945
http://sourceforge.net/p/foray/code/12945
Author: victormote
Date: 2022-12-24 17:41:05 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Simplify internals of parsing attributes/properties.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.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/NamespaceFo.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/PdLanguage.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/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.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/fo/prop/CountryTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LanguageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScriptTests.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -176,6 +176,11 @@
public Property parseAttribute(final Attributes attributes, final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
final Property property = parseAttributeForNS(attributeName, attributeValue, creator);
+ if (property == null) {
+ final String message = String.format("Could not create property \"{}\" with value \"{}\".", attributeName,
+ attributeValue);
+ throw new PropertyException(message);
+ }
return property;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -71,7 +71,19 @@
@Override
public Property parseAttributeForNS(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
- return makeProperty(attributeName, attributeValue);
+ final String basePropertyName = Property.getBasePropertyName(attributeName);
+ final AxslPropertyId enumeration = enumeratePropertyName(basePropertyName);
+ if (enumeration == null) {
+ throw new PropertyException("Invalid property for axsl namespace: " + attributeName);
+ }
+ switch (enumeration) {
+ case METADATA_KEY: {
+ return new MetadataKey(attributeValue);
+ }
+ default: {
+ return null;
+ }
+ }
}
/**
@@ -121,28 +133,4 @@
return AxslPropertyId.xslValueOf(propertyName);
}
- /**
- * Makes a property in this namespace.
- * @param propertyFullName The unparsed property name.
- * @param attributeValue The unparsed property value.
- * @return The parsed Property instance.
- * @throws PropertyException For errors in the property or its value.
- */
- public Property makeProperty(final String propertyFullName, final String attributeValue)
- throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName(propertyFullName);
- final AxslPropertyId enumeration = enumeratePropertyName(basePropertyName);
- if (enumeration == null) {
- throw new PropertyException("Invalid property for axsl namespace: " + propertyFullName);
- }
- switch (enumeration) {
- case METADATA_KEY: {
- return new MetadataKey(propertyFullName, attributeValue);
- }
- default: {
- return null;
- }
- }
- }
-
}
Modified: 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/AxslEnumerated.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/AxslEnumerated.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -48,11 +48,10 @@
/**
* Default Constructor.
- * @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AxslEnumerated(final String propertyFullName, final String attributeValue) throws PropertyException {
+ public AxslEnumerated(final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -47,12 +47,11 @@
/**
* Default Constructor.
- * @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public MetadataKey(final String propertyFullName, final String attributeValue) throws PropertyException {
- super(propertyFullName, attributeValue);
+ public MetadataKey(final String attributeValue) throws PropertyException {
+ super(attributeValue);
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -421,27 +421,10 @@
public Property parseAttributeForNS(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue, creator);
- checkNullProperty(property, attributeName, attributeValue);
return property;
}
/**
- * Checks the created property, throwing an exception if it is null.
- * @param property The property to be checked.
- * @param attributeName The attribute name used to create the property.
- * @param attributeValue The attribute value used to create the property.
- * @throws PropertyException If {@code property} is null.
- */
- private static void checkNullProperty(final Property property, final String attributeName,
- final String attributeValue) throws PropertyException {
- if (property == null) {
- final String message = String.format("Could not create property \"{}\" with value \"{}\".", attributeName,
- attributeValue);
- throw new PropertyException(message);
- }
- }
-
- /**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
*/
@@ -1238,7 +1221,7 @@
return new PdContentWidth(propertyFullName, attributeValue);
}
case COUNTRY: {
- return new PdCountry(propertyFullName, attributeValue);
+ return new PdCountry(attributeValue);
}
case CUE: {
return new PdCue(propertyFullName, attributeValue);
@@ -1397,7 +1380,7 @@
return new PdKeepWithPrevious(propertyFullName, attributeValue);
}
case LANGUAGE: {
- return new PdLanguage(propertyFullName, attributeValue);
+ return new PdLanguage(attributeValue);
}
case LAST_LINE_END_INDENT: {
return new PdLastLineEndIndent(propertyFullName, attributeValue);
@@ -1652,7 +1635,7 @@
return new PdScoreSpaces(propertyFullName, attributeValue);
}
case SCRIPT: {
- return new PdScript(propertyFullName, attributeValue);
+ return new PdScript(attributeValue);
}
case SHOW_DESTINATION: {
return new PdShowDestination(propertyFullName, attributeValue);
Modified: 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/PdCountry.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -56,12 +56,10 @@
/**
* Constructor.
- * @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdCountry(final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdCountry(final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdLanguage.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLanguage.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -55,12 +55,10 @@
/**
* Constructor.
- * @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdLanguage(final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdLanguage(final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdScript.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScript.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -61,11 +61,10 @@
/**
* Constructor.
- * @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdScript(final String propertyFullName, final String attributeValue) throws PropertyException {
+ public PdScript(final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -34,7 +34,6 @@
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.PropertyList;
-import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
@@ -71,11 +70,7 @@
@Override
public Property parseAttributeForNS(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
- /*
- * Right now, all extension attributes are also attributes that are
- * handled by the FO namespace, so we just use those.
- */
- return NamespaceFo.getInstance().makeProperty(attributeName, attributeValue, creator);
+ return null;
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -72,8 +72,19 @@
@Override
public Property parseAttributeForNS(final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
- final Property property = makeProperty(attributeName, attributeValue);
- return property;
+ final String basePropertyName = Property.getBasePropertyName(attributeName);
+ final XmlPropertyId enumeration = enumeratePropertyName(basePropertyName);
+ if (enumeration == null) {
+ throw new PropertyException("Invalid property for xml namespace: " + attributeName);
+ }
+ switch (enumeration) {
+ case LANG: {
+ return new Lang(attributeValue);
+ }
+ default: {
+ return null;
+ }
+ }
}
/**
@@ -99,28 +110,4 @@
return XmlPropertyId.xmlValueOf(propertyName);
}
- /**
- * Makes a property in this namespace.
- * @param propertyFullName The unparsed property name.
- * @param attributeValue The unparsed property value.
- * @return The parsed Property instance.
- * @throws PropertyException For errors in the property or its value.
- */
- public Property makeProperty(final String propertyFullName, final String attributeValue)
- throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName(propertyFullName);
- final XmlPropertyId enumeration = enumeratePropertyName(basePropertyName);
- if (enumeration == null) {
- throw new PropertyException("Invalid property for xml namespace: " + propertyFullName);
- }
- switch (enumeration) {
- case LANG: {
- return new Lang(propertyFullName, attributeValue);
- }
- default: {
- return null;
- }
- }
- }
-
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -55,23 +55,20 @@
/**
* Constructor.
- * @param propertyFullName The full name of this property.
* @param attributeValue The parsed property value.
* @throws PropertyException For an invalid property value.
*/
- public Lang(final String propertyFullName, final String attributeValue) throws PropertyException {
- super();
- this.value = createPropertyValue(propertyFullName, attributeValue);
+ public Lang(final String attributeValue) throws PropertyException {
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the string property value into a parsed value.
- * @param propertyFullName The full name of this property.
* @param value The parsed property value.
* @return The parsed property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final String propertyFullName, final String value)
+ private PropertyValue createPropertyValue(final String value)
throws PropertyException {
final PropertyCollection collection = new PropertyCollection();
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
@@ -88,13 +85,13 @@
/* This logic assumes the attribute value is well-formed. */
final WritingSystem4a writingSystem = WritingSystem4a.find(value);
if (writingSystem.getLanguage() != null) {
- collection.addItem(new PdLanguage(propertyFullName, writingSystem.getLanguage().getAlpha3Code()));
+ collection.addItem(new PdLanguage(writingSystem.getLanguage().getAlpha3Code()));
}
if (writingSystem.getCountry() != null) {
- collection.addItem(new PdCountry(propertyFullName, writingSystem.getCountry().getAlpha3Code()));
+ collection.addItem(new PdCountry(writingSystem.getCountry().getAlpha3Code()));
}
if (writingSystem.getScript() != null) {
- collection.addItem(new PdScript(propertyFullName, writingSystem.getScript().getAlphaCode()));
+ collection.addItem(new PdScript(writingSystem.getScript().getAlphaCode()));
}
// // There are 2 properties which can be explicitly set
Modified: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CountryTests.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CountryTests.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CountryTests.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -40,7 +40,7 @@
@Override
protected PdCountry createProperty(final FoObj fobj,
final String attributeValue) throws PropertyException {
- final PdCountry property = new PdCountry("", attributeValue);
+ final PdCountry property = new PdCountry(attributeValue);
return property;
}
Modified: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LanguageTests.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LanguageTests.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LanguageTests.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -40,7 +40,7 @@
@Override
protected PdLanguage createProperty(final FoObj fobj,
final String attributeValue) throws PropertyException {
- final PdLanguage property = new PdLanguage("", attributeValue);
+ final PdLanguage property = new PdLanguage(attributeValue);
return property;
}
Modified: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScriptTests.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScriptTests.java 2022-12-24 17:00:21 UTC (rev 12944)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScriptTests.java 2022-12-24 17:41:05 UTC (rev 12945)
@@ -40,7 +40,7 @@
@Override
protected PdScript createProperty(final FoObj fobj,
final String attributeValue) throws PropertyException {
- final PdScript property = new PdScript("", attributeValue);
+ final PdScript property = new PdScript(attributeValue);
return property;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 17:00:24
|
Revision: 12944
http://sourceforge.net/p/foray/code/12944
Author: victormote
Date: 2022-12-24 17:00:21 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove unneeded parameter from API for parsing attributes/properties.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:42:35 UTC (rev 12943)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 17:00:21 UTC (rev 12944)
@@ -175,13 +175,12 @@
*/
public Property parseAttribute(final Attributes attributes, final String attributeName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
- final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, creator);
+ final Property property = parseAttributeForNS(attributeName, attributeValue, creator);
return property;
}
/**
* Parses one attribute in this namespace.
- * @param attributes The unparsed SAX attributes.
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
* @param creator The FO Tree creation context.
@@ -188,8 +187,8 @@
* @return The parsed property.
* @throws PropertyException For errors during parsing.
*/
- public abstract Property parseAttributeForNS(Attributes attributes, String attributeName, String attributeValue,
- FoTreeCreator creator) throws PropertyException;
+ public abstract Property parseAttributeForNS(String attributeName, String attributeValue, FoTreeCreator creator)
+ throws PropertyException;
/**
* Parses the attributes for an object in a pre-specified order, building the PropertyList from them.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:42:35 UTC (rev 12943)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 17:00:21 UTC (rev 12944)
@@ -42,7 +42,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
/**
@@ -70,8 +69,8 @@
}
@Override
- public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoTreeCreator creator) throws PropertyException {
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
return makeProperty(attributeName, attributeValue);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:42:35 UTC (rev 12943)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 17:00:21 UTC (rev 12944)
@@ -391,7 +391,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
/**
@@ -419,8 +418,8 @@
}
@Override
- public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoTreeCreator creator) throws PropertyException {
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue, creator);
checkNullProperty(property, attributeName, attributeValue);
return property;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:42:35 UTC (rev 12943)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 17:00:21 UTC (rev 12944)
@@ -39,7 +39,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
/**
@@ -70,8 +69,8 @@
}
@Override
- public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoTreeCreator creator) throws PropertyException {
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
/*
* Right now, all extension attributes are also attributes that are
* handled by the FO namespace, so we just use those.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:42:35 UTC (rev 12943)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 17:00:21 UTC (rev 12944)
@@ -39,7 +39,6 @@
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import javax.xml.XMLConstants;
@@ -71,8 +70,8 @@
}
@Override
- public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoTreeCreator creator) throws PropertyException {
+ public Property parseAttributeForNS(final String attributeName, final String attributeValue,
+ final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue);
return property;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 16:42:37
|
Revision: 12943
http://sourceforge.net/p/foray/code/12943
Author: victormote
Date: 2022-12-24 16:42:35 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Consolidate parseAttributes method into the superclass.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:29:26 UTC (rev 12942)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:42:35 UTC (rev 12943)
@@ -149,9 +149,21 @@
* @return The newly-created property list.
* @throws FoTreeException For errors during attribute/property parsing.
*/
- public abstract PropertyList parseAttributes(Attributes attlist, FoTreeCreator creator)
- throws FoTreeException;
+ public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator) throws FoTreeException {
+ if (attlist.getLength() < 1) {
+ return PropertyList.emptyPropertyList();
+ }
+ final int[] attributeSort = sortAttributes(attlist);
+ final PropertyList propertyList = new PropertyList(attlist.getLength());
+ try {
+ makeList(propertyList, attlist, attributeSort, creator);
+ } catch (final PropertyException e) {
+ throw new FoTreeException(e);
+ }
+ return propertyList;
+ }
+
/**
* Parses one attribute.
* @param attributes The unparsed SAX attributes.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:29:26 UTC (rev 12942)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:42:35 UTC (rev 12943)
@@ -70,19 +70,6 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
- throws FoTreeException {
- final int[] attributeSort = sortAttributes(attlist);
- final PropertyList propertyList = new PropertyList(attlist.getLength());
- try {
- makeList(propertyList, attlist, attributeSort, creator);
- } catch (final PropertyException e) {
- throw new FoTreeException(e);
- }
- return propertyList;
- }
-
- @Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
final String attributeValue, final FoTreeCreator creator) throws PropertyException {
return makeProperty(attributeName, attributeValue);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:29:26 UTC (rev 12942)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:42:35 UTC (rev 12943)
@@ -419,19 +419,6 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
- throws FoTreeException {
- final int[] attributeSort = sortAttributes(attlist);
- final PropertyList propertyList = new PropertyList(attlist.getLength());
- try {
- makeList(propertyList, attlist, attributeSort, creator);
- } catch (final PropertyException e) {
- throw new FoTreeException(e);
- }
- return propertyList;
- }
-
- @Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
final String attributeValue, final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue, creator);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:29:26 UTC (rev 12942)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:42:35 UTC (rev 12943)
@@ -70,19 +70,6 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
- throws FoTreeException {
- final int[] attributeSort = sortAttributes(attlist);
- final PropertyList propertyList = new PropertyList(attlist.getLength());
- try {
- makeList(propertyList, attlist, attributeSort, creator);
- } catch (final PropertyException e) {
- throw new FoTreeException(e);
- }
- return propertyList;
- }
-
- @Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
final String attributeValue, final FoTreeCreator creator) throws PropertyException {
/*
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:29:26 UTC (rev 12942)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:42:35 UTC (rev 12943)
@@ -71,12 +71,6 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator) {
- // This isn't needed for the xml: namespace.
- return PropertyList.emptyPropertyList();
- }
-
- @Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
final String attributeValue, final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 16:29:29
|
Revision: 12942
http://sourceforge.net/p/foray/code/12942
Author: victormote
Date: 2022-12-24 16:29:26 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove locator from API for attribute/property parsing.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -337,9 +337,9 @@
/*
* ******* IMPORTANT *******
* Parse the attributes/properties first, as they are independent of the elements/objects.
- * Parsing the properties is much easier and cleaner we just parse them first, and don't worry about any
+ * Parsing the properties is much easier and cleaner if we just parse them first, and don't worry about any
* validation tasks until we join them up with the object to which they will be attached. */
- final PropertyList list = nativeNamespace.parseAttributes(attlist, getLocator(), this);
+ final PropertyList list = nativeNamespace.parseAttributes(attlist, this);
/* Now parse the element/object itself. */
fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -145,12 +145,11 @@
/**
* Parse the attributes for an element in this namespace.
* @param attlist The unparsed SAX attributes.
- * @param locator The SAX locator.
* @param creator The FO Tree creation context.
* @return The newly-created property list.
* @throws FoTreeException For errors during attribute/property parsing.
*/
- public abstract PropertyList parseAttributes(Attributes attlist, Locator locator, FoTreeCreator creator)
+ public abstract PropertyList parseAttributes(Attributes attlist, FoTreeCreator creator)
throws FoTreeException;
/**
@@ -158,14 +157,13 @@
* @param attributes The unparsed SAX attributes.
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
- * @param locator The SAX locator.
* @param creator The FO Tree creation context.
* @return The parsed property.
* @throws PropertyException For errors during parsing.
*/
public Property parseAttribute(final Attributes attributes, final String attributeName, final String attributeValue,
- final Locator locator, final FoTreeCreator creator) throws PropertyException {
- final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, locator, creator);
+ final FoTreeCreator creator) throws PropertyException {
+ final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, creator);
return property;
}
@@ -174,13 +172,12 @@
* @param attributes The unparsed SAX attributes.
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
- * @param locator The SAX locator.
* @param creator The FO Tree creation context.
* @return The parsed property.
* @throws PropertyException For errors during parsing.
*/
public abstract Property parseAttributeForNS(Attributes attributes, String attributeName, String attributeValue,
- Locator locator, FoTreeCreator creator) throws PropertyException;
+ FoTreeCreator creator) throws PropertyException;
/**
* Parses the attributes for an object in a pre-specified order, building the PropertyList from them.
@@ -188,12 +185,11 @@
* @param attributes The unparsed SAX attributes.
* @param attributeSort The order in which the various attributes should be parsed, so that compound values are
* handled properly.
- * @param locator The SAX locator.
* @param creator The FO Tree creation context.
* @throws PropertyException For errors during parsing.
*/
protected void makeList(final PropertyList propertyList, final Attributes attributes, final int[] attributeSort,
- final Locator locator, final FoTreeCreator creator)
+ final FoTreeCreator creator)
throws PropertyException {
for (int j = 0; j < attributeSort.length; j++) {
/* We are reading through the attributes elements in attributeSort
@@ -229,7 +225,7 @@
if (namespace instanceof NamespaceNative) {
final NamespaceNative nativeNamespace = (NamespaceNative) namespace;
final Property property = nativeNamespace.parseAttribute(attributes, localName, attributeValue,
- locator, creator);
+ creator);
if (property != null) {
propertyList.addProperty(property);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -70,12 +70,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
+ public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, creator);
+ makeList(propertyList, attlist, attributeSort, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
@@ -84,8 +84,7 @@
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final Locator locator, final FoTreeCreator creator)
- throws PropertyException {
+ final String attributeValue, final FoTreeCreator creator) throws PropertyException {
return makeProperty(attributeName, attributeValue);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -419,12 +419,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
+ public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, creator);
+ makeList(propertyList, attlist, attributeSort, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
@@ -433,8 +433,7 @@
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final Locator locator, final FoTreeCreator creator)
- throws PropertyException {
+ final String attributeValue, final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue, creator);
checkNullProperty(property, attributeName, attributeValue);
return property;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -70,12 +70,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
+ public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, creator);
+ makeList(propertyList, attlist, attributeSort, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
@@ -84,8 +84,7 @@
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final Locator locator, final FoTreeCreator creator)
- throws PropertyException {
+ final String attributeValue, final FoTreeCreator creator) throws PropertyException {
/*
* Right now, all extension attributes are also attributes that are
* handled by the FO namespace, so we just use those.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:17:28 UTC (rev 12941)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:29:26 UTC (rev 12942)
@@ -71,7 +71,7 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator) {
+ public PropertyList parseAttributes(final Attributes attlist, final FoTreeCreator creator) {
// This isn't needed for the xml: namespace.
return PropertyList.emptyPropertyList();
}
@@ -78,8 +78,7 @@
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final Locator locator, final FoTreeCreator creator)
- throws PropertyException {
+ final String attributeValue, final FoTreeCreator creator) throws PropertyException {
final Property property = makeProperty(attributeName, attributeValue);
return property;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 16:17:31
|
Revision: 12941
http://sourceforge.net/p/foray/code/12941
Author: victormote
Date: 2022-12-24 16:17:28 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove the FoTreeParser from process of parsing attributes/properties.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -339,7 +339,7 @@
* Parse the attributes/properties first, as they are independent of the elements/objects.
* Parsing the properties is much easier and cleaner we just parse them first, and don't worry about any
* validation tasks until we join them up with the object to which they will be attached. */
- final PropertyList list = nativeNamespace.parseAttributes(attlist, getLocator(), this, this);
+ final PropertyList list = nativeNamespace.parseAttributes(attlist, getLocator(), this);
/* Now parse the element/object itself. */
fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -146,13 +146,12 @@
* Parse the attributes for an element in this namespace.
* @param attlist The unparsed SAX attributes.
* @param locator The SAX locator.
- * @param builder The FOTree builder.
* @param creator The FO Tree creation context.
* @return The newly-created property list.
* @throws FoTreeException For errors during attribute/property parsing.
*/
- public abstract PropertyList parseAttributes(Attributes attlist, Locator locator,
- FoTreeParser4a builder, FoTreeCreator creator) throws FoTreeException;
+ public abstract PropertyList parseAttributes(Attributes attlist, Locator locator, FoTreeCreator creator)
+ throws FoTreeException;
/**
* Parses one attribute.
@@ -160,14 +159,12 @@
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
* @param locator The SAX locator.
- * @param builder The FOTree builder.
* @param creator The FO Tree creation context.
* @return The parsed property.
* @throws PropertyException For errors during parsing.
*/
public Property parseAttribute(final Attributes attributes, final String attributeName, final String attributeValue,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
- throws PropertyException {
+ final Locator locator, final FoTreeCreator creator) throws PropertyException {
final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, locator, creator);
return property;
}
@@ -192,12 +189,11 @@
* @param attributeSort The order in which the various attributes should be parsed, so that compound values are
* handled properly.
* @param locator The SAX locator.
- * @param builder The FO Tree builder.
* @param creator The FO Tree creation context.
* @throws PropertyException For errors during parsing.
*/
protected void makeList(final PropertyList propertyList, final Attributes attributes, final int[] attributeSort,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
+ final Locator locator, final FoTreeCreator creator)
throws PropertyException {
for (int j = 0; j < attributeSort.length; j++) {
/* We are reading through the attributes elements in attributeSort
@@ -233,7 +229,7 @@
if (namespace instanceof NamespaceNative) {
final NamespaceNative nativeNamespace = (NamespaceNative) namespace;
final Property property = nativeNamespace.parseAttribute(attributes, localName, attributeValue,
- locator, builder, creator);
+ locator, creator);
if (property != null) {
propertyList.addProperty(property);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -30,7 +30,6 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.FoTreeParser4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -71,12 +70,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
- final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
+ throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -30,7 +30,6 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.FoTreeParser4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -420,12 +419,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
- final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
+ throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -30,7 +30,6 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.FoTreeParser4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -71,13 +70,12 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
- final FoTreeParser4a builder, final FoTreeCreator creator)
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
- makeList(propertyList, attlist, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:04:17 UTC (rev 12940)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 16:17:28 UTC (rev 12941)
@@ -30,7 +30,6 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.FoTree4a;
-import org.foray.fotree.FoTreeParser4a;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
@@ -72,8 +71,7 @@
}
@Override
- public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
- final FoTreeParser4a builder, final FoTreeCreator creator) {
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator, final FoTreeCreator creator) {
// This isn't needed for the xml: namespace.
return PropertyList.emptyPropertyList();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 16:04:20
|
Revision: 12940
http://sourceforge.net/p/foray/code/12940
Author: victormote
Date: 2022-12-24 16:04:17 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Clean up some more namespace-related code.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 15:28:34 UTC (rev 12939)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 16:04:17 UTC (rev 12940)
@@ -288,7 +288,7 @@
this.proxyParser.startElement(namespaceURI, localName, rawName, attlist);
return;
}
- final Namespace namespace = getTreeServer().getNamespace(namespaceURI);
+ final Namespace namespace = Namespace.getNamespace(namespaceURI);
if (namespace == null) {
final String message = "Unregistered namespace: " + namespaceURI + ": " +
getShortLocationString(getLocator());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 15:28:34 UTC (rev 12939)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 16:04:17 UTC (rev 12940)
@@ -28,22 +28,11 @@
package org.foray.fotree;
-import org.foray.common.ClassService;
-import org.foray.fotree.axsl.NamespaceAxsl;
-import org.foray.fotree.fo.NamespaceFo;
-import org.foray.fotree.foray.NamespaceForay;
-import org.foray.fotree.foreign.NamespaceMath;
-import org.foray.fotree.foreign.NamespaceSvg;
-import org.foray.fotree.xml.NamespaceXml;
-
import org.axsl.fotree.FoTreeFactory;
import org.axsl.fotree.text.FoOrthographyServer;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* The top-level object in the FOTree implementation.
@@ -58,11 +47,6 @@
/** The list of URLs in which resources should be searched. */
private List<URL> resourceSearchPath;
- /** Map whose key is a String of the namespace URI, and whose value is
- * a Namespace instance that knows how to parse items in that namespace. */
- private Map<String, Namespace> namespaceMap
- = new HashMap<String, Namespace>();
-
/**
* Constructor.
* @param orthographyServer The hyphenation server.
@@ -71,79 +55,8 @@
public FoTreeServer4a(final FoOrthographyServer orthographyServer, final List<URL> resourceSearchPath) {
this.orthographyServer = orthographyServer;
this.resourceSearchPath = resourceSearchPath;
- setupNamespaces();
}
- /**
- * Creates and registers the standard Namespace instances and those custom
- * namespaces that are embedded.
- */
- private void setupNamespaces() {
- // Register the standard Namespaces.
- registerNamespace(NamespaceFo.getInstance());
- registerNamespace(NamespaceXml.getInstance());
- registerNamespace(NamespaceSvg.getInstance());
- registerNamespace(NamespaceMath.getInstance());
- registerNamespace(NamespaceForay.getInstance());
- registerNamespace(NamespaceAxsl.getInstance());
-
- // Register custom embedded Namespaces from available services
- final List<String> providers = ClassService.providers(org.foray.fotree.Namespace.class);
- if (providers != null) {
- for (String str : providers) {
- try {
- final Namespace ns = createNonstandardNamespace(str);
- registerNamespace(ns);
- } catch (final IllegalArgumentException e) { }
- }
- }
- }
-
- /**
- * Add a Namespace instance to the list of namespaces that we should be able to parse.
- * @param namespace A Namespace instance to be added.
- */
- public void registerNamespace(final Namespace namespace) {
- this.namespaceMap.put(namespace.getNamespaceURI(), namespace);
- }
-
- /**
- * Returns the namespace for a given name.
- * @param namespaceURI The namespace URI for which a namespace is needed.
- * @return The namespace instance.
- */
- public Namespace getNamespace(final String namespaceURI) {
- return this.namespaceMap.get(namespaceURI);
- }
-
- /**
- * Creates a Namespace instance for the given class name.
- * @param mappingClassName The name of the Namespace subclass for which
- * an instance should be created.
- * @return The namespace instance.
- */
- public Namespace createNonstandardNamespace(final String mappingClassName) {
- try {
- return (Namespace) Class.forName(mappingClassName).getDeclaredConstructor().newInstance();
- } catch (final ClassNotFoundException e) {
- throw new IllegalArgumentException("Could not find "
- + mappingClassName);
- } catch (final InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate "
- + mappingClassName);
- } catch (final IllegalAccessException e) {
- throw new IllegalArgumentException("Could not access "
- + mappingClassName);
- } catch (final ClassCastException e) {
- throw new IllegalArgumentException(mappingClassName
- + " is not an ElementMapping");
- } catch (final InvocationTargetException e) {
- throw new IllegalArgumentException(e);
- } catch (final NoSuchMethodException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
@Override
public FoTreeParser4a createFoTreeParser() {
final FoTreeParser4a foTreeBuilder = new FoTreeParser4a(this, null);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2022-12-24 15:28:34 UTC (rev 12939)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2022-12-24 16:04:17 UTC (rev 12940)
@@ -56,6 +56,22 @@
}
/**
+ * Finds the {@link Namespace} instance for a given namespace URI.
+ * @param namespaceUri The URI for which a namespace is needed.
+ * @return The namespace matching {@code namespaceUri}, or null if none is found.
+ */
+ public static Namespace getNamespace(final String namespaceUri) {
+ if (namespaceUri == null) {
+ return null;
+ }
+ final Namespace namespace = NamespaceNative.getNamespaceNative(namespaceUri);
+ if (namespace != null) {
+ return namespace;
+ }
+ return NamespaceForeign.getNamespaceForeign(namespaceUri);
+ }
+
+ /**
* Returns the URI for this namespace.
* @return URI for this namespace.
*/
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2022-12-24 15:28:34 UTC (rev 12939)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2022-12-24 16:04:17 UTC (rev 12940)
@@ -28,16 +28,42 @@
package org.foray.fotree;
+import org.foray.fotree.foreign.NamespaceMath;
+import org.foray.fotree.foreign.NamespaceSvg;
import org.foray.xml.Sax2DomParser;
+import org.axsl.constants.XmlConstants;
+
+import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Abstract superclass for {@link Namespace} instances whose members are parsed as foreign objects in the FO tree.
*/
public abstract class NamespaceForeign extends Namespace {
+ /** Map whose key is a String of the namespace URI, and whose value is
+ * a Namespace instance that knows how to parse items in that namespace. */
+ private static Map<String, NamespaceForeign> namespaceMap = new HashMap<String, NamespaceForeign>();
+
+ static {
+ namespaceMap.put(XmlConstants.SVG_NS_URI, NamespaceSvg.getInstance());
+ namespaceMap.put(XmlConstants.MATHML_NS_URI, NamespaceMath.getInstance());
+ }
+
/**
+ * Finds the {@link NamespaceForeign} instance for a given namespace URI.
+ * @param namespaceUri The URI for which a foreign namespace is needed.
+ * @return The foreign namespace matching {@code namespaceUri}, or null if none is found.
+ */
+ public static NamespaceForeign getNamespaceForeign(final String namespaceUri) {
+ return namespaceMap.get(namespaceUri);
+ }
+
+ /**
* Create a DOM {@link Document} instance.
* @return The newly-created {@link Document} instance for this namespace.
*/
@@ -56,4 +82,18 @@
return parser;
}
+ /**
+ * Registers a foreign namespace for use by the FO tree parser.
+ * @param namespaceUri The URI of the namespace to be registered.
+ * @param namespace The namespace instance to be used to process elements and attributes in the {@code namespaceUri}
+ * namespace.
+ */
+ public static void registerForeignNamespace(final String namespaceUri, final NamespaceForeign namespace) {
+ if (namespaceMap.containsKey(namespaceUri)) {
+ LogFactory.getLog(NamespaceForeign.class).warn(
+ "Custom namespace processor registered for namespace: " + namespaceUri);
+ }
+ namespaceMap.put(namespaceUri, namespace);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 15:28:37
|
Revision: 12939
http://sourceforge.net/p/foray/code/12939
Author: victormote
Date: 2022-12-24 15:28:34 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove some duplicate namespace-related code.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.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/fo/obj/AbstractFlow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFolioDescriptor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractIndexFormatting.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractTablePart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Bookmark4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ColorProfile4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Float4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.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/obj/Leader4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListBlock4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItem4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemBody4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemLabel4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Marker4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiCase4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiProperties4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiPropertySet4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiSwitch4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiToggle4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequence4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequenceMaster4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequenceWrapper4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Region4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RegionNameSpecifier4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RepeatablePmAlternatives4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RepeatablePmReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RetrieveMarker4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RetrieveTableMarker4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Root4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ScalingValueCitation4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/SimplePageMaster4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/SinglePageMasterReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableAndCaption4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCaption4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableCell4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableColumn4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/TableRow4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Title4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Wrapper4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.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-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -702,7 +702,7 @@
* Gets the Namespace instance that is associated with this object.
* @return The Namespace instance that is associated with this object.
*/
- public abstract Namespace getNamespace();
+ public abstract NamespaceNative getNamespace();
/**
* Returns the left margin of this object.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -28,7 +28,6 @@
package org.foray.fotree;
-import org.foray.fotree.fo.NamespaceFo;
import org.foray.fotree.fo.obj.Root4a;
import org.axsl.fotree.FoTree;
@@ -116,14 +115,6 @@
}
/**
- * Return the FO namespace instance.
- * @return The FO namespace instance.
- */
- public NamespaceFo getFONamespace() {
- return getTreeServer().getFONamespace();
- }
-
- /**
* Indicates whether we wish to preserve the raw FO Tree content so that it can be round-tripped.
* Setting this value to true will generally increase the amount of memory consumed, the amount of processing time
* consumed, or both.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -63,9 +63,6 @@
private Map<String, Namespace> namespaceMap
= new HashMap<String, Namespace>();
- /** The "FO" namespace. */
- private NamespaceFo namespaceFO;
-
/**
* Constructor.
* @param orthographyServer The hyphenation server.
@@ -84,16 +81,10 @@
private void setupNamespaces() {
// Register the standard Namespaces.
registerNamespace(NamespaceFo.getInstance());
- this.namespaceFO = NamespaceFo.getInstance();
-
registerNamespace(NamespaceXml.getInstance());
-
registerNamespace(NamespaceSvg.getInstance());
-
- this.registerNamespace(NamespaceMath.getInstance());
-
+ registerNamespace(NamespaceMath.getInstance());
registerNamespace(NamespaceForay.getInstance());
-
registerNamespace(NamespaceAxsl.getInstance());
// Register custom embedded Namespaces from available services
@@ -126,14 +117,6 @@
}
/**
- * Returns the namespace used for "FO" items.
- * @return The namespace used for "FO" items.
- */
- public NamespaceFo getFONamespace() {
- return this.namespaceFO;
- }
-
- /**
* Creates a Namespace instance for the given class name.
* @param mappingClassName The name of the Namespace subclass for which
* an instance should be created.
Modified: 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/obj/Metadata4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,7 +29,7 @@
package org.foray.fotree.axsl.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyList;
import org.foray.fotree.axsl.AxslPropertyId;
@@ -117,7 +117,7 @@
}
@Override
- public Namespace getNamespace() {
+ public NamespaceNative getNamespace() {
return NamespaceAxsl.getInstance();
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFlow.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFlow.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
@@ -99,8 +100,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFolioDescriptor.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFolioDescriptor.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractFolioDescriptor.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerInline;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -85,8 +86,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractIndexFormatting.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractIndexFormatting.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractIndexFormatting.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerInline;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -87,8 +88,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractPageReference.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
@@ -98,8 +99,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractTablePart.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractTablePart.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractTablePart.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
@@ -169,8 +170,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BasicLink4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerComplex;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -106,8 +107,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BidiOverride4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerComplex;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -90,8 +91,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerComplex;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -103,8 +104,8 @@
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockContainer4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -107,8 +108,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Bookmark4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Bookmark4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Bookmark4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -151,8 +152,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerTextOnly;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.foray.primitive.StringUtils;
import org.axsl.fotree.FoContext;
@@ -101,8 +102,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTree4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -105,8 +106,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarBegin4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -93,8 +94,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ChangeBarEnd4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -93,8 +94,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -32,8 +32,9 @@
import org.foray.common.i18n.Language4a;
import org.foray.common.i18n.Script4a;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -104,8 +105,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
// @Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ColorProfile4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ColorProfile4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ColorProfile4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -92,8 +93,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -232,8 +233,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Declarations4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,9 +29,10 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
import org.foray.fotree.axsl.obj.Metadata4a;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -128,8 +129,7 @@
/* The only sanctioned content is (color-profile)*, but content from
* other namespaces is permitted. */
for (FoObj node : this.getChildren()) {
- if (node.getNamespace()
- == this.getFoTree().getFONamespace()) {
+ if (node.getNamespace() == NamespaceFo.getInstance()) {
if (node instanceof ColorProfile4a) {
/* The content is valid. */
} else {
@@ -149,8 +149,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -89,8 +90,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Float4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Float4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Float4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -94,8 +95,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowAssignment4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -98,8 +99,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowMap4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowNameSpecifier4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -93,8 +94,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowSourceList4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -97,8 +98,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FlowTargetList4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -97,8 +98,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,9 +30,10 @@
import org.foray.common.primitive.UnicodeCharUtils;
import org.foray.common.primitive.XmlCharacterUtils;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.FoValue;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.fo.FoText;
@@ -82,8 +83,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Footnote4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -104,8 +105,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FootnoteBody4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexKeyReference4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexPageCitationList4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeBegin4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/IndexRangeEnd4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -94,8 +95,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InitialPropertySet4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Inline4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerComplex;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -88,8 +89,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InlineContainer4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.ForeignXml;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -98,8 +99,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: 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/obj/LayoutMasterSet4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/LayoutMasterSet4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,11 +29,12 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.FoPropertyId;
+import org.foray.fotree.fo.NamespaceFo;
import org.foray.fotree.fo.prop.PdFlowNameReference;
import org.foray.fotree.fo.prop.PdRegionNameReference;
@@ -254,8 +255,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Leader4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Leader4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Leader4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -30,8 +30,9 @@
import org.foray.fotree.FoContainerInline;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListBlock4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListBlock4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListBlock4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -99,8 +100,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItem4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItem4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItem4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -115,8 +116,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemBody4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemBody4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemBody4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemLabel4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemLabel4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ListItemLabel4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Marker4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Marker4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Marker4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -32,8 +32,9 @@
import org.foray.common.data.OrderedTreeNode;
import org.foray.fotree.FoContainerComplex;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -136,8 +137,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiCase4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiCase4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiCase4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiProperties4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiProperties4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiProperties4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiPropertySet4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiPropertySet4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiPropertySet4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -92,8 +93,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiSwitch4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiSwitch4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiSwitch4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -95,8 +96,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiToggle4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiToggle4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/MultiToggle4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -96,8 +97,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequence4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequence4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequence4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
@@ -204,8 +205,8 @@
}
@Override
- public Namespace getNamespace() {
- return this.getFoTree().getFONamespace();
+ public NamespaceNative getNamespace() {
+ return NamespaceFo.getInstance();
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequenceMaster4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequenceMaster4a.java 2022-12-24 14:56:04 UTC (rev 12938)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/PageSequenceMaster4a.java 2022-12-24 15:28:34 UTC (rev 12939)
@@ -29,8 +29,9 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.Namespace;
+import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
+import org.foray.fotree.fo.NamespaceFo;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
@@ -119,8 +120,8 @@
}
@Override
- public Namespace getNamespace() {
- ...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-24 14:56:06
|
Revision: 12938
http://sourceforge.net/p/foray/code/12938
Author: victormote
Date: 2022-12-24 14:56:04 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove some duplicate namespace-related code.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.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/foreign/InstreamMathElement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -28,13 +28,8 @@
package org.foray.fotree;
-import org.foray.fotree.axsl.NamespaceAxsl;
import org.foray.fotree.fo.NamespaceFo;
import org.foray.fotree.fo.obj.Root4a;
-import org.foray.fotree.foray.NamespaceForay;
-import org.foray.fotree.foreign.NamespaceMath;
-import org.foray.fotree.foreign.NamespaceSvg;
-import org.foray.fotree.xml.NamespaceXml;
import org.axsl.fotree.FoTree;
import org.axsl.fotree.text.FoOrthographyServer;
@@ -129,46 +124,6 @@
}
/**
- * Return the Extension namespace instance.
- * @return The Extension namespace instance.
- */
- public NamespaceForay getForayNamespace() {
- return getTreeServer().getForayNamespace();
- }
-
- /**
- * Return the SVG namespace instance.
- * @return The SVG namespace instance.
- */
- public NamespaceSvg getSVGNamespace() {
- return getTreeServer().getSVGNamespace();
- }
-
- /**
- * Return the MathML namespace instance.
- * @return The MathML namespace instance.
- */
- public NamespaceMath getMathNamespace() {
- return getTreeServer().getMathNamespace();
- }
-
- /**
- * Return the XML namespace instance.
- * @return The XML namespace instance.
- */
- public NamespaceXml getXMLNamespace() {
- return getTreeServer().getXMLNamespace();
- }
-
- /**
- * Returns the aXSL namespace instance.
- * @return The aXSL namespace instance.
- */
- public NamespaceAxsl getAxslNamespace() {
- return getTreeServer().getAxslNamespace();
- }
-
- /**
* Indicates whether we wish to preserve the raw FO Tree content so that it can be round-tripped.
* Setting this value to true will generally increase the amount of memory consumed, the amount of processing time
* consumed, or both.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -334,7 +334,11 @@
}
}
- /* Parse the attributes/properties first, as they are independent of the elements/objects. */
+ /*
+ * ******* IMPORTANT *******
+ * Parse the attributes/properties first, as they are independent of the elements/objects.
+ * Parsing the properties is much easier and cleaner we just parse them first, and don't worry about any
+ * validation tasks until we join them up with the object to which they will be attached. */
final PropertyList list = nativeNamespace.parseAttributes(attlist, getLocator(), this, this);
/* Now parse the element/object itself. */
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -66,21 +66,6 @@
/** The "FO" namespace. */
private NamespaceFo namespaceFO;
- /** The namespace to use for "foray" items. */
- private NamespaceForay namespaceForay;
-
- /** The namespace to use for "axsl" items. */
- private NamespaceAxsl namespaceAxsl;
-
- /** The "SVG" namespace. */
- private NamespaceSvg namespaceSVG;
-
- /** The "MathML" namespace. */
- private NamespaceMath namespaceMath;
-
- /** The "XML namespace. */
- private NamespaceXml namespaceXML;
-
/**
* Constructor.
* @param orthographyServer The hyphenation server.
@@ -102,19 +87,14 @@
this.namespaceFO = NamespaceFo.getInstance();
registerNamespace(NamespaceXml.getInstance());
- this.namespaceXML = NamespaceXml.getInstance();
registerNamespace(NamespaceSvg.getInstance());
- this.namespaceSVG = NamespaceSvg.getInstance();
this.registerNamespace(NamespaceMath.getInstance());
- this.namespaceMath = NamespaceMath.getInstance();
registerNamespace(NamespaceForay.getInstance());
- this.namespaceForay = NamespaceForay.getInstance();
registerNamespace(NamespaceAxsl.getInstance());
- this.namespaceAxsl = NamespaceAxsl.getInstance();
// Register custom embedded Namespaces from available services
final List<String> providers = ClassService.providers(org.foray.fotree.Namespace.class);
@@ -154,46 +134,6 @@
}
/**
- * Returns the namespace used for extension items.
- * @return The namespace used for extension items.
- */
- public NamespaceForay getForayNamespace() {
- return this.namespaceForay;
- }
-
- /**
- * Returns the namespace used for "SVG" items.
- * @return The namespace used for "SVG" items.
- */
- public NamespaceSvg getSVGNamespace() {
- return this.namespaceSVG;
- }
-
- /**
- * Returns the namespace used for "MathML" items.
- * @return The namespace used for "MathML" items.
- */
- public NamespaceMath getMathNamespace() {
- return this.namespaceMath;
- }
-
- /**
- * Returns the namespace used for "XML" items.
- * @return The namespace used for "XML" items.
- */
- public NamespaceXml getXMLNamespace() {
- return this.namespaceXML;
- }
-
- /**
- * Returns the namespace used for "axsl" items.
- * @return The namespace used for "axsl" items.
- */
- public NamespaceAxsl getAxslNamespace() {
- return this.namespaceAxsl;
- }
-
- /**
* Creates a Namespace instance for the given class name.
* @param mappingClassName The name of the Namespace subclass for which
* an instance should be created.
Modified: 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/obj/Metadata4a.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -34,6 +34,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.axsl.AxslPropertyId;
import org.foray.fotree.axsl.AxslValue;
+import org.foray.fotree.axsl.NamespaceAxsl;
import org.foray.fotree.axsl.prop.AxslEnumerated;
import org.foray.fotree.fo.obj.Declarations4a;
import org.foray.fotree.fo.obj.FoText4a;
@@ -117,7 +118,7 @@
@Override
public Namespace getNamespace() {
- return this.getFoTree().getAxslNamespace();
+ return NamespaceAxsl.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -54,7 +54,7 @@
@Override
public Namespace getNamespace() {
- return this.getFoTree().getMathNamespace();
+ return NamespaceMath.getInstance();
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java 2022-12-24 14:35:28 UTC (rev 12937)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java 2022-12-24 14:56:04 UTC (rev 12938)
@@ -54,7 +54,7 @@
@Override
public Namespace getNamespace() {
- return this.getFoTree().getSVGNamespace();
+ return NamespaceSvg.getInstance();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 14:35:30
|
Revision: 12937
http://sourceforge.net/p/foray/code/12937
Author: victormote
Date: 2022-12-24 14:35:28 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Resolve attribute namespaces better.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 13:45:58 UTC (rev 12936)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTree4a.java 2022-12-24 14:35:28 UTC (rev 12937)
@@ -47,9 +47,6 @@
*/
public class FoTree4a implements FoTree {
- /** The namespace URI for FOray extensions to XSL-FO, whose typical prefix is "foray:". */
- public static final String FORAY_NS_URI = "http://org.foray/fo-extensions/2004";
-
/** The parent server. */
private FoTreeServer4a treeServer;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 13:45:58 UTC (rev 12936)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 14:35:28 UTC (rev 12937)
@@ -28,6 +28,12 @@
package org.foray.fotree;
+import org.foray.fotree.axsl.NamespaceAxsl;
+import org.foray.fotree.fo.NamespaceFo;
+import org.foray.fotree.foray.NamespaceForay;
+import org.foray.fotree.xml.NamespaceXml;
+
+import org.axsl.constants.XmlConstants;
import org.axsl.fotree.FoTreeCreator;
import org.axsl.fotree.FoTreeException;
@@ -40,6 +46,24 @@
public abstract class NamespaceNative extends Namespace {
/**
+ * Finds the {@link NamespaceNative} instance for a given namespace URI.
+ * @param namespaceUri The URI for which a native namespace is needed.
+ * @return The native namespace matching {@code namespaceUri}, or null if none is found.
+ */
+ public static NamespaceNative getNamespaceNative(final String namespaceUri) {
+ if (namespaceUri == null) {
+ return null;
+ }
+ switch(namespaceUri) {
+ case XmlConstants.XSLFO_NS_URI: return NamespaceFo.getInstance();
+ case javax.xml.XMLConstants.XML_NS_URI: return NamespaceXml.getInstance();
+ case XmlConstants.AXSL_NS_URI: return NamespaceAxsl.getInstance();
+ case NamespaceForay.FORAY_NS_URI: return NamespaceForay.getInstance();
+ default: return null;
+ }
+ }
+
+ /**
* Parse an element in this namespace.
* @param foTree The parent FO Tree.
* @param localName The local name of the element.
@@ -192,9 +216,9 @@
* parser & ignored by us. */
continue;
}
- final FoTreeServer4a treeServer = builder.getTreeServer();
final String namespaceURI = attributes.getURI(i);
- Namespace namespace = null;
+
+ NamespaceNative namespace = null;
if (namespaceURI == null
|| "".equals(namespaceURI)) {
/* If no namespace is specified on the attribute, use the
@@ -201,7 +225,7 @@
* namespace from the element. */
namespace = this;
} else {
- namespace = treeServer.getNamespace(namespaceURI);
+ namespace = NamespaceNative.getNamespaceNative(namespaceURI);
}
if (namespace == null) {
throw new PropertyException("Unknown namespace: " + namespaceURI);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 13:45:58 UTC (rev 12936)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 14:35:28 UTC (rev 12937)
@@ -48,6 +48,9 @@
*/
public final class NamespaceForay extends NamespaceNative {
+ /** The namespace URI for FOray extensions to XSL-FO, whose typical prefix is "foray:". */
+ public static final String FORAY_NS_URI = "http://org.foray/fo-extensions/2004";
+
/** The singleton instance. */
private static NamespaceForay theInstance;
@@ -58,7 +61,7 @@
@Override
public String getNamespaceURI() {
- return FoTree4a.FORAY_NS_URI;
+ return FORAY_NS_URI;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 13:46:01
|
Revision: 12936
http://sourceforge.net/p/foray/code/12936
Author: victormote
Date: 2022-12-24 13:45:58 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Simplify parsing of attributes/properties.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -334,12 +334,10 @@
}
}
-
/* Parse the attributes/properties first, as they are independent of the elements/objects. */
- final PropertyList list = nativeNamespace.createNewPropertyList(attlist);
- nativeNamespace.parseAttributes(list, attlist, getLocator(), this, this);
+ final PropertyList list = nativeNamespace.parseAttributes(attlist, getLocator(), this, this);
-
+ /* Now parse the element/object itself. */
fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
if (getLocator() != null) {
final Locator locator = getLocator();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -119,23 +119,16 @@
}
/**
- * Return a newly-created appropriate PropertyList for this namespace.
- * @param attlist The attributes that will become the properties in the list.
- * @return The newly-created property list.
- */
- protected abstract PropertyList createNewPropertyList(Attributes attlist);
-
- /**
* Parse the attributes for an element in this namespace.
- * @param list The property list into which the parsed values should be placed.
* @param attlist The unparsed SAX attributes.
* @param locator The SAX locator.
* @param builder The FOTree builder.
* @param creator The FO Tree creation context.
+ * @return The newly-created property list.
* @throws FoTreeException For errors during attribute/property parsing.
*/
- public abstract void parseAttributes(PropertyList list, Attributes attlist, Locator locator, FoTreeParser4a builder,
- FoTreeCreator creator) throws FoTreeException;
+ public abstract PropertyList parseAttributes(Attributes attlist, Locator locator,
+ FoTreeParser4a builder, FoTreeCreator creator) throws FoTreeException;
/**
* Parses one attribute.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -71,14 +71,16 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
+ final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
+ return propertyList;
}
@Override
@@ -88,11 +90,6 @@
return makeProperty(attributeName, attributeValue);
}
- @Override
- protected PropertyList createNewPropertyList(final Attributes attlist) {
- return new PropertyList(attlist.getLength());
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -420,14 +420,16 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
+ final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
+ return propertyList;
}
@Override
@@ -439,11 +441,6 @@
return property;
}
- @Override
- protected PropertyList createNewPropertyList(final Attributes attlist) {
- return new PropertyList(attlist.getLength());
- }
-
/**
* Checks the created property, throwing an exception if it is null.
* @param property The property to be checked.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -68,15 +68,17 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
final FoTreeParser4a builder, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
+ final PropertyList propertyList = new PropertyList(attlist.getLength());
try {
makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
throw new FoTreeException(e);
}
+ return propertyList;
}
@Override
@@ -90,11 +92,6 @@
return NamespaceFo.getInstance().makeProperty(attributeName, attributeValue, creator);
}
- @Override
- protected PropertyList createNewPropertyList(final Attributes attlist) {
- return new PropertyList(attlist.getLength());
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 13:33:58 UTC (rev 12935)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 13:45:58 UTC (rev 12936)
@@ -72,10 +72,10 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ public PropertyList parseAttributes(final Attributes attlist, final Locator locator,
final FoTreeParser4a builder, final FoTreeCreator creator) {
// This isn't needed for the xml: namespace.
- return;
+ return PropertyList.emptyPropertyList();
}
@Override
@@ -86,11 +86,6 @@
return property;
}
- @Override
- protected PropertyList createNewPropertyList(final Attributes attlist) {
- return new PropertyList(attlist.getLength());
- }
-
/**
* Returns the singleton instance of this class.
* @return The singleton instance of this class.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 13:34:00
|
Revision: 12935
http://sourceforge.net/p/foray/code/12935
Author: victormote
Date: 2022-12-24 13:33:58 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Parse the attributes/properties before the elements/objects.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 01:10:27 UTC (rev 12934)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 13:33:58 UTC (rev 12935)
@@ -312,9 +312,13 @@
}
}
+ /* Foreign namespaces have already either processed or thrown an exception. The only thing that should be left
+ * is native namespaces. */
NamespaceNative nativeNamespace = null;
if (namespace instanceof NamespaceNative) {
nativeNamespace = (NamespaceNative) namespace;
+ } else {
+ throw new IllegalStateException("Namespace must be native at this location.");
}
@@ -324,12 +328,18 @@
/* Before creating the new object, allow an existing FoObjMixed to capture any text that has accumulated, so
* that the text will be a sibling of the new object. */
finalizeText();
- final PropertyList list = nativeNamespace.createNewPropertyList(attlist);
if (this.currentFObj == null) {
if (! "root".equals(localName)) {
throw new SAXException("fo:root must be first element parsed");
}
}
+
+
+ /* Parse the attributes/properties first, as they are independent of the elements/objects. */
+ final PropertyList list = nativeNamespace.createNewPropertyList(attlist);
+ nativeNamespace.parseAttributes(list, attlist, getLocator(), this, this);
+
+
fobj = nativeNamespace.parseElement(this.foTree, localName, this.currentFObj, list, getLocator(), this);
if (getLocator() != null) {
final Locator locator = getLocator();
@@ -336,9 +346,6 @@
fobj.setLocation(locator.getSystemId(), locator.getLineNumber(), locator.getColumnNumber());
}
fobj.validateAncestry();
- if (nativeNamespace != null) {
- nativeNamespace.parseAttributes(list, attlist, getLocator(), this, this);
- }
fobj.validatePropertyTypes();
fobj.validatePropertyValues();
fobj.validateProperties();
@@ -350,6 +357,9 @@
/* Give the fobj a chance to do some validation and/or setup before
* the children are processed. */
fobj.setup();
+
+
+
checkRoot(fobj);
// Let Root register an "id", if any.
this.rootFObj.addId(fobj);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 01:10:30
|
Revision: 12934
http://sourceforge.net/p/foray/code/12934
Author: victormote
Date: 2022-12-24 01:10:27 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.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/NamespaceAxsl.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/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -337,7 +337,7 @@
}
fobj.validateAncestry();
if (nativeNamespace != null) {
- nativeNamespace.parseAttributes(list, attlist, fobj, getLocator(), this, this);
+ nativeNamespace.parseAttributes(list, attlist, getLocator(), this, this);
}
fobj.validatePropertyTypes();
fobj.validatePropertyValues();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -129,14 +129,13 @@
* Parse the attributes for an element in this namespace.
* @param list The property list into which the parsed values should be placed.
* @param attlist The unparsed SAX attributes.
- * @param currentFObj The FoObj instance to whom the attributes belong.
* @param locator The SAX locator.
* @param builder The FOTree builder.
* @param creator The FO Tree creation context.
* @throws FoTreeException For errors during attribute/property parsing.
*/
- public abstract void parseAttributes(PropertyList list, Attributes attlist, FoObj currentFObj, Locator locator,
- FoTreeParser4a builder, FoTreeCreator creator) throws FoTreeException;
+ public abstract void parseAttributes(PropertyList list, Attributes attlist, Locator locator, FoTreeParser4a builder,
+ FoTreeCreator creator) throws FoTreeException;
/**
* Parses one attribute.
@@ -143,7 +142,6 @@
* @param attributes The unparsed SAX attributes.
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
- * @param fobj The FoObj to which the properties belong.
* @param locator The SAX locator.
* @param builder The FOTree builder.
* @param creator The FO Tree creation context.
@@ -151,10 +149,9 @@
* @throws PropertyException For errors during parsing.
*/
public Property parseAttribute(final Attributes attributes, final String attributeName, final String attributeValue,
- final FoObj fobj, final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
+ final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
throws PropertyException {
- final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, fobj, locator,
- creator);
+ final Property property = parseAttributeForNS(attributes, attributeName, attributeValue, locator, creator);
return property;
}
@@ -163,7 +160,6 @@
* @param attributes The unparsed SAX attributes.
* @param attributeName The name of the attribute to be parsed.
* @param attributeValue The value of the attribute to be parsed.
- * @param fobj The FoObj to which the properties belongs.
* @param locator The SAX locator.
* @param creator The FO Tree creation context.
* @return The parsed property.
@@ -170,13 +166,12 @@
* @throws PropertyException For errors during parsing.
*/
public abstract Property parseAttributeForNS(Attributes attributes, String attributeName, String attributeValue,
- FoObj fobj, Locator locator, FoTreeCreator creator) throws PropertyException;
+ Locator locator, FoTreeCreator creator) throws PropertyException;
/**
* Parses the attributes for an object in a pre-specified order, building the PropertyList from them.
* @param propertyList The property list into which the parsed values should be placed.
* @param attributes The unparsed SAX attributes.
- * @param parentFO The parent FO.
* @param attributeSort The order in which the various attributes should be parsed, so that compound values are
* handled properly.
* @param locator The SAX locator.
@@ -184,8 +179,8 @@
* @param creator The FO Tree creation context.
* @throws PropertyException For errors during parsing.
*/
- protected void makeList(final PropertyList propertyList, final Attributes attributes, final FoObj parentFO,
- final int[] attributeSort, final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
+ protected void makeList(final PropertyList propertyList, final Attributes attributes, final int[] attributeSort,
+ final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
throws PropertyException {
for (int j = 0; j < attributeSort.length; j++) {
/* We are reading through the attributes elements in attributeSort
@@ -221,7 +216,7 @@
if (namespace instanceof NamespaceNative) {
final NamespaceNative nativeNamespace = (NamespaceNative) namespace;
final Property property = nativeNamespace.parseAttribute(attributes, localName, attributeValue,
- parentFO, locator, builder, creator);
+ locator, builder, creator);
if (property != null) {
propertyList.addProperty(property);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -28,7 +28,6 @@
package org.foray.fotree.axsl;
-import org.foray.fotree.FoObj;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.parse.PropertyParser;
@@ -47,13 +46,11 @@
/**
* Handles the standard parsing of a property value.
- * @param fobj The FoObj to which this property belongs.
* @param rawPropertyValue String containing the raw property value.l
* @return The PropertyValue instance created by the parser.
* @throws PropertyException If the input is inconsistent.
*/
- protected PropertyValue standardParse(final FoObj fobj,
- final String rawPropertyValue) throws PropertyException {
+ protected PropertyValue standardParse(final String rawPropertyValue) throws PropertyException {
PropertyValue pv = checkKeywords(getValidKeywords(), rawPropertyValue);
if (pv != null) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -71,21 +71,21 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final FoObj currentFObj,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
+ public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
try {
- makeList(propertyList, attlist, currentFObj, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
- currentFObj.throwException(e.getMessage());
+ throw new FoTreeException(e);
}
}
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoObj fobj, final Locator locator, final FoTreeCreator creator)
+ final String attributeValue, final Locator locator, final FoTreeCreator creator)
throws PropertyException {
- return makeProperty(attributeName, attributeValue, fobj);
+ return makeProperty(attributeName, attributeValue);
}
@Override
@@ -144,24 +144,19 @@
* Makes a property in this namespace.
* @param propertyFullName The unparsed property name.
* @param attributeValue The unparsed property value.
- * @param fobj The FoObj to which this property belongs.
* @return The parsed Property instance.
* @throws PropertyException For errors in the property or its value.
*/
- public Property makeProperty(final String propertyFullName, final String attributeValue, final FoObj fobj)
+ public Property makeProperty(final String propertyFullName, final String attributeValue)
throws PropertyException {
final String basePropertyName = Property.getBasePropertyName(propertyFullName);
final AxslPropertyId enumeration = enumeratePropertyName(basePropertyName);
- final Property property = checkCompoundProperty(fobj, enumeration, propertyFullName, attributeValue);
- if (property != null) {
- return property;
- }
if (enumeration == null) {
throw new PropertyException("Invalid property for axsl namespace: " + propertyFullName);
}
switch (enumeration) {
case METADATA_KEY: {
- return new MetadataKey(fobj, propertyFullName, attributeValue);
+ return new MetadataKey(propertyFullName, attributeValue);
}
default: {
return null;
@@ -169,25 +164,4 @@
}
}
- /**
- * Checks to see if the property has already been created.
- * If it has, and if it is a compound property, sets the value for this component.
- * @param fobj The FoObj to which this property belongs.
- * @param enumeration The parsed property type.
- * @param propertyFullName The full unparsed name of the property.
- * @param attributeValue The unparsed property value.
- * @return The parsed property.
- * @throws PropertyException For errors in the property or its value.
- */
- private Property checkCompoundProperty(final FoObj fobj, final AxslPropertyId enumeration,
- final String propertyFullName, final String attributeValue) throws PropertyException {
- if (enumeration == null) {
- return null;
- }
- switch (enumeration) {
- default:
- return null;
- }
- }
-
}
Modified: 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/AxslEnumerated.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/AxslEnumerated.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -48,27 +48,22 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AxslEnumerated(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ public AxslEnumerated(final String propertyFullName, final String attributeValue) throws PropertyException {
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
+ final PropertyValue pv = standardParse(value);
if (pv instanceof AxslPropertyKeyword) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/prop/MetadataKey.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -28,7 +28,6 @@
package org.foray.fotree.axsl.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.axsl.AxslPropertyId;
import org.foray.fotree.axsl.AxslValue;
@@ -48,15 +47,12 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public MetadataKey(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public MetadataKey(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -420,21 +420,21 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final FoObj currentFObj,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
+ public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ final FoTreeParser4a builder, final FoTreeCreator creator) throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
try {
- makeList(propertyList, attlist, currentFObj, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
- currentFObj.throwException(e.getMessage());
+ throw new FoTreeException(e);
}
}
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoObj fobj, final Locator locator, final FoTreeCreator creator)
+ final String attributeValue, final Locator locator, final FoTreeCreator creator)
throws PropertyException {
- final Property property = makeProperty(attributeName, attributeValue, fobj, creator);
+ final Property property = makeProperty(attributeName, attributeValue, creator);
checkNullProperty(property, attributeName, attributeValue);
return property;
}
@@ -994,12 +994,11 @@
* Makes a property in this namespace.
* @param propertyFullName The unparsed property name.
* @param attributeValue The unparsed property value.
- * @param fobj The FoObj to which this property belongs.
* @param creator The FO Tree creation context.
* @return The parsed Property instance.
* @throws PropertyException For errors in the property or its value.
*/
- public Property makeProperty(final String propertyFullName, final String attributeValue, final FoObj fobj,
+ public Property makeProperty(final String propertyFullName, final String attributeValue,
final FoTreeCreator creator) throws PropertyException {
final String basePropertyName = Property.getBasePropertyName(propertyFullName);
final FoPropertyId enumeration = enumeratePropertyName(basePropertyName);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -68,26 +68,26 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final FoObj currentFObj,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator)
+ public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ final FoTreeParser4a builder, final FoTreeCreator creator)
throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
try {
- makeList(propertyList, attlist, currentFObj, attributeSort, locator, builder, creator);
+ makeList(propertyList, attlist, attributeSort, locator, builder, creator);
} catch (final PropertyException e) {
- currentFObj.throwException(e.getMessage());
+ throw new FoTreeException(e);
}
}
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoObj fobj, final Locator locator, final FoTreeCreator creator)
+ final String attributeValue, final Locator locator, final FoTreeCreator creator)
throws PropertyException {
/*
* Right now, all extension attributes are also attributes that are
* handled by the FO namespace, so we just use those.
*/
- return NamespaceFo.getInstance().makeProperty(attributeName, attributeValue, fobj, creator);
+ return NamespaceFo.getInstance().makeProperty(attributeName, attributeValue, creator);
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -72,8 +72,8 @@
}
@Override
- public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final FoObj currentFObj,
- final Locator locator, final FoTreeParser4a builder, final FoTreeCreator creator) {
+ public void parseAttributes(final PropertyList propertyList, final Attributes attlist, final Locator locator,
+ final FoTreeParser4a builder, final FoTreeCreator creator) {
// This isn't needed for the xml: namespace.
return;
}
@@ -80,9 +80,9 @@
@Override
public Property parseAttributeForNS(final Attributes attributes, final String attributeName,
- final String attributeValue, final FoObj fobj, final Locator locator, final FoTreeCreator creator)
+ final String attributeValue, final Locator locator, final FoTreeCreator creator)
throws PropertyException {
- final Property property = makeProperty(attributeName, attributeValue, fobj);
+ final Property property = makeProperty(attributeName, attributeValue);
return property;
}
@@ -118,29 +118,19 @@
* Makes a property in this namespace.
* @param propertyFullName The unparsed property name.
* @param attributeValue The unparsed property value.
- * @param fobj The FoObj to which this property belongs.
* @return The parsed Property instance.
* @throws PropertyException For errors in the property or its value.
*/
- public Property makeProperty(final String propertyFullName,
- final String attributeValue, final FoObj fobj)
+ public Property makeProperty(final String propertyFullName, final String attributeValue)
throws PropertyException {
- final String basePropertyName = Property.getBasePropertyName(
- propertyFullName);
- final XmlPropertyId enumeration = enumeratePropertyName(
- basePropertyName);
- final Property property = checkCompoundProperty(fobj,
- enumeration, propertyFullName, attributeValue);
- if (property != null) {
- return property;
- }
+ final String basePropertyName = Property.getBasePropertyName(propertyFullName);
+ final XmlPropertyId enumeration = enumeratePropertyName(basePropertyName);
if (enumeration == null) {
- throw new PropertyException("Invalid property for xml namespace: "
- + propertyFullName);
+ throw new PropertyException("Invalid property for xml namespace: " + propertyFullName);
}
switch (enumeration) {
case LANG: {
- return new Lang(fobj, propertyFullName, attributeValue);
+ return new Lang(propertyFullName, attributeValue);
}
default: {
return null;
@@ -148,26 +138,4 @@
}
}
- /**
- * Checks to see if the property has already been created. If it has, and
- * if it is a compound property, sets the value for this component.
- * @param fobj The FoObj to which this property belongs.
- * @param enumeration The parsed property type.
- * @param propertyFullName The full unparsed name of the property.
- * @param attributeValue The unparsed property value.
- * @return The parsed property.
- * @throws PropertyException For errors in the property or its value.
- */
- private Property checkCompoundProperty(final FoObj fobj,
- final XmlPropertyId enumeration, final String propertyFullName,
- final String attributeValue) throws PropertyException {
- if (enumeration == null) {
- return null;
- }
- switch (enumeration) {
- default:
- return null;
- }
- }
-
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java 2022-12-24 00:48:06 UTC (rev 12933)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java 2022-12-24 01:10:27 UTC (rev 12934)
@@ -29,7 +29,6 @@
package org.foray.fotree.xml.prop;
import org.foray.common.i18n.WritingSystem4a;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
@@ -56,29 +55,23 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of this property.
* @param attributeValue The parsed property value.
* @throws PropertyException For an invalid property value.
*/
- public Lang(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public Lang(final String propertyFullName, final String attributeValue) throws PropertyException {
super();
- this.value = createPropertyValue(fobj, propertyFullName,
- attributeValue);
+ this.value = createPropertyValue(propertyFullName, attributeValue);
}
/**
* Converts the string property value into a parsed value.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of this property.
* @param value The parsed property value.
* @return The parsed property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String propertyFullName, final String value)
+ private PropertyValue createPropertyValue(final String propertyFullName, final String value)
throws PropertyException {
final PropertyCollection collection = new PropertyCollection();
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 00:48:09
|
Revision: 12933
http://sourceforge.net/p/foray/code/12933
Author: victormote
Date: 2022-12-24 00:48:06 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Unhook the prase-time shorthand property logic, and add TODO item to move it to evaluation-time logic.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 00:40:58 UTC (rev 12932)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 00:48:06 UTC (rev 12933)
@@ -1003,10 +1003,10 @@
final FoTreeCreator creator) throws PropertyException {
final String basePropertyName = Property.getBasePropertyName(propertyFullName);
final FoPropertyId enumeration = enumeratePropertyName(basePropertyName);
- final Property property = checkCompoundProperty(fobj, enumeration, propertyFullName, attributeValue);
- if (property != null) {
- return property;
- }
+// final Property property = checkCompoundProperty(fobj, enumeration, propertyFullName, attributeValue);
+// if (property != null) {
+// return property;
+// }
if (enumeration == null) {
throw new PropertyException("Invalid property for fo namespace: " + propertyFullName);
}
@@ -1830,6 +1830,13 @@
}
}
+
+ /* TODO: We think that the general logic in the following method should be done at evaluation-time instead of at
+ * parse-time.
+ * In other words, the properties should be stored as they were originally, but the relationships between shorthand
+ * properties and regular properties should be evaluated as they are used. */
+
+
/**
* Checks to see if the property has already been created. If it has, and
* if it is a compound property, sets the value for this component.
@@ -1840,7 +1847,7 @@
* @return The parsed property.
* @throws PropertyException For errors in the property or its value.
*/
- private Property checkCompoundProperty(
+ Property checkCompoundProperty(
final FoObj fobj, final FoPropertyId enumeration,
final String propertyFullName, final String attributeValue)
throws PropertyException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-24 00:41:03
|
Revision: 12932
http://sourceforge.net/p/foray/code/12932
Author: victormote
Date: 2022-12-24 00:40:58 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.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/AbstractAudioDial.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/AbstractRelativeSpace.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/xml/prop/Lang.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageBreakInsideTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageCitationStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageNumberTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PagePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PageWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PauseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PitchRangeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PitchTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PlayDuringTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStartsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RefIdTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RefIndexKeyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ReferenceOrientationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RegionNameReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RegionNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RelativeAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RelativePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RenderingIntentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveBoundaryTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveBoundaryWithinTableTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrieveClassNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrievePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RetrievePositionWithinTableTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RichnessTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RoleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RuleStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/RuleThicknessTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScaleOptionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScalingMethodTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScalingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScoreSpacesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ScriptTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ShowDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SourceDocumentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpaceAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpaceBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpaceEndTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpaceStartTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpanTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakHeaderTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakNumeralTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakPunctuationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SpeechRateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SrcTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartingStateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StartsRowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/StressTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SuppressAtLineBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/SwitchToTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableLayoutTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableOmitFooterAtBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TableOmitHeaderAtBreakTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetPresentationContextTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetProcessingContextTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TargetStylesheetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAlignLastTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextAltitudeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextDecorationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextDepthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextShadowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TextTransformTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TreatAsWordSpaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/UnicodeBidiTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VerticalAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VisibilityTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VoiceFamilyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/VolumeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceCollapseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WhiteSpaceTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WidowsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WordSpacingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WrapOptionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/WritingModeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ZindexTests.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -1552,277 +1552,277 @@
return new PdPaddingTop(propertyFullName, attributeValue);
}
case PAGE_BREAK_AFTER: {
- return new PdPageBreakAfter(fobj, propertyFullName, attributeValue);
+ return new PdPageBreakAfter(propertyFullName, attributeValue);
}
case PAGE_BREAK_BEFORE: {
- return new PdPageBreakBefore(fobj, propertyFullName, attributeValue);
+ return new PdPageBreakBefore(propertyFullName, attributeValue);
}
case PAGE_BREAK_INSIDE: {
- return new PdPageBreakInside(fobj, propertyFullName, attributeValue);
+ return new PdPageBreakInside(propertyFullName, attributeValue);
}
case PAGE_CITATION_STRATEGY: {
- return new PdPageCitationStrategy(fobj, propertyFullName, attributeValue);
+ return new PdPageCitationStrategy(propertyFullName, attributeValue);
}
case PAGE_HEIGHT: {
- return new PdPageHeight(fobj, propertyFullName, attributeValue);
+ return new PdPageHeight(propertyFullName, attributeValue);
}
case PAGE_NUMBER_TREATMENT: {
- return new PdPageNumberTreatment(fobj, propertyFullName, attributeValue);
+ return new PdPageNumberTreatment(propertyFullName, attributeValue);
}
case PAGE_POSITION: {
- return new PdPagePosition(fobj, propertyFullName, attributeValue);
+ return new PdPagePosition(propertyFullName, attributeValue);
}
case PAGE_WIDTH: {
- return new PdPageWidth(fobj, propertyFullName, attributeValue);
+ return new PdPageWidth(propertyFullName, attributeValue);
}
case PAUSE: {
- return new PdPause(fobj, propertyFullName, attributeValue);
+ return new PdPause(propertyFullName, attributeValue);
}
case PAUSE_AFTER: {
- return new PdPauseAfter(fobj, propertyFullName, attributeValue);
+ return new PdPauseAfter(propertyFullName, attributeValue);
}
case PAUSE_BEFORE: {
- return new PdPauseBefore(fobj, propertyFullName, attributeValue);
+ return new PdPauseBefore(propertyFullName, attributeValue);
}
case PITCH: {
- return new PdPitch(fobj, propertyFullName, attributeValue);
+ return new PdPitch(propertyFullName, attributeValue);
}
case PITCH_RANGE: {
- return new PdPitchRange(fobj, propertyFullName, attributeValue);
+ return new PdPitchRange(propertyFullName, attributeValue);
}
case PLAY_DURING: {
- return new PdPlayDuring(fobj, propertyFullName, attributeValue);
+ return new PdPlayDuring(propertyFullName, attributeValue);
}
case POSITION: {
- return new PdPosition(fobj, propertyFullName, attributeValue);
+ return new PdPosition(propertyFullName, attributeValue);
}
case PRECEDENCE: {
- return new PdPrecedence(fobj, propertyFullName, attributeValue);
+ return new PdPrecedence(propertyFullName, attributeValue);
}
case PROVISIONAL_DISTANCE_BETWEEN_STARTS: {
- return new PdProvisionalDistanceBetweenStarts(fobj, propertyFullName, attributeValue);
+ return new PdProvisionalDistanceBetweenStarts(propertyFullName, attributeValue);
}
case PROVISIONAL_LABEL_SEPARATION: {
- return new PdProvisionalLabelSeparation(fobj, propertyFullName, attributeValue);
+ return new PdProvisionalLabelSeparation(propertyFullName, attributeValue);
}
case REF_ID: {
- return new PdRefId(fobj, propertyFullName, attributeValue);
+ return new PdRefId(propertyFullName, attributeValue);
}
case REF_INDEX_KEY: {
- return new PdRefIndexKey(fobj, propertyFullName, attributeValue);
+ return new PdRefIndexKey(propertyFullName, attributeValue);
}
case REFERENCE_ORIENTATION: {
- return new PdReferenceOrientation(fobj, propertyFullName, attributeValue);
+ return new PdReferenceOrientation(propertyFullName, attributeValue);
}
case REGION_NAME: {
- return new PdRegionName(fobj, propertyFullName, attributeValue);
+ return new PdRegionName(propertyFullName, attributeValue);
}
case REGION_NAME_REFERENCE: {
- return new PdRegionNameReference(fobj, propertyFullName, attributeValue);
+ return new PdRegionNameReference(propertyFullName, attributeValue);
}
case RELATIVE_ALIGN: {
- return new PdRelativeAlign(fobj, propertyFullName, attributeValue);
+ return new PdRelativeAlign(propertyFullName, attributeValue);
}
case RELATIVE_POSITION: {
- return new PdRelativePosition(fobj, propertyFullName, attributeValue);
+ return new PdRelativePosition(propertyFullName, attributeValue);
}
case RENDERING_INTENT: {
- return new PdRenderingIntent(fobj, propertyFullName, attributeValue);
+ return new PdRenderingIntent(propertyFullName, attributeValue);
}
case RETRIEVE_BOUNDARY: {
- return new PdRetrieveBoundary(fobj, propertyFullName, attributeValue);
+ return new PdRetrieveBoundary(propertyFullName, attributeValue);
}
case RETRIEVE_BOUNDARY_WITHIN_TABLE: {
- return new PdRetrieveBoundaryWithinTable(fobj, propertyFullName, attributeValue);
+ return new PdRetrieveBoundaryWithinTable(propertyFullName, attributeValue);
}
case RETRIEVE_CLASS_NAME: {
- return new PdRetrieveClassName(fobj, propertyFullName, attributeValue);
+ return new PdRetrieveClassName(propertyFullName, attributeValue);
}
case RETRIEVE_POSITION: {
- return new PdRetrievePosition(fobj, propertyFullName, attributeValue);
+ return new PdRetrievePosition(propertyFullName, attributeValue);
}
case RETRIEVE_POSITION_WITHIN_TABLE: {
- return new PdRetrievePositionWithinTable(fobj, propertyFullName, attributeValue);
+ return new PdRetrievePositionWithinTable(propertyFullName, attributeValue);
}
case RICHNESS: {
- return new PdRichness(fobj, propertyFullName, attributeValue);
+ return new PdRichness(propertyFullName, attributeValue);
}
case RIGHT: {
- return new PdRight(fobj, propertyFullName, attributeValue);
+ return new PdRight(propertyFullName, attributeValue);
}
case ROLE: {
- return new PdRole(fobj, propertyFullName, attributeValue, creator);
+ return new PdRole(propertyFullName, attributeValue, creator);
}
case RULE_STYLE: {
- return new PdRuleStyle(fobj, propertyFullName, attributeValue);
+ return new PdRuleStyle(propertyFullName, attributeValue);
}
case RULE_THICKNESS: {
- return new PdRuleThickness(fobj, propertyFullName, attributeValue);
+ return new PdRuleThickness(propertyFullName, attributeValue);
}
case SCALE_OPTION: {
- return new PdScaleOption(fobj, propertyFullName, attributeValue);
+ return new PdScaleOption(propertyFullName, attributeValue);
}
case SCALING: {
- return new PdScaling(fobj, propertyFullName, attributeValue);
+ return new PdScaling(propertyFullName, attributeValue);
}
case SCALING_METHOD: {
- return new PdScalingMethod(fobj, propertyFullName, attributeValue);
+ return new PdScalingMethod(propertyFullName, attributeValue);
}
case SCORE_SPACES: {
- return new PdScoreSpaces(fobj, propertyFullName, attributeValue);
+ return new PdScoreSpaces(propertyFullName, attributeValue);
}
case SCRIPT: {
- return new PdScript(fobj, propertyFullName, attributeValue);
+ return new PdScript(propertyFullName, attributeValue);
}
case SHOW_DESTINATION: {
- return new PdShowDestination(fobj, propertyFullName, attributeValue);
+ return new PdShowDestination(propertyFullName, attributeValue);
}
case SIZE: {
- return new PdSize(fobj, propertyFullName, attributeValue);
+ return new PdSize(propertyFullName, attributeValue);
}
case SOURCE_DOCUMENT: {
- return new PdSourceDocument(fobj, propertyFullName, attributeValue, creator);
+ return new PdSourceDocument(propertyFullName, attributeValue, creator);
}
case SPACE_AFTER: {
- return new PdSpaceAfter(fobj, propertyFullName, attributeValue);
+ return new PdSpaceAfter(propertyFullName, attributeValue);
}
case SPACE_BEFORE: {
- return new PdSpaceBefore(fobj, propertyFullName, attributeValue);
+ return new PdSpaceBefore(propertyFullName, attributeValue);
}
case SPACE_END: {
- return new PdSpaceEnd(fobj, propertyFullName, attributeValue);
+ return new PdSpaceEnd(propertyFullName, attributeValue);
}
case SPACE_START: {
- return new PdSpaceStart(fobj, propertyFullName, attributeValue);
+ return new PdSpaceStart(propertyFullName, attributeValue);
}
case SPAN: {
- return new PdSpan(fobj, propertyFullName, attributeValue);
+ return new PdSpan(propertyFullName, attributeValue);
}
case SPEAK: {
- return new PdSpeak(fobj, propertyFullName, attributeValue);
+ return new PdSpeak(propertyFullName, attributeValue);
}
case SPEAK_HEADER: {
- return new PdSpeakHeader(fobj, propertyFullName, attributeValue);
+ return new PdSpeakHeader(propertyFullName, attributeValue);
}
case SPEAK_NUMERAL: {
- return new PdSpeakNumeral(fobj, propertyFullName, attributeValue);
+ return new PdSpeakNumeral(propertyFullName, attributeValue);
}
case SPEAK_PUNCTUATION: {
- return new PdSpeakPunctuation(fobj, propertyFullName, attributeValue);
+ return new PdSpeakPunctuation(propertyFullName, attributeValue);
}
case SPEECH_RATE: {
- return new PdSpeechRate(fobj, propertyFullName, attributeValue);
+ return new PdSpeechRate(propertyFullName, attributeValue);
}
case SRC: {
- return new PdSrc(fobj, propertyFullName, attributeValue, creator);
+ return new PdSrc(propertyFullName, attributeValue, creator);
}
case START_INDENT: {
- return new PdStartIndent(fobj, propertyFullName, attributeValue);
+ return new PdStartIndent(propertyFullName, attributeValue);
}
case STARTING_STATE: {
- return new PdStartingState(fobj, propertyFullName, attributeValue);
+ return new PdStartingState(propertyFullName, attributeValue);
}
case STARTS_ROW: {
- return new PdStartsRow(fobj, propertyFullName, attributeValue);
+ return new PdStartsRow(propertyFullName, attributeValue);
}
case STRESS: {
- return new PdStress(fobj, propertyFullName, attributeValue);
+ return new PdStress(propertyFullName, attributeValue);
}
case SUPPRESS_AT_LINE_BREAK: {
- return new PdSuppressAtLineBreak(fobj, propertyFullName, attributeValue);
+ return new PdSuppressAtLineBreak(propertyFullName, attributeValue);
}
case SWITCH_TO: {
- return new PdSwitchTo(fobj, propertyFullName, attributeValue);
+ return new PdSwitchTo(propertyFullName, attributeValue);
}
case TABLE_LAYOUT: {
- return new PdTableLayout(fobj, propertyFullName, attributeValue);
+ return new PdTableLayout(propertyFullName, attributeValue);
}
case TABLE_OMIT_FOOTER_AT_BREAK: {
- return new PdTableOmitFooterAtBreak(fobj, propertyFullName, attributeValue);
+ return new PdTableOmitFooterAtBreak(propertyFullName, attributeValue);
}
case TABLE_OMIT_HEADER_AT_BREAK: {
- return new PdTableOmitHeaderAtBreak(fobj, propertyFullName, attributeValue);
+ return new PdTableOmitHeaderAtBreak(propertyFullName, attributeValue);
}
case TARGET_PRESENTATION_CONTEXT: {
- return new PdTargetPresentationContext(fobj, propertyFullName, attributeValue, creator);
+ return new PdTargetPresentationContext(propertyFullName, attributeValue, creator);
}
case TARGET_PROCESSING_CONTEXT: {
- return new PdTargetProcessingContext(fobj, propertyFullName, attributeValue, creator);
+ return new PdTargetProcessingContext(propertyFullName, attributeValue, creator);
}
case TARGET_STYLESHEET: {
- return new PdTargetStylesheet(fobj, propertyFullName, attributeValue, creator);
+ return new PdTargetStylesheet(propertyFullName, attributeValue, creator);
}
case TEXT_ALIGN: {
- return new PdTextAlign(fobj, propertyFullName, attributeValue);
+ return new PdTextAlign(propertyFullName, attributeValue);
}
case TEXT_ALIGN_LAST: {
- return new PdTextAlignLast(fobj, propertyFullName, attributeValue);
+ return new PdTextAlignLast(propertyFullName, attributeValue);
}
case TEXT_ALTITUDE: {
- return new PdTextAltitude(fobj, propertyFullName, attributeValue);
+ return new PdTextAltitude(propertyFullName, attributeValue);
}
case TEXT_DECORATION: {
- return new PdTextDecoration(fobj, propertyFullName, attributeValue);
+ return new PdTextDecoration(propertyFullName, attributeValue);
}
case TEXT_DEPTH: {
- return new PdTextDepth(fobj, propertyFullName, attributeValue);
+ return new PdTextDepth(propertyFullName, attributeValue);
}
case TEXT_INDENT: {
- return new PdTextIndent(fobj, propertyFullName, attributeValue);
+ return new PdTextIndent(propertyFullName, attributeValue);
}
case TEXT_SHADOW: {
- return new PdTextShadow(fobj, propertyFullName, attributeValue);
+ return new PdTextShadow(propertyFullName, attributeValue);
}
case TEXT_TRANSFORM: {
- return new PdTextTransform(fobj, propertyFullName, attributeValue);
+ return new PdTextTransform(propertyFullName, attributeValue);
}
case TOP: {
- return new PdTop(fobj, propertyFullName, attributeValue);
+ return new PdTop(propertyFullName, attributeValue);
}
case TREAT_AS_WORD_SPACE: {
- return new PdTreatAsWordSpace(fobj, propertyFullName, attributeValue);
+ return new PdTreatAsWordSpace(propertyFullName, attributeValue);
}
case UNICODE_BIDI: {
- return new PdUnicodeBidi(fobj, propertyFullName, attributeValue);
+ return new PdUnicodeBidi(propertyFullName, attributeValue);
}
case VERTICAL_ALIGN: {
- return new PdVerticalAlign(fobj, propertyFullName, attributeValue);
+ return new PdVerticalAlign(propertyFullName, attributeValue);
}
case VISIBILITY: {
- return new PdVisibility(fobj, propertyFullName, attributeValue);
+ return new PdVisibility(propertyFullName, attributeValue);
}
case VOICE_FAMILY: {
- return new PdVoiceFamily(fobj, propertyFullName, attributeValue);
+ return new PdVoiceFamily(propertyFullName, attributeValue);
}
case VOLUME: {
- return new PdVolume(fobj, propertyFullName, attributeValue);
+ return new PdVolume(propertyFullName, attributeValue);
}
case WHITE_SPACE: {
- return new PdWhiteSpace(fobj, propertyFullName, attributeValue);
+ return new PdWhiteSpace(propertyFullName, attributeValue);
}
case WHITE_SPACE_COLLAPSE: {
- return new PdWhiteSpaceCollapse(fobj, propertyFullName, attributeValue);
+ return new PdWhiteSpaceCollapse(propertyFullName, attributeValue);
}
case WHITE_SPACE_TREATMENT: {
- return new PdWhiteSpaceTreatment(fobj, propertyFullName, attributeValue);
+ return new PdWhiteSpaceTreatment(propertyFullName, attributeValue);
}
case WIDOWS: {
- return new PdWidows(fobj, propertyFullName, attributeValue);
+ return new PdWidows(propertyFullName, attributeValue);
}
case WIDTH: {
- return new PdWidth(fobj, propertyFullName, attributeValue);
+ return new PdWidth(propertyFullName, attributeValue);
}
case WORD_SPACING: {
- return new PdWordSpacing(fobj, propertyFullName, attributeValue);
+ return new PdWordSpacing(propertyFullName, attributeValue);
}
case WRAP_OPTION: {
- return new PdWrapOption(fobj, propertyFullName, attributeValue);
+ return new PdWrapOption(propertyFullName, attributeValue);
}
case WRITING_MODE: {
- return new PdWritingMode(fobj, propertyFullName, attributeValue);
+ return new PdWritingMode(propertyFullName, attributeValue);
}
case Z_INDEX: {
- return new PdZindex(fobj, propertyFullName, attributeValue);
+ return new PdZindex(propertyFullName, attributeValue);
}
default: {
return null;
Modified: 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/obj/LayoutMasterSet4a.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/LayoutMasterSet4a.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -404,8 +404,8 @@
final RegionNameSpecifier4a regionNameSpecifier = new RegionNameSpecifier4a(
targetList, propertyList);
targetList.addChild(regionNameSpecifier);
- property = new PdRegionNameReference(regionNameSpecifier,
- FoPropertyId.REGION_NAME_REFERENCE.toXslFo(), impliedName);
+ property = new PdRegionNameReference(FoPropertyId.REGION_NAME_REFERENCE.toXslFo(),
+ impliedName);
propertyList.addProperty(property);
}
Modified: 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/AbstractAudioDial.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -61,26 +61,21 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractAudioDial(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ public AbstractAudioDial(final String propertyFullName, final String attributeValue) throws PropertyException {
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/AbstractPageDimension.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPageDimension.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -56,26 +56,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractPageDimension(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractPageDimension(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/AbstractPause.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -59,19 +59,16 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractPause(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public AbstractPause(final String propertyFullName, final String attributeValue) throws PropertyException {
if (this.getPropertyType() == FoPropertyId.PAUSE) {
- this.value = createShorthandValue(fobj, attributeValue);
+ this.value = createShorthandValue(attributeValue);
return;
}
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
@@ -85,13 +82,11 @@
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
@@ -108,13 +103,11 @@
/**
* Converts the unparsed property value into its parsed, storable value for
* the case where this property is a shorthand.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createShorthandValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createShorthandValue(final String value) throws PropertyException {
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
if (pv != null) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -60,33 +60,27 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractRelativeSpace(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractRelativeSpace(final String propertyFullName, final String attributeValue)
throws PropertyException {
- final String subPropertyName = Property.getSubPropertyName(
- propertyFullName);
+ final String subPropertyName = Property.getSubPropertyName(propertyFullName);
if (subPropertyName == null) {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
return;
}
- this.value = createPropertyValueSpace(fobj, attributeValue,
- subPropertyName, propertyFullName);
+ this.value = createPropertyValueSpace(attributeValue, subPropertyName, propertyFullName);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
@@ -111,7 +105,6 @@
/**
* Creates the property value when it is a "space" value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @param subPropertyName The sub-property portion of the property name.
* @param propertyFullName The full property name.
@@ -118,12 +111,9 @@
* @return The parsed property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValueSpace(
- final FoObj fobj,
- final String value, final String subPropertyName,
+ private PropertyValue createPropertyValueSpace(final String value, final String subPropertyName,
final String propertyFullName) throws PropertyException {
- final DtSpace spaceDT = createOrAddSpace(null, fobj, value,
- subPropertyName, propertyFullName);
+ final DtSpace spaceDT = createOrAddSpace(null, value, subPropertyName, propertyFullName);
if (spaceDT != null) {
return spaceDT;
}
@@ -342,8 +332,8 @@
DtSpace spaceDT = (DtSpace) value();
final String subPropertyName = Property.getSubPropertyName(
propertyFullName);
- spaceDT = createOrAddSpace(spaceDT, fobj, attributeValue,
- subPropertyName, propertyFullName);
+ spaceDT = createOrAddSpace(spaceDT, attributeValue, subPropertyName,
+ propertyFullName);
return true;
}
@@ -352,7 +342,6 @@
* to it.
* @param inputSpaceDT The existing Space object. If it is null, it will be
* created.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed attribute value.
* @param subPropertyName The subproperty portion of the property name.
* @param propertyFullName The full name of the property.
@@ -359,9 +348,7 @@
* @return The space object that was created or updated.
* @throws PropertyException For an invalid property value.
*/
- private DtSpace createOrAddSpace(final DtSpace inputSpaceDT,
- final FoObj fobj,
- final String value, final String subPropertyName,
+ private DtSpace createOrAddSpace(final DtSpace inputSpaceDT, final String value, final String subPropertyName,
final String propertyFullName) throws PropertyException {
DtSpace spaceDT = inputSpaceDT;
if (spaceDT == null) {
Modified: 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/PdPageBreakAfter.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakAfter.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -57,14 +57,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageBreakAfter(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdPageBreakAfter(final String propertyFullName, final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPageBreakBefore.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakBefore.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -57,14 +57,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageBreakBefore(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdPageBreakBefore(final String propertyFullName, final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPageBreakInside.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakInside.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -54,14 +54,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageBreakInside(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdPageBreakInside(final String propertyFullName, final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPageCitationStrategy.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageCitationStrategy.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
@@ -53,13 +52,11 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageCitationStrategy(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdPageCitationStrategy(final String propertyFullName, final String attributeValue)
throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPageHeight.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageHeight.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -42,15 +41,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageHeight(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public PdPageHeight(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdPageNumberTreatment.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageNumberTreatment.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
@@ -51,13 +50,11 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageNumberTreatment(final FoObj fobj, final String propertyFullName,
- final String attributeValue) throws PropertyException {
+ public PdPageNumberTreatment(final String propertyFullName, final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPagePosition.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPagePosition.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -57,14 +57,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPagePosition(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
+ public PdPagePosition(final String propertyFullName, final String attributeValue) throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdPageWidth.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageWidth.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -42,15 +41,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPageWidth(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public PdPageWidth(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdPause.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPause.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.value.PropertyValue;
@@ -41,15 +40,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPause(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public PdPause(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
/**
Modified: 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/PdPauseAfter.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPauseAfter.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -40,15 +39,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdPauseAfter(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public PdPauseAfter(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdPauseBefore.java 2022-12-23 23:44:44 UTC (rev 12931)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPauseBefore.java 2022-12-24 00:40:58 UTC (rev 12932)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -40,15 +39,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attrib...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-23 23:44:51
|
Revision: 12931
http://sourceforge.net/p/foray/code/12931
Author: victormote
Date: 2022-12-23 23:44:44 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.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/AbstractAbsoluteDimension.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/AbstractCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.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/AbstractGlyphOrientation.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/AbstractMergeIndex.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractName.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/AbstractString.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/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/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/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/PdRefIndexKey.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/PdRetrieveClassName.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/PdStartIndent.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/PdWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.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/fo/prop/BorderSeparationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderSpacingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStartWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTopWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BreakAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BreakBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaptionSideTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaseNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CaseTitleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarClassTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarOffsetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarPlacementTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ChangeBarWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CharacterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ClearTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ClipTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColorProfileNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnGapTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnNumberTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ColumnWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentTypeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ContentWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CountryTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/CueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DestinationPlacementOffsetTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DirectionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/DisplayAlignTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ElevationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EmptyCellsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EndIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/EndsRowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ExtentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ExternalDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FloatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowMapNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowMapReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowNameReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FlowNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontFamilyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSelectionStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSizeAdjustTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontSizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontStretchTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontVariantTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FontWeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ForcePageCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/FormatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GlyphOrientationHorizontalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GlyphOrientationVerticalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GroupingSeparatorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/GroupingSizeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationCharacterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationKeepTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationLadderCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationPushCharacterCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/HyphenationRemainCharacterCountTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IdTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndexClassTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndexKeyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IndicateDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InitialPageNumberTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InlineProgressionDimensionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/InternalDestinationTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IntrinsicScaleValueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/IntrusionDisplaceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/KeepTogetherTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/KeepWithNextTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/KeepWithPreviousTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LanguageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LastLineEndIndentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderAlignmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderLengthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderPatternTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeaderPatternWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LetterSpacingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LetterValueTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LineHeightShiftAdjustmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LineHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LineStackingStrategyTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/LinefeedTreatmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarginTopTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MarkerClassNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MasterNameTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MasterReferenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaxHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaxWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MaximumRepeatsTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MediaUsageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergePagesAcrossIndexKeyReferencesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergeRangesAcrossIndexKeyReferencesTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MergeSequentialPageNumbersTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MinHeightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/MinWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberColumnsRepeatedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberColumnsSpannedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/NumberRowsSpannedTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OddOrEvenTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OrphansTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/OverflowTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingAfterTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingBeforeTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingEndTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingStartTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/PaddingTopTests.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-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -480,7 +480,26 @@
}
}
+ /**
+ * Checks each property value for validity when applied to this object.
+ * This is useful mostly at parse time, and mostly for functions that require specific ancestors.
+ * @throws FoTreeException If an property value attached to this object is not valid.
+ */
+ protected void validatePropertyTypes() throws FoTreeException {
+ final PropertyList properties = getPropertyList();
+ for (int index = 0; index < properties.qtyProperties(); index ++) {
+ final Property property = properties.getProperty(index);
+
+
+
+ if (! property.value().isValidForObject(this)) {
+ this.throwExceptionContentModelViolation();
+ }
+ }
+ }
+
+
/**
* A hook into the parsing process which allows the subclass instance to do some initialization-type work after all
* of the properties have been parsed, but before any of the children have been parsed.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -339,8 +339,9 @@
if (nativeNamespace != null) {
nativeNamespace.parseAttributes(list, attlist, fobj, getLocator(), this, this);
}
+ fobj.validatePropertyTypes();
+ fobj.validatePropertyValues();
fobj.validateProperties();
- fobj.validatePropertyValues();
/* If the parent is not null (which it can be for Root), register
* the newly-created object as a child of the parent. */
if (this.currentFObj != null) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java 2022-12-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -247,4 +247,14 @@
return (int) Math.round(numeric);
}
+ /**
+ * Indicates whether this property is valid when placed on a given formatting object.
+ * @param fobj The object being evaluated, usually the object to which this value's property is attached.
+ * @return True if and only if this property if valid on {@code fobj}.
+ * @see PropertyValue#isValidForObject(FoObj)
+ */
+ public boolean isValidForObject(final FoObj fobj) {
+ return true;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -1150,406 +1150,406 @@
return new PdBorderRightWidth(propertyFullName, attributeValue);
}
case BORDER_SEPARATION: {
- return new PdBorderSeparation(fobj, propertyFullName, attributeValue);
+ return new PdBorderSeparation(propertyFullName, attributeValue);
}
case BORDER_SPACING: {
- return new PdBorderSpacing(fobj, propertyFullName, attributeValue);
+ return new PdBorderSpacing(propertyFullName, attributeValue);
}
case BORDER_START_COLOR: {
- return new PdBorderStartColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderStartColor(propertyFullName, attributeValue);
}
case BORDER_START_PRECEDENCE: {
- return new PdBorderStartPrecedence(fobj, propertyFullName, attributeValue);
+ return new PdBorderStartPrecedence(propertyFullName, attributeValue);
}
case BORDER_START_STYLE: {
- return new PdBorderStartStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderStartStyle(propertyFullName, attributeValue);
}
case BORDER_START_WIDTH: {
- return new PdBorderStartWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderStartWidth(propertyFullName, attributeValue);
}
case BORDER_STYLE: {
return new PdBorderStyle(propertyFullName, attributeValue);
}
case BORDER_TOP: {
- return new PdBorderTop(fobj, propertyFullName, attributeValue);
+ return new PdBorderTop(propertyFullName, attributeValue);
}
case BORDER_TOP_COLOR: {
- return new PdBorderTopColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderTopColor(propertyFullName, attributeValue);
}
case BORDER_TOP_STYLE: {
- return new PdBorderTopStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderTopStyle(propertyFullName, attributeValue);
}
case BORDER_TOP_WIDTH: {
- return new PdBorderTopWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderTopWidth(propertyFullName, attributeValue);
}
case BORDER_WIDTH: {
return new PdBorderWidth(propertyFullName, attributeValue);
}
case BOTTOM: {
- return new PdBottom(fobj, propertyFullName, attributeValue);
+ return new PdBottom(propertyFullName, attributeValue);
}
case BREAK_AFTER: {
- return new PdBreakAfter(fobj, propertyFullName, attributeValue);
+ return new PdBreakAfter(propertyFullName, attributeValue);
}
case BREAK_BEFORE: {
- return new PdBreakBefore(fobj, propertyFullName, attributeValue);
+ return new PdBreakBefore(propertyFullName, attributeValue);
}
case CAPTION_SIDE: {
- return new PdCaptionSide(fobj, propertyFullName, attributeValue);
+ return new PdCaptionSide(propertyFullName, attributeValue);
}
case CASE_NAME: {
- return new PdCaseName(fobj, propertyFullName, attributeValue);
+ return new PdCaseName(propertyFullName, attributeValue);
}
case CASE_TITLE: {
- return new PdCaseTitle(fobj, propertyFullName, attributeValue);
+ return new PdCaseTitle(propertyFullName, attributeValue);
}
case CHANGE_BAR_CLASS: {
- return new PdChangeBarClass(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarClass(propertyFullName, attributeValue);
}
case CHANGE_BAR_COLOR: {
- return new PdChangeBarColor(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarColor(propertyFullName, attributeValue);
}
case CHANGE_BAR_OFFSET: {
- return new PdChangeBarOffset(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarOffset(propertyFullName, attributeValue);
}
case CHANGE_BAR_PLACEMENT: {
- return new PdChangeBarPlacement(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarPlacement(propertyFullName, attributeValue);
}
case CHANGE_BAR_STYLE: {
- return new PdChangeBarStyle(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarStyle(propertyFullName, attributeValue);
}
case CHANGE_BAR_WIDTH: {
- return new PdChangeBarWidth(fobj, propertyFullName, attributeValue);
+ return new PdChangeBarWidth(propertyFullName, attributeValue);
}
case CHARACTER: {
- return new org.foray.fotree.fo.prop.PdCharacter(fobj, propertyFullName, attributeValue);
+ return new org.foray.fotree.fo.prop.PdCharacter(propertyFullName, attributeValue);
}
case CLEAR: {
- return new PdClear(fobj, propertyFullName, attributeValue);
+ return new PdClear(propertyFullName, attributeValue);
}
case CLIP: {
- return new PdClip(fobj, propertyFullName, attributeValue);
+ return new PdClip(propertyFullName, attributeValue);
}
case COLOR: {
- return new PdColor(fobj, propertyFullName, attributeValue);
+ return new PdColor(propertyFullName, attributeValue);
}
case COLOR_PROFILE_NAME: {
- return new PdColorProfileName(fobj, propertyFullName, attributeValue);
+ return new PdColorProfileName(propertyFullName, attributeValue);
}
case COLUMN_COUNT: {
- return new PdColumnCount(fobj, propertyFullName, attributeValue);
+ return new PdColumnCount(propertyFullName, attributeValue);
}
case COLUMN_GAP: {
- return new PdColumnGap(fobj, propertyFullName, attributeValue);
+ return new PdColumnGap(propertyFullName, attributeValue);
}
case COLUMN_NUMBER: {
- return new PdColumnNumber(fobj, propertyFullName, attributeValue);
+ return new PdColumnNumber(propertyFullName, attributeValue);
}
case COLUMN_WIDTH: {
- return new PdColumnWidth(fobj, propertyFullName, attributeValue);
+ return new PdColumnWidth(propertyFullName, attributeValue);
}
case CONTENT_HEIGHT: {
- return new PdContentHeight(fobj, propertyFullName, attributeValue);
+ return new PdContentHeight(propertyFullName, attributeValue);
}
case CONTENT_TYPE: {
- return new PdContentType(fobj, propertyFullName, attributeValue);
+ return new PdContentType(propertyFullName, attributeValue);
}
case CONTENT_WIDTH: {
- return new PdContentWidth(fobj, propertyFullName, attributeValue);
+ return new PdContentWidth(propertyFullName, attributeValue);
}
case COUNTRY: {
- return new PdCountry(fobj, propertyFullName, attributeValue);
+ return new PdCountry(propertyFullName, attributeValue);
}
case CUE: {
- return new PdCue(fobj, propertyFullName, attributeValue);
+ return new PdCue(propertyFullName, attributeValue);
}
case CUE_AFTER: {
- return new PdCueAfter(fobj, propertyFullName, attributeValue);
+ return new PdCueAfter(propertyFullName, attributeValue);
}
case CUE_BEFORE: {
- return new PdCueBefore(fobj, propertyFullName, attributeValue);
+ return new PdCueBefore(propertyFullName, attributeValue);
}
case DESTINATION_PLACEMENT_OFFSET: {
- return new PdDestinationPlacementOffset(fobj, propertyFullName, attributeValue);
+ return new PdDestinationPlacementOffset(propertyFullName, attributeValue);
}
case DIRECTION: {
- return new PdDirection(fobj, propertyFullName, attributeValue);
+ return new PdDirection(propertyFullName, attributeValue);
}
case DISPLAY_ALIGN: {
- return new PdDisplayAlign(fobj, propertyFullName, attributeValue);
+ return new PdDisplayAlign(propertyFullName, attributeValue);
}
case DOMINANT_BASELINE: {
return PdDominantBaseline.getInstance(attributeValue);
}
case ELEVATION: {
- return new PdElevation(fobj, propertyFullName, attributeValue);
+ return new PdElevation(propertyFullName, attributeValue);
}
case EMPTY_CELLS: {
- return new PdEmptyCells(fobj, propertyFullName, attributeValue);
+ return new PdEmptyCells(propertyFullName, attributeValue);
}
case END_INDENT: {
- return new PdEndIndent(fobj, propertyFullName, attributeValue);
+ return new PdEndIndent(propertyFullName, attributeValue);
}
case ENDS_ROW: {
- return new PdEndsRow(fobj, propertyFullName, attributeValue);
+ return new PdEndsRow(propertyFullName, attributeValue);
}
case EXTENT: {
- return new PdExtent(fobj, propertyFullName, attributeValue);
+ return new PdExtent(propertyFullName, attributeValue);
}
case EXTERNAL_DESTINATION: {
- return new PdExternalDestination(fobj, propertyFullName, attributeValue, creator);
+ return new PdExternalDestination(propertyFullName, attributeValue, creator);
}
case FLOAT: {
- return new org.foray.fotree.fo.prop.PdFloat(fobj, propertyFullName, attributeValue);
+ return new org.foray.fotree.fo.prop.PdFloat(propertyFullName, attributeValue);
}
case FLOW_MAP_NAME: {
- return new PdFlowMapName(fobj, propertyFullName, attributeValue);
+ return new PdFlowMapName(propertyFullName, attributeValue);
}
case FLOW_MAP_REFERENCE: {
- return new PdFlowMapReference(fobj, propertyFullName, attributeValue);
+ return new PdFlowMapReference(propertyFullName, attributeValue);
}
case FLOW_NAME: {
- return new PdFlowName(fobj, propertyFullName, attributeValue);
+ return new PdFlowName(propertyFullName, attributeValue);
}
case FLOW_NAME_REFERENCE: {
- return new PdFlowNameReference(fobj, propertyFullName, attributeValue);
+ return new PdFlowNameReference(propertyFullName, attributeValue);
}
case FONT: {
- return new PdFont(fobj, propertyFullName, attributeValue);
+ return new PdFont(propertyFullName, attributeValue);
}
case FONT_FAMILY: {
- return new PdFontFamily(fobj, propertyFullName, attributeValue);
+ return new PdFontFamily(propertyFullName, attributeValue);
}
case FONT_SELECTION_STRATEGY: {
- return new PdFontSelectionStrategy(fobj, propertyFullName, attributeValue);
+ return new PdFontSelectionStrategy(propertyFullName, attributeValue);
}
case FONT_SIZE: {
- return new PdFontSize(fobj, propertyFullName, attributeValue);
+ return new PdFontSize(propertyFullName, attributeValue);
}
case FONT_SIZE_ADJUST: {
- return new PdFontSizeAdjust(fobj, propertyFullName, attributeValue);
+ return new PdFontSizeAdjust(propertyFullName, attributeValue);
}
case FONT_STRETCH: {
- return new PdFontStretch(fobj, propertyFullName, attributeValue);
+ return new PdFontStretch(propertyFullName, attributeValue);
}
case FONT_STYLE: {
- return new PdFontStyle(fobj, propertyFullName, attributeValue);
+ return new PdFontStyle(propertyFullName, attributeValue);
}
case FONT_VARIANT: {
- return new PdFontVariant(fobj, propertyFullName, attributeValue);
+ return new PdFontVariant(propertyFullName, attributeValue);
}
case FONT_WEIGHT: {
- return new PdFontWeight(fobj, propertyFullName, attributeValue);
+ return new PdFontWeight(propertyFullName, attributeValue);
}
case FORCE_PAGE_COUNT: {
- return new PdForcePageCount(fobj, propertyFullName, attributeValue);
+ return new PdForcePageCount(propertyFullName, attributeValue);
}
case FORMAT: {
- return new PdFormat(fobj, propertyFullName, attributeValue);
+ return new PdFormat(propertyFullName, attributeValue);
}
case GLYPH_ORIENTATION_HORIZONTAL: {
- return new PdGlyphOrientationHorizontal(fobj, propertyFullName, attributeValue);
+ return new PdGlyphOrientationHorizontal(propertyFullName, attributeValue);
}
case GLYPH_ORIENTATION_VERTICAL: {
- return new PdGlyphOrientationVertical(fobj, propertyFullName, attributeValue);
+ return new PdGlyphOrientationVertical(propertyFullName, attributeValue);
}
case GROUPING_SEPARATOR: {
- return new PdGroupingSeparator(fobj, propertyFullName, attributeValue);
+ return new PdGroupingSeparator(propertyFullName, attributeValue);
}
case GROUPING_SIZE: {
- return new PdGroupingSize(fobj, propertyFullName, attributeValue);
+ return new PdGroupingSize(propertyFullName, attributeValue);
}
case HEIGHT: {
- return new PdHeight(fobj, propertyFullName, attributeValue);
+ return new PdHeight(propertyFullName, attributeValue);
}
case HYPHENATE: {
- return new PdHyphenate(fobj, propertyFullName, attributeValue);
+ return new PdHyphenate(propertyFullName, attributeValue);
}
case HYPHENATION_CHARACTER: {
- return new PdHyphenationCharacter(fobj, propertyFullName, attributeValue);
+ return new PdHyphenationCharacter(propertyFullName, attributeValue);
}
case HYPHENATION_KEEP: {
- return new PdHyphenationKeep(fobj, propertyFullName, attributeValue);
+ return new PdHyphenationKeep(propertyFullName, attributeValue);
}
case HYPHENATION_LADDER_COUNT: {
- return new PdHyphenationLadderCount(fobj, propertyFullName, attributeValue);
+ return new PdHyphenationLadderCount(propertyFullName, attributeValue);
}
case HYPHENATION_PUSH_CHARACTER_COUNT: {
- return new PdHyphenationPushCharacterCount(fobj, propertyFullName, attributeValue);
+ return new PdHyphenationPushCharacterCount(propertyFullName, attributeValue);
}
case HYPHENATION_REMAIN_CHARACTER_COUNT: {
- return new PdHyphenationRemainCharacterCount(fobj, propertyFullName, attributeValue);
+ return new PdHyphenationRemainCharacterCount(propertyFullName, attributeValue);
}
case ID: {
- return new PdId(fobj, propertyFullName, attributeValue);
+ return new PdId(propertyFullName, attributeValue);
}
case INDEX_CLASS: {
- return new PdIndexClass(fobj, propertyFullName, attributeValue);
+ return new PdIndexClass(propertyFullName, attributeValue);
}
case INDEX_KEY: {
- return new PdIndexKey(fobj, propertyFullName, attributeValue);
+ return new PdIndexKey(propertyFullName, attributeValue);
}
case INDICATE_DESTINATION: {
- return new PdIndicateDestination(fobj, propertyFullName, attributeValue);
+ return new PdIndicateDestination(propertyFullName, attributeValue);
}
case INITIAL_PAGE_NUMBER: {
- return new PdInitialPageNumber(fobj, propertyFullName, attributeValue);
+ return new PdInitialPageNumber(propertyFullName, attributeValue);
}
case INLINE_PROGRESSION_DIMENSION: {
- return new PdInlineProgressionDimension(fobj, propertyFullName, attributeValue);
+ return new PdInlineProgressionDimension(propertyFullName, attributeValue);
}
case INTERNAL_DESTINATION: {
- return new PdInternalDestination(fobj, propertyFullName, attributeValue);
+ return new PdInternalDestination(propertyFullName, attributeValue);
}
case INTRINSIC_SCALE_VALUE: {
- return new PdIntrinsicScaleValue(fobj, propertyFullName, attributeValue);
+ return new PdIntrinsicScaleValue(propertyFullName, attributeValue);
}
case INTRUSION_DISPLACE: {
- return new PdIntrusionDisplace(fobj, propertyFullName, attributeValue);
+ return new PdIntrusionDisplace(propertyFullName, attributeValue);
}
case KEEP_TOGETHER: {
- return new PdKeepTogether(fobj, propertyFullName, attributeValue);
+ return new PdKeepTogether(propertyFullName, attributeValue);
}
case KEEP_WITH_NEXT: {
- return new PdKeepWithNext(fobj, propertyFullName, attributeValue);
+ return new PdKeepWithNext(propertyFullName, attributeValue);
}
case KEEP_WITH_PREVIOUS: {
- return new PdKeepWithPrevious(fobj, propertyFullName, attributeValue);
+ return new PdKeepWithPrevious(propertyFullName, attributeValue);
}
case LANGUAGE: {
- return new PdLanguage(fobj, propertyFullName, attributeValue);
+ return new PdLanguage(propertyFullName, attributeValue);
}
case LAST_LINE_END_INDENT: {
- return new PdLastLineEndIndent(fobj, propertyFullName, attributeValue);
+ return new PdLastLineEndIndent(propertyFullName, attributeValue);
}
case LEADER_ALIGNMENT: {
- return new PdLeaderAlignment(fobj, propertyFullName, attributeValue);
+ return new PdLeaderAlignment(propertyFullName, attributeValue);
}
case LEADER_LENGTH: {
- return new PdLeaderLength(fobj, propertyFullName, attributeValue);
+ return new PdLeaderLength(propertyFullName, attributeValue);
}
case LEADER_PATTERN: {
- return new PdLeaderPattern(fobj, propertyFullName, attributeValue);
+ return new PdLeaderPattern(propertyFullName, attributeValue);
}
case LEADER_PATTERN_WIDTH: {
- return new PdLeaderPatternWidth(fobj, propertyFullName, attributeValue);
+ return new PdLeaderPatternWidth(propertyFullName, attributeValue);
}
case LEFT: {
- return new PdLeft(fobj, propertyFullName, attributeValue);
+ return new PdLeft(propertyFullName, attributeValue);
}
case LETTER_SPACING: {
- return new PdLetterSpacing(fobj, propertyFullName, attributeValue);
+ return new PdLetterSpacing(propertyFullName, attributeValue);
}
case LETTER_VALUE: {
- return new PdLetterValue(fobj, propertyFullName, attributeValue);
+ return new PdLetterValue(propertyFullName, attributeValue);
}
case LINE_HEIGHT: {
- return new PdLineHeight(fobj, propertyFullName, attributeValue);
+ return new PdLineHeight(propertyFullName, attributeValue);
}
case LINE_HEIGHT_SHIFT_ADJUSTMENT: {
- return new PdLineHeightShiftAdjustment(fobj, propertyFullName, attributeValue);
+ return new PdLineHeightShiftAdjustment(propertyFullName, attributeValue);
}
case LINE_STACKING_STRATEGY: {
- return new PdLineStackingStrategy(fobj, propertyFullName, attributeValue);
+ return new PdLineStackingStrategy(propertyFullName, attributeValue);
}
case LINEFEED_TREATMENT: {
- return new PdLinefeedTreatment(fobj, propertyFullName, attributeValue);
+ return new PdLinefeedTreatment(propertyFullName, attributeValue);
}
case MARGIN: {
- return new PdMargin(fobj, propertyFullName, attributeValue);
+ return new PdMargin(propertyFullName, attributeValue);
}
case MARGIN_BOTTOM: {
- return new PdMarginBottom(fobj, propertyFullName, attributeValue);
+ return new PdMarginBottom(propertyFullName, attributeValue);
}
case MARGIN_LEFT: {
- return new PdMarginLeft(fobj, propertyFullName, attributeValue);
+ return new PdMarginLeft(propertyFullName, attributeValue);
}
case MARGIN_RIGHT: {
- return new PdMarginRight(fobj, propertyFullName, attributeValue);
+ return new PdMarginRight(propertyFullName, attributeValue);
}
case MARGIN_TOP: {
- return new PdMarginTop(fobj, propertyFullName, attributeValue);
+ return new PdMarginTop(propertyFullName, attributeValue);
}
case MARKER_CLASS_NAME: {
- return new PdMarkerClassName(fobj, propertyFullName, attributeValue);
+ return new PdMarkerClassName(propertyFullName, attributeValue);
}
case MASTER_NAME: {
- return new PdMasterName(fobj, propertyFullName, attributeValue);
+ return new PdMasterName(propertyFullName, attributeValue);
}
case MASTER_REFERENCE: {
- return new PdMasterReference(fobj, propertyFullName, attributeValue);
+ return new PdMasterReference(propertyFullName, attributeValue);
}
case MAX_HEIGHT: {
- return new PdMaxHeight(fobj, propertyFullName, attributeValue);
+ return new PdMaxHeight(propertyFullName, attributeValue);
}
case MAX_WIDTH: {
- return new PdMaxWidth(fobj, propertyFullName, attributeValue);
+ return new PdMaxWidth(propertyFullName, attributeValue);
}
case MAXIMUM_REPEATS: {
- return new PdMaximumRepeats(fobj, propertyFullName, attributeValue);
+ return new PdMaximumRepeats(propertyFullName, attributeValue);
}
case MEDIA_USAGE: {
- return new PdMediaUsage(fobj, propertyFullName, attributeValue);
+ return new PdMediaUsage(propertyFullName, attributeValue);
}
case MERGE_PAGES_ACROSS_INDEX_KEY_REFERENCES: {
- return new PdMergePagesAcrossIndexKeyReferences(fobj, propertyFullName, attributeValue);
+ return new PdMergePagesAcrossIndexKeyReferences(propertyFullName, attributeValue);
}
case MERGE_RANGES_ACROSS_INDEX_KEY_REFERENCES: {
- return new PdMergeRangesAcrossIndexKeyReferences(fobj, propertyFullName, attributeValue);
+ return new PdMergeRangesAcrossIndexKeyReferences(propertyFullName, attributeValue);
}
case MERGE_SEQUENTIAL_PAGE_NUMBERS: {
- return new PdMergeSequentialPageNumbers(fobj, propertyFullName, attributeValue);
+ return new PdMergeSequentialPageNumbers(propertyFullName, attributeValue);
}
case MIN_HEIGHT: {
- return new PdMinHeight(fobj, propertyFullName, attributeValue);
+ return new PdMinHeight(propertyFullName, attributeValue);
}
case MIN_WIDTH: {
- return new PdMinWidth(fobj, propertyFullName, attributeValue);
+ return new PdMinWidth(propertyFullName, attributeValue);
}
case NUMBER_COLUMNS_REPEATED: {
- return new PdNumberColumnsRepeated(fobj, propertyFullName, attributeValue);
+ return new PdNumberColumnsRepeated(propertyFullName, attributeValue);
}
case NUMBER_COLUMNS_SPANNED: {
- return new PdNumberColumnsSpanned(fobj, propertyFullName, attributeValue);
+ return new PdNumberColumnsSpanned(propertyFullName, attributeValue);
}
case NUMBER_ROWS_SPANNED: {
- return new PdNumberRowsSpanned(fobj, propertyFullName, attributeValue);
+ return new PdNumberRowsSpanned(propertyFullName, attributeValue);
}
case ODD_OR_EVEN: {
- return new PdOddOrEven(fobj, propertyFullName, attributeValue);
+ return new PdOddOrEven(propertyFullName, attributeValue);
}
case ORPHANS: {
- return new PdOrphans(fobj, propertyFullName, attributeValue);
+ return new PdOrphans(propertyFullName, attributeValue);
}
case OVERFLOW: {
- return new PdOverflow(fobj, propertyFullName, attributeValue);
+ return new PdOverflow(propertyFullName, attributeValue);
}
case PADDING: {
- return new PdPadding(fobj, propertyFullName, attributeValue);
+ return new PdPadding(propertyFullName, attributeValue);
}
case PADDING_AFTER: {
- return new PdPaddingAfter(fobj, propertyFullName, attributeValue);
+ return new PdPaddingAfter(propertyFullName, attributeValue);
}
case PADDING_BEFORE: {
- return new PdPaddingBefore(fobj, propertyFullName, attributeValue);
+ return new PdPaddingBefore(propertyFullName, attributeValue);
}
case PADDING_BOTTOM: {
- return new PdPaddingBottom(fobj, propertyFullName, attributeValue);
+ return new PdPaddingBottom(propertyFullName, attributeValue);
}
case PADDING_END: {
- return new PdPaddingEnd(fobj, propertyFullName, attributeValue);
+ return new PdPaddingEnd(propertyFullName, attributeValue);
}
case PADDING_LEFT: {
- return new PdPaddingLeft(fobj, propertyFullName, attributeValue);
+ return new PdPaddingLeft(propertyFullName, attributeValue);
}
case PADDING_RIGHT: {
- return new PdPaddingRight(fobj, propertyFullName, attributeValue);
+ return new PdPaddingRight(propertyFullName, attributeValue);
}
case PADDING_START: {
- return new PdPaddingStart(fobj, propertyFullName, attributeValue);
+ return new PdPaddingStart(propertyFullName, attributeValue);
}
case PADDING_TOP: {
- return new PdPaddingTop(fobj, propertyFullName, attributeValue);
+ return new PdPaddingTop(propertyFullName, attributeValue);
}
case PAGE_BREAK_AFTER: {
return new PdPageBreakAfter(fobj, propertyFullName, attributeValue);
@@ -1931,7 +1931,7 @@
return null;
}
assert property instanceof PdLetterSpacing : "letter-spacing must be a LetterSpacing";
- ((PdLetterSpacing) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdLetterSpacing) property).addComponent(propertyFullName, attributeValue);
return property;
}
case WORD_SPACING: {
@@ -1949,7 +1949,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-together must be a Keep";
- ((AbstractKeep) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
return property;
}
case KEEP_WITH_NEXT: {
@@ -1958,7 +1958,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-with-next must be a Keep";
- ((AbstractKeep) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
return property;
}
case KEEP_WITH_PREVIOUS: {
@@ -1967,7 +1967,7 @@
return null;
}
assert property instanceof AbstractKeep : "keep-with-previous must be a Keep";
- ((AbstractKeep) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((AbstractKeep) property).addComponent(propertyFullName, attributeValue);
return property;
}
case LINE_HEIGHT: {
@@ -1976,7 +1976,7 @@
return null;
}
assert property instanceof PdLineHeight : "line-height must be a LineHeight";
- ((PdLineHeight) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdLineHeight) property).addComponent(propertyFullName, attributeValue);
return property;
}
case LEADER_LENGTH: {
@@ -1985,7 +1985,7 @@
return null;
}
assert property instanceof PdLeaderLength : "leader-length must be a LeaderLength";
- ((PdLeaderLength) property).addComponent(fobj, propertyFullName, attributeValue);
+ ((PdLeaderLength) property).addComponent(propertyFullName, attributeValue);
return property;
}
default:
Modified: 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/obj/LayoutMasterSet4a.java 2022-12-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/LayoutMasterSet4a.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -391,8 +391,8 @@
final FlowNameSpecifier4a flowNameSpecifier = new FlowNameSpecifier4a(
sourceList, propertyList);
sourceList.addChild(flowNameSpecifier);
- Property property = new PdFlowNameReference(flowNameSpecifier,
- FoPropertyId.FLOW_NAME_REFERENCE.toXslFo(), impliedName);
+ Property property = new PdFlowNameReference(FoPropertyId.FLOW_NAME_REFERENCE.toXslFo(),
+ impliedName);
propertyList.addProperty(property);
/* The target part. */
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-23 19:44:36 UTC (rev 12930)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-23 23:44:44 UTC (rev 12931)
@@ -72,26 +72,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-23 19:44:41
|
Revision: 12930
http://sourceforge.net/p/foray/code/12930
Author: victormote
Date: 2022-12-23 19:44:36 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.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/AbstractBorderPrecedence.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/AbstractRelativeDimension.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/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/PdEndsRow.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/PdIndicateDestination.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/PdPrecedence.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/PdStartsRow.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/PdWhiteSpaceCollapse.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AbsolutePositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/ActiveStateTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AlignmentAdjustTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AlignmentBaselineTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AllowedHeightScaleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AllowedWidthScaleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AutoRestoreTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/AzimuthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundAttachmentTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundImageTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionHorizontalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundPositionVerticalTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundRepeatTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BackgroundTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BaselineShiftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BlankOrNotBlankTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BlockProgressionDimensionTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderAfterWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforePrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBeforeWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderBottomWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderCollapseTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndPrecedenceTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderEndWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderLeftWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightColorTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderRightWidthTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderStyleTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/BorderWidthTests.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -1012,142 +1012,142 @@
}
switch (enumeration) {
case ABSOLUTE_POSITION: {
- return new PdAbsolutePosition(fobj, propertyFullName, attributeValue);
+ return new PdAbsolutePosition(propertyFullName, attributeValue);
}
case ACTIVE_STATE: {
- return new PdActiveState(fobj, propertyFullName, attributeValue);
+ return new PdActiveState(propertyFullName, attributeValue);
}
case ALIGNMENT_ADJUST: {
- return new PdAlignmentAdjust(fobj, propertyFullName, attributeValue);
+ return new PdAlignmentAdjust(propertyFullName, attributeValue);
}
case ALIGNMENT_BASELINE: {
- return new PdAlignmentBaseline(fobj, propertyFullName, attributeValue);
+ return new PdAlignmentBaseline(propertyFullName, attributeValue);
}
case ALLOWED_HEIGHT_SCALE: {
- return new PdAllowedHeightScale(fobj, propertyFullName, attributeValue);
+ return new PdAllowedHeightScale(propertyFullName, attributeValue);
}
case ALLOWED_WIDTH_SCALE: {
- return new PdAllowedWidthScale(fobj, propertyFullName, attributeValue);
+ return new PdAllowedWidthScale(propertyFullName, attributeValue);
}
case AUTO_RESTORE: {
- return new PdAutoRestore(fobj, propertyFullName, attributeValue);
+ return new PdAutoRestore(propertyFullName, attributeValue);
}
case AZIMUTH: {
- return new PdAzimuth(fobj, propertyFullName, attributeValue);
+ return new PdAzimuth(propertyFullName, attributeValue);
}
case BACKGROUND: {
- return new PdBackground(fobj, propertyFullName, attributeValue);
+ return new PdBackground(propertyFullName, attributeValue);
}
case BACKGROUND_ATTACHMENT: {
- return new PdBackgroundAttachment(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundAttachment(propertyFullName, attributeValue);
}
case BACKGROUND_COLOR: {
- return new PdBackgroundColor(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundColor(propertyFullName, attributeValue);
}
case BACKGROUND_IMAGE: {
- return new PdBackgroundImage(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundImage(propertyFullName, attributeValue);
}
case BACKGROUND_POSITION: {
- return new PdBackgroundPosition(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundPosition(propertyFullName, attributeValue);
}
case BACKGROUND_POSITION_HORIZONTAL: {
- return new PdBackgroundPositionHorizontal(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundPositionHorizontal(propertyFullName, attributeValue);
}
case BACKGROUND_POSITION_VERTICAL: {
- return new PdBackgroundPositionVertical(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundPositionVertical(propertyFullName, attributeValue);
}
case BACKGROUND_REPEAT: {
- return new PdBackgroundRepeat(fobj, propertyFullName, attributeValue);
+ return new PdBackgroundRepeat(propertyFullName, attributeValue);
}
case BASELINE_SHIFT: {
- return new PdBaselineShift(fobj, propertyFullName, attributeValue);
+ return new PdBaselineShift(propertyFullName, attributeValue);
}
case BLANK_OR_NOT_BLANK: {
- return new PdBlankOrNotBlank(fobj, propertyFullName, attributeValue);
+ return new PdBlankOrNotBlank(propertyFullName, attributeValue);
}
case BLOCK_PROGRESSION_DIMENSION: {
- return new PdBlockProgressionDimension(fobj, propertyFullName, attributeValue);
+ return new PdBlockProgressionDimension(propertyFullName, attributeValue);
}
case BORDER: {
- return new PdBorder(fobj, propertyFullName, attributeValue);
+ return new PdBorder(propertyFullName, attributeValue);
}
case BORDER_AFTER_COLOR: {
- return new PdBorderAfterColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderAfterColor(propertyFullName, attributeValue);
}
case BORDER_AFTER_PRECEDENCE: {
- return new PdBorderAfterPrecedence(fobj, propertyFullName, attributeValue);
+ return new PdBorderAfterPrecedence(propertyFullName, attributeValue);
}
case BORDER_AFTER_STYLE: {
- return new PdBorderAfterStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderAfterStyle(propertyFullName, attributeValue);
}
case BORDER_AFTER_WIDTH: {
- return new PdBorderAfterWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderAfterWidth(propertyFullName, attributeValue);
}
case BORDER_BEFORE_COLOR: {
- return new PdBorderBeforeColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderBeforeColor(propertyFullName, attributeValue);
}
case BORDER_BEFORE_PRECEDENCE: {
- return new PdBorderBeforePrecedence(fobj, propertyFullName, attributeValue);
+ return new PdBorderBeforePrecedence(propertyFullName, attributeValue);
}
case BORDER_BEFORE_STYLE: {
- return new PdBorderBeforeStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderBeforeStyle(propertyFullName, attributeValue);
}
case BORDER_BEFORE_WIDTH: {
- return new PdBorderBeforeWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderBeforeWidth(propertyFullName, attributeValue);
}
case BORDER_BOTTOM: {
- return new PdBorderBottom(fobj, propertyFullName, attributeValue);
+ return new PdBorderBottom(propertyFullName, attributeValue);
}
case BORDER_BOTTOM_COLOR: {
- return new PdBorderBottomColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderBottomColor(propertyFullName, attributeValue);
}
case BORDER_BOTTOM_STYLE: {
- return new PdBorderBottomStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderBottomStyle(propertyFullName, attributeValue);
}
case BORDER_BOTTOM_WIDTH: {
- return new PdBorderBottomWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderBottomWidth(propertyFullName, attributeValue);
}
case BORDER_COLLAPSE: {
- return new PdBorderCollapse(fobj, propertyFullName, attributeValue);
+ return new PdBorderCollapse(propertyFullName, attributeValue);
}
case BORDER_COLOR: {
- return new PdBorderColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderColor(propertyFullName, attributeValue);
}
case BORDER_END_COLOR: {
- return new PdBorderEndColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderEndColor(propertyFullName, attributeValue);
}
case BORDER_END_PRECEDENCE: {
- return new PdBorderEndPrecedence(fobj, propertyFullName, attributeValue);
+ return new PdBorderEndPrecedence(propertyFullName, attributeValue);
}
case BORDER_END_STYLE: {
- return new PdBorderEndStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderEndStyle(propertyFullName, attributeValue);
}
case BORDER_END_WIDTH: {
- return new PdBorderEndWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderEndWidth(propertyFullName, attributeValue);
}
case BORDER_LEFT: {
- return new PdBorderLeft(fobj, propertyFullName, attributeValue);
+ return new PdBorderLeft(propertyFullName, attributeValue);
}
case BORDER_LEFT_COLOR: {
- return new PdBorderLeftColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderLeftColor(propertyFullName, attributeValue);
}
case BORDER_LEFT_STYLE: {
- return new PdBorderLeftStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderLeftStyle(propertyFullName, attributeValue);
}
case BORDER_LEFT_WIDTH: {
- return new PdBorderLeftWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderLeftWidth(propertyFullName, attributeValue);
}
case BORDER_RIGHT: {
- return new PdBorderRight(fobj, propertyFullName, attributeValue);
+ return new PdBorderRight(propertyFullName, attributeValue);
}
case BORDER_RIGHT_COLOR: {
- return new PdBorderRightColor(fobj, propertyFullName, attributeValue);
+ return new PdBorderRightColor(propertyFullName, attributeValue);
}
case BORDER_RIGHT_STYLE: {
- return new PdBorderRightStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderRightStyle(propertyFullName, attributeValue);
}
case BORDER_RIGHT_WIDTH: {
- return new PdBorderRightWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderRightWidth(propertyFullName, attributeValue);
}
case BORDER_SEPARATION: {
return new PdBorderSeparation(fobj, propertyFullName, attributeValue);
@@ -1168,7 +1168,7 @@
return new PdBorderStartWidth(fobj, propertyFullName, attributeValue);
}
case BORDER_STYLE: {
- return new PdBorderStyle(fobj, propertyFullName, attributeValue);
+ return new PdBorderStyle(propertyFullName, attributeValue);
}
case BORDER_TOP: {
return new PdBorderTop(fobj, propertyFullName, attributeValue);
@@ -1183,7 +1183,7 @@
return new PdBorderTopWidth(fobj, propertyFullName, attributeValue);
}
case BORDER_WIDTH: {
- return new PdBorderWidth(fobj, propertyFullName, attributeValue);
+ return new PdBorderWidth(propertyFullName, attributeValue);
}
case BOTTOM: {
return new PdBottom(fobj, propertyFullName, attributeValue);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -63,31 +63,27 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractAllowedAxisScale(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractAllowedAxisScale(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
- pv = parseTokens(fobj, value);
+ pv = parseTokens(value);
if (pv != null) {
return pv;
}
@@ -95,15 +91,12 @@
}
/**
- * Tokenizes the attribute value and parses each token, placing the contents
- * into a collection.
- * @param fobj The FoObj to which this property belongs.
+ * Tokenizes the attribute value and parses each token, placing the contents into a collection.
* @param attributeValue The unparsed property value.
* @return The parsed, storable property.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue parseTokens(final FoObj fobj,
- final String attributeValue) throws PropertyException {
+ private PropertyValue parseTokens(final String attributeValue) throws PropertyException {
final ValueCollection collection = new ValueCollection();
final StringTokenizer tokenizer = new StringTokenizer(attributeValue);
if (tokenizer.countTokens() < 1) {
@@ -111,7 +104,7 @@
}
while (tokenizer.hasMoreTokens()) {
final String token = tokenizer.nextToken();
- final PropertyValue pv = parseToken(fobj, token);
+ final PropertyValue pv = parseToken(token);
collection.addItem(pv);
}
return collection;
@@ -119,13 +112,11 @@
/**
* Parses one token from the input, returning its value.
- * @param fobj The FoObj to which this property belongs.
* @param token The unparsed property value token.
* @return The parsed, storable property for the token.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue parseToken(final FoObj fobj, final String token)
- throws PropertyException {
+ private PropertyValue parseToken(final String token) throws PropertyException {
final PropertyValue pv = this.standardParse(token, AbstractAllowedAxisScale.VALID_TOKEN_KEYWORDS);
if (pv.canEvalKeyword()) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -49,27 +49,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBackgroundPosition(final FoObj fobj,
- final String propertyFullName,
- final String attributeValue)
+ public AbstractBackgroundPosition(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.AbstractFoProperty;
import org.foray.fotree.fo.FoValue;
@@ -58,26 +57,21 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBoolean(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ public AbstractBoolean(final String propertyFullName, final String attributeValue) throws PropertyException {
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/AbstractBorder.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.AbstractFoProperty;
@@ -59,26 +58,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBorder(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractBorder(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
PropertyCollection collection = null;
/*
* Must handle inherit specially, because it essentially propogates
@@ -85,12 +80,9 @@
* to style, width, and color.
*/
if (value.equals("inherit")) {
- final PdBorderStyle borderStyle = new PdBorderStyle(fobj,
- "border-style", "inherit");
- final PdBorderWidth borderWidth = new PdBorderWidth(fobj,
- "border-width", "inherit");
- final PdBorderColor borderColor = new PdBorderColor(fobj,
- "border-color", "inherit");
+ final PdBorderStyle borderStyle = new PdBorderStyle("border-style", "inherit");
+ final PdBorderWidth borderWidth = new PdBorderWidth("border-width", "inherit");
+ final PdBorderColor borderColor = new PdBorderColor("border-color", "inherit");
collection = new PropertyCollection();
collection.addItem(borderStyle);
collection.addItem(borderWidth);
@@ -99,7 +91,7 @@
}
final StringTokenizer st = new StringTokenizer(value);
while (st.hasMoreTokens()) {
- final Property property = parseToken(fobj, st.nextToken());
+ final Property property = parseToken(st.nextToken());
if (property == null) {
throw unexpectedValue(value);
}
@@ -116,13 +108,11 @@
/**
* Parses one token from the compound property components.
- * @param fobj The FoObj to which this property belongs.
* @param token The component token.
* @return The parsed property for the token.
* @throws PropertyException For an invalid property value.
*/
- private Property parseToken(final FoObj fobj,
- final String token) throws PropertyException {
+ private Property parseToken(final String token) throws PropertyException {
final FoValue value = FoValue.xslValueOf(token);
// Check style first, since it only has keywords
Modified: 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/AbstractBorderColor.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderColor.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -60,28 +60,23 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBorderColor(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractBorderColor(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, this.getPropertyType(),
- attributeValue);
+ this.value = createPropertyValue(this.getPropertyType(), attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param enumeration The enumerated property type.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- protected PropertyValue createPropertyValue(final FoObj fobj,
- final FoPropertyId enumeration, final String value)
+ protected PropertyValue createPropertyValue(final FoPropertyId enumeration, final String value)
throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalColor()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -85,26 +85,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBorderPrecedence(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractBorderPrecedence(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/AbstractBorderStyle.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -70,26 +70,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBorderStyle(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractBorderStyle(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value)
+ private PropertyValue createPropertyValue(final String value)
throws PropertyException {
PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
Modified: 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/AbstractBorderWidth.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -66,15 +66,13 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractBorderWidth(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractBorderWidth(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
@@ -89,13 +87,11 @@
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (DtBorderWidth.isBorderWidth(pv)) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -61,26 +61,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public AbstractRelativeDimension(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public AbstractRelativeDimension(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/PdAbsolutePosition.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAbsolutePosition.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -55,13 +55,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAbsolutePosition(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdAbsolutePosition(final String propertyFullName, final String attributeValue)
throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdActiveState.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdActiveState.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -56,13 +56,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdActiveState(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdActiveState(final String propertyFullName, final String attributeValue)
throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdAlignmentAdjust.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -67,26 +67,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAlignmentAdjust(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdAlignmentAdjust(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/PdAlignmentBaseline.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentBaseline.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -68,26 +68,22 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAlignmentBaseline(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdAlignmentBaseline(final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: 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/PdAllowedHeightScale.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAllowedHeightScale.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -40,15 +39,13 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAllowedHeightScale(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdAllowedHeightScale(final String propertyFullName, final String attributeValue)
throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdAllowedWidthScale.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAllowedWidthScale.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.FoPropertyId;
@@ -40,15 +39,13 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAllowedWidthScale(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdAllowedWidthScale(final String propertyFullName, final String attributeValue)
throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdAutoRestore.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAutoRestore.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -43,15 +43,12 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAutoRestore(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- super(fobj, propertyFullName, attributeValue);
+ public PdAutoRestore(final String propertyFullName, final String attributeValue) throws PropertyException {
+ super(propertyFullName, attributeValue);
}
@Override
Modified: 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/PdAzimuth.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -124,26 +124,21 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdAzimuth(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
- throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ public PdAzimuth(final String propertyFullName, final String attributeValue) throws PropertyException {
+ this.value = createPropertyValue(attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ private PropertyValue createPropertyValue(final String value) throws PropertyException {
String remainingValue = value;
final StringTokenizer st = new StringTokenizer(value);
if (st.countTokens() == 2) {
Modified: 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/PdBackground.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -29,7 +29,6 @@
package org.foray.fotree.fo.prop;
import org.foray.common.url.UrlUtil;
-import org.foray.fotree.FoObj;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.AbstractFoProperty;
@@ -61,28 +60,24 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdBackground(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdBackground(final String propertyFullName,
+ final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, propertyFullName,
- attributeValue);
+ this.value = createPropertyValue(propertyFullName, attributeValue);
}
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- private PropertyValue createPropertyValue(final FoObj fobj,
- final String propertyFullName, final String value)
+ private PropertyValue createPropertyValue(final String propertyFullName, final String value)
throws PropertyException {
final PropertyCollection collection = new PropertyCollection();
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
@@ -125,8 +120,8 @@
if (colorFound) {
throw unexpectedValue(value);
}
- collection.addItem(new PdBackgroundColor(fobj,
- propertyFullName, tokenList.get(i)));
+ collection.addItem(new PdBackgroundColor(propertyFullName,
+ tokenList.get(i)));
colorFound = true;
break;
}
@@ -134,8 +129,7 @@
if (imageFound) {
throw unexpectedValue(value);
}
- collection.addItem(new PdBackgroundImage(fobj,
- propertyFullName, tokenList.get(i)));
+ collection.addItem(new PdBackgroundImage(propertyFullName, tokenList.get(i)));
imageFound = true;
break;
}
@@ -143,8 +137,7 @@
if (repeatFound) {
throw unexpectedValue(value);
}
- collection.addItem(new PdBackgroundRepeat(fobj,
- propertyFullName, tokenList.get(i)));
+ collection.addItem(new PdBackgroundRepeat(propertyFullName, tokenList.get(i)));
repeatFound = true;
break;
}
@@ -152,8 +145,7 @@
if (attachmentFound) {
throw unexpectedValue(value);
}
- collection.addItem(new PdBackgroundAttachment(fobj,
- propertyFullName, tokenList.get(i)));
+ collection.addItem(new PdBackgroundAttachment(propertyFullName, tokenList.get(i)));
attachmentFound = true;
break;
}
@@ -167,8 +159,8 @@
propertyInput.concat(" " + tokenList.get(i + 1));
i++;
}
- collection.addItem(new PdBackgroundPosition(fobj,
- propertyFullName, tokenList.get(i)));
+ collection.addItem(new PdBackgroundPosition(propertyFullName,
+ tokenList.get(i)));
positionFound = true;
break;
}
Modified: 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/PdBackgroundAttachment.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundAttachment.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -54,13 +54,11 @@
/**
* Default Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full name of the property.
* @param attributeValue The unparsed property value.
* @throws PropertyException For an invalid property value.
*/
- public PdBackgroundAttachment(final FoObj fobj,
- final String propertyFullName, final String attributeValue)
+ public PdBackgroundAttachment(final String propertyFullName, final String attributeValue)
throws PropertyException {
this.value = createPropertyValue(attributeValue);
}
Modified: 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/PdBackgroundColor.java 2022-12-23 18:56:21 UTC (rev 12929)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundColor.java 2022-12-23 19:44:36 UTC (rev 12930)
@@ -55,15 +55,13 @@
/**
* Constructor.
- * @param fobj The FoObj to which this property belongs.
* @param propertyFullName The full n...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-23 18:56:24
|
Revision: 12929
http://sourceforge.net/p/foray/code/12929
Author: victormote
Date: 2022-12-23 18:56:21 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMergeIndex.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/PdBackgroundAttachment.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/PdBlankOrNotBlank.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/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/PdClear.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/PdEmptyCells.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/PdFontSelectionStrategy.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/PdLeaderAlignment.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/PdLetterValue.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/PdMediaUsage.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/PdOverflow.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/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/PdPosition.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/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/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/PdRuleStyle.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/PdShowDestination.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/PdStartingState.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/PdTextTransform.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/PdVisibility.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/PdWhiteSpaceTreatment.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWrapOption.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo.prop;
-import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.AbstractFoProperty;
import org.foray.fotree.value.PropertyValue;
@@ -40,13 +39,11 @@
/**
* Converts the unparsed property value into its parsed, storable value.
- * @param fobj The FoObj to which this property belongs.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
*/
- protected PropertyValue createPropertyValue(final FoObj fobj,
- final String value) throws PropertyException {
+ protected PropertyValue createPropertyValue(final String value) throws PropertyException {
final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMergeIndex.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMergeIndex.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMergeIndex.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -60,7 +60,7 @@
*/
public AbstractMergeIndex(final FoObj fobj, final String propertyFullName,
final String attributeValue) throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
Modified: 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/PdAbsolutePosition.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAbsolutePosition.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdAbsolutePosition(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdActiveState.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdActiveState.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdActiveState(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdBackgroundAttachment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundAttachment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdBackgroundAttachment(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
Modified: 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/PdBackgroundRepeat.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundRepeat.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdBackgroundRepeat(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
Modified: 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/PdBlankOrNotBlank.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBlankOrNotBlank.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdBlankOrNotBlank(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdBorderCollapse.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderCollapse.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdBorderCollapse(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdBreakAfter.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBreakAfter.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdBreakAfter(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdBreakBefore.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBreakBefore.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdBreakBefore(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdCaptionSide.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCaptionSide.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -68,7 +68,7 @@
public PdCaptionSide(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdClear.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdClear.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -68,7 +68,7 @@
public PdClear(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdDirection.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDirection.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdDirection(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdEmptyCells.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdEmptyCells.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdEmptyCells(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdFloat.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFloat.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -68,7 +68,7 @@
public PdFloat(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdFontSelectionStrategy.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSelectionStrategy.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdFontSelectionStrategy(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdHyphenationKeep.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationKeep.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdHyphenationKeep(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLeaderAlignment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderAlignment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdLeaderAlignment(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLeaderPattern.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPattern.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdLeaderPattern(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLetterValue.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdLetterValue(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLineHeightShiftAdjustment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeightShiftAdjustment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdLineHeightShiftAdjustment(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLineStackingStrategy.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineStackingStrategy.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdLineStackingStrategy(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdLinefeedTreatment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLinefeedTreatment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdLinefeedTreatment(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdMediaUsage.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMediaUsage.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdMediaUsage(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdOddOrEven.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOddOrEven.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdOddOrEven(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdOverflow.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOverflow.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdOverflow(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPageBreakAfter.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakAfter.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdPageBreakAfter(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPageBreakBefore.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakBefore.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdPageBreakBefore(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPageBreakInside.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageBreakInside.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdPageBreakInside(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPageCitationStrategy.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageCitationStrategy.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -61,7 +61,7 @@
public PdPageCitationStrategy(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
/**
Modified: 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/PdPageNumberTreatment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageNumberTreatment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -58,7 +58,7 @@
*/
public PdPageNumberTreatment(final FoObj fobj, final String propertyFullName,
final String attributeValue) throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPagePosition.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPagePosition.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdPagePosition(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdPosition.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPosition.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdPosition(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdReferenceOrientation.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdReferenceOrientation.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -67,7 +67,7 @@
public PdReferenceOrientation(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRelativeAlign.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRelativeAlign.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdRelativeAlign(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRelativePosition.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRelativePosition.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdRelativePosition(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRenderingIntent.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRenderingIntent.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdRenderingIntent(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRetrieveBoundary.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrieveBoundary.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -60,7 +60,7 @@
public PdRetrieveBoundary(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRetrieveBoundaryWithinTable.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrieveBoundaryWithinTable.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -60,7 +60,7 @@
public PdRetrieveBoundaryWithinTable(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = this.createPropertyValue(fobj, attributeValue);
+ this.value = this.createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRetrievePosition.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrievePosition.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -61,7 +61,7 @@
public PdRetrievePosition(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRetrievePositionWithinTable.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRetrievePositionWithinTable.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -61,7 +61,7 @@
public PdRetrievePositionWithinTable(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = this.createPropertyValue(fobj, attributeValue);
+ this.value = this.createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdRuleStyle.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdRuleStyle.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -67,7 +67,7 @@
public PdRuleStyle(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdScaleOption.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScaleOption.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -59,7 +59,7 @@
*/
public PdScaleOption(final FoObj fobj, final String propertyFullName,
final String attributeValue) throws PropertyException {
- this.value = this.createPropertyValue(fobj, attributeValue);
+ this.value = this.createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdScaling.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScaling.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdScaling(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdScalingMethod.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdScalingMethod.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdScalingMethod(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdShowDestination.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdShowDestination.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -61,7 +61,7 @@
public PdShowDestination(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSpan.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpan.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdSpan(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSpeak.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeak.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdSpeak(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSpeakHeader.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakHeader.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdSpeakHeader(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSpeakNumeral.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakNumeral.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdSpeakNumeral(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSpeakPunctuation.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeakPunctuation.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdSpeakPunctuation(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdStartingState.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStartingState.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -61,7 +61,7 @@
public PdStartingState(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdSuppressAtLineBreak.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSuppressAtLineBreak.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdSuppressAtLineBreak(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdTextTransform.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextTransform.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -64,7 +64,7 @@
public PdTextTransform(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdUnicodeBidi.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdUnicodeBidi.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdUnicodeBidi(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdVisibility.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVisibility.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdVisibility(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdWhiteSpace.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWhiteSpace.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -63,7 +63,7 @@
public PdWhiteSpace(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdWhiteSpaceTreatment.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWhiteSpaceTreatment.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -65,7 +65,7 @@
public PdWhiteSpaceTreatment(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
Modified: 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/PdWrapOption.java 2022-12-23 18:27:37 UTC (rev 12928)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWrapOption.java 2022-12-23 18:56:21 UTC (rev 12929)
@@ -62,7 +62,7 @@
public PdWrapOption(final FoObj fobj,
final String propertyFullName, final String attributeValue)
throws PropertyException {
- this.value = createPropertyValue(fobj, attributeValue);
+ this.value = createPropertyValue(attributeValue);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-23 18:27:41
|
Revision: 12928
http://sourceforge.net/p/foray/code/12928
Author: victormote
Date: 2022-12-23 18:27:37 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.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/AbstractAllowedAxisScale.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/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.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/AbstractBorderPrecedence.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/AbstractContentDimension.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/AbstractEnumeration.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/AbstractName.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/AbstractRelativeDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.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/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/PdBaselineShift.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/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/PdBorderStyle.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/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/PdColor.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/PdContentType.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/PdDestinationPlacementOffset.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/PdElevation.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/PdFontFamily.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/PdGroupingSize.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/PdInitialPageNumber.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/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/PdLeaderLength.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/PdLetterSpacing.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/PdMargin.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/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/PdOrphans.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/PdPitch.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/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/PdRegionName.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/PdRuleThickness.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/PdSpeechRate.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/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/PdVerticalAlign.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/PdWidows.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/PdZindex.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -28,7 +28,6 @@
package org.foray.fotree.fo;
-import org.foray.fotree.FoObj;
import org.foray.fotree.Property;
import org.foray.fotree.PropertyException;
import org.foray.fotree.parse.PropertyParser;
@@ -57,17 +56,16 @@
/**
* Parses a property value.
- * @param fobj The FoObj to which this property belongs.
* @param rawPropertyValue String containing the raw property value.
* @return The PropertyValue instance created by the parser.
* @throws PropertyException If the input is inconsistent.
*/
- protected PropertyValue standardParse(final FoObj fobj, final String rawPropertyValue) throws PropertyException {
+ protected PropertyValue standardParse(final String rawPropertyValue) throws PropertyException {
return this.standardParse(rawPropertyValue, this.getValidKeywords());
}
/**
- * Overloaded version of {@link #standardParse(FoObj, String)} that allows subclasses to provide a different set of
+ * Overloaded version of {@link #standardParse(String)} that allows subclasses to provide a different set of
* valid keywords for the case of compound properties.
* @param rawPropertyValue String containing the raw property value.
* @param validKeywords The keywords that should be accepted when parsing.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -92,7 +92,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractAbsoluteOffset.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -77,7 +77,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -83,7 +83,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- PropertyValue pv = standardParse(fobj, value);
+ PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractAudioDial.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -81,7 +81,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -70,7 +70,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBoolean.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -78,7 +78,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractBorder.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -143,7 +143,7 @@
return new PdBorderColor(dtColor);
}
// Now try using the standard parse
- final PropertyValue pv = standardParse(fobj, token);
+ final PropertyValue pv = standardParse(token);
if (pv.canEvalLength()) {
return new PdBorderWidth(pv);
}
Modified: 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/AbstractBorderColor.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderColor.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -83,7 +83,7 @@
protected PropertyValue createPropertyValue(final FoObj fobj,
final FoPropertyId enumeration, final String value)
throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalColor()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderPrecedence.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -105,7 +105,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractBorderStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -91,7 +91,7 @@
private PropertyValue createPropertyValue(final FoObj fobj,
final String value)
throws PropertyException {
- PropertyValue pv = standardParse(fobj, value);
+ PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractBorderWidth.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -96,7 +96,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (DtBorderWidth.isBorderWidth(pv)) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -79,7 +79,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractCue.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -92,7 +92,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractEnumeration.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -47,7 +47,7 @@
*/
protected PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractIndent.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -81,7 +81,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractKeep.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractKeep.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -101,7 +101,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
@@ -327,7 +327,7 @@
}
}
}
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalInteger()) {
setComponent(keepDT, subPropertyName, pv);
return keepDT;
Modified: 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/AbstractMargin.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -78,7 +78,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractName.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractName.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractName.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -67,7 +67,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractPadding.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -76,7 +76,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractPageDimension.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPageDimension.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -76,7 +76,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractPause.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -92,7 +92,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -81,7 +81,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
@@ -214,7 +214,7 @@
return false;
}
final DtLengthRange lr = (DtLengthRange) value();
- final PropertyValue pv = standardParse(fobj, attributeValue);
+ final PropertyValue pv = standardParse(attributeValue);
if (! (pv instanceof DtLength)) {
throw unexpectedValue(attributeValue);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -87,7 +87,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdAlignmentAdjust.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -87,7 +87,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdAlignmentBaseline.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentBaseline.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -88,7 +88,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBackgroundColor.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundColor.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -94,7 +94,7 @@
if (dtColor != null) {
return dtColor;
}
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBackgroundImage.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundImage.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -88,7 +88,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBaselineShift.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBaselineShift.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -78,7 +78,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBorderColor.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -102,7 +102,7 @@
protected PropertyValue createPropertyValue(final FoObj fobj,
final FoPropertyId enumeration, final String value)
throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBorderSeparation.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderSeparation.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -100,7 +100,7 @@
private PropertyValue createPropertyValue(final FoObj fobj,
final String subPropertyName, final String value)
throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
@@ -200,7 +200,7 @@
(DtLengthBpIpDirection) value();
/* Parse the attribute. */
- final PropertyValue pv = standardParse(fobj, attributeValue);
+ final PropertyValue pv = standardParse(attributeValue);
if (pv.canEvalLength()) {
final String subPropertyName = Property.getSubPropertyName(
propertyFullName);
Modified: 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/PdBorderSpacing.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderSpacing.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -76,7 +76,7 @@
final String value) throws PropertyException {
/* BorderSpacing is a shorthand for BorderSeparation, so we will create
* and wrap an actual BorderSeparation instance. */
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return new PdBorderSeparation(pv);
}
@@ -93,8 +93,8 @@
throw unexpectedValue(value);
}
- final PropertyValue token1 = standardParse(fobj, st.nextToken());
- final PropertyValue token2 = standardParse(fobj, st.nextToken());
+ final PropertyValue token1 = standardParse(st.nextToken());
+ final PropertyValue token2 = standardParse(st.nextToken());
if (token1.canEvalLength()
&& token2.canEvalLength()) {
final DtLengthBpIpDirection bpip = new DtLengthBpIpDirection(token1,
Modified: 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/PdBorderStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -96,7 +96,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdBorderWidth.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -95,7 +95,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdChangeBarColor.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarColor.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -73,7 +73,7 @@
*/
protected PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalColor()) {
return pv;
}
Modified: 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/PdChangeBarOffset.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarOffset.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -71,7 +71,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalLength()) {
return pv;
}
Modified: 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/PdChangeBarPlacement.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarPlacement.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -78,7 +78,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdChangeBarStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarStyle.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -67,7 +67,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (this.canEvalBorderStyle(pv)) {
return pv;
}
Modified: 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/PdChangeBarWidth.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdChangeBarWidth.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -70,7 +70,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (DtBorderWidth.isBorderWidth(pv)) {
return new DtBorderWidth(pv);
}
Modified: 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/PdColor.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColor.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -78,7 +78,7 @@
if (dtColor != null) {
return dtColor;
}
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdColumnCount.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnCount.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -73,7 +73,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdColumnGap.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -79,7 +79,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdColumnNumber.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnNumber.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -71,7 +71,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalNumeric()) {
return pv;
}
Modified: 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/PdColumnWidth.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -69,7 +69,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalPercentage()) {
return pv;
}
Modified: 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/PdContentType.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentType.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -75,7 +75,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdCountry.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -85,7 +85,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdDestinationPlacementOffset.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDestinationPlacementOffset.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -68,7 +68,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalLength()) {
return pv;
}
Modified: 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/PdDisplayAlign.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDisplayAlign.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -77,7 +77,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdElevation.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -97,7 +97,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdExtent.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -81,7 +81,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontFamily.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontFamily.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -102,7 +102,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, value);
+ final PropertyValue pv = this.standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontSize.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -131,7 +131,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalPercentage()
|| pv.canEvalKeyword()) {
return pv;
Modified: 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/PdFontSizeAdjust.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSizeAdjust.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -74,7 +74,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontStretch.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontStretch.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -94,7 +94,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontStyle.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -87,7 +87,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontVariant.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontVariant.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -85,7 +85,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdFontWeight.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontWeight.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -86,7 +86,7 @@
* @throws PropertyException For an invalid property value.
*/
private PropertyValue createPropertyValue(final FoObj fobj, final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdForcePageCount.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdForcePageCount.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -79,7 +79,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdGroupingSize.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdGroupingSize.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -68,7 +68,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalNumeric()) {
return pv;
}
Modified: 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/PdHyphenationLadderCount.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationLadderCount.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -77,7 +77,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdHyphenationPushCharacterCount.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationPushCharacterCount.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -73,7 +73,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdHyphenationRemainCharacterCount.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHyphenationRemainCharacterCount.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -74,7 +74,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/PdId.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdId.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -67,7 +67,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException {
- final PropertyValue pv = standardParse(fobj, value);
+ final PropertyValue pv = standardParse(value);
if (pv instanceof DtName) {
return pv;
}
Modified: 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/PdInitialPageNumber.java 2022-12-23 18:21:45 UTC (rev 12927)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdInitialPageNumber.java 2022-12-23 18:27:37 UTC (rev 12928)
@@ -77,7 +77,7 @@
*/
private PropertyValue createPropertyValue(final FoObj fobj,
final String value) throws PropertyException ...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-23 18:21:48
|
Revision: 12927
http://sourceforge.net/p/foray/code/12927
Author: victormote
Date: 2022-12-23 18:21:45 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.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/AbstractRelativeSpace.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/PdBorderStyle.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/PdFontFamily.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/PdPadding.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/PdVoiceFamily.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -63,21 +63,19 @@
* @throws PropertyException If the input is inconsistent.
*/
protected PropertyValue standardParse(final FoObj fobj, final String rawPropertyValue) throws PropertyException {
- return this.standardParse(fobj, rawPropertyValue, this.getValidKeywords());
+ return this.standardParse(rawPropertyValue, this.getValidKeywords());
}
/**
- * Overloaded version of {@link #standardParse(FoObj, String)} that allows
- * subclasses to provide a different set of valid keywords for the case
- * of compound properties.
- * @param fobj The FoObj to which this property belongs.
+ * Overloaded version of {@link #standardParse(FoObj, String)} that allows subclasses to provide a different set of
+ * valid keywords for the case of compound properties.
* @param rawPropertyValue String containing the raw property value.
* @param validKeywords The keywords that should be accepted when parsing.
* @return The PropertyValue instance created by the parser.
* @throws PropertyException If the input is inconsistent.
*/
- protected PropertyValue standardParse(final FoObj fobj, final String rawPropertyValue,
- final FoValue[] validKeywords) throws PropertyException {
+ protected PropertyValue standardParse(final String rawPropertyValue, final FoValue[] validKeywords)
+ throws PropertyException {
final PropertyValue pv = checkKeywords(validKeywords, rawPropertyValue);
if (pv != null) {
return pv;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -126,8 +126,7 @@
*/
private PropertyValue parseToken(final FoObj fobj, final String token)
throws PropertyException {
- final PropertyValue pv = this.standardParse(fobj, token,
- AbstractAllowedAxisScale.VALID_TOKEN_KEYWORDS);
+ final PropertyValue pv = this.standardParse(token, AbstractAllowedAxisScale.VALID_TOKEN_KEYWORDS);
if (pv.canEvalKeyword()) {
return pv;
}
Modified: 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/AbstractBorderStyle.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -95,7 +95,7 @@
if (pv.canEvalKeyword()) {
return pv;
}
- pv = this.standardParse(fobj, value, DtBorderStyle.VALID_KEYWORDS);
+ pv = this.standardParse(value, DtBorderStyle.VALID_KEYWORDS);
if (this.canEvalBorderStyle(pv)) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -369,7 +369,7 @@
spaceDT = new DtSpace(length, length, length,
FoValue.DISCARD, new DtInteger(0));
}
- final PropertyValue pv = this.standardParse(fobj, value, null);
+ final PropertyValue pv = this.standardParse(value, null);
if (pv.canEvalLength()) {
final boolean componentAdded = spaceDT.addComponent(subPropertyName,
pv);
Modified: 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/PdBorderColor.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -120,8 +120,7 @@
}
while (st.hasMoreTokens()) {
final String token = st.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, token,
- PdBorderColor.VALID_TOKEN_KEYWORDS);
+ final PropertyValue parsedToken = this.standardParse(token, PdBorderColor.VALID_TOKEN_KEYWORDS);
if (parsedToken.canEvalColor()
|| parsedToken.canEvalKeyword()) {
collection.addItem(parsedToken);
Modified: 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/PdBorderStyle.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -113,8 +113,7 @@
}
while (st.hasMoreTokens()) {
final String token = st.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, token,
- DtBorderStyle.VALID_KEYWORDS);
+ final PropertyValue parsedToken = this.standardParse(token, DtBorderStyle.VALID_KEYWORDS);
final FoValue foValue = this.convertValueToFoValue(parsedToken);
if (DtBorderStyle.isBorderStyle(foValue)) {
final DtBorderStyle borderStyle = DtBorderStyle.getInstance(
Modified: 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/PdBorderWidth.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -112,8 +112,7 @@
}
while (st.hasMoreTokens()) {
final String token = st.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, token,
- DtBorderWidth.VALID_KEYWORDS);
+ final PropertyValue parsedToken = this.standardParse(token, DtBorderWidth.VALID_KEYWORDS);
if (DtBorderWidth.isBorderWidth(parsedToken)) {
collection.addItem(parsedToken);
} else {
Modified: 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/PdFontFamily.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontFamily.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -115,8 +115,7 @@
final ValueCollection collection = new ValueCollection();
while (tokenizer.hasMoreTokens()) {
final String token = tokenizer.nextToken().trim();
- final PropertyValue parsedToken = this.standardParse(fobj, token,
- PdFontFamily.VALID_TOKEN_KEYWORDS);
+ final PropertyValue parsedToken = this.standardParse(token, PdFontFamily.VALID_TOKEN_KEYWORDS);
if (parsedToken.canEvalKeyword()
|| parsedToken instanceof DtName
|| parsedToken instanceof DtString) {
Modified: 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/PdMargin.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -92,8 +92,7 @@
final ValueCollection collection = new ValueCollection();
while (st.hasMoreTokens()) {
final String token = st.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, value,
- null);
+ final PropertyValue parsedToken = this.standardParse(value, null);
if (parsedToken.canEvalLength()
|| parsedToken.canEvalPercentage()) {
collection.addItem(parsedToken);
Modified: 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/PdPadding.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -92,8 +92,7 @@
final ValueCollection collection = new ValueCollection();
while (st.hasMoreTokens()) {
final String token = st.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, value,
- null);
+ final PropertyValue parsedToken = this.standardParse(value, null);
if (parsedToken.canEvalLength()
|| parsedToken.canEvalPercentage()) {
collection.addItem(parsedToken);
Modified: 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/PdPlayDuring.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPlayDuring.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -103,7 +103,7 @@
if (st.countTokens() < 1) {
throw unexpectedValue(value);
}
- pv = this.standardParse(fobj, st.nextToken(), null);
+ pv = this.standardParse(st.nextToken(), null);
if (! this.canEvalUri(pv)) {
throw unexpectedValue(value);
}
Modified: 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/PdVoiceFamily.java 2022-12-23 18:06:01 UTC (rev 12926)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVoiceFamily.java 2022-12-23 18:21:45 UTC (rev 12927)
@@ -99,8 +99,7 @@
final ValueCollection collection = new ValueCollection();
while (tokenizer.hasMoreTokens()) {
final String token = tokenizer.nextToken();
- final PropertyValue parsedToken = this.standardParse(fobj, token,
- PdVoiceFamily.VALID_TOKEN_KEYWORDS);
+ final PropertyValue parsedToken = this.standardParse(token, PdVoiceFamily.VALID_TOKEN_KEYWORDS);
if (parsedToken.canEvalKeyword()
|| parsedToken instanceof DtName) {
collection.addItem(parsedToken);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
10 messages has been excluded from this view by a project administrator.
