From 6abdc24080fe87995f39bd54bed99976dace4652 Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Sun, 6 Apr 2008 10:37:10 +0000 Subject: [PATCH] make local variables final. --- .../puppycrawl/tools/checkstyle/PackageNamesLoader.java | 2 +- .../checks/design/HideUtilityClassConstructorCheck.java | 6 +++--- .../checks/duplicates/StrictDuplicateCodeCheck.java | 9 +++++---- .../checks/header/CrossLanguageRegexpHeaderCheck.java | 4 ++-- .../checks/metrics/AbstractComplexityCheck.java | 2 +- .../tools/checkstyle/filters/SeverityMatchFilter.java | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java index 2a43948e5..a730d84a1 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java @@ -80,7 +80,7 @@ public final class PackageNamesLoader Attributes aAtts) throws SAXException { - if (aQName.equals("package")) { + if ("package".equals(aQName)) { //push package name final String name = aAtts.getValue("name"); if (name == null) { diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java index 5ae53d1a2..7bbbe8854 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java @@ -52,16 +52,16 @@ public class HideUtilityClassConstructorCheck extends Check boolean hasPublicCtor = false; while (child != null) { - int type = child.getType(); + final int type = child.getType(); if (type == TokenTypes.METHOD_DEF || type == TokenTypes.VARIABLE_DEF) { hasMethodOrField = true; final DetailAST modifiers = child.findFirstToken(TokenTypes.MODIFIERS); - boolean isStatic = + final boolean isStatic = modifiers.branchContains(TokenTypes.LITERAL_STATIC); - boolean isPrivate = + final boolean isPrivate = modifiers.branchContains(TokenTypes.LITERAL_PRIVATE); if (!isStatic && !isPrivate) { diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java index 8b2a54281..6b2e833c3 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java @@ -368,7 +368,7 @@ public final class StrictDuplicateCodeCheck extends AbstractFileSetCheck for (int iLine = 0; iLine < iBlockCount; iLine++) { final int iSum = iLineBlockChecksums[iLine]; - int[] jLines = jChecksumInfo.findLinesWithChecksum(iSum); + final int[] jLines = jChecksumInfo.findLinesWithChecksum(iSum); // detailed analysis only if the iLine block occurs in jFile at all if (jLines.length > 0) { findDuplicateFromLine(aI, aJ, iLine, jLines, ignorePairs); @@ -420,10 +420,11 @@ public final class StrictDuplicateCodeCheck extends AbstractFileSetCheck } } - int duplicateLines = verifiyDuplicateLines(aI, aJ, aILine, jLine); + final int duplicateLines = + verifiyDuplicateLines(aI, aJ, aILine, jLine); if (duplicateLines >= mMin) { reportDuplicate(duplicateLines, aILine, mFiles.get(aJ), jLine); - int extend = duplicateLines - mMin; + final int extend = duplicateLines - mMin; for (int i = 0; i < extend; i++) { final int offset = (i + 1); aIgnore.put(aILine + offset, jLine + offset); @@ -499,7 +500,7 @@ public final class StrictDuplicateCodeCheck extends AbstractFileSetCheck */ private String[] getTrimmed(String[] aLines) { - String[] ret = new String[aLines.length]; + final String[] ret = new String[aLines.length]; for (int i = 0; i < ret.length; i++) { ret[i] = aLines[i].trim(); } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/header/CrossLanguageRegexpHeaderCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/header/CrossLanguageRegexpHeaderCheck.java index 4dfea6650..30de51bd8 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/header/CrossLanguageRegexpHeaderCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/header/CrossLanguageRegexpHeaderCheck.java @@ -127,12 +127,12 @@ public final class CrossLanguageRegexpHeaderCheck extends AbstractFileSetCheck final RegexpHeaderChecker regexpHeaderChecker = new RegexpHeaderChecker( mHeaderInfo, new FileSetCheckViolationMonitor()); - List files = filter(aFiles); + final List files = filter(aFiles); for (final File file : files) { final String path = file.getPath(); msgDispatcher.fireFileStarted(path); try { - String[] lines = Utils.getLines(path); + final String[] lines = Utils.getLines(path); regexpHeaderChecker.checkLines(lines); } catch (IOException ex) { diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractComplexityCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractComplexityCheck.java index 48787e4a7..0ef20c280 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractComplexityCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractComplexityCheck.java @@ -192,7 +192,7 @@ public abstract class AbstractComplexityCheck */ private void leaveMethodDef(DetailAST aAST) { - BigInteger max = BigInteger.valueOf(mMax); + final BigInteger max = BigInteger.valueOf(mMax); if (mCurrentValue.compareTo(max) > 0) { log(aAST, getMessageID(), mCurrentValue, max); } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java index 465860964..d2cb4203e 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java @@ -64,7 +64,7 @@ public class SeverityMatchFilter /** {@inheritDoc} */ public boolean accept(AuditEvent aEvent) { - boolean result = mSeverityLevel.equals(aEvent.getSeverityLevel()); + final boolean result = mSeverityLevel.equals(aEvent.getSeverityLevel()); if (mAcceptOnMatch) { return result; }