[FOray-commit] SF.net SVN: foray: [7812] trunk/foray/foray-fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7812] trunk/foray/foray-fotree
|
From: <vic...@us...> - 2006-07-23 00:19:48
|
Revision: 7812 Author: victormote Date: 2006-07-22 17:19:17 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7812&view=rev Log Message: ----------- Implement standard use of "final" modifier on local variables and parameters. Modified Paths: -------------- trunk/foray/foray-fotree/.project trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java Modified: trunk/foray/foray-fotree/.project =================================================================== --- trunk/foray/foray-fotree/.project 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/.project 2006-07-23 00:19:17 UTC (rev 7812) @@ -10,14 +10,8 @@ <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/FOLineNonText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -36,8 +36,8 @@ private org.axsl.foR.FOLineNonText realLineNonText; private FOContext context; - public FOLineNonText(org.axsl.foR.FOLineNonText realLineNonText, - FOContext context) { + public FOLineNonText(final org.axsl.foR.FOLineNonText realLineNonText, + final FOContext context) { this.realLineNonText = realLineNonText; this.context = context; } @@ -45,42 +45,45 @@ /** * {@inheritDoc} */ - public int inlineSizeOptimum(int lineLength) { + public int inlineSizeOptimum(final int lineLength) { return this.realLineNonText.inlineSizeOptimum(this.context, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeOptimum(FOContext context, int lineLength) { + public int inlineSizeOptimum(final FOContext context, + final int lineLength) { return this.realLineNonText.inlineSizeOptimum(context, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeMinimum(int lineLength) { + public int inlineSizeMinimum(final int lineLength) { return this.realLineNonText.inlineSizeMinimum(this.context, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeMinimum(FOContext context, int lineLength) { + public int inlineSizeMinimum(final FOContext context, + final int lineLength) { return this.realLineNonText.inlineSizeMinimum(context, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeMaximum(int lineLength) { + public int inlineSizeMaximum(final int lineLength) { return this.realLineNonText.inlineSizeMaximum(this.context, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeMaximum(FOContext context, int lineLength) { + public int inlineSizeMaximum(final FOContext context, + final int lineLength) { return this.realLineNonText.inlineSizeMaximum(context, lineLength); } @@ -94,7 +97,8 @@ /** * {@inheritDoc} */ - public org.axsl.foR.FOLineNonText getContextWrapper(FOContext context) { + public org.axsl.foR.FOLineNonText getContextWrapper( + final FOContext context) { /* This *is* the wrapper. */ return this; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -38,7 +38,8 @@ private org.axsl.foR.FOLineText realLineText; private FOContext context; - public FOLineText(org.axsl.foR.FOLineText realLineText, FOContext context) { + public FOLineText(final org.axsl.foR.FOLineText realLineText, + final FOContext context) { this.realLineText = realLineText; this.context = context; } @@ -53,7 +54,7 @@ /** * {@inheritDoc} */ - public char[] inlineText(FOContext context) { + public char[] inlineText(final FOContext context) { return realLineText.inlineText(context); } @@ -67,21 +68,21 @@ /** * {@inheritDoc} */ - public FontUse inlinePrimaryFont(FOContext context) { + public FontUse inlinePrimaryFont(final FOContext context) { return realLineText.inlinePrimaryFont(context); } /** * {@inheritDoc} */ - public FontUse inlineSecondaryFont(char c) { + public FontUse inlineSecondaryFont(final char c) { return realLineText.inlineSecondaryFont(this.context, c); } /** * {@inheritDoc} */ - public FontUse inlineSecondaryFont(FOContext context, char c) { + public FontUse inlineSecondaryFont(final FOContext context, final char c) { return realLineText.inlineSecondaryFont(context, c); } @@ -95,7 +96,7 @@ /** * {@inheritDoc} */ - public int inlineFontSize(FOContext context) { + public int inlineFontSize(final FOContext context) { return realLineText.inlineFontSize(context); } @@ -109,7 +110,7 @@ /** * {@inheritDoc} */ - public int inlineLetterSpacingOptimum(FOContext context) { + public int inlineLetterSpacingOptimum(final FOContext context) { return realLineText.inlineLetterSpacingOptimum(context); } @@ -123,7 +124,7 @@ /** * {@inheritDoc} */ - public boolean inlineWrapOption(FOContext context) { + public boolean inlineWrapOption(final FOContext context) { return realLineText.inlineWrapOption(context); } @@ -137,7 +138,7 @@ /** * {@inheritDoc} */ - public boolean inlineHyphenate(FOContext context) { + public boolean inlineHyphenate(final FOContext context) { return realLineText.inlineHyphenate(context); } @@ -151,7 +152,7 @@ /** * {@inheritDoc} */ - public String inlineLanguage(FOContext context) { + public String inlineLanguage(final FOContext context) { return realLineText.inlineLanguage(context); } @@ -165,7 +166,7 @@ /** * {@inheritDoc} */ - public String inlineCountry(FOContext context) { + public String inlineCountry(final FOContext context) { return realLineText.inlineCountry(context); } @@ -179,7 +180,7 @@ /** * {@inheritDoc} */ - public int inlineHyphenationRemainCount(FOContext context) { + public int inlineHyphenationRemainCount(final FOContext context) { return realLineText.inlineHyphenationRemainCount(context); } @@ -193,7 +194,7 @@ /** * {@inheritDoc} */ - public int inlineHyphenationPushCount(FOContext context) { + public int inlineHyphenationPushCount(final FOContext context) { return realLineText.inlineHyphenationPushCount(context); } @@ -207,7 +208,7 @@ /** * {@inheritDoc} */ - public char inlineHyphenationCharacter(FOContext context) { + public char inlineHyphenationCharacter(final FOContext context) { return realLineText.inlineHyphenationCharacter(context); } /** @@ -220,7 +221,7 @@ /** * {@inheritDoc} */ - public boolean inlineIsFauxSmallCaps(FOContext context) { + public boolean inlineIsFauxSmallCaps(final FOContext context) { return realLineText.inlineIsFauxSmallCaps(context); } @@ -234,7 +235,7 @@ /** * {@inheritDoc} */ - public int inlineFauxSmallCapsFontSize(FOContext context) { + public int inlineFauxSmallCapsFontSize(final FOContext context) { return realLineText.inlineFauxSmallCapsFontSize(context); } @@ -262,7 +263,7 @@ /** * {@inheritDoc} */ - public org.axsl.foR.FOLineText getContextWrapper(FOContext context) { + public org.axsl.foR.FOLineText getContextWrapper(final FOContext context) { /* This *is* the wrapper. */ return this; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -47,7 +47,7 @@ private FONodeResult result; - protected FONode(FObj parent) { + protected FONode(final FObj parent) { super(parent); } @@ -58,26 +58,26 @@ * issues. * @return This node's effective parent. */ - public FObj effectiveParent(FOContext context) { + public FObj effectiveParent(final FOContext context) { /* If either this or its parent is a Marker, we want to return that * Marker's surrogate RetrieveMarker's parent. */ if (this instanceof Marker) { return effectiveMarkerParent(context); } - TreeNode parent = this.getParent(); + final TreeNode parent = this.getParent(); if (parent instanceof Marker) { return effectiveMarkerParent(context); } return realParent(); } - private FObj effectiveMarkerParent(FOContext context) { + private FObj effectiveMarkerParent(final FOContext context) { if (context == null) { /* TODO: Consider throwing an Exception. This should NOT * happen. */ return realParent(); } - RetrieveMarker retrieve = context.getRetrieveMarker(); + final RetrieveMarker retrieve = context.getRetrieveMarker(); if (retrieve == null) { /* TODO: Consider throwing an Exception. This should NOT * happen. */ @@ -109,7 +109,7 @@ /** * {@inheritDoc} */ - public void setProxy(FONodeProxy proxy) { + public void setProxy(final FONodeProxy proxy) { this.proxy = proxy; } @@ -123,7 +123,7 @@ /** * {@inheritDoc} */ - public void setResult(FONodeResult result) { + public void setResult(final FONodeResult result) { this.result = result; } @@ -144,7 +144,7 @@ return; } for (int i = 0; i < this.getChildren().size(); i++) { - FONode node = (FONode) this.getChildren().get(i); + final FONode node = (FONode) this.getChildren().get(i); node.reset(); } } @@ -152,7 +152,7 @@ /** * {@inheritDoc} */ - public org.axsl.foR.FONode getFONodeChildAt(int childIndex) { + public org.axsl.foR.FONode getFONodeChildAt(final int childIndex) { return (FONode) super.getChildAt(childIndex); } @@ -164,7 +164,8 @@ this.getColumn()); } - public String getContextMessage(String systemId, int line, int column) { + public String getContextMessage(final String systemId, final int line, + final int column) { return " Context: " + systemId + "\n" + " (Line " + line + ", Column " + column + ")"; } @@ -173,7 +174,7 @@ * {@inheritDoc} */ public org.axsl.foR.fo.Marker ancestorMarker() { - FObj parent = this.realParent(); + final FObj parent = this.realParent(); if (parent == null) { return null; } @@ -191,13 +192,13 @@ return realParent().getLogger(); } - public void throwException(String message) throws FOTreeException { + public void throwException(final String message) throws FOTreeException { throwException(getContextMessage(), message); } - public void throwException(String contextMessage, String message) - throws FOTreeException{ - FOTreeException exception = new FOTreeException(message); + public void throwException(final String contextMessage, + final String message) throws FOTreeException{ + final FOTreeException exception = new FOTreeException(message); exception.setContextMessage(contextMessage); throw exception; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -74,7 +74,7 @@ private char[] ca; private byte filterStatus = FILTER_RAW; - public FOText(FObj parent, char[] chars) { + public FOText(final FObj parent, final char[] chars) { super(parent); this.ca = chars; filterContent(); @@ -86,7 +86,7 @@ if (this.getFOTreeBuilder().preserveRawContent()) { return; } - Marker ancestorMarker = this.ancestorMarker(); + final Marker ancestorMarker = this.ancestorMarker(); if (ancestorMarker != null) { /* There is an fo:marker ancestor, so we can't know what the values * are for white-space-treatment, linefeed-treatment, @@ -119,7 +119,7 @@ public boolean isAllWhiteSpace() { for (int i = 0; i < ca.length; i++) { - char ch = ca[i]; + final char ch = ca[i]; if ((ch == ' ') || (ch == '\n') || (ch == '\r') @@ -146,17 +146,17 @@ * * @return The text that should appear in the refined FO tree. */ - public char[] getRefinedText(FOContext context) { + public char[] getRefinedText(final FOContext context) { /* TODO: This needs to come from effectiveParent, with context. */ - FObj effectiveParent = this.realParent(); + final FObj effectiveParent = this.realParent(); if (this.filterStatus >= FILTER_REFINED_FO_TREE) { /* The stored text has already been filtered. Just return it. */ return this.ca; } - char[] charArray = getPreTextTransformText(context); + final char[] charArray = getPreTextTransformText(context); // Now handle text-transform. - short textTransform = effectiveParent.traitTextTransform(context); + final short textTransform = effectiveParent.traitTextTransform(context); if (textTransform != Constants.FOVAL_NONE) { for (int i = 0; i < charArray.length; i++) { charArray[i] = applyTextTransform(context, charArray, i, @@ -189,8 +189,8 @@ * @return The text that should appear in the refined FO tree, except that * text-transform is not applied. */ - private char[] getPreTextTransformText(FOContext context) { - FObj effectiveParent = this.effectiveParent(context); + private char[] getPreTextTransformText(final FOContext context) { + final FObj effectiveParent = this.effectiveParent(context); if (this.filterStatus >= FILTER_PRE_TRANSFORM) { /* The stored text has already been filtered. Just return it. */ return this.ca; @@ -221,9 +221,10 @@ * @param textTransform The value of the text-transform enumerated property. * @return The transformed char. */ - private char applyTextTransform(FOContext context, char[] charArray, - int index, short textTransform) { - char c = charArray[index]; + private char applyTextTransform(final FOContext context, + final char[] charArray, final int index, + final short textTransform) { + final char c = charArray[index]; switch (textTransform) { /* This method not be entered if value is NONE. */ case Constants.FOVAL_UPPERCASE: @@ -271,9 +272,10 @@ * @return True iff the character at this location is the start of a new * word. */ - private boolean isStartOfWord(FOContext context, char[] charArray, - int index) { - char prevChar = getRelativeCharInBlock(context, charArray, index, -1); + private boolean isStartOfWord(final FOContext context, + final char[] charArray, final int index) { + final char prevChar = getRelativeCharInBlock(context, charArray, + index, -1); /* All we are really concerned about here is of what type prevChar is. If inputChar is not part of a word, then the Java conversions will (we hope) simply return inputChar. @@ -288,7 +290,7 @@ * as a possessive or a contraction, or might be a closing quote. */ case IS_WORD_CHAR_MAYBE: - char prevPrevChar = getRelativeCharInBlock(context, charArray, + final char prevPrevChar = getRelativeCharInBlock(context, charArray, index, -2); switch (isWordChar(prevPrevChar)) { case IS_WORD_CHAR_TRUE: @@ -317,7 +319,7 @@ * depending on whether the character should be considered part of a word * or not. */ - public static int isWordChar(char inputChar) { + public static int isWordChar(final char inputChar) { switch (Character.getType(inputChar)) { case Character.COMBINING_SPACING_MARK: return IS_WORD_CHAR_TRUE; @@ -405,10 +407,10 @@ * @return the character in the offset position within the block; 0x0000 if * the offset points to an area outside of the block. */ - private char getRelativeCharInBlock(FOContext context, char[] charArray, - int index, int offset) { + private char getRelativeCharInBlock(final FOContext context, + final char[] charArray, final int index, final int offset) { // The easy case is where the desired character is in the same FOText - int desiredIndex = index + offset; + final int desiredIndex = index + offset; if (desiredIndex >= 0 && desiredIndex < charArray.length) { return ca[desiredIndex]; } @@ -419,7 +421,8 @@ remainingOffset = offset - (charArray.length - 1 - index); FOText nextFOText = this.getNextContiguousTextInBlock(); while (nextFOText != null) { - char[] nextText = nextFOText.getPreTextTransformText(context); + final char[] nextText = + nextFOText.getPreTextTransformText(context); if (nextText.length >= remainingOffset) { return nextText[remainingOffset - 1]; } @@ -432,7 +435,7 @@ remainingOffset = offset + index; FOText prevFOText = this.getPreviousContiguousTextInBlock(); while (prevFOText != null) { - char[] prevText = prevFOText.getPreTextTransformText(context); + final char[] prevText = prevFOText.getPreTextTransformText(context); if (prevText.length >= Math.abs(remainingOffset)) { return prevText[prevText.length + remainingOffset]; } @@ -450,7 +453,7 @@ * non-text leaf between, null is returned. */ private FOText getNextContiguousTextInBlock() { - FONode nextLeaf = (FONode) this.getNextLeaf(); + final FONode nextLeaf = (FONode) this.getNextLeaf(); return getContiguousTextInBlock(nextLeaf); } @@ -462,7 +465,7 @@ * non-text leaf between, null is returned. */ private FOText getPreviousContiguousTextInBlock() { - FONode previousLeaf = (FONode) this.getPreviousLeaf(); + final FONode previousLeaf = (FONode) this.getPreviousLeaf(); return getContiguousTextInBlock(previousLeaf); } @@ -475,9 +478,9 @@ * 3) #leafToTest has the same ancestor Block as this. * If any of these are not true, null is returned. */ - private FOText getContiguousTextInBlock(FONode leafToTest) { - FObj effectiveParent = this.realParent(); - FOContext context = null; + private FOText getContiguousTextInBlock(final FONode leafToTest) { + final FObj effectiveParent = this.realParent(); + final FOContext context = null; if (leafToTest == null) { return null; } @@ -486,15 +489,15 @@ } /* If either is within a Leader, they both need to be in the same one. */ - Leader thisLeader = effectiveParent.getNearestLeader(context); - Leader testLeader = leafToTest.effectiveParent(context) + final Leader thisLeader = effectiveParent.getNearestLeader(context); + final Leader testLeader = leafToTest.effectiveParent(context) .getNearestLeader(context); if (thisLeader != testLeader) { return null; } - Block thisBlock = this.effectiveParent(context).getContainingBlock( - context); - Block testBlock = leafToTest.effectiveParent(context) + final Block thisBlock = + this.effectiveParent(context).getContainingBlock(context); + final Block testBlock = leafToTest.effectiveParent(context) .getContainingBlock(context); if (thisBlock != testBlock) { return null; @@ -512,8 +515,8 @@ * * @return The text that should appear in the area tree. */ - public char[] getAreaTreeText(FOContext context) { - FObj effectiveParent = this.realParent(); + public char[] getAreaTreeText(final FOContext context) { + final FObj effectiveParent = this.realParent(); if (this.filterStatus >= FILTER_AREA_TREE) { /* The stored text has already been filtered. Just return it. */ return this.ca; @@ -522,8 +525,8 @@ // Start with the refined FO Tree text char[] returnArray = getRefinedText(context); // Apply white-space-collapse. - boolean whiteSpaceCollapse = effectiveParent.traitWhiteSpaceCollapse( - context); + final boolean whiteSpaceCollapse = + effectiveParent.traitWhiteSpaceCollapse(context); returnArray = applyWhiteSpaceCollapse(returnArray, whiteSpaceCollapse); /* Set the instance text to the more refined value and update the @@ -537,7 +540,7 @@ return this.inlineText(null); } - public char[] inlineText(FOContext context) { + public char[] inlineText(final FOContext context) { return getAreaTreeText(context); } @@ -545,17 +548,17 @@ return this.inlinePrimaryFont(null); } - public FontUse inlinePrimaryFont(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public FontUse inlinePrimaryFont(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.getPrimaryFont(context); } - public FontUse inlineSecondaryFont(char c) { + public FontUse inlineSecondaryFont(final char c) { return this.inlineSecondaryFont(null, c); } - public FontUse inlineSecondaryFont(FOContext context, char c) { - FObj effectiveParent = effectiveParent(context); + public FontUse inlineSecondaryFont(final FOContext context, final char c) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.getSecondaryFont(context, c); } @@ -563,8 +566,8 @@ return this.inlineFontSize(null); } - public int inlineFontSize(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public int inlineFontSize(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitFontSize(context); } @@ -572,8 +575,8 @@ return this.inlineLetterSpacingOptimum(null); } - public int inlineLetterSpacingOptimum(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public int inlineLetterSpacingOptimum(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitLetterSpacingOpt(context); } @@ -581,8 +584,8 @@ return this.inlineWrapOption(null); } - public boolean inlineWrapOption(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public boolean inlineWrapOption(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return (effectiveParent.traitWrapOption(context) == Constants.FOVAL_WRAP); } @@ -591,8 +594,8 @@ return this.inlineHyphenate(null); } - public boolean inlineHyphenate(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public boolean inlineHyphenate(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitHyphenate(context); } @@ -600,8 +603,8 @@ return this.inlineLanguage(null); } - public String inlineLanguage(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public String inlineLanguage(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitLanguage(context); } @@ -609,8 +612,8 @@ return this.inlineCountry(null); } - public String inlineCountry(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public String inlineCountry(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitCountry(context); } @@ -618,8 +621,8 @@ return this.inlineHyphenationRemainCount(null); } - public int inlineHyphenationRemainCount(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public int inlineHyphenationRemainCount(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitHyphenationRemainCharacterCount(context); } @@ -627,8 +630,8 @@ return this.inlineHyphenationPushCount(null); } - public int inlineHyphenationPushCount(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public int inlineHyphenationPushCount(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitHyphenationPushCharacterCount(context); } @@ -636,8 +639,8 @@ return this.inlineHyphenationCharacter(null); } - public char inlineHyphenationCharacter(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public char inlineHyphenationCharacter(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.traitHyphenationCharacter(context); } @@ -645,8 +648,8 @@ return this.inlineIsFauxSmallCaps(null); } - public boolean inlineIsFauxSmallCaps(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public boolean inlineIsFauxSmallCaps(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); if (effectiveParent.traitFontVariant(context) != Constants.FOVAL_SMALL_CAPS) { return false; @@ -665,8 +668,8 @@ return this.inlineFauxSmallCapsFontSize(null); } - public int inlineFauxSmallCapsFontSize(FOContext context) { - FObj effectiveParent = effectiveParent(context); + public int inlineFauxSmallCapsFontSize(final FOContext context) { + final FObj effectiveParent = effectiveParent(context); return effectiveParent.getFauxSmallCapFontSize(context); } @@ -692,9 +695,9 @@ * Note that {@link #DISCARD_CHAR} is not a valid Unicode codepoint, and * should therefore never be in the input. */ - public static char applyWhiteSpaceTreatment(char[] charArray, int index, - short whiteSpaceTreatment) { - char c = charArray[index]; + public static char applyWhiteSpaceTreatment(final char[] charArray, + final int index, final short whiteSpaceTreatment) { + final char c = charArray[index]; if (! XMLCharacter.isXMLWhitespace(c)) { /* If it is not whitespace, it cannot be changed. */ return c; @@ -774,7 +777,7 @@ * white-space-treatment, <code>charArray</code> is returned. * Otherwise, a new char array with the result is returned. */ - public static char[] applyWhiteSpaceTreatment(char[] charArray, + public static char[] applyWhiteSpaceTreatment(final char[] charArray, short whiteSpaceTreatment) { switch (whiteSpaceTreatment) { case Constants.FOVAL_IGNORE: @@ -796,8 +799,8 @@ int discardElements = 0; int changeElements = 0; for (int i = 0; i < charArray.length; i++) { - char c = charArray[i]; - char conversionChar = applyWhiteSpaceTreatment(charArray, i, + final char c = charArray[i]; + final char conversionChar = applyWhiteSpaceTreatment(charArray, i, whiteSpaceTreatment); if (conversionChar == DISCARD_CHAR) { discardElements ++; @@ -812,11 +815,11 @@ /* We now know that changes of some sort must be made. Create a new * array in which to put the results. */ - char[] returnArray = new char[charArray.length - discardElements]; + final char[] returnArray = new char[charArray.length - discardElements]; discardElements = 0; for (int i = 0; i < charArray.length; i++) { - char conversionChar = applyWhiteSpaceTreatment(charArray, + final char conversionChar = applyWhiteSpaceTreatment(charArray, i, whiteSpaceTreatment); if (conversionChar == DISCARD_CHAR) { discardElements ++; @@ -827,7 +830,8 @@ return returnArray; } - public static char applyLinefeedTreatment(char c, short linefeedTreatment) { + public static char applyLinefeedTreatment(final char c, + final short linefeedTreatment) { assert c == 0x000a: "Invalid linefeed-treatment input."; switch (linefeedTreatment) { case Constants.FOVAL_IGNORE: { @@ -859,7 +863,7 @@ * <code>charArray</code> is returned. Otherwise, a new char array with the * result is returned. */ - public static char[] applyLinefeedTreatment(char[] charArray, + public static char[] applyLinefeedTreatment(final char[] charArray, short linefeedTreatment) { switch (linefeedTreatment) { case Constants.FOVAL_PRESERVE: { @@ -881,7 +885,7 @@ int discardElements = 0; int changeElements = 0; for (int i = 0; i < charArray.length; i++) { - char c = charArray[i]; + final char c = charArray[i]; if (c == 0x000a) { if (linefeedTreatment == Constants.FOVAL_IGNORE) { discardElements ++; @@ -897,12 +901,12 @@ /* We now know that changes of some sort must be made. Create a new * array in which to put the results. */ - char[] returnArray = new char[charArray.length - discardElements]; + final char[] returnArray = new char[charArray.length - discardElements]; discardElements = 0; for (int i = 0; i < charArray.length; i++) { - char c = charArray[i]; + final char c = charArray[i]; if (c == 0x000a) { - char conversionChar = applyLinefeedTreatment(c, + final char conversionChar = applyLinefeedTreatment(c, linefeedTreatment); if (conversionChar == DISCARD_CHAR) { discardElements ++; @@ -928,8 +932,9 @@ * if the next character is a line-feed. * If neither of these is true, returns the original character. */ - public static char applyWhiteSpaceCollapse(char[] charArray, int index) { - char c = charArray[index]; + public static char applyWhiteSpaceCollapse(final char[] charArray, + final int index) { + final char c = charArray[index]; if (! XMLCharacter.isXMLWhitespace(c)) { /* If it is not whitespace, nothing should change. */ return c; @@ -961,15 +966,15 @@ * white-space-collapse, <code>charArray</code> is returned. * Otherwise, a new char array with the result is returned. */ - public static char[] applyWhiteSpaceCollapse(char[] charArray, - boolean whiteSpaceCollapse) { + public static char[] applyWhiteSpaceCollapse(final char[] charArray, + final boolean whiteSpaceCollapse) { if (! whiteSpaceCollapse) { return charArray; } int discardElements = 0; for (int i = 0; i < charArray.length; i++) { - char convertChar = applyWhiteSpaceCollapse(charArray, i); + final char convertChar = applyWhiteSpaceCollapse(charArray, i); if (convertChar == DISCARD_CHAR) { discardElements ++; } @@ -981,10 +986,10 @@ /* We now know that changes of some sort must be made. Create a new * array in which to put the results. */ - char[] returnArray = new char[charArray.length - discardElements]; + final char[] returnArray = new char[charArray.length - discardElements]; discardElements = 0; for (int i = 0; i < charArray.length; i++) { - char conversionChar = applyWhiteSpaceCollapse(charArray, i); + final char conversionChar = applyWhiteSpaceCollapse(charArray, i); if (conversionChar == DISCARD_CHAR) { discardElements ++; } else { @@ -1006,12 +1011,12 @@ return this.parentFO().getColumn(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final ProxyFactory factory) { return factory.makeProxy(this); } - public org.axsl.foR.FOLineText getContextWrapper(FOContext context) { - org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + public org.axsl.foR.FOLineText getContextWrapper(final FOContext context) { + final org.axsl.foR.fo.Marker marker = this.ancestorMarker(); if (marker == null) { return this; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -90,7 +90,7 @@ URL[] graphicSearchPath; boolean cachingGraphics; - public FOTreeBuilder(FOrayFOTreeServer server, Log logger) { + public FOTreeBuilder(final FOrayFOTreeServer server, final Log logger) { this.server = server; this.logger = logger; } @@ -98,7 +98,7 @@ /** * SAX Handler for characters */ - public void characters(char[] data, int start, int length) + public void characters(final char[] data, final int start, final int length) throws SAXException { if (activeForeignXML != null) { // If inside foreign XML, let the ForeignXML instance handle it. @@ -110,7 +110,7 @@ currentFObj.addCharacters(data, start, length, locator.getSystemId(), locator.getLineNumber(), locator.getColumnNumber()); - } catch (FOTreeException e) { + } catch (final FOTreeException e) { throw new SAXException(e); } } @@ -119,8 +119,8 @@ /** * SAX Handler for the end of an element */ - public void endElement(String uri, String localName, String rawName) - throws SAXException { + public void endElement(final String uri, final String localName, + final String rawName) throws SAXException { if (activeForeignXML != null) { // If inside foreign XML, let the ForeignXML instance handle it. activeForeignXML.endElement(uri, localName, rawName); @@ -131,7 +131,7 @@ } try { currentFObj.end(); - } catch (FOTreeException e) { + } catch (final FOTreeException e) { throw new SAXException(e); } notifyFObjComplete(currentFObj); @@ -157,31 +157,32 @@ notifyDocumentComplete(); } - public void setDocumentLocator(Locator locator) { + public void setDocumentLocator(final Locator locator) { this.locator = locator; } /** * SAX Handler for the start of an element */ - public void startElement(String namespaceURI, String localName, - String rawName, Attributes attlist) throws SAXException { + public void startElement(final String namespaceURI, final String localName, + final String rawName, final Attributes attlist) + throws SAXException { if (activeForeignXML != null) { // If inside foreign XML, let the ForeignXML instance handle it. activeForeignXML.startElement(namespaceURI, localName, rawName, attlist); return; } - Namespace namespace = getTreeServer().getNamespace(namespaceURI); + final Namespace namespace = getTreeServer().getNamespace(namespaceURI); if (namespace == null) { - String message = "Unregistered namespace: " + namespaceURI; + final String message = "Unregistered namespace: " + namespaceURI; getLogger().error(message + ": " + getLine() + ":" + getColumn()); throw new SAXException(message); } /* the formatting object started */ FObj fobj = null; try { - PropertyList list = namespace.createNewPropertyList(localName, + final PropertyList list = namespace.createNewPropertyList(localName, attlist); fobj = namespace.parseElement(localName, currentFObj, list, locator, this); @@ -196,7 +197,7 @@ rootFObj.addId(fobj); // Let Root register an unmatched "ref-id", if any. rootFObj.checkUnmatchedReference(fobj); - } catch (FOTreeException e) { + } catch (final FOTreeException e) { throw new SAXException(e); } currentFObj = fobj; @@ -206,7 +207,7 @@ * @param fobj * @throws SAXException */ - private void checkRoot(FObj fobj) throws SAXException { + private void checkRoot(final FObj fobj) throws SAXException { if (rootFObj != null) { return; } @@ -216,13 +217,13 @@ return; } if (fobj.getName().equals("root")) { - FOTreeException fote = new FOTreeException("Root element is " + final FOTreeException fote = new FOTreeException("Root element is " + "missing the namespace declaration: " + "http://www.w3.org/1999/XSL/Format"); fote.setContextMessage(fobj.getContextMessage()); throw new SAXException(fote); } - FOTreeException fote = new FOTreeException("Root element must be " + final FOTreeException fote = new FOTreeException("Root element must be " + "root, not " + fobj.getName()); fote.setContextMessage(fobj.getContextMessage()); throw new SAXException(new FOTreeException(fote)); @@ -262,7 +263,7 @@ * FOTreeEvent firings. * @param listener the Object which should be notified */ - public void registerListener (FOTreeListener listener) { + public void registerListener (final FOTreeListener listener) { if (listener == null) { return; } @@ -277,7 +278,7 @@ * about FOTreeEvent firings. * @param listener the Object which should no longer be notified */ - public void removeFOTreeListener (FOTreeListener listener) { + public void removeFOTreeListener (final FOTreeListener listener) { if (listener == null) { return; } @@ -292,15 +293,16 @@ * FOTreeEvent has been fired. * @param fobj The FObj instance that was just completed. */ - private void notifyFObjComplete(FObj fobj) { + private void notifyFObjComplete(final FObj fobj) { /* If nobody wants these events, don't waste resources creating * them. */ if (this.qtyFObjListeners < 1) { return; } - FOTreeEvent event = new FOTreeEvent(this, fobj); + final FOTreeEvent event = new FOTreeEvent(this, fobj); for (int i = 0; i < foTreeListeners.size(); i++) { - FOTreeListener listener = (FOTreeListener) foTreeListeners.get(i); + final FOTreeListener listener = + (FOTreeListener) foTreeListeners.get(i); listener.foFObjComplete(event); } } @@ -310,10 +312,11 @@ * FOTreeEvent has been fired. * @param pageSequence The PageSequence instance that was just completed. */ - private void notifyPageSequenceComplete(PageSequence pageSequence) { - FOTreeEvent event = new FOTreeEvent(this, pageSequence); + private void notifyPageSequenceComplete(final PageSequence pageSequence) { + final FOTreeEvent event = new FOTreeEvent(this, pageSequence); for (int i = 0; i < foTreeListeners.size(); i++) { - FOTreeListener listener = (FOTreeListener) foTreeListeners.get(i); + final FOTreeListener listener = + (FOTreeListener) foTreeListeners.get(i); listener.foPageSequenceComplete(event); } } @@ -323,9 +326,10 @@ * FOTreeEvent has been fired. */ private void notifyDocumentComplete() { - FOTreeEvent event = new FOTreeEvent(this); + final FOTreeEvent event = new FOTreeEvent(this); for (int i = 0; i < foTreeListeners.size(); i++) { - FOTreeListener listener = (FOTreeListener) foTreeListeners.get(i); + final FOTreeListener listener = + (FOTreeListener) foTreeListeners.get(i); listener.foDocumentComplete(event); } } @@ -346,7 +350,7 @@ return getTreeServer().getXMLNamespace(); } - public String getPropertyName(short propertyType) { + public String getPropertyName(final short propertyType) { return this.server.getPropertyName(propertyType); } @@ -354,7 +358,7 @@ return this.rootFObj; } - public void activateForeignXML(ForeignXML foreign) { + public void activateForeignXML(final ForeignXML foreign) { this.activeForeignXML = foreign; } @@ -366,7 +370,7 @@ return this.server; } - public void setGraphicServer(GraphicServer graphicServer) { + public void setGraphicServer(final GraphicServer graphicServer) { this.graphicServer = graphicServer; } @@ -374,7 +378,7 @@ return this.graphicServer; } - public void setTextServer(TextServer textServer) { + public void setTextServer(final TextServer textServer) { this.textServer = textServer; } @@ -382,7 +386,7 @@ return this.textServer; } - public void setFontConsumer(FontConsumer consumer) { + public void setFontConsumer(final FontConsumer consumer) { this.fontConsumer = consumer; } @@ -390,7 +394,7 @@ return this.fontConsumer; } - public void setGraphicSearchPath(URL[] graphicSearchPath) { + public void setGraphicSearchPath(final URL[] graphicSearchPath) { this.graphicSearchPath = graphicSearchPath; } @@ -398,7 +402,7 @@ return this.graphicSearchPath; } - public void setCachingGraphics(boolean cachingGraphics) { + public void setCachingGraphics(final boolean cachingGraphics) { this.cachingGraphics = cachingGraphics; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-07-22 22:07:57 UTC (rev 7811) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-07-23 00:19:17 UTC (rev 7812) @@ -59,8 +59,9 @@ protected int line; protected int column; - protected FObj(FObj parent, PropertyList propertyList, String systemId, - int line, int column) throws FOTreeException { + protected FObj(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { // Register the parent as the parent of this. super(parent); // Register this as a child of the parent. @@ -114,15 +115,17 @@ * @param column The columns number of the location of the text being * added (used in error messages). */ - protected void addCharacters(char[] data, int start, int length, - String systemId, int line, int column) throws FOTreeException { + protected void addCharacters(final char[] data, final int start, + final int length, final String systemId, final int line, + final int column) throws FOTreeException { if (containsText(data, start, length)) { throwException(getContextMessage(systemId, line, column), "May not contain non-whitespace text."); } } - protected boolean containsText(char[] data, int start, int length) { + protected boolean containsText(final char[] data, final int start, + final int length) { if (data == null || data.length < 1) { return false; } @@ -131,7 +134,7 @@ return false; } for (int i = start; i < start + length; i++) { - char c = data[i]; + final char c = data[i]; if (! XMLCharacter.isXMLWhitespace(c)) { return true; } @@ -191,7 +194,7 @@ * issues. * @return The nearest ancestor FObj that generates reference areas. */ - public org.axsl.foR.FObj ancestorGeneratingRA(FOContext context) { + public org.axsl.foR.FObj ancestorGeneratingRA(final FOContext context) { if (effectiveParent(context).isRAGenerator()) { return effectiveParent(context); } @@ -201,7 +204,7 @@ /** * @return Self or the nearest ancestor FObj that generates reference areas. */ - public org.axsl.foR.FObj nearestGeneratingRA(FOContext context) { + public org.axsl.foR.FObj nearestGeneratingRA(final FOContext context) { if (this.isRAGenerator()) { return this; } @@ -213,7 +216,8 @@ * issues. * @return Self or the nearest ancestor FObj that is a ListItem. */ - public org.axsl.foR.fo.ListItem getNearestListItem(FOContext context) { + public org.axsl.foR.fo.ListItem getNearestListItem( + final FOContext context) { return effectiveParent(context).getNearestListItem(context); } @@ -223,7 +227,7 @@ * @return The nearest ancestor FObj that is a ListBlock. */ public org.axsl.foR.fo.ListBlock getNearestAncestorListBlock( - FOContext context) { + final FOContext context) { if (getParent() == null) { return null; } @@ -245,11 +249,11 @@ * the nearest ancestor that is a Block, or null if there is no ancestor * Block. */ - public org.axsl.foR.fo.Block getContainingBlock(FOContext context) { + public org.axsl.foR.fo.Block getContainingBlock(final FOContext context) { return effectiveParent(context).getContainingBlock(context); } - public org.axsl.foR.fo.Flow getFlow(FOContext context) { + public org.axsl.foR.fo.Flow getFlow(final FOContext context) { if (getParent() == null) { return null; } @@ -259,36 +263,37 @@ /** * {@inheritDoc} */ - public org.axsl.foR.fo.Table getNearestTable(FOContext context) { + public org.axsl.foR.fo.Table getNearestTable(final FOContext context) { return effectiveParent(context).getNearestTable(context); } - public org.axsl.foR.fo.Leader getNearestLeader(FOContext context) { + public org.axsl.foR.fo.Leader getNearestLeader(final FOContext context) { return effectiveParent(context).getNearestLeader(context); } /** * {@inheritDoc} */ - public org.axsl.foR.fo.BasicLink getBasicLink(FOContext context) { + public org.axsl.foR.fo.BasicLink getBasicLink(final FOContext context) { return effectiveParent(context).getBasicLink(context); } /** * {@inheritDoc} */ - public org.axsl.foR.FObj ancestorListRelatedObject(FOContext context) { + public org.axsl.foR.FObj ancestorListRelatedObject( + final FOContext context) { return effectiveParent(context).ancestorListRelatedObject(context); } /** * {@inheritDoc} */ - public String refIdNeeded(FOContext context) { + public String refIdNeeded(final FOContext context) { return null; } - protected void addChild(FONode child) throws FOTreeException { + protected void addChild(final FONode child) throws FOTreeException { children.add(child); } @@ -313,14 +318,14 @@ return true; } - public void checkExceptionLocation(FOTreeException exception) { + public void checkExceptionLocation(final FOTreeException exception) { if (exception.isContextSet()) { return; } exception.setContextMessage(getContextMessage()); } - public void logWarning(String message) { + public void logWarning(final String message) { getLogger().warn(message + "\n" + getContextMessage()); } @@ -342,84 +347,88 @@ */ public abstract Namespace getNamespace() ; - public String getPropertyName(short propertyType) { + public String getPropertyName(final short propertyType) { return getFOTreeBuilder().getPropertyName(propertyType); } /** * {@inheritDoc} */ - public int getMarginLeft(FOContext context, int widthContainingBlock) { + public int getMarginLeft(final FOContext context, + final int widthContainingBlock) { return propertyList.getMarginLeft(context, widthContainingBlock); } /** * {@inheritDoc} */ - public int getMarginRight(FOContext context, int widthContainingBlock) { + public int getMarginRight(final FOContext context, + final int widthContainingBlock) { return propertyList.getMarginRight(context, widthContainingBlock); } /** * {@inheritDoc} */ - public int getMarginTop(FOContext context, int widthContainingBlock) { + public int getMarginTop(final FOContext context, + final int widthContainingBlock) { return propertyList.getMarginTop(context, widthContainingBlock); } /** * {@inheritDoc} */ - public int getMarginBottom(FOContext context, int widthContainingBlock) { + public int getMarginBottom(final FOContext context, + final int widthContainingBlock) { return propertyList.getMarginBottom(context, widthContainingBlock); } /** * {@inheritDoc} */ - public Color traitColor(FOContext context) { + public Color traitColor(final FOContext context) { return propertyList.getColor(context); } /** * {@inheritDoc} */ - public short traitWrapOption(FOContext context) { + public short traitWrapOption(final FOContext context) { return propertyList.getWrapOption(context); } /** * {@inheritDoc} */ - public boolean traitWhiteSpaceCollapse(FOContext context) { + public boolean traitWhiteSpaceCollapse(final FOContext context) { return propertyList.getWhiteSpaceCollapse(context); } /** * {@inheritDoc} */ - public boolean traitUnderlineScore(FOContext context) { + public boolean traitUnderlineScore(final FOContext context) { return propertyList.getUnderlineScore(context); } /** * {@inheritDoc} */ - public boolean traitOverlineScore(FOContext context) { + public boolean traitOverlineScore(final FOContext context) { return propertyList.getOverlineScore(context); } /** * {@inheritDoc} */ - public boolean traitThroughScore(FOContext context) { + public boolean traitThroughScore(final FOContext context) { return propertyList.getThroughScore(context); } /** * {@inheritDoc} */ - public Color traitUnderlineScoreColor(FOContext context) { + public Color traitUnderlineScoreColor(final FOContext context) { /* TODO: This is not right. See Sections 5.5.6 and 7.16.4. Inheritance * is unusual here, and we need to fix it. */ return traitColor(context); @@ -428,7 +437,7 @@ /** * {@inheritDoc} */ - public Color traitOverlineScoreColor(FOContext context) { + public Color traitOverlineScoreColor(final FOContext context) { // Value is the same as for underline. return traitUnderlineScoreColor(context); } @@ -436,7 +445,7 @@ /** * {@inheritDoc} */ - public Color traitThroughScoreColor(FOContext context) { + public Color traitThroughScoreColor(final FOContext context) { // Value is the same as for underline. return traitUnderlineScoreColor(context); } @@ -444,7 +453,7 @@ /** * {@inheritDoc} */ - public boolean traitBlink(FOContext context) { + public boolean traitBlink(final FOContext context) { return propertyList.getBlink(context); } @@ -472,7 +481,8 @@ /** * {@inheritDoc} */ - public int traitStartIndent(FOContext context, int ipdContainingRA) { + public int traitStartIndent(final FOContext context, + final int ipdContainingRA) { return propertyList.getIndent(context, Constants.DIRECTION_START, ipdContainingRA); } @@ -480,7 +490,7 @@ /** * {@inheritDoc} */ - public short traitSpan(FOContext context) { + public short traitSpan(final FOContext context) { /* * Only block-level FOs are affected by column-count, so, for all other * FOs, treat them as if the span trait were "all". @@ -514,7 +524,7 @@ return propertyList.getRetrieveBoundary(); } - public int traitColumnNumber(FOContext context) { + public int traitColumnNumber(final FOContext context) { return propertyList.getColumnNumber(context); } @@ -529,35 +539,35 @@ /** * {@inheritDoc} */ - public short traitBorderCollapse(FOContext context) { + public short traitBorderCollapse(final FOContext context) { return propertyList.getBorderCollapse(context); } /** * {@inheritDoc} */ - public short traitDisplayAlign(FOContext context) { + public short traitDisplayAlign(final FOContext context) { return propertyList.getDisplayAlign(context); } /** * {@inheritDoc} */ - public short traitRelativeAlign(FOContext context) { + public short traitRelativeAlign(final FOContext context) { return propertyList.getRelativeAlign(context); } /** * {@inheritDoc} */ - public int traitBorderSeparationIPD(FOContext context) { + public int traitBorderSeparationIPD(final FOContext context) { return propertyList.getBorderSeparationIPD(context); } /** * {@inheritDoc} */ - public int traitBorderSeparationBPD(FOContext context) { + public int traitBorderSeparationBPD(final FOContext context) { return propertyList.getBorderSeparationBPD(context); } @@ -571,7 +581,7 @@ /** * {@inheritDoc} */ - public int traitColumnWidth(FOContext context, int tableWidth) { + public int traitColumnWidth(final FOContext context, final int tableWidth) { return propertyList.getColumnWidth(context, tableWidth); } @@ -585,70 +595,70 @@ /** * {@inheritDoc} */ - public short traitBreakAfter(FOContext context) { + public short traitBreakAfter(final FOContext context) { return propertyList.getBreakAfter(context); } /** * {@inheritDoc} */ - public int traitKeepTogetherWithinLine(FOContext context) { + public int traitKeepTogetherWithinLine(final FOContext context) { return propertyList.traitKeepTogetherWithinLine(context); } /** * {@inheritDoc} */ - public int traitKeepTogetherWithinColumn(FOContext context) { + public int traitKeepTogetherWithinColumn(final FOContext context) { return propertyList.traitKeepTogetherWithinColumn(context); } /** * {@inheritDoc} */ - public int traitKeepTogetherWithinPage(FOContext context) { + public int traitKeepTogetherWithinPage(final FOContext context) { return propertyList.traitKeepTogetherWithinPage(context); } /** * {@inheritDoc} */ - public int traitKeepWithNextWithinLine(FOContext context) { + public int traitKeepWithNextWithinLine(final FOContext context) { return propertyList.traitKeepWithNextWithinLine(context); } /** * {@inheritDoc} */ - public int traitKeepWithNextWithinColumn(FOContext context) { + public int traitKeepWithNextWithinColumn(final FOContext context) { return propertyList.traitKeepWithNextWithinColumn(context); } /** * {@inheritDoc} */ - public int traitKeepWithNextWithinPage(FOContext context) { + public in... [truncated message content] |
