Merged changes from Trunk up to revision 990155

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript@990174 13f79535-47bb-0310-9956-ffa450edef68

46 files changed, 215 insertions, 221 deletions

diff --git a/src/java/org/apache/fop/area/DestinationData.java b/src/java/org/apache/fop/area/DestinationData.java
index 75b981fb7..f8d906b91 100644
--- a/src/java/org/apache/fop/area/DestinationData.java
+++ b/src/java/org/apache/fop/area/DestinationData.java
@@ -98,7 +98,7 @@ public class DestinationData extends AbstractOffDocumentItem implements Resolvab
      * object that corresponds to the IDRef
      *
      * {@inheritDoc} List)
-     * @asf.todo check to make sure it works if multiple bookmark-items
+     * TODO check to make sure it works if multiple bookmark-items
      * have the same idref
      */
     public void resolveIDRef(String id, List pages) {
diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 8293180cf..c711a76c0 100644
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -72,7 +72,7 @@ import org.apache.fop.fo.properties.XMLLangShorthandParser;
  * This class creates and returns an array of Property.Maker instances
  * indexed by the PR_* propId from Constants.java.
  *
- * @asf.todo Check multi-threading safety of the statics below
+ * TODO Check multi-threading safety of the statics below
  */
 public final class FOPropertyMapping implements Constants {
 
diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index cb265b008..34e29a58a 100644
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -255,7 +255,7 @@ public abstract class FObj extends FONode implements Constants {
     /**
      * Check if this formatting object generates reference areas.
      * @return true if generates reference areas
-     * @asf.todo see if needed
+     * TODO see if needed
      */
     public boolean generatesReferenceAreas() {
         return false;
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index 9967a54d8..51d2581cd 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -76,9 +76,9 @@ public class Footnote extends FObj {
     /**
      * {@inheritDoc}
      * <br>XSL Content Model: (inline,footnote-body)
-     * @asf.todo implement additional constraint: A fo:footnote is not permitted
+     * TODO implement additional constraint: A fo:footnote is not permitted
      *      to have a fo:float, fo:footnote, or fo:marker as a descendant.
-     * @asf.todo implement additional constraint: A fo:footnote is not
+     * TODO implement additional constraint: A fo:footnote is not
      *      permitted to have as a descendant a fo:block-container that
      *      generates an absolutely positioned area.
      */
diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index 1b32e3f1e..54027514c 100644
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -30,7 +30,7 @@ import org.apache.fop.fo.properties.LengthRangeProperty;
  * <code>fo:leader</code></a> object.
  * The main property of <code>fo:leader</code> is leader-pattern.
  * The following patterns are treated: rule, space, dots and use-content.
- * @asf.todo implement validateChildNode()
+ * TODO implement validateChildNode()
  */
 public class Leader extends InlineLevel {
     // The value of properties relevant for fo:leader.
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index 3f714dbd8..c4a2aa64b 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -119,7 +119,7 @@ public class ListItem extends FObj implements BreakPropertySet {
 
     /**
      * {@inheritDoc}
-     * @asf.todo see if can/should rely on base class for this
+     * TODO see if can/should rely on base class for this
      *    (i.e., add to childNodes instead)
      */
     public void addChildNode(FONode child) {
diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java
index d8f69af28..4588a9df3 100644
--- a/src/java/org/apache/fop/fo/flow/Marker.java
+++ b/src/java/org/apache/fop/fo/flow/Marker.java
@@ -110,7 +110,7 @@ public class Marker extends FObjMixed {
      * <br><i>Additionally: "An fo:marker may contain any formatting objects that
      * are permitted as a replacement of any fo:retrieve-marker that retrieves
      * the fo:marker's children."</i>
-     * @asf.todo implement "additional" constraint, possibly within fo:retrieve-marker
+     * TODO implement "additional" constraint, possibly within fo:retrieve-marker
      */
     protected void validateChildNode(Locator loc, String nsURI, String localName)
             throws ValidationException {
diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java
index 76bded0be..ac965dffb 100644
--- a/src/java/org/apache/fop/fo/flow/MultiCase.java
+++ b/src/java/org/apache/fop/fo/flow/MultiCase.java
@@ -27,7 +27,7 @@ import org.apache.fop.fo.PropertyList;
 /**
  * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_multi-case">
  * <code>fo:multi-case</code></a> object.
- * @asf.todo implement validateChildNode()
+ * TODO implement validateChildNode()
  */
 public class MultiCase extends FObj {
     // The value of properties relevant for fo:multi-case.
diff --git a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
index 5ee5e78ad..634460ec4 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
@@ -30,7 +30,7 @@ import org.apache.fop.fo.ValidationException;
 /**
  * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table-and-caption">
  * <code>fo:table-and-caption</code></a> property.
- * @asf.todo needs implementation
+ * TODO needs implementation
  */
 public class TableAndCaption extends FObj /*implements BreakPropertySet*/ {
     // The value of properties relevant for fo:table-and-caption.
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 01ca5863e..74b85e78c 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -151,7 +151,7 @@ public class PageSequence extends AbstractPageSequence {
 
     /**
      * {@inheritDoc}
-     * @asf.todo see if addChildNode() should also be called for fo's other than
+     * TODO see if addChildNode() should also be called for fo's other than
      *  fo:flow.
      */
     public void addChildNode(FONode child) throws FOPException {
diff --git a/src/java/org/apache/fop/fo/properties/CharacterProperty.java b/src/java/org/apache/fop/fo/properties/CharacterProperty.java
index 5fef57a8b..ebded4b50 100644
--- a/src/java/org/apache/fop/fo/properties/CharacterProperty.java
+++ b/src/java/org/apache/fop/fo/properties/CharacterProperty.java
@@ -24,7 +24,7 @@ import org.apache.fop.fo.PropertyList;
 
 /**
  * Superclass for properties that wrap a character value
- * @asf.todo convert character value to int in order to denote unicode scalar value
+ * TODO convert character value to int in order to denote unicode scalar value
  * instead of a single UTF-16 code element
  */
 public final class CharacterProperty extends Property {
diff --git a/src/java/org/apache/fop/hyphenation/ByteVector.java b/src/java/org/apache/fop/hyphenation/ByteVector.java
index 920089684..d1448abdc 100644
--- a/src/java/org/apache/fop/hyphenation/ByteVector.java
+++ b/src/java/org/apache/fop/hyphenation/ByteVector.java
@@ -69,7 +69,7 @@ public class ByteVector implements Serializable {
     /**
      * Construct byte vector instance.
      * @param a byte array to use
-     * @asf.todo should n should be initialized to a.length to be consistent with
+     * TODO should n should be initialized to a.length to be consistent with
      * CharVector behavior? [GA]
      */
     public ByteVector(byte[] a) {
@@ -82,7 +82,7 @@ public class ByteVector implements Serializable {
      * Construct byte vector instance.
      * @param a byte array to use
      * @param capacity initial block size
-     * @asf.todo should n should be initialized to a.length to be consistent with
+     * TODO should n should be initialized to a.length to be consistent with
      * CharVector behavior? [GA]
      */
     public ByteVector(byte[] a, int capacity) {
diff --git a/src/java/org/apache/fop/hyphenation/HyphenationException.java b/src/java/org/apache/fop/hyphenation/HyphenationException.java
index e109cadf9..484d01cbd 100644
--- a/src/java/org/apache/fop/hyphenation/HyphenationException.java
+++ b/src/java/org/apache/fop/hyphenation/HyphenationException.java
@@ -22,7 +22,7 @@ package org.apache.fop.hyphenation;
 /**
  * An hyphenation exception.
  * @author Carlos Villegas <cav@uniscope.co.jp>
- * @asf.todo Derive from FOPException
+ * TODO Derive from FOPException
  */
 public class HyphenationException extends Exception {
 
diff --git a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
index b8bbc0c6c..0eae6fa9c 100644
--- a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
@@ -55,8 +55,8 @@ public class BalancingColumnBreakingAlgorithm extends PageBreakingAlgorithm {
      * @param columnCount number of columns
      * @see PageBreakingAlgorithm
      */
-    public BalancingColumnBreakingAlgorithm                     // CSOK: ParameterNumber
-        (LayoutManager topLevelLM,
+    public BalancingColumnBreakingAlgorithm(                     // CSOK: ParameterNumber
+            LayoutManager topLevelLM,
             PageProvider pageProvider,
             PageBreakingLayoutListener layoutListener,
             int alignment, int alignmentLast,
diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
index f8d78d477..15f8ffa8d 100644
--- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
@@ -285,11 +285,11 @@ public abstract class BreakingAlgorithm {
          * @param totalDemerits a real number
          * @param previous a node
          */
-        public KnuthNode                                        // CSOK: ParameterNumber
-            (int position, int line, int fitness,
-                         int totalWidth, int totalStretch, int totalShrink,
-                         double adjustRatio, int availableShrink, int availableStretch,
-                         int difference, double totalDemerits, KnuthNode previous) {
+        public KnuthNode(                                        // CSOK: ParameterNumber
+                int position, int line, int fitness,
+                int totalWidth, int totalStretch, int totalShrink,
+                double adjustRatio, int availableShrink, int availableStretch,
+                int difference, double totalDemerits, KnuthNode previous) {
             this.position = position;
             this.line = line;
             this.fitness = fitness;
@@ -671,11 +671,11 @@ public abstract class BreakingAlgorithm {
      * @param previous active node for the preceding breakpoint
      * @return a new node
      */
-    protected KnuthNode createNode                              // CSOK: ParameterNumber
-        (int position, int line, int fitness,
-                                   int totalWidth, int totalStretch, int totalShrink,
-                                   double adjustRatio, int availableShrink, int availableStretch,
-                                   int difference, double totalDemerits, KnuthNode previous) {
+    protected KnuthNode createNode(                              // CSOK: ParameterNumber
+            int position, int line, int fitness,
+            int totalWidth, int totalStretch, int totalShrink,
+            double adjustRatio, int availableShrink, int availableStretch,
+            int difference, double totalDemerits, KnuthNode previous) {
         return new KnuthNode(position, line, fitness,
                              totalWidth, totalStretch, totalShrink,
                              adjustRatio, availableShrink, availableStretch,
diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index 2e6f6926a..a29398b93 100644
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -36,7 +36,7 @@ import org.apache.fop.fo.pagination.Flow;
  * Its parent LM is the PageSequenceLayoutManager.
  * This LM is responsible for getting columns of the appropriate size
  * and filling them with block-level areas generated by its children.
- * @asf.todo Reintroduce emergency counter (generate error to avoid endless loop)
+ * TODO Reintroduce emergency counter (generate error to avoid endless loop)
  */
 public class FlowLayoutManager extends BlockStackingLayoutManager
                                implements BlockLevelLayoutManager {
diff --git a/src/java/org/apache/fop/layoutmgr/LayoutException.java b/src/java/org/apache/fop/layoutmgr/LayoutException.java
index 280266003..2638d0210 100644
--- a/src/java/org/apache/fop/layoutmgr/LayoutException.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutException.java
@@ -29,7 +29,7 @@ import org.apache.fop.events.EventExceptionManager.ExceptionFactory;
  * Exception thrown by FOP if an unrecoverable layout error occurs. An example: An area overflows
  * a viewport that has overflow="error-if-overflow".
  *
- * @asf.todo Discuss if this should become a checked exception.
+ * TODO Discuss if this should become a checked exception.
  */
 public class LayoutException extends RuntimeException {
 
diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
index e0b0cae11..7e54cbe43 100644
--- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
@@ -514,7 +514,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
                     footnoteElementIndex
                         = getFootnoteList(footnoteListIndex).size() - 1;
                 } else if (((canDeferOldFN = canDeferOldFootnotes // CSOK: InnerAssignment
-                             (pageNode, elementIndex)) 
+                             (pageNode, elementIndex))
                             || newFootnotes)
                            && (footnoteSplit = getFootnoteSplit // CSOK: InnerAssignment
                                (pageNode, getLineWidth(activeNode.line) - actualWidth,
@@ -1125,7 +1125,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
      */
     protected void addNode(int line, KnuthNode node) {
         if (node.position < par.size() - 1 && line > 0
-            && (ipdDifference = compareIPDs(line - 1)) != 0) {  // CSOK: InnerAssignment
+                && (ipdDifference = compareIPDs(line - 1)) != 0) {  // CSOK: InnerAssignment
             log.trace("IPD changes at page " + line);
             if (bestNodeForIPDChange == null
                     || node.totalDemerits < bestNodeForIPDChange.totalDemerits) {
diff --git a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
index ed22886a4..66e162692 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
@@ -194,9 +194,8 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager {
                                         areaInfo.alignmentContext,
                                         notifyPos(new LeafPosition(this, 0)), false));
             if (areaInfo.bHyphenated) {
-                returnList.add
-                    (new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
-                                      new LeafPosition(this, -1), false));
+                returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
+                        new LeafPosition(this, -1), false));
             }
         } else {
             // adjustable letter space
@@ -207,8 +206,8 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager {
                     new LeafPosition(this, -1), true));
             returnList.add(new KnuthGlue(letterSpaceIPD.mult(areaInfo.iLScount),
                     new LeafPosition(this, -1), true));
-            returnList.add
-                (new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
+            returnList.add (
+                    new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
             if (areaInfo.bHyphenated) {
                 returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
                         new LeafPosition(this, -1), false));
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
index f5a0a51f8..df7371fe5 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
@@ -48,7 +48,7 @@ import org.apache.fop.traits.MinOptMax;
  * an exception to this rule.)
  * This class can be extended to handle the creation and adding of the
  * inline area.
- * @asf.todo [GA] replace use of hungarian notation with normalized java naming
+ * TODO [GA] replace use of hungarian notation with normalized java naming
  */
 public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
                                    implements InlineLevelLayoutManager {
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index 7e87de241..83d286c15 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -132,10 +132,10 @@ public class LineLayoutManager extends InlineStackingLayoutManager
         private int spaceAfter;
         private int baseline;
 
-        LineBreakPosition                                       // CSOK: ParameterNumber
-            (LayoutManager lm, int index, int startIndex, int breakIndex,
-             int shrink, int stretch, int diff, double ipdA, double adjust, int ind,
-             int lh, int lw, int sb, int sa, int bl) {
+        LineBreakPosition(                                       // CSOK: ParameterNumber
+                LayoutManager lm, int index, int startIndex, int breakIndex,
+                int shrink, int stretch, int diff, double ipdA, double adjust, int ind,
+                int lh, int lw, int sb, int sa, int bl) {
             super(lm, breakIndex);
             availableShrink = shrink;
             availableStretch = stretch;
@@ -196,20 +196,14 @@ public class LineLayoutManager extends InlineStackingLayoutManager
      * which was the first element in the paragraph
      * returned by each LM.
      */
-    private class Update {
-        private InlineLevelLayoutManager inlineLM;
-        private int firstIndex;
+    private final class Update {
+        private final InlineLevelLayoutManager inlineLM;
+        private final int firstIndex;
 
-        public Update(InlineLevelLayoutManager lm, int index) {
+        private Update(InlineLevelLayoutManager lm, int index) {
             inlineLM = lm;
             firstIndex = index;
         }
-        InlineLevelLayoutManager getInlineLM() {
-            return inlineLM;
-        }
-        int getFirstIndex() {
-            return firstIndex;
-        }
     }
 
     // this class represents a paragraph
@@ -331,9 +325,9 @@ public class LineLayoutManager extends InlineStackingLayoutManager
         private int follow;
         private static final double MAX_DEMERITS = 10e6;
 
-        public LineBreakingAlgorithm                            // CSOK: ParameterNumber
-            (int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
-             int lh, int ld, int fl, boolean first, int maxFlagCount, LineLayoutManager llm) {
+        public LineBreakingAlgorithm(                            // CSOK: ParameterNumber
+                int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
+                int lh, int ld, int fl, boolean first, int maxFlagCount, LineLayoutManager llm) {
             super(textAlign, textAlignLast, first, false, maxFlagCount);
             pageAlignment = pageAlign;
             textIndent = indent;
@@ -362,7 +356,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
             indent += (textAlign == Constants.EN_CENTER)
                       ? difference / 2 : (textAlign == Constants.EN_END) ? difference : 0;
             indent += (bestActiveNode.line == 1 && indentFirstPart && isFirstInBlock)
-                ? textIndent : 0;
+                      ? textIndent : 0;
             double ratio = (textAlign == Constants.EN_JUSTIFY
                 || difference < 0 && -difference <= bestActiveNode.availableShrink)
                         ? bestActiveNode.adjustRatio : 0;
@@ -410,9 +404,9 @@ public class LineLayoutManager extends InlineStackingLayoutManager
             activePossibility = -1;
         }
 
-        private LineBreakPosition makeLineBreakPosition         // CSOK: ParameterNumber
-            (KnuthSequence par, int firstElementIndex, int lastElementIndex, int availableShrink,
-             int availableStretch, int difference, double ratio, int indent) {
+        private LineBreakPosition makeLineBreakPosition(         // CSOK: ParameterNumber
+                KnuthSequence par, int firstElementIndex, int lastElementIndex, int availableShrink,
+                int availableStretch, int difference, double ratio, int indent) {
             // line height calculation - spaceBefore may differ from spaceAfter
             // by 1mpt due to rounding
             int spaceBefore = (lineHeight - lead - follow) / 2;
@@ -717,7 +711,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager
 
                     // finish last paragraph if it was closed with a linefeed
                     if (lastElement.isPenalty()
-                        && ((KnuthPenalty) lastElement).getPenalty() == -KnuthPenalty.INFINITE) {
+                            && ((KnuthPenalty) lastElement).getPenalty()
+                                == -KnuthPenalty.INFINITE) {
                         // a penalty item whose value is -inf
                         // represents a preserved linefeed,
                         // which forces a line break
diff --git a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
index f3e8784c1..56bcdaa3b 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
@@ -37,7 +37,7 @@ public class PageNumberCitationLastLayoutManager extends AbstractPageNumberCitat
      * Constructor
      *
      * @param node the formatting object that creates this area
-     * @asf.todo better retrieval of font info
+     * TODO better retrieval of font info
      */
     public PageNumberCitationLastLayoutManager(PageNumberCitationLast node) {
         super(node);
diff --git a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
index b9f786c97..958a854ac 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
@@ -35,7 +35,7 @@ public class PageNumberCitationLayoutManager extends AbstractPageNumberCitationL
      * Constructor
      *
      * @param node the formatting object that creates this area
-     * @asf.todo better retrieval of font info
+     * TODO better retrieval of font info
      */
     public PageNumberCitationLayoutManager(PageNumberCitation node) {
         super(node);
diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 4c45fbe66..cbe2e2639 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -81,10 +81,10 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
         private boolean breakOppAfter;
         private final Font font;
 
-        AreaInfo                                                // CSOK: ParameterNumber
-            (int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
-             MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
-             Font font) {
+        AreaInfo(                                                // CSOK: ParameterNumber
+                int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
+                MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
+                Font font) {
             assert startIndex <= breakIndex;
             this.startIndex = startIndex;
             this.breakIndex = breakIndex;
diff --git a/src/java/org/apache/fop/layoutmgr/table/CellPart.java b/src/java/org/apache/fop/layoutmgr/table/CellPart.java
index 8af3a3d43..cde19e67b 100644
--- a/src/java/org/apache/fop/layoutmgr/table/CellPart.java
+++ b/src/java/org/apache/fop/layoutmgr/table/CellPart.java
@@ -61,8 +61,8 @@ class CellPart {
      * @param bpAfterLast width of (possibly optional) border- and padding-after if this
      * part will be the last one on the page
      */
-    protected CellPart                                          // CSOK: ParameterNumber
-        (PrimaryGridUnit pgu, int start, int end, boolean last,
+    protected CellPart(                                          // CSOK: ParameterNumber
+            PrimaryGridUnit pgu, int start, int end, boolean last,
             int condBeforeContentLength, int length, int condAfterContentLength,
             int bpBeforeNormal, int bpBeforeFirst,
             int bpAfterNormal, int bpAfterLast) {
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
index ab37248ea..fc35a8069 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
@@ -33,7 +33,7 @@ import org.apache.fop.layoutmgr.PositionIterator;
  * The caption contains blocks that are positioned next to the
  * table on the caption side.
  * The caption blocks have an implicit keep with the table.
- * @asf.todo Implement getNextKnuthElements()
+ * TODO Implement getNextKnuthElements()
  */
 public class TableAndCaptionLayoutManager extends BlockStackingLayoutManager {
 
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
index 96ffc0a90..7ba0b5970 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
@@ -31,7 +31,7 @@ import org.apache.fop.layoutmgr.PositionIterator;
  * LayoutManager for a table-caption FO.
  * The table caption contains blocks that are placed beside the
  * table.
- * @asf.todo Implement getNextKnuthElements()
+ * TODO Implement getNextKnuthElements()
  */
 public class TableCaptionLayoutManager extends BlockStackingLayoutManager {
 
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index 5fb733a51..ded18384d 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -277,10 +277,10 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager
      * this row is placed on a previous page). Used to calculate the placement of the
      * row's background image if any
      */
-    public void addAreas                                        // CSOK: ParameterNumber
-        (PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
-         int startRow, int endRow, int borderBeforeWhich, int borderAfterWhich, boolean firstOnPage,
-         boolean lastOnPage, RowPainter painter, int firstRowHeight) {
+    public void addAreas(                                        // CSOK: ParameterNumber
+            PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
+            int startRow, int endRow, int borderBeforeWhich, int borderAfterWhich,
+            boolean firstOnPage, boolean lastOnPage, RowPainter painter, int firstRowHeight) {
         getParentArea(null);
 
         addId();
diff --git a/src/java/org/apache/fop/pdf/PDFCIDFont.java b/src/java/org/apache/fop/pdf/PDFCIDFont.java
index 9a91dd992..459fe2584 100644
--- a/src/java/org/apache/fop/pdf/PDFCIDFont.java
+++ b/src/java/org/apache/fop/pdf/PDFCIDFont.java
@@ -56,10 +56,10 @@ public class PDFCIDFont extends PDFObject {
      * @param supplement Supplement number
      * @param descriptor CID font descriptor
      */
-    public PDFCIDFont                                           // CSOK: ParameterNumber
-        (String basefont, CIDFontType cidtype, int dw,
-         int[] w, String registry, String ordering,
-         int supplement, PDFCIDFontDescriptor descriptor) {
+    public PDFCIDFont(                                           // CSOK: ParameterNumber
+            String basefont, CIDFontType cidtype, int dw,
+            int[] w, String registry, String ordering,
+            int supplement, PDFCIDFontDescriptor descriptor) {
 
         this(basefont, cidtype, dw,
                 new PDFWArray(w),
diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java
index 8ebd15127..752d14207 100644
--- a/src/java/org/apache/fop/pdf/PDFFactory.java
+++ b/src/java/org/apache/fop/pdf/PDFFactory.java
@@ -292,13 +292,13 @@ public class PDFFactory {
      * It should be 0 as this is the constructor for sampled functions.
      * @return the PDF function that was created
      */
-    public PDFFunction makeFunction                             // CSOK: ParameterNumber
-        (int theFunctionType, List theDomain,
-         List theRange, List theSize,
-         int theBitsPerSample, int theOrder,
-         List theEncode, List theDecode,
-         StringBuffer theFunctionDataStream,
-         List theFilter) {
+    public PDFFunction makeFunction(                             // CSOK: ParameterNumber
+            int theFunctionType, List theDomain,
+            List theRange, List theSize,
+            int theBitsPerSample, int theOrder,
+            List theEncode, List theDecode,
+            StringBuffer theFunctionDataStream,
+            List theFilter) {
         // Type 0 function
         PDFFunction function = new PDFFunction(theFunctionType, theDomain,
                                                theRange, theSize,
@@ -466,13 +466,13 @@ public class PDFFactory {
      * @param theFunction The PDF Function that maps an (x,y) location to a color
      * @return the PDF shading that was created
      */
-    public PDFShading makeShading                               // CSOK: ParameterNumber
-        (PDFResourceContext res, int theShadingType,
-         PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, List theDomain,
-         List theMatrix,
-         PDFFunction theFunction) {
+    public PDFShading makeShading(                               // CSOK: ParameterNumber
+            PDFResourceContext res, int theShadingType,
+            PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, List theDomain,
+            List theMatrix,
+            PDFFunction theFunction) {
         // make Shading of Type 1
         PDFShading shading = new PDFShading(theShadingType,
                                             theColorSpace, theBackground,
@@ -519,13 +519,13 @@ public class PDFFactory {
      * The default is [false, false]
      * @return the PDF shading that was created
      */
-    public PDFShading makeShading                               // CSOK: ParameterNumber
-        (PDFResourceContext res, int theShadingType,
-         PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, List theCoords,
-         List theDomain, PDFFunction theFunction,
-         List theExtend) {
+    public PDFShading makeShading(                               // CSOK: ParameterNumber
+            PDFResourceContext res, int theShadingType,
+            PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, List theCoords,
+            List theDomain, PDFFunction theFunction,
+            List theExtend) {
         // make Shading of Type 2 or 3
         PDFShading shading = new PDFShading(theShadingType,
                                             theColorSpace, theBackground,
@@ -573,15 +573,15 @@ public class PDFFactory {
      * @param theFunction the PDFFunction
      * @return the PDF shading that was created
      */
-    public PDFShading makeShading                               // CSOK: ParameterNumber
-        (PDFResourceContext res, int theShadingType,
-         PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias,
-         int theBitsPerCoordinate,
-         int theBitsPerComponent,
-         int theBitsPerFlag, List theDecode,
-         PDFFunction theFunction) {
+    public PDFShading makeShading(                               // CSOK: ParameterNumber
+            PDFResourceContext res, int theShadingType,
+            PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias,
+            int theBitsPerCoordinate,
+            int theBitsPerComponent,
+            int theBitsPerFlag, List theDecode,
+            PDFFunction theFunction) {
         // make Shading of type 4,6 or 7
         PDFShading shading = new PDFShading(theShadingType,
                                             theColorSpace, theBackground,
@@ -629,15 +629,15 @@ public class PDFFactory {
      * @param theFunction The PDFFunction that's mapped on to this shape
      * @return the PDF shading that was created
      */
-    public PDFShading makeShading                               // CSOK: ParameterNumber
-        (PDFResourceContext res, int theShadingType,
-         PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias,
-         int theBitsPerCoordinate,
-         int theBitsPerComponent, List theDecode,
-         int theVerticesPerRow,
-         PDFFunction theFunction) {
+    public PDFShading makeShading(                               // CSOK: ParameterNumber
+            PDFResourceContext res, int theShadingType,
+            PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias,
+            int theBitsPerCoordinate,
+            int theBitsPerComponent, List theDecode,
+            int theVerticesPerRow,
+            PDFFunction theFunction) {
         // make shading of Type 5
         PDFShading shading = new PDFShading(theShadingType,
                                             theColorSpace, theBackground,
@@ -680,12 +680,12 @@ public class PDFFactory {
      * @param thePatternDataStream The stream of pattern data to be tiled.
      * @return the PDF pattern that was created
      */
-    public PDFPattern makePattern                               // CSOK: ParameterNumber
-        (PDFResourceContext res, int thePatternType,    // 1
-         PDFResources theResources, int thePaintType, int theTilingType,
-         List theBBox, double theXStep,
-         double theYStep, List theMatrix,
-         List theXUID, StringBuffer thePatternDataStream) {
+    public PDFPattern makePattern(                               // CSOK: ParameterNumber
+            PDFResourceContext res, int thePatternType,    // 1
+            PDFResources theResources, int thePaintType, int theTilingType,
+            List theBBox, double theXStep,
+            double theYStep, List theMatrix,
+            List theXUID, StringBuffer thePatternDataStream) {
         // PDFResources theResources
         PDFPattern pattern = new PDFPattern(theResources, 1,
                                             thePaintType, theTilingType,
diff --git a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
index 4350ed7dd..9d255545f 100644
--- a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
+++ b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
@@ -40,11 +40,11 @@ public class PDFFontDescriptor extends PDFDictionary {
      * @param italicAngle the angle of the vertical dominant strokes
      * @param stemV the width of the dominant vertical stems of glyphs
      */
-    public PDFFontDescriptor                                    // CSOK: ParameterNumber
-        (String basefont, int ascent,
-         int descent, int capHeight, int flags,
-         PDFRectangle fontBBox, int italicAngle,
-         int stemV) {
+    public PDFFontDescriptor(                                    // CSOK: ParameterNumber
+            String basefont, int ascent,
+            int descent, int capHeight, int flags,
+            PDFRectangle fontBBox, int italicAngle,
+            int stemV) {
         super();
 
         put("Type", new PDFName("FontDescriptor"));
diff --git a/src/java/org/apache/fop/pdf/PDFFunction.java b/src/java/org/apache/fop/pdf/PDFFunction.java
index 5b5d41490..9e93ebee8 100644
--- a/src/java/org/apache/fop/pdf/PDFFunction.java
+++ b/src/java/org/apache/fop/pdf/PDFFunction.java
@@ -211,11 +211,11 @@ public class PDFFunction extends PDFObject {
      * @param theFunctionType This is the type of function (0,2,3, or 4).
      * It should be 0 as this is the constructor for sampled functions.
      */
-    public PDFFunction                                          // CSOK: ParameterNumber
-        (int theFunctionType, List theDomain,
-         List theRange, List theSize, int theBitsPerSample,
-         int theOrder, List theEncode, List theDecode,
-         StringBuffer theFunctionDataStream, List theFilter) {
+    public PDFFunction(                                          // CSOK: ParameterNumber
+            int theFunctionType, List theDomain,
+            List theRange, List theSize, int theBitsPerSample,
+            int theOrder, List theEncode, List theDecode,
+            StringBuffer theFunctionDataStream, List theFilter) {
         super();
 
         this.functionType = 0;      // dang well better be 0;
diff --git a/src/java/org/apache/fop/pdf/PDFPattern.java b/src/java/org/apache/fop/pdf/PDFPattern.java
index ebde4ac6a..74f56377e 100644
--- a/src/java/org/apache/fop/pdf/PDFPattern.java
+++ b/src/java/org/apache/fop/pdf/PDFPattern.java
@@ -117,12 +117,12 @@ public class PDFPattern extends PDFPathPaint {
      * @param theXUID Optional vector of Integers that uniquely identify the pattern
      * @param thePatternDataStream The stream of pattern data to be tiled.
      */
-    public PDFPattern                                           // CSOK: ParameterNumber
-        (PDFResources theResources, int thePatternType,    // 1
-         int thePaintType, int theTilingType, List theBBox,
-         double theXStep, double theYStep,
-         List theMatrix, List theXUID,
-         StringBuffer thePatternDataStream) {
+    public PDFPattern(                                           // CSOK: ParameterNumber
+            PDFResources theResources, int thePatternType,    // 1
+            int thePaintType, int theTilingType, List theBBox,
+            double theXStep, double theYStep,
+            List theMatrix, List theXUID,
+            StringBuffer thePatternDataStream) {
         super();
         this.resources = theResources;
         // This next parameter is implicit to all constructors, and is
diff --git a/src/java/org/apache/fop/pdf/PDFShading.java b/src/java/org/apache/fop/pdf/PDFShading.java
index 10d7bf628..2f955b850 100644
--- a/src/java/org/apache/fop/pdf/PDFShading.java
+++ b/src/java/org/apache/fop/pdf/PDFShading.java
@@ -164,11 +164,11 @@ public class PDFShading extends PDFObject {
      * It's optional, the default is the identity matrix
      * @param theFunction The PDF Function that maps an (x,y) location to a color
      */
-    public PDFShading                                           // CSOK: ParameterNumber
-        (int theShadingType, PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, List theDomain,
-         List theMatrix, PDFFunction theFunction) {
+    public PDFShading(                                           // CSOK: ParameterNumber
+            int theShadingType, PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, List theDomain,
+            List theMatrix, PDFFunction theFunction) {
         super();
         this.shadingType = theShadingType;    // 1
         this.colorSpace = theColorSpace;
@@ -203,12 +203,12 @@ public class PDFShading extends PDFObject {
      *                  and end colors past the start and end points
      * The default is [false, false]
      */
-    public PDFShading                                           // CSOK: ParameterNumber
-        (int theShadingType, PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, List theCoords,
-         List theDomain, PDFFunction theFunction,
-         List theExtend) {
+    public PDFShading(                                           // CSOK: ParameterNumber
+            int theShadingType, PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, List theCoords,
+            List theDomain, PDFFunction theFunction,
+            List theExtend) {
         super();
         this.shadingType = theShadingType;    // 2 or 3
         this.colorSpace = theColorSpace;
@@ -244,12 +244,12 @@ public class PDFShading extends PDFObject {
      * @param theDecode List of Doubles see PDF 1.3 spec pages 303 to 312.
      * @param theFunction the PDFFunction
      */
-    public PDFShading                                           // CSOK: ParameterNumber
-        (int theShadingType, PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, int theBitsPerCoordinate,
-         int theBitsPerComponent, int theBitsPerFlag,
-         List theDecode, PDFFunction theFunction) {
+    public PDFShading(                                           // CSOK: ParameterNumber
+            int theShadingType, PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, int theBitsPerCoordinate,
+            int theBitsPerComponent, int theBitsPerFlag,
+            List theDecode, PDFFunction theFunction) {
         super();
 
         this.shadingType = theShadingType;    // 4,6 or 7
@@ -284,12 +284,12 @@ public class PDFShading extends PDFObject {
      * @param theVerticesPerRow number of vertices in each "row" of the lattice.
      * @param theFunction The PDFFunction that's mapped on to this shape
      */
-    public PDFShading                                           // CSOK: ParameterNumber
-        (int theShadingType, PDFDeviceColorSpace theColorSpace,
-         List theBackground, List theBBox,
-         boolean theAntiAlias, int theBitsPerCoordinate,
-         int theBitsPerComponent, List theDecode,
-         int theVerticesPerRow, PDFFunction theFunction) {
+    public PDFShading(                                           // CSOK: ParameterNumber
+            int theShadingType, PDFDeviceColorSpace theColorSpace,
+            List theBackground, List theBBox,
+            boolean theAntiAlias, int theBitsPerCoordinate,
+            int theBitsPerComponent, List theDecode,
+            int theVerticesPerRow, PDFFunction theFunction) {
         super();
         this.shadingType = theShadingType;    // 5
         this.colorSpace = theColorSpace;
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
index ac4936a43..cfce3a875 100644
--- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
@@ -172,10 +172,10 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
      * @param bpsStart the border-start traits
      * @param bpsEnd the border-end traits
      */
-    protected void drawBackground                               // CSOK: ParameterNumber
-        (float startx, float starty, float width, float height, Trait.Background back,
-         BorderProps bpsBefore, BorderProps bpsAfter,
-         BorderProps bpsStart, BorderProps bpsEnd) {
+    protected void drawBackground(                               // CSOK: ParameterNumber
+            float startx, float starty, float width, float height, Trait.Background back,
+            BorderProps bpsBefore, BorderProps bpsAfter,
+            BorderProps bpsStart, BorderProps bpsEnd) {
         if (back != null) {
             endTextObject();
 
@@ -261,10 +261,10 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
      * @param bpsStart the border-start traits
      * @param bpsEnd the border-end traits
      */
-    protected void drawBorders                                  // CSOK: ParameterNumber
-        (float startx, float starty, float width, float height,
-         BorderProps bpsBefore, BorderProps bpsAfter,
-         BorderProps bpsStart, BorderProps bpsEnd) {
+    protected void drawBorders(                                  // CSOK: ParameterNumber
+            float startx, float starty, float width, float height,
+            BorderProps bpsBefore, BorderProps bpsAfter,
+            BorderProps bpsStart, BorderProps bpsEnd) {
         Rectangle2D.Float borderRect = new Rectangle2D.Float(startx, starty, width, height);
         drawBorders(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd);
     }
@@ -282,8 +282,8 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
      * @param bpsStart the border specification on the start side
      * @param bpsEnd the border specification on the end side
      */
-    protected void drawBorders                                  // CSOK: MethodLength
-        (Rectangle2D.Float borderRect,
+    protected void drawBorders(                                  // CSOK: MethodLength
+            Rectangle2D.Float borderRect,
             BorderProps bpsBefore, BorderProps bpsAfter, BorderProps bpsStart, BorderProps bpsEnd) {
         //TODO generalize each of the four conditions into using a parameterized drawBorder()
         boolean[] border = new boolean[] {
@@ -858,9 +858,9 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
      * @param style the border style (one of Constants.EN_DASHED etc.)
      * @param col the color for the border segment
      */
-    protected abstract void drawBorderLine                      // CSOK: ParameterNumber
-        (float x1, float y1, float x2, float y2, boolean horz,
-         boolean startOrBefore, int style, Color col);
+    protected abstract void drawBorderLine(                      // CSOK: ParameterNumber
+            float x1, float y1, float x2, float y2, boolean horz,
+            boolean startOrBefore, int style, Color col);
 
     /** {@inheritDoc} */
     public void renderForeignObject(ForeignObject fo, Rectangle2D pos) {
diff --git a/src/java/org/apache/fop/render/afp/AFPPainter.java b/src/java/org/apache/fop/render/afp/AFPPainter.java
index 21bc4ab48..0bbfef3e8 100644
--- a/src/java/org/apache/fop/render/afp/AFPPainter.java
+++ b/src/java/org/apache/fop/render/afp/AFPPainter.java
@@ -281,8 +281,8 @@ public class AFPPainter extends AbstractIFPainter {
             return mpt / 1000f;
         }
 
-        protected void drawBorderLine                           // CSOK: ParameterNumber
-            (int x1, int y1, int x2, int y2, boolean horz,
+        protected void drawBorderLine(                           // CSOK: ParameterNumber
+                int x1, int y1, int x2, int y2, boolean horz,
                 boolean startOrBefore, int style, Color color) throws IOException {
             BorderPaintingInfo borderPaintInfo = new BorderPaintingInfo(
                     toPoints(x1), toPoints(y1), toPoints(x2), toPoints(y2),
@@ -317,9 +317,9 @@ public class AFPPainter extends AbstractIFPainter {
     }
 
     /** {@inheritDoc} */
-    public void drawText                                        // CSOK: MethodLength
-        (int x, int y, final int letterSpacing, final int wordSpacing, final int[] dx,
-         final String text) throws IFException {
+    public void drawText(                                        // CSOK: MethodLength
+            int x, int y, final int letterSpacing, final int wordSpacing, final int[] dx,
+            final String text) throws IFException {
         final int fontSize = this.state.getFontSize();
         getPaintingState().setFontSize(fontSize);
 
diff --git a/src/java/org/apache/fop/render/intermediate/BorderPainter.java b/src/java/org/apache/fop/render/intermediate/BorderPainter.java
index ad37b1dc1..20402369a 100644
--- a/src/java/org/apache/fop/render/intermediate/BorderPainter.java
+++ b/src/java/org/apache/fop/render/intermediate/BorderPainter.java
@@ -217,9 +217,9 @@ public abstract class BorderPainter {
      * @param color the border color
      * @throws IOException if an I/O error occurs
      */
-    protected abstract void drawBorderLine                      // CSOK: ParameterNumber
-        (int x1, int y1, int x2, int y2,
-         boolean horz, boolean startOrBefore, int style, Color color) throws IOException;
+    protected abstract void drawBorderLine(                      // CSOK: ParameterNumber
+            int x1, int y1, int x2, int y2,
+            boolean horz, boolean startOrBefore, int style, Color color) throws IOException;
 
     /**
      * Draws a line/rule.
diff --git a/src/java/org/apache/fop/render/intermediate/IFRenderer.java b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
index 23a5da3e3..bdeb1e9a1 100644
--- a/src/java/org/apache/fop/render/intermediate/IFRenderer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
@@ -1238,8 +1238,8 @@ public class IFRenderer extends AbstractPathOrientedRenderer {
     }
 
     /** {@inheritDoc} */
-    protected void drawBorders                                  // CSOK: ParameterNumber
-        (float startx, float starty,
+    protected void drawBorders(                                  // CSOK: ParameterNumber
+            float startx, float starty,
             float width, float height,
             BorderProps bpsBefore, BorderProps bpsAfter,
             BorderProps bpsStart, BorderProps bpsEnd) {
@@ -1252,8 +1252,8 @@ public class IFRenderer extends AbstractPathOrientedRenderer {
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (float x1, float y1, float x2, float y2, boolean horz,
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            float x1, float y1, float x2, float y2, boolean horz,
             boolean startOrBefore, int style, Color col) {
         //Simplified implementation that is only used by renderTextDecoration()
         //drawBorders() is overridden and uses the Painter's high-level method drawBorderRect()
diff --git a/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java b/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
index e4576373d..b2b29188b 100644
--- a/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
+++ b/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
@@ -64,8 +64,8 @@ public class Java2DBorderPainter extends BorderPainter {
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (int x1, int y1, int x2, int y2, boolean horz,
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            int x1, int y1, int x2, int y2, boolean horz,
             boolean startOrBefore, int style, Color color) {
         float w = x2 - x1;
         float h = y2 - y1;
diff --git a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
index cbd50c954..73af5c8be 100644
--- a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
+++ b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
@@ -536,8 +536,8 @@ public abstract class Java2DRenderer extends AbstractPathOrientedRenderer implem
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (float x1, float y1, float x2, float y2,
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            float x1, float y1, float x2, float y2,
             boolean horz, boolean startOrBefore, int style, Color col) {
         Graphics2D g2d = state.getGraph();
         float width = x2 - x1;
diff --git a/src/java/org/apache/fop/render/pcl/PCLPainter.java b/src/java/org/apache/fop/render/pcl/PCLPainter.java
index 00b25a5e3..afae8ac27 100644
--- a/src/java/org/apache/fop/render/pcl/PCLPainter.java
+++ b/src/java/org/apache/fop/render/pcl/PCLPainter.java
@@ -390,11 +390,11 @@ public class PCLPainter extends AbstractIFPainter implements PCLConstants {
 
     private static final double SAFETY_MARGIN_FACTOR = 0.05;
 
-    private Rectangle getTextBoundingBox                        // CSOK: ParameterNumber
-        (int x, int y,
-         int letterSpacing, int wordSpacing, int[] dx,
-         String text,
-         Font font, FontMetricsMapper metrics) {
+    private Rectangle getTextBoundingBox(                        // CSOK: ParameterNumber
+            int x, int y,
+            int letterSpacing, int wordSpacing, int[] dx,
+            String text,
+            Font font, FontMetricsMapper metrics) {
         int maxAscent = metrics.getMaxAscent(font.getFontSize()) / 1000;
         int descent = metrics.getDescender(font.getFontSize()) / 1000; //is negative
         int safetyMargin = (int)(SAFETY_MARGIN_FACTOR * font.getFontSize());
diff --git a/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java b/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
index 287f89607..f8090fdeb 100644
--- a/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
+++ b/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
@@ -50,9 +50,9 @@ public class PDFBorderPainter extends BorderPainter {
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (int x1, int y1, int x2, int y2, boolean horz,
-         boolean startOrBefore, int style, Color col) {
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            int x1, int y1, int x2, int y2, boolean horz,
+            boolean startOrBefore, int style, Color col) {
        drawBorderLine(generator, x1 / 1000f, y1 / 1000f, x2 / 1000f, y2 / 1000f,
                horz, startOrBefore, style, col);
     }
@@ -61,10 +61,10 @@ public class PDFBorderPainter extends BorderPainter {
      * @param generator pdf content generator
      * @see BorderPainter#drawBorderLine
      */
-    public static void drawBorderLine       // CSOK: ParameterNumber|MethodLength
-        (PDFContentGenerator generator,
-         float x1, float y1, float x2, float y2, boolean horz,  // CSOK: JavadocMethod
-         boolean startOrBefore, int style, Color col) {         // CSOK: JavadocMethod
+    public static void drawBorderLine(       // CSOK: ParameterNumber|MethodLength
+            PDFContentGenerator generator,
+            float x1, float y1, float x2, float y2, boolean horz,  // CSOK: JavadocMethod
+            boolean startOrBefore, int style, Color col) {         // CSOK: JavadocMethod
         float colFactor;
         float w = x2 - x1;
         float h = y2 - y1;
diff --git a/src/java/org/apache/fop/render/ps/PSBorderPainter.java b/src/java/org/apache/fop/render/ps/PSBorderPainter.java
index f5d5169c4..1e2964eed 100644
--- a/src/java/org/apache/fop/render/ps/PSBorderPainter.java
+++ b/src/java/org/apache/fop/render/ps/PSBorderPainter.java
@@ -52,9 +52,9 @@ public class PSBorderPainter extends BorderPainter {
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (int x1, int y1, int x2, int y2, boolean horz,
-         boolean startOrBefore, int style, Color col) throws IOException {
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            int x1, int y1, int x2, int y2, boolean horz,
+            boolean startOrBefore, int style, Color col) throws IOException {
        drawBorderLine(generator, toPoints(x1), toPoints(y1), toPoints(x2), toPoints(y2),
                horz, startOrBefore, style, col);
     }
@@ -71,11 +71,11 @@ public class PSBorderPainter extends BorderPainter {
      * @param gen ps content generator
      * @see BorderPainter#drawBorderLine
      */
-    public static void drawBorderLine                           // CSOK: ParameterNumber
-        (PSGenerator gen,
-         float x1, float y1, float x2, float y2, boolean horz,  // CSOK: JavadocMethod
-         boolean startOrBefore, int style, Color col)           // CSOK: JavadocMethod
-        throws IOException {                                    // CSOK: JavadocMethod
+    public static void drawBorderLine(                           // CSOK: ParameterNumber
+            PSGenerator gen,
+            float x1, float y1, float x2, float y2, boolean horz,  // CSOK: JavadocMethod
+            boolean startOrBefore, int style, Color col)           // CSOK: JavadocMethod
+            throws IOException {                                   // CSOK: JavadocMethod
         float w = x2 - x1;
         float h = y2 - y1;
         if ((w < 0) || (h < 0)) {
diff --git a/src/java/org/apache/fop/render/ps/PSPainter.java b/src/java/org/apache/fop/render/ps/PSPainter.java
index 1fc7b8667..b31775177 100644
--- a/src/java/org/apache/fop/render/ps/PSPainter.java
+++ b/src/java/org/apache/fop/render/ps/PSPainter.java
@@ -403,10 +403,10 @@ public class PSPainter extends AbstractIFPainter {
         }
     }
 
-    private void writeText                                      // CSOK: ParameterNumber
-        (String text, int start, int len,
-         int letterSpacing, int wordSpacing, int[] dx,
-         Font font, Typeface tf, boolean multiByte) throws IOException {
+    private void writeText(                                      // CSOK: ParameterNumber
+            String text, int start, int len,
+            int letterSpacing, int wordSpacing, int[] dx,
+            Font font, Typeface tf, boolean multiByte) throws IOException {
         PSGenerator generator = getGenerator();
         int end = start + len;
         int initialSize = len;
diff --git a/src/java/org/apache/fop/render/txt/TXTRenderer.java b/src/java/org/apache/fop/render/txt/TXTRenderer.java
index b64eb172c..aa36ea28f 100644
--- a/src/java/org/apache/fop/render/txt/TXTRenderer.java
+++ b/src/java/org/apache/fop/render/txt/TXTRenderer.java
@@ -494,9 +494,9 @@ public class TXTRenderer extends AbstractPathOrientedRenderer {
     /**
      * {@inheritDoc}
      */
-    protected void drawBorderLine                               // CSOK: ParameterNumber
-        (float x1, float y1, float x2, float y2,
-         boolean horz, boolean startOrBefore, int style, Color col) {
+    protected void drawBorderLine(                               // CSOK: ParameterNumber
+            float x1, float y1, float x2, float y2,
+            boolean horz, boolean startOrBefore, int style, Color col) {
 
         int borderHeight = bm.getHeight();
         int borderWidth = bm.getWidth();
diff --git a/src/java/org/apache/fop/util/ColorExt.java b/src/java/org/apache/fop/util/ColorExt.java
index 6f4e21382..30f6e9fc3 100644
--- a/src/java/org/apache/fop/util/ColorExt.java
+++ b/src/java/org/apache/fop/util/ColorExt.java
@@ -118,10 +118,10 @@ public final class ColorExt extends Color {
      *            ICC color values
      * @return the requested color object
      */
-    public static ColorExt createFromSvgIccColor                // CSOK: ParameterNumber
-        (float red, float green,
-         float blue, float opacity, String profileName, String profileHref,
-         ColorSpace profileCS, float[] colorValues) {
+    public static ColorExt createFromSvgIccColor(                // CSOK: ParameterNumber
+            float red, float green,
+            float blue, float opacity, String profileName, String profileHref,
+            ColorSpace profileCS, float[] colorValues) {
         //TODO this method is not referenced by FOP, can it be deleted?
         ColorExt ce = new ColorExt(red, green, blue, opacity);
         ce.rgbReplacementRed = -1;