diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java index 1a10f282a..33e1cc709 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java @@ -94,21 +94,21 @@ public class ClassResolver { // See if in the package if (pkg != null && !pkg.isEmpty()) { - clazz = resolveQualifiedName(pkg + PERIOD + name); - if (clazz != null) { - return clazz; + final Class classFromQualifiedName = resolveQualifiedName(pkg + PERIOD + name); + if (classFromQualifiedName != null) { + return classFromQualifiedName; } } // see if inner class of this class - clazz = resolveInnerClass(name, currentClass); - if (clazz != null) { - return clazz; + final Class innerClass = resolveInnerClass(name, currentClass); + if (innerClass != null) { + return innerClass; } - clazz = resolveByStarImports(name); - if (clazz != null) { - return clazz; + final Class classFromStarImport = resolveByStarImports(name); + if (classFromStarImport != null) { + return classFromStarImport; } // Giving up, the type is unknown, so load the class to generate an diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java index 526d63656..da9fcd470 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java @@ -481,7 +481,7 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { return; } - Iterator it = tags.iterator(); + final Iterator it = tags.iterator(); if (ast.getType() != TokenTypes.ANNOTATION_FIELD_DEF) { // Check for inheritDoc boolean hasInheritDocTag = false; @@ -497,9 +497,9 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { } // Dump out all unused tags - it = tags.iterator(); - while (it.hasNext()) { - final JavadocTag jt = it.next(); + final Iterator unusedTagIt = tags.iterator(); + while (unusedTagIt.hasNext()) { + final JavadocTag jt = unusedTagIt.next(); if (!jt.isSeeOrInheritDocTag()) { log(jt.getLineNo(), MSG_UNUSED_TAG_GENERAL); } @@ -921,7 +921,7 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { ExceptionInfo foundException = null; // First look for matches on the exception name - ListIterator throwIt = throwsList.listIterator(); + final ListIterator throwIt = throwsList.listIterator(); while (!found && throwIt.hasNext()) { final ExceptionInfo ei = throwIt.next(); @@ -933,9 +933,9 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { } // Now match on the exception type - throwIt = throwsList.listIterator(); - while (!found && throwIt.hasNext()) { - final ExceptionInfo ei = throwIt.next(); + final ListIterator exceptionInfoIt = throwsList.listIterator(); + while (!found && exceptionInfoIt.hasNext()) { + final ExceptionInfo ei = exceptionInfoIt.next(); if (documentedCI.getClazz() == ei.getClazz()) { found = true; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java index d28cc4d33..0f52a65a3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java @@ -171,17 +171,17 @@ class TagParser { } text = text.substring(column).trim(); - column = 0; + int position = 0; //Character.isJavidentifier... may not be a valid HTML //identifier but is valid for generics - while (column < text.length() - && (Character.isJavaIdentifierStart(text.charAt(column)) - || Character.isJavaIdentifierPart(text.charAt(column)))) { - column++; + while (position < text.length() + && (Character.isJavaIdentifierStart(text.charAt(position)) + || Character.isJavaIdentifierPart(text.charAt(position)))) { + position++; } - return text.substring(0, column); + return text.substring(0, position); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java index b14635f90..e39bb7b9a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java @@ -158,13 +158,13 @@ public class ParenPadCheck extends AbstractParenPadCheck { * @param ast the token to check. */ private void visitLiteralFor(DetailAST ast) { - DetailAST parenAst = ast.findFirstToken(TokenTypes.LPAREN); - if (!isPrecedingEmptyForInit(parenAst)) { - processLeft(parenAst); + final DetailAST lparen = ast.findFirstToken(TokenTypes.LPAREN); + if (!isPrecedingEmptyForInit(lparen)) { + processLeft(lparen); } - parenAst = ast.findFirstToken(TokenTypes.RPAREN); - if (!isFollowsEmptyForIterator(parenAst)) { - processRight(parenAst); + final DetailAST rparen = ast.findFirstToken(TokenTypes.RPAREN); + if (!isFollowsEmptyForIterator(rparen)) { + processRight(rparen); } }