[FOray-commit] SF.net SVN: foray: [7814] trunk/foray/foray-fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7814] trunk/foray/foray-fotree
|
From: <vic...@us...> - 2006-07-23 14:57:47
|
Revision: 7814 Author: victormote Date: 2006-07-23 07:56:47 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7814&view=rev Log Message: ----------- Implement standard use of final modifier on local variable and method parameters. Modified Paths: -------------- trunk/foray/foray-fotree/.project trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SwitchTo.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java Modified: trunk/foray/foray-fotree/.project =================================================================== --- trunk/foray/foray-fotree/.project 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/.project 2006-07-23 14:56:47 UTC (rev 7814) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -55,30 +55,30 @@ Constants.FOVAL_INHERIT, }; - public FontFamily(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontFamily(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontFamily(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontFamily(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } return new DtString(value); } - public String[] getValue(FOContext context, FObj fobj) { + public String[] getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueNoInstance(context, fobj); @@ -88,23 +88,24 @@ case Constants.FOVAL_CURSIVE: case Constants.FOVAL_FANTASY: case Constants.FOVAL_MONOSPACE: { - String[] returnArray + final String[] returnArray = {Constants.propertyKeywordValues[keyword]}; return returnArray; } } } if (this.value instanceof DtString) { - DtString stringDT = (DtString) this.value; - String[] returnArray = FontUtility.foFontFamily( + final DtString stringDT = (DtString) this.value; + final String[] returnArray = FontUtility.foFontFamily( stringDT.getValue()); return returnArray; } return DEFAULT_FONT_FAMILY; } - public static String[] getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static String[] getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitFontFamily(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -70,20 +70,20 @@ 20700, }; - public FontSize(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontSize(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontSize(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontSize(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -100,9 +100,9 @@ throw unexpectedValue(value, propertyList); } - public int getValue(FOContext context, FObj fobj) { + public int getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getBaseFontSize(context, fobj); @@ -137,12 +137,12 @@ } } if (this.value instanceof DtLength) { - DtLength length = (DtLength) this.value; + final DtLength length = (DtLength) this.value; return length.getValue(getBaseFontSize(context, fobj), 0); } if (this.value instanceof DtPercentage) { - DtPercentage percentageDT = (DtPercentage) this.value; - float percentage = percentageDT.getValue(); + final DtPercentage percentageDT = (DtPercentage) this.value; + final float percentage = percentageDT.getValue(); return Math.round(percentage * getBaseFontSize(context, fobj) / 100); } @@ -153,16 +153,18 @@ return getBaseFontSize(context, fobj); } - public static int getValueNoInstance(FOContext context, FObj fobj) { + public static int getValueNoInstance(final FOContext context, + final FObj fobj) { return getBaseFontSize(context, fobj); } - private static int getBaseFontSize(FOContext context, FObj fobj) { + private static int getBaseFontSize(final FOContext context, + final FObj fobj) { /* * The base font size comes from the parent object, and is needed * for "em" and percentage computations. */ - FObj parent = fobj.effectiveParent(context); + final FObj parent = fobj.effectiveParent(context); int baseFontSize = getDefaultFontSize(); if (parent != null) { baseFontSize = parent.traitFontSize(context); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -43,20 +43,22 @@ Constants.FOVAL_INHERIT, }; - public FontSizeAdjust(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontSizeAdjust(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontSizeAdjust(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontSizeAdjust(final PropertyList propertyList, + final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -68,12 +70,12 @@ throw unexpectedValue(value, propertyList); } - public double getValue(FOContext context, FObj fobj) { + public double getValue(final FOContext context, final FObj fobj) { if (this.value instanceof DtNumber) { return ((DtNumber) this.value).getValue(); } if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueNoInstance(context, fobj); @@ -87,8 +89,9 @@ return getValueNoInstance(context, fobj); } - public static double getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static double getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (fobj != null) { return parent.traitFontSizeAdjust(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -52,30 +52,30 @@ Constants.FOVAL_INHERIT, }; - public FontStretch(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontStretch(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontStretch(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontStretch(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } throw unexpectedValue(value, propertyList); } - public short getValue(FObj fobj) { + public short getValue(final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { } @@ -84,8 +84,9 @@ return 0; } - public static short getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static short getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitFontStretch(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -45,30 +45,30 @@ Constants.FOVAL_INHERIT, }; - public FontStyle(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontStyle(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontStyle(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontStyle(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } throw unexpectedValue(value, propertyList); } - public short getValue(FOContext context, FObj fobj) { + public short getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueNoInstance(context, fobj); @@ -81,8 +81,9 @@ return Constants.FOVAL_NORMAL; } - public static short getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static short getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitFontStyle(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -43,30 +43,30 @@ Constants.FOVAL_INHERIT, }; - public FontVariant(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontVariant(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontVariant(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontVariant(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } throw unexpectedValue(value, propertyList); } - public short getValue(FOContext context, FObj fobj) { + public short getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { return getValueNoInstance(context, fobj); } @@ -75,8 +75,9 @@ return Constants.FOVAL_NORMAL; } - public static short getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static short getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitFontVariant(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -47,27 +47,27 @@ Constants.FOVAL_INHERIT, }; - public FontWeight(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public FontWeight(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public FontWeight(PropertyList propertyList, short enumeration, - PropertyValue value) throws PropertyException { + public FontWeight(final PropertyList propertyList, final short enumeration, + final PropertyValue value) throws PropertyException { super(propertyList, enumeration, value); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } pv = standardParse(propertyList, value, false, false); if (pv instanceof DtInteger) { - int integer = ((DtInteger) pv).getValue(); + final int integer = ((DtInteger) pv).getValue(); switch (integer) { case 100: case 200: @@ -86,9 +86,9 @@ throw unexpectedValue(value, propertyList); } - public short getValue(FOContext context, FObj fobj) { + public short getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueNoInstance(context, fobj); @@ -109,7 +109,7 @@ * font-family using that weight, and 3) find the relative font * in that font-family. */ - FontUse font = getInheritedFont(context, fobj); + final FontUse font = getInheritedFont(context, fobj); if (font == null) { break; } @@ -117,7 +117,7 @@ } case Constants.FOVAL_LIGHTER: { /* See comments re: algorithm in FOVAL_BOLDER case above. */ - FontUse font = getInheritedFont(context, fobj); + final FontUse font = getInheritedFont(context, fobj); if (font == null) { break; } @@ -131,8 +131,9 @@ return 400; } - public static short getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static short getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitFontWeight(context); } @@ -143,12 +144,12 @@ return validKeywords; } - FontUse getInheritedFont(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + FontUse getInheritedFont(final FOContext context, final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent == null) { return null; } - FontUse font = parent.getPrimaryFont(context); + final FontUse font = parent.getPrimaryFont(context); return font; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -47,28 +47,29 @@ Constants.FOVAL_INHERIT, }; - public ForcePageCount(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public ForcePageCount(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } throw unexpectedValue(value, propertyList); } - public short getValue(FOContext context, FObj fobj) { + public short getValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.effectiveParent(context); + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitForcePageCount(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -33,15 +33,15 @@ public class Format extends Property { - public Format(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public Format(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { if (value.length() != 0) { return new DtString(value); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -50,15 +50,16 @@ Constants.FOVAL_INHERIT, }; - public GlyphOrientation(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public GlyphOrientation(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -70,9 +71,10 @@ throw unexpectedValue(value, propertyList); } - public short getValue(FOContext context, FObj fobj, byte axis) { + public short getValue(final FOContext context, final FObj fobj, + final byte axis) { if (this.value instanceof DtAngle) { - double angleValue = ((DtAngle) this.value).getValue(); + final double angleValue = ((DtAngle) this.value).getValue(); if (angleValue < 45) { return 0; } @@ -85,7 +87,7 @@ return 270; } if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_AUTO: { // AUTO only applies to glyph-orientation-vertical @@ -99,9 +101,9 @@ return getValueNoInstance(context, fobj, axis); } - public static short getValueNoInstance(FOContext context, FObj fobj, - byte axis) { - FObj parent = fobj.effectiveParent(context); + public static short getValueNoInstance(final FOContext context, + final FObj fobj, final byte axis) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { switch (axis) { case Constants.AXIS_HORIZONTAL: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -33,20 +33,21 @@ public class GroupingSize extends Property { - public GroupingSize(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) - throws PropertyException { + public GroupingSize(final PropertyList propertyList, + final short enumeration, final String propertyFullName, + final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { /* The standard allows for a numeric value, but we will round it and * store it as an integer, because it appears to be totally useless * except as an integer. */ - PropertyValue pv = standardParse(propertyList, value, true, false); + final PropertyValue pv = standardParse(propertyList, value, true, + false); if (pv instanceof DtInteger) { return pv; } @@ -55,7 +56,7 @@ public int getValue() { if (this.value instanceof DtInteger) { - DtInteger integer = (DtInteger) this.value; + final DtInteger integer = (DtInteger) this.value; return integer.getValue(); } return getValueNoInstance(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -45,15 +45,16 @@ Constants.FOVAL_INHERIT, }; - public HyphLadderCount(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public HyphLadderCount(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -65,12 +66,12 @@ throw unexpectedValue(value, propertyList); } - public int getValue(FOContext context, FObj fobj) { + public int getValue(final FOContext context, final FObj fobj) { if (this.value instanceof DtInteger) { return ((DtInteger) this.value).getValue(); } if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueNoInstance(context, fobj); @@ -83,8 +84,9 @@ return getValueNoInstance(context, fobj); } - public static int getValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static int getValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent != null) { return parent.traitHyphLadderCount(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -41,15 +41,16 @@ Constants.FOVAL_INHERIT, }; - public HyphPushCharCount(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public HyphPushCharCount(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + public PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -62,9 +63,9 @@ throw unexpectedValue(value, propertyList); } - public int traitValue(FOContext context, FObj fobj) { + public int traitValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return fobj.effectiveParent(context) @@ -78,8 +79,9 @@ return traitValueNoInstance(context, fobj); } - public static int traitValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static int traitValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent == null) { return 2; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -42,15 +42,16 @@ Constants.FOVAL_INHERIT, }; - public HyphRemainCharCount(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public HyphRemainCharCount(final PropertyList propertyList, + final short enumeration, final String propertyFullName, + final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + public PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -63,9 +64,9 @@ throw unexpectedValue(value, propertyList); } - public int traitValue(FOContext context, FObj fobj) { + public int traitValue(final FOContext context, final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); + final short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return fobj.effectiveParent(context) @@ -79,8 +80,9 @@ return traitValueNoInstance(context, fobj); } - public static int traitValueNoInstance(FOContext context, FObj fobj) { - FObj parent = fobj.effectiveParent(context); + public static int traitValueNoInstance(final FOContext context, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent == null) { return 2; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -33,16 +33,17 @@ public class Id extends Property { - public Id(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public Id(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = standardParse(propertyList, value, false, false); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final PropertyValue pv = standardParse(propertyList, value, false, + false); if (pv instanceof DtName) { return pv; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -49,15 +49,15 @@ Constants.FOVAL_INHERIT, }; - public Indent(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public Indent(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + public PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -76,7 +76,7 @@ return pv; } if (pv instanceof Expr) { - Expr expression = (Expr) pv; + final Expr expression = (Expr) pv; if (expression.canEvalUnitPower1()) { return pv; } @@ -84,10 +84,10 @@ throw unexpectedValue(value, propertyList); } - public int getValue(FOContext context, FObj fobj, byte direction, - int ipdContainingRA) { + public int getValue(final FOContext context, final FObj fobj, + final byte direction, final int ipdContainingRA) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { return getValueNoInstance(context, fobj, direction, ipdContainingRA); @@ -98,34 +98,33 @@ 0); } if (this.value instanceof DtPercentage) { - DtPercentage percentageDT = (DtPercentage) this.value; - float percentage = percentageDT.getValue(); + final DtPercentage percentageDT = (DtPercentage) this.value; + final float percentage = percentageDT.getValue(); return Math.round(percentage * ipdContainingRA / 100); } if (this.value instanceof FnLabelEnd && direction == Constants.DIRECTION_END) { - FnLabelEnd function = (FnLabelEnd) this.value; - DtLength lengthDT = function.eval(fobj, ipdContainingRA); + final FnLabelEnd function = (FnLabelEnd) this.value; + final DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(context), 0); } if (this.value instanceof FnBodyStart && direction == Constants.DIRECTION_START) { - FnBodyStart function = (FnBodyStart) this.value; - DtLength lengthDT = function.eval(fobj, ipdContainingRA); + final FnBodyStart function = (FnBodyStart) this.value; + final DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(context), 0); } if (this.value instanceof Expr) { - Expr expression = (Expr) this.value; + final Expr expression = (Expr) this.value; return expression.evalUnitPower1(fobj.traitFontSize(context), ipdContainingRA); } return getValueNoInstance(context, fobj, direction, ipdContainingRA); } - public static int getValueNoInstance(FOContext context, FObj fobj, - byte direction, - int ipdContainingRA) { - FObj parent = fobj.effectiveParent(context); + public static int getValueNoInstance(final FOContext context, + final FObj fobj, final byte direction, final int ipdContainingRA) { + final FObj parent = fobj.effectiveParent(context); if (parent == null) { return 0; } @@ -137,7 +136,7 @@ * @param direction One of the directional constants. * @return String representation of the raw property name. */ - public static short rawPropertyType(int direction) { + public static short rawPropertyType(final int direction) { switch (direction) { case Constants.DIRECTION_START: { return Constants.FOPROP_START_INDENT; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -45,15 +45,16 @@ Constants.FOVAL_INHERIT, }; - public InitialPageNumber(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public InitialPageNumber(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + public PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; @@ -65,14 +66,15 @@ throw unexpectedValue(value, propertyList); } - public int getValue(FOContext context, FObj fobj, int lastPageNumberUsed) { + public int getValue(final FOContext context, final FObj fobj, + final int lastPageNumberUsed) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.effectiveParent(context); + final FObj parent = fobj.effectiveParent(context); if (parent != null) { - InitialPageNumber property = (InitialPageNumber) + final InitialPageNumber property = (InitialPageNumber) parent.propertyList.getProperty (Constants.FOPROP_INITIAL_PAGE_NUMBER); return property.getValue(context, parent, @@ -103,13 +105,13 @@ return getValueNoInstance(lastPageNumberUsed); } - public short getRawValue(FObj fobj) { + public short getRawValue(final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { - FObj parent = fobj.realParent(); + final FObj parent = fobj.realParent(); if (parent != null) { - PropertyList propertyList = parent.propertyList; + final PropertyList propertyList = parent.propertyList; return propertyList.getRawInitialPageNumber(); } return getRawValueNoInstance(); @@ -122,7 +124,7 @@ return getRawValueNoInstance(); } - public static int getValueNoInstance(int lastPageNumberUsed) { + public static int getValueNoInstance(final int lastPageNumberUsed) { return lastPageNumberUsed + 1; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -33,16 +33,17 @@ public class InternalDestination extends Property { - public InternalDestination(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public InternalDestination(final PropertyList propertyList, + final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); this.value = createPropertyValue(propertyList, attributeValue); } - private PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - DtName pv = DtName.makeNameDT(value); + private PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { + final DtName pv = DtName.makeNameDT(value); if (pv == null) { throw unexpectedValue(value, propertyList, "Invalid NCName"); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-07-23 00:55:19 UTC (rev 7813) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-07-23 14:56:47 UTC (rev 7814) @@ -60,11 +60,12 @@ Constants.FOVAL_ALWAYS, }; - public Keep(PropertyList propertyList, short enumeration, - String propertyFullName, String attributeValue) + public Keep(final PropertyList propertyList, final short enumeration, + final String propertyFullName, final String attributeValue) throws PropertyException { super(propertyList, enumeration); - String subPropertyName = Property.getSubPropertyName(propertyFullName); + final String subPropertyName = Property.getSubPropertyName( + propertyFullName); if (subPropertyName == null) { this.value = createPropertyValue(propertyList, attributeValue); return; @@ -73,24 +74,25 @@ subPropertyName, propertyFullName); } - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { + public PropertyValue createPropertyValue(final PropertyList propertyList, + final String value) throws PropertyException { PropertyValue pv = checkKeywords(value); if (pv != null) { return pv; } pv = standardParse(propertyList, value, false, false); if (pv instanceof DtInteger) { - int integer = ((DtInteger) pv).getValue(); + final int integer = ((DtInteger) pv).getValue(); return new DtKeep(integer, integer, integer); } throw unexpectedValue(value, propertyList); } - private PropertyValue createPropertyValueSpace(PropertyList propertyList, - String value, String subPropertyName, String propertyFullName) + private PropertyValue createPropertyValueSpace( + final PropertyList propertyList, final String value, + final String subPropertyName, final String propertyFullName) throws PropertyException { - DtKeep keepDT = createOrAddKeep(null, propertyList, value, + final DtKeep keepDT = createOrAddKeep(null, propertyList, value, subPropertyName, propertyFullName); if (keepDT != null) { return keepDT; @@ -98,9 +100,10 @@ throw unexpectedValue(value, propertyList); } - public int getValue(FOContext context, int subProperty, FObj fobj) { + public int getValue(final FOContext context, final int subProperty, + final FObj fobj) { if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) this.value).getValue(); + final short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { return getValueInherited(context, this.propertyType, @@ -115,7 +118,7 @@ } } if (this.value instanceof DtKeep) { - DtKeep keepDT = (DtKeep) this.value; + final DtKeep keepDT = (DtKeep) this.value; switch (subProperty) { case WITHIN_LINE: { return keepDT.getWithinLine(); @@ -133,9 +136,8 @@ fobj); } - public static int getValueNoInstance(FOContext context, short propertyType, - int subProperty, - FObj fobj) { + public static int getValueNoInstance(final FOContext context, + final short propertyType, final int subProperty, final FObj fobj) { // keep-together is inherited, the others are not if (propertyType != Constants.FOPROP_KEEP_TOGETHER) { return org.axsl.foR.Keep.AUTO; @@ -143,10 +145,10 @@ return getValueInherited(context, propertyType, subProperty, fobj); } - private static int getValueInherited(FOContext context, short propertyType, - int subProperty, - FObj fobj) { - FObj parent = fobj.effectiveParent(context); + private static int getValueInherited(final FOContext context, + final short propertyType, final int subProperty, + final FObj fobj) { + final FObj parent = fobj.effectiveParent(context); if (parent == null) { return org.axsl.foR.Keep.AUTO; } @@ -207,22 +209,24 @@ * pre-existing value is not the correct type. * @throws PropertyException If the input is not valid. */ - public boolean addComponent(PropertyList propertyList, - String propertyFullName, String attributeValue) + public boolean addComponent(final PropertyList propertyList, + final String propertyFullName, final String attributeValue) throws PropertyException { if (! (value instanceof DtKeep)) { return false; } DtKeep keepDT = (DtKeep) value; - String subPropertyName = Property.getSubPropertyName(propertyFullName); + final String subPropertyName = Property.getSubPropertyName( + propertyFullName); keepDT = createOrAddKeep(keepDT, propertyList, attributeValue, subPropertyName, propertyFullName); return true; } - private DtKeep createOrAddKeep(DtKeep keepDT, PropertyList propertyList, - String value, String subPropertyName, String propertyFullName) - throws PropertyException { + private DtKeep createOrAddKeep(DtKeep keepDT, + final PropertyList propertyList, + final String value, final String subPropertyName, + final String propertyFullName) throws PropertyException { if (keepDT == null) { keepDT = DtKeep.createKeepDT(); } @@ -230,7 +234... [truncated message content] |
