You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/05/07 20:53:30 UTC

svn commit: r1480018 [1/2] - in /xmlgraphics/fop/trunk: ./ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/codegen/unicode/java/org/apache/fop/text/linebreak/ src/java/org/apache/fop/afp/ src/java/org/apache/fop/complexscripts/bidi/ sr...

Author: vhennebert
Date: Tue May  7 18:53:29 2013
New Revision: 1480018

URL: http://svn.apache.org/r1480018
Log:
Cosmetics only: removed Checkstyle SuppressWithNearbyCommentFilter and fixed corresponding issues

Modified:
    xmlgraphics/fop/trunk/checkstyle-5.5.xml
    xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
    xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java

Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Tue May  7 18:53:29 2013
@@ -44,14 +44,6 @@
   <!-- ===================================================================================================== -->
 
   <!-- ===================================================================================================== -->
-  <module name="SuppressWithNearbyCommentFilter">
-    <property name="commentFormat" value="CSOK\: ([\w\|]+)"/>
-    <property name="checkFormat" value="$1"/>
-    <property name="influenceFormat" value="0"/>
-  </module>
-  <!-- ===================================================================================================== -->
-
-  <!-- ===================================================================================================== -->
   <module name="TreeWalker">
 
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -130,7 +122,8 @@
 
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
     <module name="InnerAssignment">
-      <property name="tokens" value="ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
+      <property name="tokens" 
+        value="BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
     </module>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
 

Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java Tue May  7 18:53:29 2013
@@ -445,7 +445,7 @@ public final class GenerateBidiClass {
         }
     }
 
-    private static final int[] testData =                       // CSOK: ConstantName
+    private static final int[] TEST_DATA =
     {
         0x000000, BidiConstants.BN,
         0x000009, BidiConstants.S,
@@ -495,9 +495,9 @@ public final class GenerateBidiClass {
     };
 
     private static void test() throws Exception {
-        for (int i = 0, n = testData.length / 2; i < n; i++) {
-            int ch = testData [ i * 2 + 0 ];
-            int tc = testData [ i * 2 + 1 ];
+        for (int i = 0, n = TEST_DATA.length / 2; i < n; i++) {
+            int ch = TEST_DATA [ i * 2 + 0 ];
+            int tc = TEST_DATA [ i * 2 + 1 ];
             int bc = getBidiClass(ch);
             if (bc != tc) {
                 throw new Exception("test mapping failed for character (0x" + Integer.toHexString(ch) + "): expected " + tc + ", got " + bc);
@@ -545,9 +545,9 @@ public final class GenerateBidiClass {
     }
 
     private static class Interval implements Comparable {
-        int start;                                              // CSOK: VisibilityModifier
-        int end;                                                // CSOK: VisibilityModifier
-        int bidiClass;                                          // CSOK: VisibilityModifier
+        int start;
+        int end;
+        int bidiClass;
         Interval(int start, int end, int bidiClass) {
             this.start = start;
             this.end = end;

Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Tue May  7 18:53:29 2013
@@ -83,7 +83,7 @@ public final class GenerateLineBreakUtil
      * @param outFileName Name of the output file.
      * @throws Exception in case anything goes wrong.
      */
-    private static void convertLineBreakProperties(// CSOK: MethodLength
+    private static void convertLineBreakProperties(
         String lineBreakFileName,
         String propertyValueFileName,
         String breakPairFileName,

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java Tue May  7 18:53:29 2013
@@ -41,7 +41,7 @@ public class AFPBorderPainter extends Ab
     }
 
     /** {@inheritDoc} */
-    public void paint(PaintingInfo paintInfo) { // CSOK: MethodLength
+    public void paint(PaintingInfo paintInfo) {
         BorderPaintingInfo borderPaintInfo = (BorderPaintingInfo)paintInfo;
         float w = borderPaintInfo.getX2() - borderPaintInfo.getX1();
         float h = borderPaintInfo.getY2() - borderPaintInfo.getY1();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java Tue May  7 18:53:29 2013
@@ -48,7 +48,7 @@ public final class BidiResolver {
     /**
      * logging instance
      */
-    private static final Log log = LogFactory.getLog(BidiResolver.class);                                                   // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(BidiResolver.class);
 
     private BidiResolver() {
     }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java Tue May  7 18:53:29 2013
@@ -166,7 +166,7 @@ public class DelimitedTextRange {
      * text range
      * @return a list of text intervals as described above
      */
-    private static final Log log = LogFactory.getLog(BidiResolver.class); // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(BidiResolver.class);
     private List assignLevels(TextInterval ti, int[] levels) {
         Vector tiv = new Vector();
         FONode fn = ti.getNode();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java Tue May  7 18:53:29 2013
@@ -43,7 +43,7 @@ public final class UnicodeBidiAlgorithm 
     /**
      * logging instance
      */
-    private static final Log log = LogFactory.getLog(BidiResolver.class);                                                   // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(BidiResolver.class);
 
     private UnicodeBidiAlgorithm() {
     }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java Tue May  7 18:53:29 2013
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
 public final class GlyphCoverageTable extends GlyphMappingTable implements GlyphCoverageMapping {
 
     /* logging instance */
-    private static final Log log = LogFactory.getLog(GlyphCoverageTable.class);                                         // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GlyphCoverageTable.class);
 
     /** empty mapping table */
     public static final int GLYPH_COVERAGE_TYPE_EMPTY = GLYPH_MAPPING_TYPE_EMPTY;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java Tue May  7 18:53:29 2013
@@ -41,7 +41,7 @@ import org.apache.fop.complexscripts.uti
 public class GlyphDefinitionTable extends GlyphTable {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GlyphDefinitionTable.class);                                       // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GlyphDefinitionTable.class);
 
     /** glyph class subtable type */
     public static final int GDEF_LOOKUP_TYPE_GLYPH_CLASS = 1;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java Tue May  7 18:53:29 2013
@@ -34,7 +34,7 @@ import org.apache.fop.complexscripts.uti
  */
 public abstract class GlyphPositioningSubtable extends GlyphSubtable implements GlyphPositioning {
 
-    private static final GlyphPositioningState state = new GlyphPositioningState();   // CSOK: ConstantName
+    private static final GlyphPositioningState STATE = new GlyphPositioningState();
 
     /**
      * Instantiate a <code>GlyphPositioningSubtable</code>.
@@ -124,8 +124,8 @@ public abstract class GlyphPositioningSu
      * @return true if a non-zero adjustment occurred
      */
     public static final boolean position(GlyphSequence gs, String script, String language, String feature, int fontSize, GlyphPositioningSubtable[] sta, int[] widths, int[][] adjustments, ScriptContextTester sct) {
-        synchronized (state) {
-            return position(state.reset(gs, script, language, feature, fontSize, widths, adjustments, sct), sta, -1);
+        synchronized (STATE) {
+            return position(STATE.reset(gs, script, language, feature, fontSize, widths, adjustments, sct), sta, -1);
         }
     }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java Tue May  7 18:53:29 2013
@@ -46,7 +46,7 @@ import org.apache.fop.complexscripts.uti
 public class GlyphPositioningTable extends GlyphTable {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GlyphPositioningTable.class);                                      // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GlyphPositioningTable.class);
 
     /** single positioning subtable type */
     public static final int GPOS_LOOKUP_TYPE_SINGLE = 1;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java Tue May  7 18:53:29 2013
@@ -33,7 +33,7 @@ import org.apache.fop.complexscripts.uti
  */
 public abstract class GlyphSubstitutionSubtable extends GlyphSubtable implements GlyphSubstitution {
 
-    private static final GlyphSubstitutionState state = new GlyphSubstitutionState();   // CSOK: ConstantName
+    private static final GlyphSubstitutionState STATE = new GlyphSubstitutionState();
 
     /**
      * Instantiate a <code>GlyphSubstitutionSubtable</code>.
@@ -121,8 +121,8 @@ public abstract class GlyphSubstitutionS
      * @return output glyph sequence
      */
     public static final GlyphSequence substitute(GlyphSequence gs, String script, String language, String feature, GlyphSubstitutionSubtable[] sta, ScriptContextTester sct) {
-        synchronized (state) {
-            return substitute(state.reset(gs, script, language, feature, sct), sta, -1);
+        synchronized (STATE) {
+            return substitute(STATE.reset(gs, script, language, feature, sct), sta, -1);
         }
     }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java Tue May  7 18:53:29 2013
@@ -44,7 +44,7 @@ import org.apache.fop.complexscripts.uti
 public class GlyphSubstitutionTable extends GlyphTable {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GlyphSubstitutionTable.class);                                     // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GlyphSubstitutionTable.class);
 
     /** single substitution subtable type */
     public static final int GSUB_LOOKUP_TYPE_SINGLE = 1;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java Tue May  7 18:53:29 2013
@@ -52,7 +52,7 @@ import org.apache.fop.complexscripts.uti
 public class GlyphTable {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GlyphTable.class);                                                 // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GlyphTable.class);
 
     /** substitution glyph table type */
     public static final int GLYPH_TABLE_TYPE_SUBSTITUTION = 1;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java Tue May  7 18:53:29 2013
@@ -48,10 +48,10 @@ import org.apache.fop.complexscripts.uti
 public class ArabicScriptProcessor extends DefaultScriptProcessor {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(ArabicScriptProcessor.class);                                      // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(ArabicScriptProcessor.class);
 
     /** features to use for substitutions */
-    private static final String[] gsubFeatures =                                                                        // CSOK: ConstantNameCheck
+    private static final String[] GSUB_FEATURES =
     {
         "calt",                                                 // contextual alternates
         "ccmp",                                                 // glyph composition/decomposition
@@ -64,7 +64,7 @@ public class ArabicScriptProcessor exten
     };
 
     /** features to use for positioning */
-    private static final String[] gposFeatures =                                                                        // CSOK: ConstantNameCheck
+    private static final String[] GPOS_FEATURES =
     {
         "curs",                                                 // cursive positioning
         "kern",                                                 // kerning
@@ -124,7 +124,7 @@ public class ArabicScriptProcessor exten
 
     /** {@inheritDoc} */
     public String[] getSubstitutionFeatures() {
-        return gsubFeatures;
+        return GSUB_FEATURES;
     }
 
     /** {@inheritDoc} */
@@ -134,7 +134,7 @@ public class ArabicScriptProcessor exten
 
     /** {@inheritDoc} */
     public String[] getPositioningFeatures() {
-        return gposFeatures;
+        return GPOS_FEATURES;
     }
 
     /** {@inheritDoc} */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java Tue May  7 18:53:29 2013
@@ -34,7 +34,7 @@ import org.apache.fop.complexscripts.uti
 public class DefaultScriptProcessor extends ScriptProcessor {
 
     /** features to use for substitutions */
-    private static final String[] gsubFeatures =                                                                        // CSOK: ConstantNameCheck
+    private static final String[] GSUB_FEATURES =
     {
         "ccmp",                                                 // glyph composition/decomposition
         "liga",                                                 // common ligatures
@@ -42,7 +42,7 @@ public class DefaultScriptProcessor exte
     };
 
     /** features to use for positioning */
-    private static final String[] gposFeatures =                                                                        // CSOK: ConstantNameCheck
+    private static final String[] GPOS_FEATURES =
     {
         "kern",                                                 // kerning
         "mark",                                                 // mark to base or ligature positioning
@@ -56,7 +56,7 @@ public class DefaultScriptProcessor exte
     @Override
     /** {@inheritDoc} */
     public String[] getSubstitutionFeatures() {
-        return gsubFeatures;
+        return GSUB_FEATURES;
     }
 
     @Override
@@ -68,7 +68,7 @@ public class DefaultScriptProcessor exte
     @Override
     /** {@inheritDoc} */
     public String[] getPositioningFeatures() {
-        return gposFeatures;
+        return GPOS_FEATURES;
     }
 
     @Override

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java Tue May  7 18:53:29 2013
@@ -40,7 +40,7 @@ import org.apache.fop.complexscripts.uti
 public class DevanagariScriptProcessor extends IndicScriptProcessor {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(DevanagariScriptProcessor.class);                                  // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(DevanagariScriptProcessor.class);
 
     DevanagariScriptProcessor(String script) {
         super(script);
@@ -352,10 +352,10 @@ public class DevanagariScriptProcessor e
     static final short C_M_TYPE     = 0x00FF;       // type mask
     static final short C_M_FLAGS    = 0x7F00;       // flag mask
     // devanagari block range
-    static final int ccaStart       =  0x0900;      // first code point mapped by cca                                   // CSOK: ConstantNameCheck
-    static final int ccaEnd         =  0x0980;      // last code point + 1 mapped by cca                                // CSOK: ConstantNameCheck
+    static final int CCA_START       =  0x0900;      // first code point mapped by cca
+    static final int CCA_END         =  0x0980;      // last code point + 1 mapped by cca
     // devanagari character type lookups
-    static final short[] cca = {                                                                                        // CSOK: ConstantNameCheck
+    static final short[] CCA = {
         C_O,                        // 0x0900       // INVERTED CANDRABINDU
         C_O,                        // 0x0901       // CANDRABINDU
         C_O,                        // 0x0902       // ANUSVARA
@@ -404,8 +404,8 @@ public class DevanagariScriptProcessor e
         C_C,                        // 0x092D       // BHA
         C_C,                        // 0x092E       // MA
         C_C,                        // 0x092F       // YA
-        C_C|C_R,                    // 0x0930       // RA                                                               // CSOK: WhitespaceAround
-        C_C|C_R|C_N,                // 0x0931       // RRA          = 0930+093C                                         // CSOK: WhitespaceAround
+        C_C | C_R,                  // 0x0930       // RA
+        C_C | C_R | C_N,            // 0x0931       // RRA          = 0930+093C
         C_C,                        // 0x0932       // LA
         C_C,                        // 0x0933       // LLA
         C_C,                        // 0x0934       // LLLA
@@ -419,7 +419,7 @@ public class DevanagariScriptProcessor e
         C_N,                        // 0x093C       // NUKTA
         C_S,                        // 0x093D       // AVAGRAHA
         C_M,                        // 0x093E       // AA
-        C_M|C_PRE,                  // 0x093F       // I                                                               // CSOK: WhitespaceAround
+        C_M | C_PRE,                // 0x093F       // I
         C_M,                        // 0x0940       // II
         C_M,                        // 0x0941       // U
         C_M,                        // 0x0942       // UU
@@ -444,14 +444,14 @@ public class DevanagariScriptProcessor e
         C_M,                        // 0x0955       // CANDRA LONG E
         C_M,                        // 0x0956       // UE
         C_M,                        // 0x0957       // UUE
-        C_C|C_N,                    // 0x0958       // QA                                                               // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x0959       // KHHA                                                             // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095A       // GHHA                                                             // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095B       // ZA                                                               // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095C       // DDDHA                                                            // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095D       // RHA                                                              // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095E       // FA                                                               // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x095F       // YYA                                                              // CSOK: WhitespaceAround
+        C_C | C_N,                  // 0x0958       // QA
+        C_C | C_N,                  // 0x0959       // KHHA
+        C_C | C_N,                  // 0x095A       // GHHA
+        C_C | C_N,                  // 0x095B       // ZA
+        C_C | C_N,                  // 0x095C       // DDDHA
+        C_C | C_N,                  // 0x095D       // RHA
+        C_C | C_N,                  // 0x095E       // FA
+        C_C | C_N,                  // 0x095F       // YYA
         C_V,                        // 0x0960       // VOCALIC RR
         C_V,                        // 0x0961       // VOCALIC LL
         C_M,                        // 0x0962       // VOCALIC RR
@@ -486,8 +486,8 @@ public class DevanagariScriptProcessor e
         C_C                         // 0x097F       // BBA (SINDHI)
     };
     static int typeOf(int c) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return cca [ c - ccaStart ] & C_M_TYPE;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return CCA [ c - CCA_START ] & C_M_TYPE;
         } else {
             return C_U;
         }
@@ -496,8 +496,8 @@ public class DevanagariScriptProcessor e
         return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return (cca [ c - ccaStart ] & f) == f;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return (CCA [ c - CCA_START ] & f) == f;
         } else {
             return false;
         }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java Tue May  7 18:53:29 2013
@@ -40,7 +40,7 @@ import org.apache.fop.complexscripts.uti
 public class GujaratiScriptProcessor extends IndicScriptProcessor {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GujaratiScriptProcessor.class);                                  // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GujaratiScriptProcessor.class);
 
     GujaratiScriptProcessor(String script) {
         super(script);
@@ -352,10 +352,10 @@ public class GujaratiScriptProcessor ext
     static final short C_M_TYPE     = 0x00FF;       // type mask
     static final short C_M_FLAGS    = 0x7F00;       // flag mask
     // gujarati block range
-    static final int ccaStart       =  0x0A80;      // first code point mapped by cca                                   // CSOK: ConstantNameCheck
-    static final int ccaEnd         =  0x0B00;      // last code point + 1 mapped by cca                                // CSOK: ConstantNameCheck
+    static final int CCA_START       =  0x0A80;      // first code point mapped by cca
+    static final int CCA_END         =  0x0B00;      // last code point + 1 mapped by cca
     // gujarati character type lookups
-    static final short[] cca = {                                                                                        // CSOK: ConstantNameCheck
+    static final short[] CCA = {
         C_U,                        // 0x0A80       // UNASSIGNED
         C_O,                        // 0x0A81       // CANDRABINDU
         C_O,                        // 0x0A82       // ANUSVARA
@@ -404,7 +404,7 @@ public class GujaratiScriptProcessor ext
         C_C,                        // 0x0AAD       // BHA
         C_C,                        // 0x0AAE       // MA
         C_C,                        // 0x0AAF       // YA
-        C_C|C_R,                    // 0x0AB0       // RA                                                               // CSOK: WhitespaceAround
+        C_C | C_R,                  // 0x0AB0       // RA
         C_U,                        // 0x0AB1       // UNASSIGNED
         C_C,                        // 0x0AB2       // LA
         C_C,                        // 0x0AB3       // LLA
@@ -419,7 +419,7 @@ public class GujaratiScriptProcessor ext
         C_N,                        // 0x0ABC       // NUKTA
         C_S,                        // 0x0ABD       // AVAGRAHA
         C_M,                        // 0x0ABE       // AA
-        C_M|C_PRE,                  // 0x0ABF       // I                                                               // CSOK: WhitespaceAround
+        C_M | C_PRE,                // 0x0ABF       // I
         C_M,                        // 0x0AC0       // II
         C_M,                        // 0x0AC1       // U
         C_M,                        // 0x0AC2       // UU
@@ -486,8 +486,8 @@ public class GujaratiScriptProcessor ext
         C_U                         // 0x0AFF       // UNASSIGNED
     };
     static int typeOf(int c) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return cca [ c - ccaStart ] & C_M_TYPE;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return CCA [ c - CCA_START ] & C_M_TYPE;
         } else {
             return C_U;
         }
@@ -496,8 +496,8 @@ public class GujaratiScriptProcessor ext
         return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return (cca [ c - ccaStart ] & f) == f;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return (CCA [ c - CCA_START ] & f) == f;
         } else {
             return false;
         }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java Tue May  7 18:53:29 2013
@@ -41,7 +41,7 @@ import org.apache.fop.complexscripts.uti
 public class GurmukhiScriptProcessor extends IndicScriptProcessor {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(GurmukhiScriptProcessor.class);                                  // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(GurmukhiScriptProcessor.class);
 
     GurmukhiScriptProcessor(String script) {
         super(script);
@@ -353,10 +353,10 @@ public class GurmukhiScriptProcessor ext
     static final short C_M_TYPE     = 0x00FF;       // type mask
     static final short C_M_FLAGS    = 0x7F00;       // flag mask
     // gurmukhi block range
-    static final int ccaStart       =  0x0A00;      // first code point mapped by cca                                   // CSOK: ConstantNameCheck
-    static final int ccaEnd         =  0x0A80;      // last code point + 1 mapped by cca                                // CSOK: ConstantNameCheck
+    static final int CCA_START       =  0x0A00;      // first code point mapped by cca
+    static final int CCA_END         =  0x0A80;      // last code point + 1 mapped by cca
     // gurmukhi character type lookups
-    static final short[] cca = {                                                                                        // CSOK: ConstantNameCheck
+    static final short[] CCA = {
         C_U,                        // 0x0A00       // UNASSIGNED
         C_O,                        // 0x0A01       // ADAK BINDI
         C_O,                        // 0x0A02       // BINDI
@@ -405,7 +405,7 @@ public class GurmukhiScriptProcessor ext
         C_C,                        // 0x0A2D       // BHA
         C_C,                        // 0x0A2E       // MA
         C_C,                        // 0x0A2F       // YA
-        C_C|C_R,                    // 0x0A30       // RA                                                               // CSOK: WhitespaceAround
+        C_C | C_R,                  // 0x0A30       // RA
         C_U,                        // 0x0A31       // UNASSIGNED
         C_C,                        // 0x0A32       // LA
         C_C,                        // 0x0A33       // LLA
@@ -420,7 +420,7 @@ public class GurmukhiScriptProcessor ext
         C_N,                        // 0x0A3C       // NUKTA
         C_U,                        // 0x0A3D       // UNASSIGNED
         C_M,                        // 0x0A3E       // AA
-        C_M|C_PRE,                  // 0x0A3F       // I                                                               // CSOK: WhitespaceAround
+        C_M | C_PRE,                // 0x0A3F       // I
         C_M,                        // 0x0A40       // II
         C_M,                        // 0x0A41       // U
         C_M,                        // 0x0A42       // UU
@@ -446,12 +446,12 @@ public class GurmukhiScriptProcessor ext
         C_U,                        // 0x0A56       // UNASSIGNED
         C_U,                        // 0x0A57       // UNASSIGNED
         C_U,                        // 0x0A58       // UNASSIGNED
-        C_C|C_N,                    // 0x0A59       // KHHA                                                             // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x0A5A       // GHHA                                                             // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x0A5B       // ZA                                                               // CSOK: WhitespaceAround
-        C_C|C_N,                    // 0x0A5C       // RRA                                                              // CSOK: WhitespaceAround
+        C_C | C_N,                  // 0x0A59       // KHHA
+        C_C | C_N,                  // 0x0A5A       // GHHA
+        C_C | C_N,                  // 0x0A5B       // ZA
+        C_C | C_N,                  // 0x0A5C       // RRA
         C_U,                        // 0x0A5D       // UNASSIGNED
-        C_C|C_N,                    // 0x0A5E       // FA                                                               // CSOK: WhitespaceAround
+        C_C | C_N,                  // 0x0A5E       // FA
         C_U,                        // 0x0A5F       // UNASSIGNED
         C_U,                        // 0x0A60       // UNASSIGNED
         C_U,                        // 0x0A61       // UNASSIGNED
@@ -487,8 +487,8 @@ public class GurmukhiScriptProcessor ext
         C_U                         // 0x0A7F       // UNASSIGNED
     };
     static int typeOf(int c) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return cca [ c - ccaStart ] & C_M_TYPE;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return CCA [ c - CCA_START ] & C_M_TYPE;
         } else {
             return C_U;
         }
@@ -497,8 +497,8 @@ public class GurmukhiScriptProcessor ext
         return typeOf(c) == t;
     }
     static boolean hasFlag(int c, int f) {
-        if ((c >= ccaStart) && (c < ccaEnd)) {
-            return (cca [ c - ccaStart ] & f) == f;
+        if ((c >= CCA_START) && (c < CCA_END)) {
+            return (CCA [ c - CCA_START ] & f) == f;
         } else {
             return false;
         }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java Tue May  7 18:53:29 2013
@@ -21,7 +21,6 @@ package org.apache.fop.complexscripts.sc
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -55,10 +54,10 @@ import org.apache.fop.complexscripts.uti
 public class IndicScriptProcessor extends DefaultScriptProcessor {
 
     /** logging instance */
-    private static final Log log = LogFactory.getLog(IndicScriptProcessor.class);                                      // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(IndicScriptProcessor.class);
 
     /** required features to use for substitutions */
-    private static final String[] gsubReqFeatures =                                                                    // CSOK: ConstantNameCheck
+    private static final String[] GSUB_REQ_FEATURES =
     {
         "abvf",                                                 // above base forms
         "abvs",                                                 // above base substitutions
@@ -82,7 +81,7 @@ public class IndicScriptProcessor extend
     };
 
     /** optional features to use for substitutions */
-    private static final String[] gsubOptFeatures =                                                                     // CSOK: ConstantNameCheck
+    private static final String[] GSUB_OPT_FEATURES =
     {
         "afrc",                                                 // alternative fractions
         "calt",                                                 // contextual alternatives
@@ -90,7 +89,7 @@ public class IndicScriptProcessor extend
     };
 
     /** required features to use for positioning */
-    private static final String[] gposReqFeatures =                                                                     // CSOK: ConstantNameCheck
+    private static final String[] GPOS_REQ_FEATURES =
     {
         "abvm",                                                 // above base marks
         "blwm",                                                 // below base marks
@@ -99,7 +98,7 @@ public class IndicScriptProcessor extend
     };
 
     /** required features to use for positioning */
-    private static final String[] gposOptFeatures =                                                                     // CSOK: ConstantNameCheck
+    private static final String[] GPOS_OPT_FEATURES =
     {
     };
 
@@ -150,12 +149,12 @@ public class IndicScriptProcessor extend
 
     /** {@inheritDoc} */
     public String[] getSubstitutionFeatures() {
-        return gsubReqFeatures;
+        return GSUB_REQ_FEATURES;
     }
 
     /** {@inheritDoc} */
     public String[] getOptionalSubstitutionFeatures() {
-        return gsubOptFeatures;
+        return GSUB_OPT_FEATURES;
     }
 
     /** {@inheritDoc} */
@@ -165,12 +164,12 @@ public class IndicScriptProcessor extend
 
     /** {@inheritDoc} */
     public String[] getPositioningFeatures() {
-        return gposReqFeatures;
+        return GPOS_REQ_FEATURES;
     }
 
     /** {@inheritDoc} */
     public String[] getOptionalPositioningFeatures() {
-        return gposOptFeatures;
+        return GPOS_OPT_FEATURES;
     }
 
     /** {@inheritDoc} */
@@ -231,7 +230,7 @@ public class IndicScriptProcessor extend
     }
 
     private static Set<String> basicShapingFeatures;
-    private static final String[] basicShapingFeatureStrings = {                                                        // CSOK: ConstantNameCheck
+    private static final String[] BASIC_SHAPING_FEATURE_STRINGS = {
         "abvf",
         "akhn",
         "blwf",
@@ -247,7 +246,7 @@ public class IndicScriptProcessor extend
     };
     static {
         basicShapingFeatures = new HashSet<String>();
-        for (String s : basicShapingFeatureStrings) {
+        for (String s : BASIC_SHAPING_FEATURE_STRINGS) {
             basicShapingFeatures.add(s);
         }
     }
@@ -261,7 +260,7 @@ public class IndicScriptProcessor extend
     }
 
     private static  Set<String> presentationFeatures;
-    private static final String[] presentationFeatureStrings = {                                                        // CSOK: ConstantNameCheck
+    private static final String[] PRESENTATION_FEATURE_STRINGS = {
         "abvs",
         "blws",
         "calt",
@@ -271,7 +270,7 @@ public class IndicScriptProcessor extend
     };
     static {
         presentationFeatures = new HashSet<String>();
-        for (String s : presentationFeatureStrings) {
+        for (String s : PRESENTATION_FEATURE_STRINGS) {
             presentationFeatures.add(s);
         }
     }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java Tue May  7 18:53:29 2013
@@ -133,7 +133,7 @@ public final class CharScript {
       * A static (class) parameter indicating whether V2 indic shaping
       * rules apply or not, with default being <code>true</code>.
       */
-    private static final boolean useV2Indic = true; // CSOK: ConstantNameCheck
+    private static final boolean USE_V2_INDIC = true;
 
     private CharScript() {
     }
@@ -697,7 +697,7 @@ public final class CharScript {
      * @return either SC or the V2 flavor of SC if V2 indic rules apply
      */
     public static int useV2IndicRules(int sc) {
-        if (useV2Indic) {
+        if (USE_V2_INDIC) {
             return (sc < 1000) ? (sc + 1000) : sc;
         } else {
             return sc;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java Tue May  7 18:53:29 2013
@@ -983,10 +983,10 @@ public class GlyphSequence implements Cl
             return sortIntervals(sa, ea);
         }
 
-        private static final int[] sortIncrements16                                                             // CSOK: ConstantNameCheck
+        private static final int[] SORT_INCREMENTS_16
             = { 1391376, 463792, 198768, 86961, 33936, 13776, 4592, 1968, 861, 336, 112, 48, 21, 7, 3, 1 };
 
-        private static final int[] sortIncrements03                                                             // CSOK: ConstantNameCheck
+        private static final int[] SORT_INCREMENTS_03
             = { 7, 3, 1 };
 
         /**
@@ -997,7 +997,7 @@ public class GlyphSequence implements Cl
             assert ea != null;
             assert sa.length == ea.length;
             int ni = sa.length;
-            int[] incr = (ni < 21) ? sortIncrements03 : sortIncrements16;
+            int[] incr = (ni < 21) ? SORT_INCREMENTS_03 : SORT_INCREMENTS_16;
             for (int k = 0; k < incr.length; k++) {
                 for (int h = incr [ k ], i = h, n = ni, j; i < n; i++) {
                     int s1 = sa [ i ];

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java Tue May  7 18:53:29 2013
@@ -27,9 +27,9 @@ package org.apache.fop.datatypes;
 public class FODimension {
 
     /** distance (in millipoints) on the inline-progression-direction */
-    public int ipd; // CSOK: VisibilityModifier
+    public int ipd;
     /** distance (in millipoints) on the block-progression-direction */
-    public int bpd; // CSOK: VisibilityModifier
+    public int bpd;
 
     /**
      * Constructor

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue May  7 18:53:29 2013
@@ -566,7 +566,7 @@ public final class FOPropertyMapping imp
         addPropertyMaker("volume", m);
     }
 
-    private void createBorderPaddingBackgroundProperties() {    // CSOK: MethodLength
+    private void createBorderPaddingBackgroundProperties() {
         PropertyMaker m;
         BorderWidthPropertyMaker bwm;
         CorrespondingPropertyMaker corr;
@@ -1332,7 +1332,7 @@ public final class FOPropertyMapping imp
         addPropertyMaker("relative-align", m);
     }
 
-    private void createAreaDimensionProperties() {              // CSOK: MethodLength
+    private void createAreaDimensionProperties() {
         PropertyMaker m;
         LengthProperty.Maker l;
         DimensionPropertyMaker pdim;
@@ -1534,7 +1534,7 @@ public final class FOPropertyMapping imp
         }
     }
 
-    private void createBlockAndLineProperties() {               // CSOK: MethodLength
+    private void createBlockAndLineProperties() {
         PropertyMaker m;
 
         // hyphenation-keep
@@ -2723,7 +2723,7 @@ public final class FOPropertyMapping imp
         addPropertyMaker("z-index", m);
     }
 
-    private void createShorthandProperties() {                  // CSOK: MethodLength
+    private void createShorthandProperties() {
         PropertyMaker m;
 
         // background

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java Tue May  7 18:53:29 2013
@@ -46,13 +46,13 @@ public class ConditionalBorder {
     public static final int REST = 2;
 
     /** Normal case, no break. */
-    BorderSpecification normal;                  // CSOK: VisibilityModifier
+    BorderSpecification normal;
 
     /** Special case: the cell is at the top or the bottom of the page. */
-    BorderSpecification leadingTrailing;         // CSOK: VisibilityModifier
+    BorderSpecification leadingTrailing;
 
     /** Special case: break inside the cell. */
-    BorderSpecification rest;                    // CSOK: VisibilityModifier
+    BorderSpecification rest;
 
     /** The model used to resolve borders. */
     private CollapsingBorderModel collapsingBorderModel;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java Tue May  7 18:53:29 2013
@@ -65,13 +65,13 @@ public class GridUnit {
     private byte flags = 0;
 
     /** the border-before specification */
-    ConditionalBorder borderBefore;             // CSOK: VisibilityModifier
+    ConditionalBorder borderBefore;
     /** the border-after specification */
-    ConditionalBorder borderAfter;              // CSOK: VisibilityModifier
+    ConditionalBorder borderAfter;
     /** the border-start specification */
-    BorderSpecification borderStart;            // CSOK: VisibilityModifier
+    BorderSpecification borderStart;
     /** the border-end specification */
-    BorderSpecification borderEnd;              // CSOK: VisibilityModifier
+    BorderSpecification borderEnd;
 
     /** The border model helper associated with the table */
     protected CollapsingBorderModel collapsingBorderModel;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Tue May  7 18:53:29 2013
@@ -55,7 +55,7 @@ public class TableAndCaption extends FOb
     //     private int textAlign;
     // End of property values
 
-    static boolean notImplementedWarningGiven = false; // CSOK: VisibilityModifier
+    static boolean notImplementedWarningGiven = false;
 
     /** used for FO validation */
     private boolean tableCaptionFound = false;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java Tue May  7 18:53:29 2013
@@ -54,7 +54,7 @@ public class TableCaption extends FObj i
     /** used for FO validation */
     private boolean blockItemFound = false;
 
-    static boolean notImplementedWarningGiven = false; // CSOK: VisibilityModifier
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * Create a TableCaption instance with the given {@link FONode}

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Tue May  7 18:53:29 2013
@@ -48,12 +48,12 @@ public abstract class TableFObj extends 
     private Numeric borderEndPrecedence;
     private Numeric borderStartPrecedence;
 
-    ConditionalBorder borderBefore;             // CSOK: VisibilityModifier
-    ConditionalBorder borderAfter;              // CSOK: VisibilityModifier
-    BorderSpecification borderStart;            // CSOK: VisibilityModifier
-    BorderSpecification borderEnd;              // CSOK: VisibilityModifier
+    ConditionalBorder borderBefore;
+    ConditionalBorder borderAfter;
+    BorderSpecification borderStart;
+    BorderSpecification borderEnd;
 
-    CollapsingBorderModel collapsingBorderModel; // CSOK: VisibilityModifier
+    CollapsingBorderModel collapsingBorderModel;
 
     /**
      * Create a TableFObj instance that is a child

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java Tue May  7 18:53:29 2013
@@ -33,27 +33,27 @@ public class CommonAbsolutePosition {
     /**
      * The "absolute-position" property.
      */
-    public int absolutePosition;                                // CSOK: VisibilityModifier
+    public int absolutePosition;
 
     /**
      * The "top" property.
      */
-    public Length top;                                          // CSOK: VisibilityModifier
+    public Length top;
 
     /**
      * The "right" property.
      */
-    public Length right;                                        // CSOK: VisibilityModifier
+    public Length right;
 
     /**
      * The "bottom" property.
      */
-    public Length bottom;                                       // CSOK: VisibilityModifier
+    public Length bottom;
 
     /**
      * The "left" property.
      */
-    public Length left;                                         // CSOK: VisibilityModifier
+    public Length left;
 
     /**
      * Create a CommonAbsolutePosition object.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java Tue May  7 18:53:29 2013
@@ -30,92 +30,92 @@ public class CommonAural {
     /**
      * The "azimuth" property.
      */
-    public int azimuth;                                         // CSOK: VisibilityModifier
+    public int azimuth;
 
     /**
      * The "cueAfter" property.
      */
-    public String cueAfter;                                     // CSOK: VisibilityModifier
+    public String cueAfter;
 
     /**
      * The "cueBefore" property.
      */
-    public String cueBefore;                                    // CSOK: VisibilityModifier
+    public String cueBefore;
 
     /**
      * The "elevation" property.
      */
-    public int elevation;                                       // CSOK: VisibilityModifier
+    public int elevation;
 
     /**
      * The "pauseAfter" property.
      */
-    public int pauseAfter;                                      // CSOK: VisibilityModifier
+    public int pauseAfter;
 
     /**
      * The "pauseBefore" property.
      */
-    public int pauseBefore;                                     // CSOK: VisibilityModifier
+    public int pauseBefore;
 
     /**
      * The "pitch" property.
      */
-    public int pitch;                                           // CSOK: VisibilityModifier
+    public int pitch;
 
     /**
      * The "pitch-range" property.
      */
-    public int pitchRange;                                      // CSOK: VisibilityModifier
+    public int pitchRange;
 
     /**
      * The "playDuring" property.
      */
-    public int playDuring;                                      // CSOK: VisibilityModifier
+    public int playDuring;
 
     /**
      * The "richness" property.
      */
-    public int richness;                                        // CSOK: VisibilityModifier
+    public int richness;
 
     /**
      * The "speak" property.
      */
-    public int speak;                                           // CSOK: VisibilityModifier
+    public int speak;
 
     /**
      * The "speak-header" property.
      */
-    public int speakHeader;                                     // CSOK: VisibilityModifier
+    public int speakHeader;
 
     /**
      * The "speak-numeral" property.
      */
-    public int speakNumeral;                                    // CSOK: VisibilityModifier
+    public int speakNumeral;
 
     /**
      * The "speak-punctuation" property.
      */
-    public int speakPunctuation;                                // CSOK: VisibilityModifier
+    public int speakPunctuation;
 
     /**
      * The "speech-rate" property.
      */
-    public int speechRate;                                      // CSOK: VisibilityModifier
+    public int speechRate;
 
     /**
      * The "stress" property.
      */
-    public int stress;                                          // CSOK: VisibilityModifier
+    public int stress;
 
     /**
      * The "voice-family" property.
      */
-    public int voiceFamily;                                     // CSOK: VisibilityModifier
+    public int voiceFamily;
 
     /**
      * The "volume" property.
      */
-    public int volume;                                          // CSOK: VisibilityModifier
+    public int volume;
 
     /**
      * Create a CommonAbsolutePosition object.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java Tue May  7 18:53:29 2013
@@ -57,32 +57,32 @@ public class CommonBorderPaddingBackgrou
     /**
      * The "background-attachment" property.
      */
-    public final int backgroundAttachment;                      // CSOK: VisibilityModifier
+    public final int backgroundAttachment;
 
     /**
      * The "background-color" property.
      */
-    public final Color backgroundColor;                         // CSOK: VisibilityModifier
+    public final Color backgroundColor;
 
     /**
      * The "background-image" property.
      */
-    public final String backgroundImage;                        // CSOK: VisibilityModifier
+    public final String backgroundImage;
 
     /**
      * The "background-repeat" property.
      */
-    public final int backgroundRepeat;                          // CSOK: VisibilityModifier
+    public final int backgroundRepeat;
 
     /**
      * The "background-position-horizontal" property.
      */
-    public final Length backgroundPositionHorizontal;           // CSOK: VisibilityModifier
+    public final Length backgroundPositionHorizontal;
 
     /**
      * The "background-position-vertical" property.
      */
-    public final Length backgroundPositionVertical;             // CSOK: VisibilityModifier
+    public final Length backgroundPositionVertical;
 
 
     private ImageInfo backgroundImageInfo;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java Tue May  7 18:53:29 2013
@@ -62,10 +62,10 @@ public final class CommonFont {
     private final EnumProperty fontWeight;
 
     /** The "font-size" property. */
-    public final Length fontSize;                               // CSOK: VisibilityModifier
+    public final Length fontSize;
 
     /** The "font-size-adjust" property. */
-    public final Numeric fontSizeAdjust;                        // CSOK: VisibilityModifier
+    public final Numeric fontSizeAdjust;
 
 
     /**
@@ -80,7 +80,7 @@ public final class CommonFont {
      * @param fontSize  the font-size (possibly non-cached)
      * @param fontSizeAdjust    the font-size-adjust (possibly non-cached)
      */
-    private CommonFont(FontFamilyProperty fontFamily,           // CSOK: ParameterNumber
+    private CommonFont(FontFamilyProperty fontFamily,
                        EnumProperty fontSelectionStrategy,
                        EnumProperty fontStretch,
                        EnumProperty fontStyle,

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java Tue May  7 18:53:29 2013
@@ -46,25 +46,25 @@ public final class CommonHyphenation {
     private int hash = 0;
 
     /** The "language" property */
-    public final StringProperty language;                       // CSOK: VisibilityModifier
+    public final StringProperty language;
 
     /** The "country" property */
-    public final StringProperty country;                        // CSOK: VisibilityModifier
+    public final StringProperty country;
 
     /** The "script" property */
-    public final StringProperty script;                         // CSOK: VisibilityModifier
+    public final StringProperty script;
 
     /** The "hyphenate" property */
-    public final EnumProperty hyphenate;                        // CSOK: VisibilityModifier
+    public final EnumProperty hyphenate;
 
     /** The "hyphenation-character" property */
-    public final CharacterProperty hyphenationCharacter;        // CSOK: VisibilityModifier
+    public final CharacterProperty hyphenationCharacter;
 
     /** The "hyphenation-push-character-count" property */
-    public final NumberProperty hyphenationPushCharacterCount;  // CSOK: VisibilityModifier
+    public final NumberProperty hyphenationPushCharacterCount;
 
     /** The "hyphenation-remain-character-count" property*/
-    public final NumberProperty hyphenationRemainCharacterCount; // CSOK: VisibilityModifier
+    public final NumberProperty hyphenationRemainCharacterCount;
 
     /**
      * Construct a CommonHyphenation object holding the given properties

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java Tue May  7 18:53:29 2013
@@ -33,42 +33,42 @@ public class CommonMarginBlock {
     /**
      * The "margin-top" property.
      */
-    public Length marginTop;                                    // CSOK: VisibilityModifier
+    public Length marginTop;
 
     /**
      * The "margin-bottom" property.
      */
-    public Length marginBottom;                                 // CSOK: VisibilityModifier
+    public Length marginBottom;
 
     /**
      * The "margin-left" property.
      */
-    public Length marginLeft;                                   // CSOK: VisibilityModifier
+    public Length marginLeft;
 
     /**
      * The "margin-right" property.
      */
-    public Length marginRight;                                  // CSOK: VisibilityModifier
+    public Length marginRight;
 
     /**
      * The "space-before" property.
      */
-    public SpaceProperty spaceBefore;                           // CSOK: VisibilityModifier
+    public SpaceProperty spaceBefore;
 
     /**
      * The "space-after" property.
      */
-    public SpaceProperty spaceAfter;                            // CSOK: VisibilityModifier
+    public SpaceProperty spaceAfter;
 
     /**
      * The "start-indent" property.
      */
-    public Length startIndent;                                  // CSOK: VisibilityModifier
+    public Length startIndent;
 
     /**
      * The "end-indent" property.
      */
-    public Length endIndent;                                    // CSOK: VisibilityModifier
+    public Length endIndent;
 
     /**
      * Create a CommonMarginBlock object.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java Tue May  7 18:53:29 2013
@@ -34,32 +34,32 @@ public class CommonMarginInline {
     /**
      * The "margin-top" property.
      */
-    public Length marginTop;                                    // CSOK: VisibilityModifier
+    public Length marginTop;
 
     /**
      * The "margin-bottom" property.
      */
-    public Length marginBottom;                                 // CSOK: VisibilityModifier
+    public Length marginBottom;
 
     /**
      * The "margin-left" property.
      */
-    public Length marginLeft;                                   // CSOK: VisibilityModifier
+    public Length marginLeft;
 
     /**
      * The "margin-right" property.
      */
-    public Length marginRight;                                  // CSOK: VisibilityModifier
+    public Length marginRight;
 
     /**
      * The "space-start" property.
      */
-    public SpaceProperty spaceStart;                            // CSOK: VisibilityModifier
+    public SpaceProperty spaceStart;
 
     /**
      * The "space-end" property.
      */
-    public SpaceProperty spaceEnd;                              // CSOK: VisibilityModifier
+    public SpaceProperty spaceEnd;
 
     /**
      * Create a CommonMarginInline object.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java Tue May  7 18:53:29 2013
@@ -33,27 +33,27 @@ public class CommonRelativePosition {
     /**
      * The "relative-position" property.
      */
-    public int relativePosition;                                // CSOK: VisibilityModifier
+    public int relativePosition;
 
     /**
      * The "top" property.
      */
-    public Length top;                                          // CSOK: VisibilityModifier
+    public Length top;
 
     /**
      * The "right" property.
      */
-    public Length right;                                        // CSOK: VisibilityModifier
+    public Length right;
 
     /**
      * The "bottom" property.
      */
-    public Length bottom;                                       // CSOK: VisibilityModifier
+    public Length bottom;
 
     /**
      * The "left" property.
      */
-    public Length left;                                         // CSOK: VisibilityModifier
+    public Length left;
 
     /**
      * Create a CommonRelativePosition object.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java Tue May  7 18:53:29 2013
@@ -42,7 +42,7 @@ import org.apache.fop.util.CharUtilities
 public class MultiByteFont extends CIDFont implements Substitutable, Positionable {
 
     /** logging instance */
-    private static final Log log // CSOK: ConstantNameCheck
+    private static final Log log
         = LogFactory.getLog(MultiByteFont.class);
 
     private String ttcName;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java Tue May  7 18:53:29 2013
@@ -42,13 +42,13 @@ public class Hyphen implements Serializa
     private static final long serialVersionUID = 8989909741110279085L;
 
     /** pre break string */
-    public String preBreak;                                     // CSOK: VisibilityModifier
+    public String preBreak;
 
     /** no break string */
-    public String noBreak;                                      // CSOK: VisibilityModifier
+    public String noBreak;
 
     /** post break string */
-    public String postBreak;                                    // CSOK: VisibilityModifier
+    public String postBreak;
 
     /**
      * Construct a hyphen.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java Tue May  7 18:53:29 2013
@@ -525,18 +525,18 @@ public class TernaryTree implements Clon
         /**
          * current node index
          */
-        int cur;                                                // CSOK: VisibilityModifier
+        int cur;
 
         /**
          * current key
          */
-        String curkey;                                          // CSOK: VisibilityModifier
+        String curkey;
 
         private class Item implements Cloneable {
             /** parent */
-            char parent;                                        // CSOK: VisibilityModifier
+            char parent;
             /** child */
-            char child;                                         // CSOK: VisibilityModifier
+            char child;
 
             /** default constructor */
             public Item() {
@@ -564,12 +564,12 @@ public class TernaryTree implements Clon
         /**
          * Node stack
          */
-        Stack ns;                                               // CSOK: VisibilityModifier
+        Stack ns;
 
         /**
          * key stack implemented with a StringBuffer
          */
-        StringBuffer ks;                                        // CSOK: VisibilityModifier
+        StringBuffer ks;
 
         /** default constructor */
         public Iterator() {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Tue May  7 18:53:29 2013
@@ -47,14 +47,14 @@ public abstract class AbstractBreaker {
      */
     public static class PageBreakPosition extends LeafPosition {
         // Percentage to adjust (stretch or shrink)
-        double bpdAdjust;                                       // CSOK: VisibilityModifier
-        int difference;                                         // CSOK: VisibilityModifier
-        int footnoteFirstListIndex;                             // CSOK: VisibilityModifier
-        int footnoteFirstElementIndex;                          // CSOK: VisibilityModifier
-        int footnoteLastListIndex;                              // CSOK: VisibilityModifier
-        int footnoteLastElementIndex;                           // CSOK: VisibilityModifier
+        double bpdAdjust;
+        int difference;
+        int footnoteFirstListIndex;
+        int footnoteFirstElementIndex;
+        int footnoteLastListIndex;
+        int footnoteLastElementIndex;
 
-        PageBreakPosition(LayoutManager lm, int breakIndex,     // CSOK: ParameterNumber
+        PageBreakPosition(LayoutManager lm, int breakIndex,
                           int ffli, int ffei, int flli, int flei,
                           double bpdA, int diff) {
             super(lm, breakIndex);
@@ -96,9 +96,9 @@ public abstract class AbstractBreaker {
         private static final long serialVersionUID = -5348831120146774118L;
 
         /** Number of elements to ignore at the beginning of the list. */
-        int ignoreAtStart = 0;                                  // CSOK: VisibilityModifier
+        int ignoreAtStart = 0;
         /** Number of elements to ignore at the end of the list. */
-        int ignoreAtEnd = 0;                                    // CSOK: VisibilityModifier
+        int ignoreAtEnd = 0;
 
         /**
          * startOn represents where on the page/which page layout

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Tue May  7 18:53:29 2013
@@ -226,49 +226,49 @@ public abstract class BreakingAlgorithm 
      */
     public class KnuthNode {
         /** index of the breakpoint represented by this node */
-        public final int position;                              // CSOK: VisibilityModifier
+        public final int position;
 
         /** number of the line ending at this breakpoint */
-        public final int line;                                  // CSOK: VisibilityModifier
+        public final int line;
 
         /** fitness class of the line ending at this breakpoint. One of 0, 1, 2, 3. */
-        public final int fitness;                               // CSOK: VisibilityModifier
+        public final int fitness;
 
         /** accumulated width of the KnuthElements up to after this breakpoint. */
-        public final int totalWidth;                            // CSOK: VisibilityModifier
+        public final int totalWidth;
 
         /** accumulated stretchability of the KnuthElements up to after this breakpoint. */
-        public final int totalStretch;                          // CSOK: VisibilityModifier
+        public final int totalStretch;
 
         /** accumulated shrinkability of the KnuthElements up to after this breakpoint. */
-        public final int totalShrink;                           // CSOK: VisibilityModifier
+        public final int totalShrink;
 
         /** adjustment ratio if the line ends at this breakpoint */
-        public final double adjustRatio;                        // CSOK: VisibilityModifier
+        public final double adjustRatio;
 
         /** available stretch of the line ending at this breakpoint */
-        public final int availableShrink;                       // CSOK: VisibilityModifier
+        public final int availableShrink;
 
         /** available shrink of the line ending at this breakpoint */
-        public final int availableStretch;                      // CSOK: VisibilityModifier
+        public final int availableStretch;
 
         /** difference between target and actual line width */
-        public final int difference;                            // CSOK: VisibilityModifier
+        public final int difference;
 
         /** minimum total demerits up to this breakpoint */
-        public double totalDemerits;                            // CSOK: VisibilityModifier
+        public double totalDemerits;
 
         /** best node for the preceding breakpoint */
-        public KnuthNode previous;                              // CSOK: VisibilityModifier
+        public KnuthNode previous;
 
         /** next possible node in the same line */
-        public KnuthNode next;                                  // CSOK: VisibilityModifier
+        public KnuthNode next;
 
         /**
          * Holds the number of subsequent recovery attempty that are made to get content fit
          * into a line.
          */
-        public int fitRecoveryCounter = 0;                      // CSOK: VisibilityModifier
+        public int fitRecoveryCounter = 0;
 
         /**
          * Construct node.
@@ -995,7 +995,7 @@ public abstract class BreakingAlgorithm 
      * @param availableShrink   the available amount of shrink
      * @param availableStretch  tha available amount of stretch
      */
-    protected void forceNode(KnuthNode node,                    // CSOK: ParameterNumber
+    protected void forceNode(KnuthNode node,
                              int line,
                              int elementIdx,
                              int difference,



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Re: svn commit: r1480018 [1/2] - in /xmlgraphics/fop/trunk: ./ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/codegen/unicode/java/org/apache/fop/text/linebreak/ src/java/org/apache/fop/afp/ src/java/org/apache/fop/complexscripts/bidi/ sr...

Posted by Vincent Hennebert <vh...@gmail.com>.
On 07/05/13 20:53, vhennebert wrote:
> Author: vhennebert
> Date: Tue May  7 18:53:29 2013
> New Revision: 1480018
> 
> URL: http://svn.apache.org/r1480018
> Log:
> Cosmetics only: removed Checkstyle SuppressWithNearbyCommentFilter and fixed corresponding issues
<snip/>
> Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1480018&r1=1480017&r2=1480018&view=diff
> ==============================================================================
> --- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
> +++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Tue May  7 18:53:29 2013
> @@ -44,14 +44,6 @@
<snip/>
>      <module name="InnerAssignment">
> -      <property name="tokens" value="ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
> +      <property name="tokens" 
> +        value="BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
>      </module>

I removed the ASSIGN operator from the list as it looked reasonable to
me to have inner assignment at those places that became flagged by this
check.

<snip/>

Vincent