diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2013-05-07 18:53:29 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2013-05-07 18:53:29 +0000 |
| commit | 439fb3ee98f378b92bed65154c106acba0bf9eda (patch) | |
| tree | cf4374e950bc2a1c8c5dd04e581c06a53bb8bcef /src/java/org/apache | |
| parent | e8f590803ae0bb67a0d1686c47ccc2fb6d187ae8 (diff) | |
| download | xmlgraphics-fop-439fb3ee98f378b92bed65154c106acba0bf9eda.tar.gz xmlgraphics-fop-439fb3ee98f378b92bed65154c106acba0bf9eda.zip | |
Cosmetics only: removed Checkstyle SuppressWithNearbyCommentFilter and fixed corresponding issues
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1480018 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
57 files changed, 254 insertions, 255 deletions
diff --git a/src/java/org/apache/fop/afp/AFPBorderPainter.java b/src/java/org/apache/fop/afp/AFPBorderPainter.java index 675027100..f80a269a2 100644 --- a/src/java/org/apache/fop/afp/AFPBorderPainter.java +++ b/src/java/org/apache/fop/afp/AFPBorderPainter.java @@ -41,7 +41,7 @@ public class AFPBorderPainter extends AbstractAFPPainter { } /** {@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(); diff --git a/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java b/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java index 3ae1605f9..8b78615d4 100644 --- a/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java +++ b/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java @@ -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() { } diff --git a/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java b/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java index 48cd8df6f..2f69eb73b 100644 --- a/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java +++ b/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java @@ -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(); diff --git a/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java b/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java index 77cc6de13..b1234d323 100644 --- a/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java +++ b/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java @@ -43,7 +43,7 @@ public final class UnicodeBidiAlgorithm implements BidiConstants { /** * logging instance */ - private static final Log log = LogFactory.getLog(BidiResolver.class); // CSOK: ConstantNameCheck + private static final Log log = LogFactory.getLog(BidiResolver.class); private UnicodeBidiAlgorithm() { } diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java index 19b3f7c19..7e2d0e818 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java @@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFactory; 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; diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java index 3deaa7d8b..0e98e4588 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java @@ -41,7 +41,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence; 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; diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java index 36d175ff1..d269a342a 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java @@ -34,7 +34,7 @@ import org.apache.fop.complexscripts.util.ScriptContextTester; */ 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 GlyphPositioningSubtable extends GlyphSubtable implements * @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); } } diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java index 0a6a17d05..b22766013 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java @@ -46,7 +46,7 @@ import org.apache.fop.complexscripts.util.GlyphTester; 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; diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java index 458d960ea..ebcf35b8d 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java @@ -33,7 +33,7 @@ import org.apache.fop.complexscripts.util.ScriptContextTester; */ 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 GlyphSubstitutionSubtable extends GlyphSubtable implements * @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); } } diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java index c80c0bbae..18aba212c 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java @@ -44,7 +44,7 @@ import org.apache.fop.complexscripts.util.GlyphTester; 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; diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java index e96845eee..33f59194b 100644 --- a/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java +++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java @@ -52,7 +52,7 @@ import org.apache.fop.complexscripts.util.ScriptContextTester; 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; diff --git a/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java index 2a1e55df3..1d310b21d 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java @@ -48,10 +48,10 @@ import org.apache.fop.complexscripts.util.ScriptContextTester; 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 extends DefaultScriptProcessor { }; /** 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 extends DefaultScriptProcessor { /** {@inheritDoc} */ public String[] getSubstitutionFeatures() { - return gsubFeatures; + return GSUB_FEATURES; } /** {@inheritDoc} */ @@ -134,7 +134,7 @@ public class ArabicScriptProcessor extends DefaultScriptProcessor { /** {@inheritDoc} */ public String[] getPositioningFeatures() { - return gposFeatures; + return GPOS_FEATURES; } /** {@inheritDoc} */ diff --git a/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java index 1dff3d8c4..7aa532838 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java @@ -34,7 +34,7 @@ import org.apache.fop.complexscripts.util.ScriptContextTester; 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 extends ScriptProcessor { }; /** 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 extends ScriptProcessor { @Override /** {@inheritDoc} */ public String[] getSubstitutionFeatures() { - return gsubFeatures; + return GSUB_FEATURES; } @Override @@ -68,7 +68,7 @@ public class DefaultScriptProcessor extends ScriptProcessor { @Override /** {@inheritDoc} */ public String[] getPositioningFeatures() { - return gposFeatures; + return GPOS_FEATURES; } @Override diff --git a/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java index d39261316..0459863ee 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java @@ -40,7 +40,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence; 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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; } diff --git a/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java index aaf0290e8..dc97e79a8 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java @@ -40,7 +40,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence; 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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; } diff --git a/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java index 5c41951cf..262d56864 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java @@ -41,7 +41,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence; 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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 extends IndicScriptProcessor { 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; } diff --git a/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java b/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java index 1da3fda42..c16c9fe0c 100644 --- a/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java +++ b/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java @@ -21,7 +21,6 @@ package org.apache.fop.complexscripts.scripts; 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.util.ScriptContextTester; 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 extends DefaultScriptProcessor { }; /** 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 extends DefaultScriptProcessor { }; /** 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 extends DefaultScriptProcessor { }; /** 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 extends DefaultScriptProcessor { /** {@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 extends DefaultScriptProcessor { /** {@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 extends DefaultScriptProcessor { } 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 extends DefaultScriptProcessor { }; 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 extends DefaultScriptProcessor { } 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 extends DefaultScriptProcessor { }; static { presentationFeatures = new HashSet<String>(); - for (String s : presentationFeatureStrings) { + for (String s : PRESENTATION_FEATURE_STRINGS) { presentationFeatures.add(s); } } diff --git a/src/java/org/apache/fop/complexscripts/util/CharScript.java b/src/java/org/apache/fop/complexscripts/util/CharScript.java index 06db10304..e81313aef 100644 --- a/src/java/org/apache/fop/complexscripts/util/CharScript.java +++ b/src/java/org/apache/fop/complexscripts/util/CharScript.java @@ -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; diff --git a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java index bd282a430..696d2c8d3 100644 --- a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java +++ b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java @@ -983,10 +983,10 @@ public class GlyphSequence implements Cloneable { 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 Cloneable { 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 ]; diff --git a/src/java/org/apache/fop/datatypes/FODimension.java b/src/java/org/apache/fop/datatypes/FODimension.java index e1a94d087..1ccb1ad55 100644 --- a/src/java/org/apache/fop/datatypes/FODimension.java +++ b/src/java/org/apache/fop/datatypes/FODimension.java @@ -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 diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 61255dc01..36e3f21c4 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -566,7 +566,7 @@ public final class FOPropertyMapping implements Constants { 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 implements Constants { 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 implements Constants { } } - private void createBlockAndLineProperties() { // CSOK: MethodLength + private void createBlockAndLineProperties() { PropertyMaker m; // hyphenation-keep @@ -2723,7 +2723,7 @@ public final class FOPropertyMapping implements Constants { addPropertyMaker("z-index", m); } - private void createShorthandProperties() { // CSOK: MethodLength + private void createShorthandProperties() { PropertyMaker m; // background diff --git a/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java b/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java index 639e01db4..6a2cc7050 100644 --- a/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java +++ b/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java @@ -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; diff --git a/src/java/org/apache/fop/fo/flow/table/GridUnit.java b/src/java/org/apache/fop/fo/flow/table/GridUnit.java index 37f3df37c..229a7177f 100644 --- a/src/java/org/apache/fop/fo/flow/table/GridUnit.java +++ b/src/java/org/apache/fop/fo/flow/table/GridUnit.java @@ -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; 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 667138e00..f5ee8a714 100644 --- a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java @@ -55,7 +55,7 @@ public class TableAndCaption extends FObj implements CommonAccessibilityHolder { // 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; diff --git a/src/java/org/apache/fop/fo/flow/table/TableCaption.java b/src/java/org/apache/fop/fo/flow/table/TableCaption.java index def1c1093..7976e9bae 100644 --- a/src/java/org/apache/fop/fo/flow/table/TableCaption.java +++ b/src/java/org/apache/fop/fo/flow/table/TableCaption.java @@ -54,7 +54,7 @@ public class TableCaption extends FObj implements CommonAccessibilityHolder { /** 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} diff --git a/src/java/org/apache/fop/fo/flow/table/TableFObj.java b/src/java/org/apache/fop/fo/flow/table/TableFObj.java index 2506c26b4..ae8477401 100644 --- a/src/java/org/apache/fop/fo/flow/table/TableFObj.java +++ b/src/java/org/apache/fop/fo/flow/table/TableFObj.java @@ -48,12 +48,12 @@ public abstract class TableFObj extends FObj { 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 diff --git a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java index f803439b9..59333242f 100644 --- a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java +++ b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java @@ -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. diff --git a/src/java/org/apache/fop/fo/properties/CommonAural.java b/src/java/org/apache/fop/fo/properties/CommonAural.java index c805ab4fe..a47f183f1 100644 --- a/src/java/org/apache/fop/fo/properties/CommonAural.java +++ b/src/java/org/apache/fop/fo/properties/CommonAural.java @@ -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. diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java index 61c7b95cd..78c8d9045 100644 --- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java @@ -57,32 +57,32 @@ public class CommonBorderPaddingBackground { /** * 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; diff --git a/src/java/org/apache/fop/fo/properties/CommonFont.java b/src/java/org/apache/fop/fo/properties/CommonFont.java index 7ec1f219f..63f037724 100644 --- a/src/java/org/apache/fop/fo/properties/CommonFont.java +++ b/src/java/org/apache/fop/fo/properties/CommonFont.java @@ -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, diff --git a/src/java/org/apache/fop/fo/properties/CommonHyphenation.java b/src/java/org/apache/fop/fo/properties/CommonHyphenation.java index d5f4c538b..a06c27349 100644 --- a/src/java/org/apache/fop/fo/properties/CommonHyphenation.java +++ b/src/java/org/apache/fop/fo/properties/CommonHyphenation.java @@ -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 diff --git a/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java b/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java index a45c09672..f71f36662 100644 --- a/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java +++ b/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java @@ -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. diff --git a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java index 3b1d886ea..04f60ac66 100644 --- a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java +++ b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java @@ -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. diff --git a/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java b/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java index 32d21133b..872d72314 100644 --- a/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java +++ b/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java @@ -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. diff --git a/src/java/org/apache/fop/fonts/MultiByteFont.java b/src/java/org/apache/fop/fonts/MultiByteFont.java index 6e4b1dffe..83f6491f3 100644 --- a/src/java/org/apache/fop/fonts/MultiByteFont.java +++ b/src/java/org/apache/fop/fonts/MultiByteFont.java @@ -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; diff --git a/src/java/org/apache/fop/hyphenation/Hyphen.java b/src/java/org/apache/fop/hyphenation/Hyphen.java index 50a9b57e1..48af1e8b5 100644 --- a/src/java/org/apache/fop/hyphenation/Hyphen.java +++ b/src/java/org/apache/fop/hyphenation/Hyphen.java @@ -42,13 +42,13 @@ public class Hyphen implements Serializable { 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. diff --git a/src/java/org/apache/fop/hyphenation/TernaryTree.java b/src/java/org/apache/fop/hyphenation/TernaryTree.java index 04def1927..92f7a8449 100644 --- a/src/java/org/apache/fop/hyphenation/TernaryTree.java +++ b/src/java/org/apache/fop/hyphenation/TernaryTree.java @@ -525,18 +525,18 @@ public class TernaryTree implements Cloneable, Serializable { /** * 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 Cloneable, Serializable { /** * Node stack */ - Stack ns; // CSOK: VisibilityModifier + Stack ns; /** * key stack implemented with a StringBuffer */ - StringBuffer ks; // CSOK: VisibilityModifier + StringBuffer ks; /** default constructor */ public Iterator() { diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java index 7f806a883..9ba4a0b14 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -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 - - PageBreakPosition(LayoutManager lm, int breakIndex, // CSOK: ParameterNumber + double bpdAdjust; + int difference; + int footnoteFirstListIndex; + int footnoteFirstElementIndex; + int footnoteLastListIndex; + int footnoteLastElementIndex; + + 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 diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java index 8a7142084..c7048295f 100644 --- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java @@ -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, diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java index 87e984e76..59145dd72 100644 --- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java @@ -117,7 +117,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { * @param favorSinglePart true if favoring single part * @see BreakingAlgorithm */ - public PageBreakingAlgorithm(LayoutManager topLevelLM, // CSOK: ParameterNumber + public PageBreakingAlgorithm(LayoutManager topLevelLM, PageProvider pageProvider, PageBreakingLayoutListener layoutListener, int alignment, int alignmentLast, @@ -141,15 +141,15 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { protected class KnuthPageNode extends KnuthNode { /** Additional length due to footnotes. */ - public int totalFootnotes; // CSOK: VisibilityModifier + public int totalFootnotes; /** Index of the last inserted footnote. */ - public int footnoteListIndex; // CSOK: VisibilityModifier + public int footnoteListIndex; /** Index of the last inserted element of the last inserted footnote. */ - public int footnoteElementIndex; // CSOK: VisibilityModifier + public int footnoteElementIndex; - public KnuthPageNode(int position, // CSOK: ParameterNumber + public KnuthPageNode(int position, int line, int fitness, int totalWidth, int totalStretch, int totalShrink, int totalFootnotes, int footnoteListIndex, int footnoteElementIndex, @@ -280,7 +280,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { /** {@inheritDoc} */ @Override - protected KnuthNode createNode(int position, // CSOK: ParameterNumber + protected KnuthNode createNode(int position, int line, int fitness, int totalWidth, int totalStretch, int totalShrink, double adjustRatio, int availableShrink, int availableStretch, @@ -515,10 +515,10 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { footnoteListIndex = footnotesList.size() - 1; footnoteElementIndex = getFootnoteList(footnoteListIndex).size() - 1; - } else if (((canDeferOldFN = canDeferOldFootnotes(// CSOK: InnerAssignment + } else if (((canDeferOldFN = canDeferOldFootnotes( pageNode, elementIndex)) || newFootnotes) - && (footnoteSplit = getFootnoteSplit(// CSOK: InnerAssignment + && (footnoteSplit = getFootnoteSplit( pageNode, getLineWidth(activeNode.line) - actualWidth, canDeferOldFN)) > 0) { // it is allowed to break or even defer footnotes if either: @@ -890,7 +890,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { insertedFootnotesLength = totalFootnotesLength; footnoteListIndex = lengthList.size() - 1; footnoteElementIndex = getFootnoteList(footnoteListIndex).size() - 1; - } else if ((split = getFootnoteSplit(// CSOK: InnerAssignment + } else if ((split = getFootnoteSplit( footnoteListIndex, footnoteElementIndex, insertedFootnotesLength, availableBPD, true)) > 0) { // add a piece of a footnote @@ -1145,7 +1145,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { @Override 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) { log.trace("IPD changes at page " + line); if (bestNodeForIPDChange == null || node.totalDemerits < bestNodeForIPDChange.totalDemerits) { diff --git a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java index eb199da9d..c1992965c 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java +++ b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java @@ -111,7 +111,7 @@ public class AlignmentContext implements Constants { * @param dominantBaseline the dominant-baseline property * @param parentAlignmentContext the parent alignment context */ - private AlignmentContext(int altitude, // CSOK: ParameterNumber + private AlignmentContext(int altitude, int depth, int lineHeight, int xHeight, diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index 00782f62b..dd80db1d1 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java @@ -256,7 +256,7 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { } /** {@inheritDoc} */ - @Override // CSOK: MethodLength + @Override public List getNextKnuthElements( LayoutContext context, int alignment) { LayoutManager curLM; diff --git a/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java b/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java index 2ef3b93da..129bab183 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java +++ b/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java @@ -165,13 +165,13 @@ public final class PDFEncryptionJCE extends PDFObject implements PDFEncryption { private static final class EncryptionSettings { - final int encryptionLength; // CSOK: VisibilityModifier + final int encryptionLength; - final int permissions; // CSOK: VisibilityModifier + final int permissions; - final String userPassword; // CSOK: VisibilityModifier + final String userPassword; - final String ownerPassword; // CSOK: VisibilityModifier + final String ownerPassword; EncryptionSettings(int encryptionLength, int permissions, String userPassword, String ownerPassword) { diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java index 2feeece32..0f8d360c8 100644 --- a/src/java/org/apache/fop/pdf/PDFFactory.java +++ b/src/java/org/apache/fop/pdf/PDFFactory.java @@ -1061,12 +1061,12 @@ public class PDFFactory { } else if (targetLo.endsWith(".pdf")) { // Bare PDF file name? return getGoToPDFAction(target, null, -1, newWindow); - } else if ((index = targetLo.indexOf(".pdf#page=")) > 0) { // CSOK: InnerAssignment + } else if ((index = targetLo.indexOf(".pdf#page=")) > 0) { // PDF file + page? String filename = target.substring(0, index + 4); int page = Integer.parseInt(target.substring(index + 10)); return getGoToPDFAction(filename, null, page, newWindow); - } else if ((index = targetLo.indexOf(".pdf#dest=")) > 0) { // CSOK: InnerAssignment + } else if ((index = targetLo.indexOf(".pdf#dest=")) > 0) { // PDF file + destination? String filename = target.substring(0, index + 4); String dest = target.substring(index + 10); diff --git a/src/java/org/apache/fop/pdf/PDFFunction.java b/src/java/org/apache/fop/pdf/PDFFunction.java index 1329e24df..f424569b9 100644 --- a/src/java/org/apache/fop/pdf/PDFFunction.java +++ b/src/java/org/apache/fop/pdf/PDFFunction.java @@ -374,7 +374,7 @@ public class PDFFunction extends PDFObject { * * @return the PDF string. */ - public byte[] toPDF() { // CSOK: MethodLength + public byte[] toPDF() { int vectorSize = 0; int numberOfFunctions = 0; int tempInt = 0; diff --git a/src/java/org/apache/fop/pdf/PDFShading.java b/src/java/org/apache/fop/pdf/PDFShading.java index 82f4c03ed..62012b9b2 100644 --- a/src/java/org/apache/fop/pdf/PDFShading.java +++ b/src/java/org/apache/fop/pdf/PDFShading.java @@ -334,7 +334,7 @@ public class PDFShading extends PDFObject { * * @return the PDF string. */ - public String toPDFString() { // CSOK: MethodLength + public String toPDFString() { int vectorSize; int tempInt; StringBuffer p = new StringBuffer(128); diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java index 0651975fd..0ba158631 100644 --- a/src/java/org/apache/fop/render/awt/AWTRenderer.java +++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java @@ -62,7 +62,7 @@ public class AWTRenderer extends Java2DRenderer implements Pageable { public static final String MIME_TYPE = MimeConstants.MIME_FOP_AWT_PREVIEW; /** flag for debugging */ - public boolean debug; // CSOK: VisibilityModifier + public boolean debug; /** * Will be notified when rendering progresses diff --git a/src/java/org/apache/fop/render/intermediate/BorderPainter.java b/src/java/org/apache/fop/render/intermediate/BorderPainter.java index 0e6268884..1ec127f83 100644 --- a/src/java/org/apache/fop/render/intermediate/BorderPainter.java +++ b/src/java/org/apache/fop/render/intermediate/BorderPainter.java @@ -77,7 +77,7 @@ public class BorderPainter { * @param innerBackgroundColor the inner background color * @throws IFException if an error occurs while drawing the borders */ - public void drawBorders(Rectangle borderRect, // CSOK: MethodLength + public void drawBorders(Rectangle borderRect, BorderProps bpsTop, BorderProps bpsBottom, BorderProps bpsLeft, BorderProps bpsRight, Color innerBackgroundColor) throws IFException { diff --git a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java index 9227e678a..110581f27 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java +++ b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java @@ -82,17 +82,17 @@ public class Java2DSVGHandler extends AbstractGenericSVGHandler */ public static class Java2DInfo { /** see Java2D_STATE */ - public Java2DGraphicsState state; // CSOK: VisibilityModifier + public Java2DGraphicsState state; /** see Java2D_WIDTH */ - public int width; // CSOK: VisibilityModifier + public int width; /** see Java2D_HEIGHT */ - public int height; // CSOK: VisibilityModifier + public int height; /** see Java2D_XPOS */ - public int currentXPosition; // CSOK: VisibilityModifier + public int currentXPosition; /** see Java2D_YPOS */ - public int currentYPosition; // CSOK: VisibilityModifier + public int currentYPosition; /** paint as bitmap */ - public boolean paintAsBitmap; // CSOK: VisibilityModifier + public boolean paintAsBitmap; /** {@inheritDoc} */ public String toString() { diff --git a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java index 8eaac923c..45d8dff2d 100644 --- a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java +++ b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java @@ -62,7 +62,7 @@ public class PDFImageHandlerSVG implements ImageHandler { private static Log log = LogFactory.getLog(PDFImageHandlerSVG.class); /** {@inheritDoc} */ - public void handleImage(RenderingContext context, // CSOK: MethodLength + public void handleImage(RenderingContext context, Image image, Rectangle pos) throws IOException { PDFRenderingContext pdfContext = (PDFRenderingContext)context; diff --git a/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java b/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java index 2eb5bc8aa..e82a63d0d 100644 --- a/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java @@ -67,12 +67,12 @@ class PDFLogicalStructureHandler { * operator. This is the structure type of the corresponding structure * element. */ - final String tag; // CSOK: VisibilityModifier + final String tag; /** * The value for the MCID entry of the marked-content sequence's property list. */ - final int mcid; // CSOK: VisibilityModifier + final int mcid; private final PDFStructElem parent; diff --git a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java index 434daa5b0..3899e40e7 100644 --- a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java @@ -80,33 +80,33 @@ public class PDFSVGHandler extends AbstractGenericSVGHandler */ public static class PDFInfo { /** see PDF_DOCUMENT */ - public PDFDocument pdfDoc; // CSOK: VisibilityModifier + public PDFDocument pdfDoc; /** see OUTPUT_STREAM */ - public OutputStream outputStream; // CSOK: VisibilityModifier + public OutputStream outputStream; /** see PDF_PAGE */ - public PDFPage pdfPage; // CSOK: VisibilityModifier + public PDFPage pdfPage; /** see PDF_CONTEXT */ - public PDFResourceContext pdfContext; // CSOK: VisibilityModifier + public PDFResourceContext pdfContext; /** see PDF_STREAM */ //public PDFStream currentStream; /** see PDF_WIDTH */ - public int width; // CSOK: VisibilityModifier + public int width; /** see PDF_HEIGHT */ - public int height; // CSOK: VisibilityModifier + public int height; /** see PDF_FONT_INFO */ - public FontInfo fi; // CSOK: VisibilityModifier + public FontInfo fi; /** see PDF_FONT_NAME */ - public String currentFontName; // CSOK: VisibilityModifier + public String currentFontName; /** see PDF_FONT_SIZE */ - public int currentFontSize; // CSOK: VisibilityModifier + public int currentFontSize; /** see PDF_XPOS */ - public int currentXPosition; // CSOK: VisibilityModifier + public int currentXPosition; /** see PDF_YPOS */ - public int currentYPosition; // CSOK: VisibilityModifier + public int currentYPosition; /** see PDF_HANDLER_CONFIGURATION */ - public Configuration cfg; // CSOK: VisibilityModifier + public Configuration cfg; /** true if SVG should be rendered as a bitmap instead of natively */ - public boolean paintAsBitmap; // CSOK: VisibilityModifier + public boolean paintAsBitmap; } /** {@inheritDoc} */ diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 94ed80949..dfeff65f1 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -1518,7 +1518,7 @@ public class RTFHandler extends FOEventHandler { * @param foNode FO node whose event is to be called * @param bStart TRUE calls the start handler, FALSE the end handler */ - private void invokeDeferredEvent(FONode foNode, boolean bStart) { // CSOK: MethodLength + private void invokeDeferredEvent(FONode foNode, boolean bStart) { if (foNode instanceof PageSequence) { if (bStart) { startPageSequence((PageSequence) foNode); diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java index 5ecf5351c..1f57ec846 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java @@ -30,10 +30,10 @@ import java.io.Writer; */ public class RtfFootnote extends RtfContainer implements IRtfTextrunContainer, IRtfListContainer { - RtfTextrun textrunInline = null; // CSOK: VisibilityModifier - RtfContainer body = null; // CSOK: VisibilityModifier - RtfList list = null; // CSOK: VisibilityModifier - boolean bBody = false; // CSOK: VisibilityModifier + RtfTextrun textrunInline = null; + RtfContainer body = null; + RtfList list = null; + boolean bBody = false; /** * Create an RTF list item as a child of given container with default attributes. diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index 97b5e9fda..25885a5ed 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -778,7 +778,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand * @param fill true if the paint should be set for filling * @return true if the paint is handled natively, false if the paint should be rasterized */ - protected boolean applyPaint(Paint paint, boolean fill) { // CSOK: MethodLength + protected boolean applyPaint(Paint paint, boolean fill) { preparePainting(); if (paint instanceof Color) { diff --git a/src/java/org/apache/fop/traits/BorderProps.java b/src/java/org/apache/fop/traits/BorderProps.java index e274517d9..d230a02b2 100644 --- a/src/java/org/apache/fop/traits/BorderProps.java +++ b/src/java/org/apache/fop/traits/BorderProps.java @@ -58,19 +58,19 @@ public class BorderProps implements Serializable { } /** Border style (one of EN_*) */ - public final int style; // Enum for border style // CSOK: VisibilityModifier + public final int style; // Enum for border style /** Border color */ - public final Color color; // CSOK: VisibilityModifier + public final Color color; /** Border width */ - public final int width; // CSOK: VisibilityModifier + public final int width; private final int radiusStart; private final int radiusEnd; /** Border mode */ - private final Mode mode; // CSOK: VisibilityModifier + private final Mode mode; /** * Constructs a new BorderProps instance. diff --git a/src/java/org/apache/fop/util/ColorUtil.java b/src/java/org/apache/fop/util/ColorUtil.java index b18192657..344d7d619 100644 --- a/src/java/org/apache/fop/util/ColorUtil.java +++ b/src/java/org/apache/fop/util/ColorUtil.java @@ -784,7 +784,7 @@ public final class ColorUtil { /** * Initializes the colorMap with some predefined values. */ - private static void initializeColorMap() { // CSOK: MethodLength + private static void initializeColorMap() { colorMap = Collections.synchronizedMap(new java.util.HashMap<String, Color>()); colorMap.put("aliceblue", createColor(240, 248, 255)); |