[FOray-commit] SF.net SVN: foray: [7807] trunk/foray/foray-areatree/src/java/org/foray/area
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7807] trunk/foray/foray-areatree/src/java/org/foray/area
|
From: <vic...@us...> - 2006-07-22 19:17:15
|
Revision: 7807 Author: victormote Date: 2006-07-22 12:16:29 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7807&view=rev Log Message: ----------- Implement standard use of "final" modifier on local variables and parameters. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -44,8 +44,8 @@ * @param parentArea * @param retrieveMarker */ - public AbstractInlineArea(FONode generatedBy, LineArea parentArea, - RetrieveMarker retrieveMarker) { + public AbstractInlineArea(final FONode generatedBy, + final LineArea parentArea, final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -55,8 +55,9 @@ * @param parentArea * @param retrieveMarker */ - public AbstractInlineArea(FONode generatedBy, AbstractInlineArea parentArea, - RetrieveMarker retrieveMarker) { + public AbstractInlineArea(final FONode generatedBy, + final AbstractInlineArea parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -75,7 +76,8 @@ return Constants.AXIS_IP; } - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -36,8 +36,8 @@ implements org.axsl.areaR.Area, org.axsl.areaW.AbstractNormalBlockArea { - public AbstractNormalBlockArea(FObj parentFObj, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractNormalBlockArea(final FObj parentFObj, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(parentFObj, parentArea, retrieveMarker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -34,8 +34,8 @@ */ public abstract class AbstractPlaceholder extends Area { - public AbstractPlaceholder(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractPlaceholder(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -77,7 +77,8 @@ /** * {@inheritDoc} */ - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return this.getParentArea().getOverflowArea(childRequesting); } @@ -98,21 +99,21 @@ /** * {@inheritDoc} */ - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { return; } /** * {@inheritDoc} */ - public void setMinimumProgressionDimension(int minimumPD) { + public void setMinimumProgressionDimension(final int minimumPD) { return; } /** * {@inheritDoc} */ - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { return; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -35,13 +35,13 @@ implements BackgroundArea, org.axsl.areaW.AbstractTableContainer { - public AbstractTableContainer(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractTableContainer(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } - public TableRowContainer makeTableRowContainer(TableRow node, - RetrieveMarker retrieveMarker) { + public TableRowContainer makeTableRowContainer(final TableRow node, + final RetrieveMarker retrieveMarker) { return new org.foray.area.TableRowContainer(node, this, retrieveMarker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -55,8 +55,8 @@ * @param generatedBy * @param parentArea */ - public Area(FONode generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public Area(final FONode generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -155,12 +155,12 @@ } public int traitEndIndent() { - int percentBase = this.getContainingReferenceArea().crIPD(); + final int percentBase = this.getContainingReferenceArea().crIPD(); return traitGeneratedBy().traitEndIndent(this, percentBase); } public int traitStartIndent() { - int percentBase = this.getContainingReferenceArea().crIPD(); + final int percentBase = this.getContainingReferenceArea().crIPD(); return traitGeneratedBy().traitStartIndent(this, percentBase); } @@ -175,7 +175,7 @@ return traitGeneratedBy().getPrimaryFont(this); } - public FontUse getSecondaryFont(int codePoint) { + public FontUse getSecondaryFont(final int codePoint) { return traitGeneratedBy().getSecondaryFont(this, codePoint); } @@ -223,7 +223,7 @@ if (getParent() == null) { return true; } - List siblings = getAreaNodeParent().getChildren(); + final List siblings = getAreaNodeParent().getChildren(); if (siblings == null) { return true; } @@ -237,7 +237,7 @@ if (getParent() == null) { return true; } - List siblings = getAreaNodeParent().getChildren(); + final List siblings = getAreaNodeParent().getChildren(); if (siblings == null) { return true; } @@ -256,17 +256,17 @@ return false; } - public int getWordWidth(String word) { - FontUse fontUse = getPrimaryFont(); - Font font = fontUse.getFont(); + public int getWordWidth(final String word) { + final FontUse fontUse = getPrimaryFont(); + final Font font = fontUse.getFont(); fontUse.registerCharsUsed(word); return font.width(word, traitFontSize(), traitLetterSpacingOpt(), traitWordSpacingOpt()); } - public int getCharWidth(char c) { - FontUse fontUse = getPrimaryFont(); - Font font = getPrimaryFont().getFont(); + public int getCharWidth(final char c) { + final FontUse fontUse = getPrimaryFont(); + final Font font = getPrimaryFont().getFont(); fontUse.registerCharUsed(c); return font.width(c, traitFontSize()) + traitLetterSpacingOpt(); } @@ -369,7 +369,7 @@ // Start at the padding-rectangle origin. int x = prOriginX(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingRight = (this.traitIPDirection() + final boolean goingRight = (this.traitIPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitBorderStartWidth(); @@ -378,7 +378,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitBorderBeforeWidth(); @@ -398,7 +398,7 @@ // Start at the padding-rectangle origin. int y = prOriginY(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingDown = (this.traitBPDirection() + final boolean goingDown = (this.traitBPDirection() == Constants.DIRECTION_TOP_TO_BOTTOM); if (goingDown) { y += this.traitBorderBeforeWidth(); @@ -407,7 +407,7 @@ } } else { // Our BP Axis is horizontal - boolean goingUp = (this.traitIPDirection() + final boolean goingUp = (this.traitIPDirection() == Constants.DIRECTION_BOTTOM_TO_TOP); if (goingUp) { y -= this.traitBorderStartWidth(); @@ -467,7 +467,7 @@ // Start at the content-rectangle origin. int x = crOriginX(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingRight = (this.traitIPDirection() + final boolean goingRight = (this.traitIPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitPaddingStart(); @@ -476,7 +476,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitPaddingBefore(); @@ -496,7 +496,7 @@ // Start at the content-rectangle origin. int y = crOriginY(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingDown = (this.traitBPDirection() + final boolean goingDown = (this.traitBPDirection() == Constants.DIRECTION_TOP_TO_BOTTOM); if (goingDown) { y += this.traitPaddingBefore(); @@ -505,7 +505,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { y -= this.traitPaddingBefore(); @@ -797,13 +797,13 @@ } public int traitSpaceStartOptimum() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitSpaceStartOptimum(this, ancestor.crIPD()); } public int traitSpaceEndOptimum() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD()); } @@ -817,7 +817,7 @@ private int nearestBaseBPD() { int nearestBPD = -1; - Area nearest = this.ancestorGeneratedByBlockLevelFO(); + final Area nearest = this.ancestorGeneratedByBlockLevelFO(); if (nearest != null) { nearestBPD = nearest.crBPD(); } @@ -850,7 +850,7 @@ private int nearestBaseIPD() { int nearestIPD = -1; - Area nearest = this.ancestorGeneratedByBlockLevelFO(); + final Area nearest = this.ancestorGeneratedByBlockLevelFO(); if (nearest != null) { nearestIPD = nearest.crIPD(); } @@ -934,7 +934,7 @@ * the writing-mode. */ public byte contentStackingDirectionAbsolute() { - byte relative = contentStackingAxisRelative(); + final byte relative = contentStackingAxisRelative(); return getWritingMode().getAbsoluteDirFromRelativeAxis(relative); } @@ -1000,7 +1000,7 @@ } public short referenceOrientationCumulative() { - Area containingRA = this.getContainingReferenceArea(); + final Area containingRA = this.getContainingReferenceArea(); short cumulative = containingRA.traitReferenceOrientation(); /* * The FObj method from which the following line is derived returns @@ -1072,7 +1072,7 @@ * if there is none. */ public String destinationName() { - String id = traitId(); + final String id = traitId(); if (id == null || id.equals("")) { return null; } @@ -1096,7 +1096,7 @@ * of a link, returns {@link Constants#BASIC_LINK_INVALID}. */ public byte linkType() { - BasicLink link = this.traitGeneratedBy().getBasicLink(this); + final BasicLink link = this.traitGeneratedBy().getBasicLink(this); if (link == null) { return Constants.BASIC_LINK_INVALID; } @@ -1110,7 +1110,7 @@ * external-destination. */ public String linkDestination() { - BasicLink link = this.traitGeneratedBy().getBasicLink(this); + final BasicLink link = this.traitGeneratedBy().getBasicLink(this); if (link == null) { return null; } @@ -1118,7 +1118,7 @@ } public int getHyphenWidth() { - char hyphenChar = traitHyphenationCharacter(); + final char hyphenChar = traitHyphenationCharacter(); return getCharWidth(hyphenChar); } @@ -1160,46 +1160,47 @@ return true; } - public TableArea makeTableArea(Table table, - RetrieveMarker retrieveMarker) { + public TableArea makeTableArea(final Table table, + final RetrieveMarker retrieveMarker) { return new org.foray.area.TableRA(table, this, retrieveMarker); } - public NormalBlockArea makeNormalBlockArea(Block block, - RetrieveMarker retrieveMarker) { + public NormalBlockArea makeNormalBlockArea(final Block block, + final RetrieveMarker retrieveMarker) { return new org.foray.area.NormalBlockArea(block, this, retrieveMarker); } public BlockContainerRA makeBlockContainerArea( - BlockContainer blockContainer, RetrieveMarker retrieveMarker) { + final BlockContainer blockContainer, + final RetrieveMarker retrieveMarker) { return new org.foray.area.BlockContainerRA(blockContainer, this, retrieveMarker); } - public ListBlockArea makeListBlockArea(ListBlock listBlock, - RetrieveMarker retrieveMarker) { + public ListBlockArea makeListBlockArea(final ListBlock listBlock, + final RetrieveMarker retrieveMarker) { return new org.foray.area.ListBlockArea(listBlock, this, retrieveMarker); } public int traitTop() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitTop(this, ancestor.crBPD()); } public int traitBottom() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitBottom(this, ancestor.crBPD()); } public int traitLeft() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitLeft(this, ancestor.crIPD()); } public int traitRight() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitRight(this, ancestor.crIPD()); } @@ -1234,7 +1235,7 @@ if (! this.isInNormalFlow()) { return false; } - Area parent = getParentArea(); + final Area parent = getParentArea(); if (parent instanceof LineArea) { /* LineArea children grow in the IPD, LineArea grows in the BPD. */ return false; @@ -1248,7 +1249,7 @@ } public org.axsl.areaW.MarkerContentArea makeMarkerContentArea( - RetrieveMarker retrieve, Marker marker) { + final RetrieveMarker retrieve, final Marker marker) { return new MarkerContentArea(retrieve, this, marker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -38,8 +38,8 @@ */ public abstract class AreaFixed extends Area { - public AreaFixed(FObj generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public AreaFixed(final FObj generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -48,10 +48,10 @@ */ public int progressionDimensionAvailable() { int dimension = brBPD(); - List children = getChildren(); + final List children = getChildren(); for (int i = 0; i < children.size(); i++) { if (children.get(i) instanceof AreaFlexible) { - AreaFlexible child = (AreaFlexible) children.get(i); + final AreaFlexible child = (AreaFlexible) children.get(i); dimension -= child.usedProgressionDimensionNormalFlow(); } } @@ -66,17 +66,17 @@ return 0; } - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { // No-op. Exists here to minimize casts. return; } - public void setMinimumProgressionDimension(int minPD) { + public void setMinimumProgressionDimension(final int minPD) { // No-op. Exists here to minimize casts. return; } - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { // No-op. Exists here to minimize casts. return; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -51,8 +51,8 @@ */ private int anteriorSpace; - public AreaFlexible(FONode generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public AreaFlexible(final FONode generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); initializeProgressionDimension(); initializeAnteriorSpace(); @@ -93,14 +93,14 @@ * See {@link #getAnteriorSpace()} for a description of "anterior space". * @param anteriorSpace The anteriorSpace to set. */ - public void setAnteriorSpace(int anteriorSpace) { - Area parent = getParentArea(); + public void setAnteriorSpace(final int anteriorSpace) { + final Area parent = getParentArea(); if (parent instanceof AreaFlexible) { /* * A change to anteriorSpace does not affect the anteriorSpace * of the parent, but it does affects its progressionDimension. */ - AreaFlexible afParent = (AreaFlexible) parent; + final AreaFlexible afParent = (AreaFlexible) parent; int value = afParent.getProgressionDimension(); // Subtract the old value value -= this.getAnteriorSpace(); @@ -117,14 +117,14 @@ * See {@link #getAnteriorSpace()} for a description of "anterior space". * @param incrementAmount The amount to adjust the anteriorSpace. */ - public void incrementAnteriorSpace(int incrementAmount) { - Area parent = getParentArea(); + public void incrementAnteriorSpace(final int incrementAmount) { + final Area parent = getParentArea(); if (parent instanceof AreaFlexible) { /* * A change to anteriorSpace does not affect the anteriorSpace * of the parent, but it does affects its progressionDimension. */ - AreaFlexible afParent = (AreaFlexible) parent; + final AreaFlexible afParent = (AreaFlexible) parent; afParent.incrementProgressionDimension(incrementAmount); } this.anteriorSpace += incrementAmount; @@ -135,9 +135,9 @@ * "progression dimension". * @param progressionDimension The progressionDimension to set. */ - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { if (shouldAdjustParentPD()) { - Area parent = getParentArea(); + final Area parent = getParentArea(); /* The new value. */ int incrementAmount = progressionDimension; /* Subtract the old value. */ @@ -153,9 +153,9 @@ * "progression dimension". * @param incrementAmount The amount to adjust the progressionDimension. */ - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { if (shouldAdjustParentPD()) { - Area parent = getParentArea(); + final Area parent = getParentArea(); parent.incrementProgressionDimension(incrementAmount); } this.progressionDimension += incrementAmount; @@ -166,7 +166,7 @@ * progression dimension. * @param minPD */ - public void setMinimumProgressionDimension(int minPD) { + public void setMinimumProgressionDimension(final int minPD) { if (minPD <= this.progressionDimension) { return; } @@ -199,7 +199,7 @@ */ protected int crIPDBlockArea() { int actual = 0; - int computed = this.traitIPDimensionOpt(); + final int computed = this.traitIPDimensionOpt(); if (computed < 0) { actual = getParentArea().crIPD() - traitBorderStartWidth() @@ -217,7 +217,7 @@ */ protected int crBPDInline() { int actual = 0; - int computed = this.traitBPDimensionOpt(); + final int computed = this.traitBPDimensionOpt(); if (computed < 0) { actual = getParentArea().crBPD() - traitBorderBeforeWidth() @@ -234,7 +234,7 @@ * Computes the initial value of anteriorSpace for this Area. */ public void initializeAnteriorSpace() { - Area previous = getPreviousSiblingArea(); + final Area previous = getPreviousSiblingArea(); if (previous != null) { if (isBlockArea()) { this.setAnteriorSpace(previous.traitSpaceAfterOptimum()); @@ -257,15 +257,15 @@ /** * @param previous The previous sibling Area to this. */ - private void checkHalfLeading(Area previous) { + private void checkHalfLeading(final Area previous) { // This test different than isBlockArea() if (! (previous instanceof NormalBlockArea)) { return; } - NormalBlockArea ba = (NormalBlockArea) previous; - AreaNode lastChild = ba.getLastAreaNodeChild(); + final NormalBlockArea ba = (NormalBlockArea) previous; + final AreaNode lastChild = ba.getLastAreaNodeChild(); if (lastChild instanceof LineArea) { - LineArea lastLineArea = (LineArea) lastChild; + final LineArea lastLineArea = (LineArea) lastChild; this.incrementAnteriorSpace(lastLineArea.traitHalfLeadingOpt()); } } @@ -293,9 +293,9 @@ return getParentArea().progressionDimensionAvailable(); } - public void removeChild(AreaNode areaNode) { + public void removeChild(final AreaNode areaNode) { if (areaNode instanceof AreaFlexible) { - AreaFlexible af = (AreaFlexible) areaNode; + final AreaFlexible af = (AreaFlexible) areaNode; this.incrementProgressionDimension(- af.getProgressionDimension()); } super.removeChild(areaNode); @@ -303,11 +303,11 @@ public int pdUsedBySiblings() { int pdUsedBySiblings = 0; - int siblingIndex = siblingIndex(); - List siblings = getSiblings(); + final int siblingIndex = siblingIndex(); + final List siblings = getSiblings(); for (int i = 0; i < siblingIndex; i++) { if (siblings.get(i) instanceof AreaFlexible) { - AreaFlexible af = (AreaFlexible) siblings.get(i); + final AreaFlexible af = (AreaFlexible) siblings.get(i); if (af.isInNormalFlow()) { /* If the Area is not part of the normal flow, then its * progression dimension should not be included in the Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -60,15 +60,15 @@ * parent in the AreaTree. * @param retrieveMarker TODO */ - public AreaNode(FONode generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public AreaNode(final FONode generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(parentArea); if (! (this instanceof AreaTree)) { // AreaTree has no parent with which to register getAreaNodeParent().getChildren().add(this); // Root can't do this because the AreaTreeControl isn't registered. this.generatedBy = linkage(generatedBy, retrieveMarker); - FOLinkageNormal normalLinkage = this.getNormalLinkage( + final FOLinkageNormal normalLinkage = this.getNormalLinkage( retrieveMarker); normalLinkage.registerGeneratedArea(this); } @@ -92,12 +92,12 @@ this.getNormalLinkage().unregisterGeneratedArea(this); } - public void removeChild(org.axsl.areaW.AreaNode areaNode) { + public void removeChild(final org.axsl.areaW.AreaNode areaNode) { this.children.remove(areaNode); } - public static FOLinkage linkage(FONode foNode, - RetrieveMarker retrieveMarker) { + public static FOLinkage linkage(final FONode foNode, + final RetrieveMarker retrieveMarker) { if (foNode == null) { return null; } @@ -109,10 +109,11 @@ linkage = new FOLinkageNormal(foNode); } else { try { - FOLinkageMarker markerLinkage = new FOLinkageMarker(foNode); + final FOLinkageMarker markerLinkage = new FOLinkageMarker( + foNode); markerLinkage.getNormalLinkage(retrieveMarker); linkage = markerLinkage; - } catch (AreaWException e) { + } catch (final AreaWException e) { /* Ignore this. It should never happen as we have already tested * for the condition that causes the exception, i.e. that foNode * has no ancestor marker. */ @@ -127,8 +128,9 @@ return (FOLinkageNormal) this.generatedBy; } if (this.generatedBy instanceof FOLinkageMarker) { - FOLinkageMarker linkageMarker = (FOLinkageMarker) this.generatedBy; - RetrieveMarker retrieveMarker = this.getRetrieveMarker(); + final FOLinkageMarker linkageMarker = (FOLinkageMarker) + this.generatedBy; + final RetrieveMarker retrieveMarker = this.getRetrieveMarker(); return linkageMarker.getNormalLinkage(retrieveMarker); } /* TODO: Consider throwing an Exception. This shouldn't happen. */ @@ -138,12 +140,14 @@ /* Use this overloaded version when we haven't yet gottent the * RetrieveMarker instance stashed in the FOLinkageMarker, especially * during AreaNode construction. */ - public FOLinkageNormal getNormalLinkage(RetrieveMarker retrieveMarker) { + public FOLinkageNormal getNormalLinkage( + final RetrieveMarker retrieveMarker) { if (this.generatedBy instanceof FOLinkageNormal) { return (FOLinkageNormal) this.generatedBy; } if (this.generatedBy instanceof FOLinkageMarker) { - FOLinkageMarker linkageMarker = (FOLinkageMarker) this.generatedBy; + final FOLinkageMarker linkageMarker = (FOLinkageMarker) + this.generatedBy; return linkageMarker.getNormalLinkage(retrieveMarker); } /* TODO: Consider throwing an Exception. This shouldn't happen. */ @@ -182,7 +186,7 @@ } public Area getParentArea() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } @@ -193,7 +197,7 @@ } public Area getPreviousSiblingArea() { - AreaNode previousSibling = (AreaNode) getPreviousSibling(); + final AreaNode previousSibling = (AreaNode) getPreviousSibling(); if (previousSibling == null) { return null; } @@ -204,12 +208,12 @@ } public Area ancestorBlockAreaNotALineArea() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } if (parent instanceof Area) { - Area parentArea = (Area) parent; + final Area parentArea = (Area) parent; if (parentArea.isBlockArea() && ! (parentArea instanceof LineArea)) { return parentArea; @@ -219,7 +223,7 @@ } public NormalBlockArea ancestorNormalBlockArea() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } @@ -234,7 +238,7 @@ } public Area getContainingReferenceArea() { - Area parent = getParentArea(); + final Area parent = getParentArea(); if (parent.traitIsReferenceArea()) { return parent; } @@ -280,7 +284,7 @@ * if there is none. */ public Area ancestorGeneratedByBlockLevelFO() { - Area parent = getParentArea(); + final Area parent = getParentArea(); if (parent == null) { return null; } @@ -342,7 +346,7 @@ return null; } for (int i = 0; i < children.size(); i++) { - Object child = children.get(i); + final Object child = children.get(i); if (child instanceof Area) { return (Area) child; } @@ -358,7 +362,7 @@ return null; } for (int i = children.size() - 1; i >= 0; i--) { - Object child = children.get(i); + final Object child = children.get(i); if (child instanceof Area) { return (Area) child; } @@ -370,7 +374,7 @@ * @return The ancestor SpanRA, or null if there is none. */ public SpanRA ancestorSpanRA() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } @@ -381,7 +385,7 @@ * @return The ancestor LineArea, or null if there is none. */ public LineArea ancestorLineArea() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } @@ -397,7 +401,7 @@ * implementation instead of the interface (for internal AreaTree use). */ public TableRA ancestorTableRA() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } @@ -412,22 +416,22 @@ } public PageCollection ancestorPageCollection() { - AreaNode parent = getAreaNodeParent(); + final AreaNode parent = getAreaNodeParent(); if (parent == null) { return null; } return parent.ancestorPageCollection(); } - public void moveChildBackward(AreaNode child, AreaNode oldParent, - AreaNode newParent) { + public void moveChildBackward(final AreaNode child, + final AreaNode oldParent, final AreaNode newParent) { oldParent.removeChild(child); newParent.getChildren().add(child); child.setParent(newParent); } - public void moveChildForward(AreaNode child, AreaNode oldParent, - AreaNode newParent) { + public void moveChildForward(final AreaNode child, final AreaNode oldParent, + final AreaNode newParent) { oldParent.removeChild(child); newParent.getChildren().add(0, child); child.setParent(newParent); @@ -459,7 +463,7 @@ * {@inheritDoc} */ public int crBPDNearestGeneratedByBlockLevelFO() { - org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); + final org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); if (nearest == null) { return Constants.DIMENSION_AUTO; } @@ -470,7 +474,7 @@ * {@inheritDoc} */ public int crIPDNearestGeneratedByBlockLevelFO() { - org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); + final org.axsl.areaW.Area nearest = nearestGeneratedByBlockLevelFO(); if (nearest == null) { return Constants.DIMENSION_AUTO; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -69,8 +69,8 @@ */ private ArrayList areaTreeListeners = new ArrayList(); - public AreaTree(Root root, FontConsumer fontConsumer, TextServer textServer, - Log logger) { + public AreaTree(final Root root, final FontConsumer fontConsumer, + final TextServer textServer, final Log logger) { super(root, null); this.fontConsumer = fontConsumer; this.textServer = textServer; @@ -84,8 +84,9 @@ } public org.axsl.areaW.PageCollection makePageCollection( - PageSequence pageSequence) { - PageCollection pageCollection = new PageCollection(pageSequence, this); + final PageSequence pageSequence) { + final PageCollection pageCollection = new PageCollection(pageSequence, + this); pageCollectionsProcessed.add(pageCollection); return pageCollection; } @@ -114,28 +115,30 @@ } public Root getRoot() { - FOLinkageNormal linkage = this.getNormalLinkage(); + final FOLinkageNormal linkage = this.getNormalLinkage(); /* Cast verified at construction. */ return (Root) linkage.getFONode(); } - private void layoutBookmarkTree(Root rootFObj) { - BookmarkTree bookmarkTree = rootFObj.getBookmarkTree(); + private void layoutBookmarkTree(final Root rootFObj) { + final BookmarkTree bookmarkTree = rootFObj.getBookmarkTree(); if (bookmarkTree == null) { return; } - BookmarkTreeArea bmtArea = new BookmarkTreeArea(bookmarkTree, this); + final BookmarkTreeArea bmtArea = new BookmarkTreeArea(bookmarkTree, + this); for (int i = 0; i < bookmarkTree.getChildren().size(); i++) { - Bookmark bookmark = (Bookmark) bookmarkTree.getChildren().get(i); + final Bookmark bookmark = (Bookmark) + bookmarkTree.getChildren().get(i); layoutBookmark(bookmark, bmtArea); } } - public void layoutBookmark(Bookmark bookmark, AreaNode area) { - BookmarkArea bookmarkArea = new BookmarkArea(bookmark, area); - List children = bookmark.getChildren(); + public void layoutBookmark(final Bookmark bookmark, final AreaNode area) { + final BookmarkArea bookmarkArea = new BookmarkArea(bookmark, area); + final List children = bookmark.getChildren(); for (int i = 0; i < children.size(); i++) { - FObj child = (FObj) children.get(i); + final FObj child = (FObj) children.get(i); if (child instanceof Bookmark) { layoutBookmark((Bookmark) child, bookmarkArea); } else if (child instanceof BookmarkTitle) { @@ -144,8 +147,8 @@ } } - private void layoutBookmarkTitle(BookmarkTitle bookmarkTitle, - BookmarkArea bookmarkArea) { + private void layoutBookmarkTitle(final BookmarkTitle bookmarkTitle, + final BookmarkArea bookmarkArea) { new BookmarkTitleArea(bookmarkTitle, bookmarkArea); } @@ -161,9 +164,9 @@ * @param id The id whose FObj instance is sought. * @return The FObj instance that is associated with id. */ - public FObj retrieveId(String id) { + public FObj retrieveId(final String id) { // Cast verified at construction. - Root root = (Root) traitGeneratedBy(); + final Root root = (Root) traitGeneratedBy(); return root.retrieveId(id); } @@ -174,11 +177,11 @@ * @return The first normal area returned by the FObj instance whose "id" * trait matches the "id" parameter, or null if none is found. */ - public Area firstNormalAreaReturned(String id) { - FObj fobj = retrieveId(id); - FOLinkage linkage = linkage(fobj, null); + public Area firstNormalAreaReturned(final String id) { + final FObj fobj = retrieveId(id); + final FOLinkage linkage = linkage(fobj, null); if (linkage instanceof FOLinkageNormal) { - FOLinkageNormal normalLinkage = (FOLinkageNormal) linkage; + final FOLinkageNormal normalLinkage = (FOLinkageNormal) linkage; return normalLinkage.firstNormalAreaReturned(); } /* Hopefully we can't reference ids in static content, right? */ @@ -188,7 +191,7 @@ /** * {@inheritDoc} */ - public void registerListener (AreaTreeListener listener) { + public void registerListener (final AreaTreeListener listener) { if (listener == null) { return; } @@ -200,7 +203,7 @@ * {@link AreaTreeEvent} firings. * @param listener The listener to be unregistered. */ - public void unRegisterListener (AreaTreeListener listener) { + public void unRegisterListener (final AreaTreeListener listener) { if (listener == null) { return; } @@ -211,15 +214,15 @@ * Notify all listeners that a "Page Complete" event has been fired. * @param page The PageArea instance that was just completed. */ - protected void notifyPageComplete(PageArea page) { + protected void notifyPageComplete(final PageArea page) { /* If nobody wants these events, don't waste resources creating * them. */ if (areaTreeListeners.size() < 1) { return; } - AreaTreeEvent event = new AreaTreeEvent(this, page); + final AreaTreeEvent event = new AreaTreeEvent(this, page); for (int i = 0; i < this.areaTreeListeners.size(); i++) { - AreaTreeListener listener = (AreaTreeListener) + final AreaTreeListener listener = (AreaTreeListener) this.areaTreeListeners.get(i); listener.pageComplete(event); } @@ -232,7 +235,7 @@ return "area-tree"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -35,17 +35,17 @@ implements org.axsl.areaR.BasicLinkArea, org.axsl.areaW.BasicLinkArea { - public BasicLinkArea(BasicLink generatedBy, LineArea parentArea, - RetrieveMarker retrieveMarker) { + public BasicLinkArea(final BasicLink generatedBy, final LineArea parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } public int crIPD() { int ipd = 0; for (int i = 0; i < getChildren().size(); i++) { - Object object = getChildren().get(i); + final Object object = getChildren().get(i); if (object instanceof Area) { - Area child = (Area) object; + final Area child = (Area) object; ipd += child.brIPD(); } } @@ -59,7 +59,7 @@ return "basic-link"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -36,7 +36,8 @@ implements org.axsl.areaR.BeforeFloatArea, org.axsl.areaW.BeforeFloatRA { - public BeforeFloatRA(FObj generatedBy, RegionRABody parentArea) { + public BeforeFloatRA(final FObj generatedBy, + final RegionRABody parentArea) { super(generatedBy, parentArea, null); } @@ -65,7 +66,8 @@ return 0; } - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return getParentArea().getOverflowArea(this); } @@ -81,15 +83,15 @@ return (RegionRABody) getParentArea(); } - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { this.getRegionBodyArea().setBeforeFloatDimension(progressionDimension); } - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { this.getRegionBodyArea().incrementBeforeFloatDimension(incrementAmount); } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -33,8 +33,8 @@ */ public abstract class BlockArea extends AreaFlexible { - public BlockArea(FObj parentFObj, Area parentArea, - RetrieveMarker retrieveMarker) { + public BlockArea(final FObj parentFObj, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(parentFObj, parentArea, retrieveMarker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -37,8 +37,8 @@ public class BlockContainerRA extends ContainerRA implements BlockContainerArea, org.axsl.areaW.BlockContainerRA { - public BlockContainerRA(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public BlockContainerRA(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -54,15 +54,15 @@ */ public int crOriginBPDOffset() { if (this.traitAbsolutePosition() == Constants.FOVAL_ABSOLUTE) { - int top = this.traitTop(); + final int top = this.traitTop(); if (top != Constants.ABSOLUTE_POSITION_AUTO) { /* If "top" is specified, that is the offset needed. */ return top; } - int bottom = this.traitBottom(); + final int bottom = this.traitBottom(); if (bottom != Constants.ABSOLUTE_POSITION_AUTO) { /* If "bottom" is specified, */ - Area parentArea = this.getAreaParent(); + final Area parentArea = this.getAreaParent(); return parentArea.crBPD() - bottom - this.getProgressionDimension(); } @@ -79,7 +79,7 @@ return "block-container"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -34,7 +34,7 @@ public class BookmarkArea extends NonArea implements org.axsl.areaR.BookmarkArea { - public BookmarkArea(Bookmark generatedBy, AreaNode parent) { + public BookmarkArea(final Bookmark generatedBy, final AreaNode parent) { super(generatedBy, parent); } @@ -53,7 +53,7 @@ return "bookmark"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -33,13 +33,14 @@ public class BookmarkTitleArea extends NonArea implements org.axsl.areaR.BookmarkTitleArea { - public BookmarkTitleArea(BookmarkTitle generatedBy, BookmarkArea parent) { + public BookmarkTitleArea(final BookmarkTitle generatedBy, + final BookmarkArea parent) { super(generatedBy, parent); } public String getTitleText() { // Cast verified at construction. - BookmarkTitle generatedBy = (BookmarkTitle) traitGeneratedBy(); + final BookmarkTitle generatedBy = (BookmarkTitle) traitGeneratedBy(); return new String(generatedBy.getContent()); } @@ -50,7 +51,7 @@ return "bookmark-title"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -33,7 +33,8 @@ public class BookmarkTreeArea extends NonArea implements org.axsl.areaR.BookmarkTreeArea { - public BookmarkTreeArea(BookmarkTree generatedBy, AreaNode parent) { + public BookmarkTreeArea(final BookmarkTree generatedBy, + final AreaNode parent) { super(generatedBy, parent); } @@ -44,7 +45,7 @@ return "bookmark-tree"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -37,12 +37,13 @@ public abstract class ContainerRA extends AreaFlexible implements org.axsl.areaW.ContainerRA { - public ContainerRA(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public ContainerRA(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -34,15 +34,16 @@ implements org.axsl.areaR.ExternalGraphicArea, org.axsl.areaW.ExternalGraphicArea { - public ExternalGraphicArea(ExternalGraphic generatedBy, LineArea parentArea, - RetrieveMarker retrieveMarker, int width) { + public ExternalGraphicArea(final ExternalGraphic generatedBy, + final LineArea parentArea, final RetrieveMarker retrieveMarker, + final int width) { super(generatedBy, parentArea, retrieveMarker); init(parentArea, width); } - public ExternalGraphicArea(ExternalGraphic generatedBy, - AbstractInlineArea parentArea, RetrieveMarker retrieveMarker, - int width) { + public ExternalGraphicArea(final ExternalGraphic generatedBy, + final AbstractInlineArea parentArea, + final RetrieveMarker retrieveMarker, final int width) { super(generatedBy, parentArea, retrieveMarker); init(parentArea, width); } @@ -51,7 +52,7 @@ * @param parentArea * @param width */ - private void init(Area parentArea, int width) { + private void init(final Area parentArea, final int width) { setProgressionDimension(width); // Adjust the bpd of the parent line-area. parentArea.setMinimumProgressionDimension(viewportBPD()); @@ -68,14 +69,14 @@ } public int viewportBPD() { - ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy(); - Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO(); + final ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy(); + final Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO(); return eg.viewportBPD(this, parentForDimensions.crBPD()); } public int viewportIPD() { - ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy(); - Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO(); + final ExternalGraphic eg = (ExternalGraphic) this.traitGeneratedBy(); + final Area parentForDimensions = this.ancestorGeneratedByBlockLevelFO(); return eg.viewportIPD(this, parentForDimensions.crIPD()); } @@ -86,7 +87,7 @@ return "external-graphic"; } - public void render(RenderVisitor visitor) { + public void render(final RenderVisitor visitor) { visitor.render(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -37,7 +37,7 @@ /** The FONode for which this linkage tracks Area generation. */ private FONode foGenerator; - public FOLinkage(FONode foGenerator) { + public FOLinkage(final FONode foGenerator) { this.foGenerator = foGenerator; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -75,9 +75,9 @@ * with an initial value of 1. */ private HashMap map = new HashMap(); - public FOLinkageMarker(FONode foGenerator) throws AreaWException { + public FOLinkageMarker(final FONode foGenerator) throws AreaWException { super(foGenerator); - Marker marker = foGenerator.ancestorMarker(); + final Marker marker = foGenerator.ancestorMarker(); if (marker == null) { throw new AreaWException("(FOray) FOLinkageMarker construction " + "attempted for object\n" @@ -86,24 +86,26 @@ } } - public FOLinkageNormal getNormalLinkage(RetrieveMarker retrieveMarker) { + public FOLinkageNormal getNormalLinkage( + final RetrieveMarker retrieveMarker) { if (retrieveMarker == null) { return null; } - Object object = this.map.get(retrieveMarker); + final Object object = this.map.get(retrieveMarker); if (object != null) { return (FOLinkageNormal) object; } - FOLinkageNormal newLinkage = new FOLinkageNormal(this.getFONode()); + final FOLinkageNormal newLinkage = new FOLinkageNormal( + this.getFONode()); this.map.put(retrieveMarker, n... [truncated message content] |
