diff --git a/config/pmd.xml b/config/pmd.xml index 8aab3198d..955111821 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -163,8 +163,6 @@ - - diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java index 87a15d8dd..a338b12e6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java @@ -295,7 +295,7 @@ public final class FileText extends AbstractList * Find positions of line breaks in the full text. * @return an array giving the first positions of each line. */ - private int[] lineBreaks() + private int[] findLineBreaks() { if (lineBreaks == null) { final int[] lineBreaks = new int[size() + 1]; @@ -323,7 +323,7 @@ public final class FileText extends AbstractList */ public LineColumn lineColumn(int pos) { - final int[] lineBreaks = lineBreaks(); + final int[] lineBreaks = findLineBreaks(); int lineNo = Arrays.binarySearch(lineBreaks, pos); if (lineNo < 0) { // we have: lineNo = -(insertion point) - 1 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java index af3902847..b86bdf9b0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java @@ -457,7 +457,7 @@ public abstract class AbstractTypeAwareCheck extends Check /** name of surrounding class. */ private final String surroundingClass; /** is class loadable. */ - private boolean isLoadable = true; + private boolean loadable = true; /** Class object of this class if it's loadable. */ private Class classObj; /** the check we use to resolve classes. */ @@ -480,7 +480,7 @@ public abstract class AbstractTypeAwareCheck extends Check /** @return if class is loadable ot not. */ private boolean isLoadable() { - return isLoadable; + return loadable; } @Override @@ -499,7 +499,7 @@ public abstract class AbstractTypeAwareCheck extends Check private void setClazz(Class classObj) { this.classObj = classObj; - isLoadable = classObj != null; + loadable = classObj != null; } @Override @@ -507,7 +507,7 @@ public abstract class AbstractTypeAwareCheck extends Check { return "RegularClass[name=" + getName() + ", in class=" + surroundingClass - + ", loadable=" + isLoadable + + ", loadable=" + loadable + ", class=" + classObj + "]"; } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java index fa939b68d..0c14ac6b9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java @@ -99,8 +99,8 @@ public class FinalClassCheck final ClassDesc desc = classes.pop(); if (!desc.isDeclaredAsFinal() && !desc.isDeclaredAsAbstract() - && desc.hasPrivateCtor() - && !desc.hasNonPrivateCtor()) + && desc.isWithPrivateCtor() + && !desc.isWithNonPrivateCtor()) { final String className = ast.findFirstToken(TokenTypes.IDENT).getText(); @@ -118,10 +118,10 @@ public class FinalClassCheck private final boolean declaredAsAbstract; /** does class have non-provate ctors */ - private boolean hasNonPrivateCtor; + private boolean withNonPrivateCtor; /** does class have private ctors */ - private boolean hasPrivateCtor; + private boolean withPrivateCtor; /** * create a new ClassDesc instance. @@ -139,31 +139,31 @@ public class FinalClassCheck /** adds private ctor. */ void reportPrivateCtor() { - hasPrivateCtor = true; + withPrivateCtor = true; } /** adds non-private ctor. */ void reportNonPrivateCtor() { - hasNonPrivateCtor = true; + withNonPrivateCtor = true; } /** * does class have private ctors. * @return true if class has private ctors */ - boolean hasPrivateCtor() + boolean isWithPrivateCtor() { - return hasPrivateCtor; + return withPrivateCtor; } /** * does class have non-private ctors. * @return true if class has non-private ctors */ - boolean hasNonPrivateCtor() + boolean isWithNonPrivateCtor() { - return hasNonPrivateCtor; + return withNonPrivateCtor; } /** @@ -191,8 +191,8 @@ public class FinalClassCheck + "[" + "final=" + declaredAsFinal + " abstract=" + declaredAsAbstract - + " pctor=" + hasPrivateCtor - + " ctor=" + hasNonPrivateCtor + + " pctor=" + withPrivateCtor + + " ctor=" + withNonPrivateCtor + "]"; } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java index 71008c6ad..9cdf8c370 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java @@ -378,7 +378,7 @@ public class CustomImportOrderCheck extends Check } final ImportDetails firstImport = importToGroupList.get(0); - String currentGroup = getImportGroup(firstImport.isStatic(), + String currentGroup = getImportGroup(firstImport.isStaticImport(), firstImport.getImportFullPath()); int groupNumber = customImportOrderRules.indexOf(currentGroup); String previousImport = null; @@ -412,7 +412,7 @@ public class CustomImportOrderCheck extends Check } else if (sortImportsInGroupAlphabetically && previousImport != null - && matchesImportGroup(importObject.isStatic(), + && matchesImportGroup(importObject.isStaticImport(), fullImportIdent, currentGroup) && compareImports(fullImportIdent, previousImport) < 0) { @@ -726,7 +726,7 @@ public class CustomImportOrderCheck extends Check private String importGroup; /** Is static import */ - private boolean isStatic; + private boolean staticImport; /** * @param importFullPath @@ -735,16 +735,16 @@ public class CustomImportOrderCheck extends Check * import line number. * @param importGroup * import group. - * @param isStatic + * @param staticImport * if import is static. */ public ImportDetails(String importFullPath, - int lineNumber, String importGroup, boolean isStatic) + int lineNumber, String importGroup, boolean staticImport) { setImportFullPath(importFullPath); setLineNumber(lineNumber); setImportGroup(importGroup); - setStatic(isStatic); + setStaticImport(staticImport); } /** @@ -808,9 +808,9 @@ public class CustomImportOrderCheck extends Check * Checks if import is static. * @return true, if import is static. */ - public boolean isStatic() + public boolean isStaticImport() { - return isStatic; + return staticImport; } /** @@ -818,9 +818,9 @@ public class CustomImportOrderCheck extends Check * @param isStatic * if import is static. */ - public void setStatic(boolean isStatic) + public void setStaticImport(boolean isStatic) { - this.isStatic = isStatic; + this.staticImport = isStatic; } } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java index 683e9ae0e..f0b1e5382 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java @@ -73,7 +73,7 @@ public class UnusedImportsCheck extends Check /** flag to indicate when time to start collecting references. */ private boolean collect; /** flag whether to process Javdoc comments. */ - private boolean processJavadoc; + private boolean processingJavadoc; /** set of the imports. */ private final Set imports = Sets.newHashSet(); @@ -83,7 +83,7 @@ public class UnusedImportsCheck extends Check public void setProcessJavadoc(boolean value) { - processJavadoc = value; + processingJavadoc = value; } @Override @@ -171,7 +171,7 @@ public class UnusedImportsCheck extends Check } else { collect = true; - if (processJavadoc) { + if (processingJavadoc) { processJavadoc(ast); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java index 02c0377e4..2a3d11bed 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java @@ -33,7 +33,7 @@ public class SynchronizedHandler extends BlockParentHandler /** * Determine that "synchronized" token used as modifier of method */ - private boolean isMethodModifier; + private boolean methodModifier; /** * Construct an instance of this handler with the given indentation check, @@ -47,13 +47,13 @@ public class SynchronizedHandler extends BlockParentHandler ExpressionHandler parent) { super(indentCheck, "synchronized", ast, parent); - isMethodModifier = isMethodModifier(ast); + methodModifier = isMethodModifier(ast); } @Override public void checkIndentation() { - if (!isMethodModifier) { + if (!methodModifier) { super.checkIndentation(); checkSynchronizedExpr(); final LineWrappingHandler lineWrap = diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java index 284107903..5c14f0f1f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java @@ -99,17 +99,17 @@ public class JavadocStyleCheck * Indicates if the first sentence should be checked for proper end of * sentence punctuation. */ - private boolean checkFirstSentence = true; + private boolean checkingFirstSentence = true; /** * Indicates if the HTML within the comment should be checked. */ - private boolean checkHtml = true; + private boolean checkingHtml = true; /** * Indicates if empty javadoc statements should be checked. */ - private boolean checkEmptyJavadoc; + private boolean checkingEmptyJavadoc; @Override public int[] getDefaultTokens() @@ -219,15 +219,15 @@ public class JavadocStyleCheck return; } - if (checkFirstSentence) { + if (checkingFirstSentence) { checkFirstSentence(ast, comment); } - if (checkHtml) { + if (checkingHtml) { checkHtml(ast, comment); } - if (checkEmptyJavadoc) { + if (checkingEmptyJavadoc) { checkEmptyJavadoc(comment); } } @@ -557,7 +557,7 @@ public class JavadocStyleCheck */ public void setCheckFirstSentence(boolean flag) { - checkFirstSentence = flag; + checkingFirstSentence = flag; } /** @@ -566,7 +566,7 @@ public class JavadocStyleCheck */ public void setCheckHtml(boolean flag) { - checkHtml = flag; + checkingHtml = flag; } /** @@ -575,6 +575,6 @@ public class JavadocStyleCheck */ public void setCheckEmptyJavadoc(boolean flag) { - checkEmptyJavadoc = flag; + checkingEmptyJavadoc = flag; } }