From e615817b5bff08ada2fce5f43e9e1bcae4e77c38 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Mon, 24 Aug 2015 22:27:49 +0200 Subject: [PATCH] Fix various typos. #1555 Fixes some `SpellCheckingInspection` inspection violations. Description: >Spellchecker inspection helps locate typos and misspelling in your code, comments and literals, and fix them in one click. --- .../checks/metrics/AbstractClassCouplingCheck.java | 2 +- .../tools/checkstyle/checks/metrics/JavaNCSSCheck.java | 4 ++-- .../checks/naming/AbbreviationAsWordInNameCheck.java | 2 +- .../checks/naming/AbstractTypeParameterNameCheck.java | 2 +- .../tools/checkstyle/checks/naming/MethodNameCheck.java | 2 +- .../tools/checkstyle/checks/regexp/RegexpCheck.java | 4 ++-- .../tools/checkstyle/checks/regexp/SinglelineDetector.java | 6 +++--- .../checks/naming/AbbreviationAsWordInNameCheckTest.java | 2 +- .../tools/checkstyle/checks/naming/MethodNameCheckTest.java | 2 +- .../checks/naming/StaticVariableNameCheckTest.java | 4 ++-- .../checks/sizes/ExecutableStatementCountCheckTest.java | 2 +- .../checkstyle/checks/sizes/MethodLengthCheckTest.java | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java index 46e4e31d1..57ac77dca 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java @@ -185,7 +185,7 @@ public abstract class AbstractClassCouplingCheck extends Check { } /** - * Incapsulates information about class coupling. + * Encapsulates information about class coupling. * * @author Simon Harris * @author o_sukhodolsky diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java index b6a82e1f9..3b8573b67 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java @@ -313,7 +313,7 @@ public class JavaNCSSCheck extends Check { private static boolean isVariableDefCountable(DetailAST ast) { boolean countable = false; - //count variable defs only if they are direct child to a slist or + //count variable definitions only if they are direct child to a slist or // object block final int parentType = ast.getParent().getType(); @@ -323,7 +323,7 @@ public class JavaNCSSCheck extends Check { //is countable if no previous sibling is found or //the sibling is no COMMA. - //This is done because multiple assignment on one line are countes + //This is done because multiple assignment on one line are counted // as 1 countable = prevSibling == null || prevSibling.getType() != TokenTypes.COMMA; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java index 309563b3d..240d63bc0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java @@ -330,7 +330,7 @@ public class AbbreviationAsWordInNameCheck extends Check { * @param str name * @param beginIndex begin index * @param endIndex end index - * @return true is abbreviation is bigger that requierd and not in ignore list + * @return true is abbreviation is bigger that required and not in ignore list */ private String getAbbreviationIfIllegal(String str, int beginIndex, int endIndex) { String result = null; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java index 50f4e6f79..b545ebbd0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java @@ -65,7 +65,7 @@ public abstract class AbstractTypeParameterNameCheck } /** - * This method must be overriden to specify the + * This method must be overridden to specify the * location of the type parameter to check. * * @return {@code TokenTypes.CLASS_DEF } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java index b01606603..56f0a502f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java @@ -37,7 +37,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * The default is false (it is not allowed). It is legal in Java to have * method with the same name as a class. As long as a return type is specified * it is a method and not a constructor which it could be easily confused as. - *

Does not check-style the name of an overriden methods

because the developer does not + *

Does not check-style the name of an overridden methods

because the developer does not * have a choice in renaming such methods. * *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java index 3e9670b99..cfd1568ee 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java @@ -221,7 +221,7 @@ public class RegexpCheck extends AbstractFormatCheck { } /** - * Check if we can stop valiation + * Check if we can stop validation * @param ignore flag * @return true is we can continue */ @@ -234,7 +234,7 @@ public class RegexpCheck extends AbstractFormatCheck { * Detect ignore situation * @param startLine position of line * @param text file text - * @param start line colun + * @param start line column * @return true is that need to be ignored */ private boolean isIgnore(int startLine, FileText text, LineColumn start) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java index f563133c6..30d24ccc9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java @@ -46,10 +46,10 @@ class SinglelineDetector { */ public void processLines(List lines) { resetState(); - int lineno = 0; + int lineNo = 0; for (String line : lines) { - lineno++; - checkLine(lineno, line, options.getPattern().matcher(line), 0); + lineNo++; + checkLine(lineNo, line, options.getPattern().matcher(line), 0); } finish(); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java index 05bc585ee..9ca8416b3 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java @@ -225,7 +225,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport { } @Test - public void testTypeNamesForThreePermittedCapitalLettersWithOverridenMethod() throws Exception { + public void testTypeNamesForThreePermitedCapitalLettersWithOverriddenMethod() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(AbbreviationAsWordInNameCheck.class); final int expectedCapitalCount = 3; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java index bdb378def..eb776d86a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java @@ -138,7 +138,7 @@ public class MethodNameCheckTest } @Test - public void testOverridenMethods() throws Exception { + public void testOverriddenMethods() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(MethodNameCheck.class); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java index e8e6f0ac8..a77cc48e4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java @@ -37,8 +37,8 @@ public class StaticVariableNameCheckTest @Test public void testGetRequiredTokens() { StaticVariableNameCheck checkObj = new StaticVariableNameCheck(); - int[] excpected = {TokenTypes.VARIABLE_DEF}; - assertArrayEquals(excpected, checkObj.getRequiredTokens()); + int[] expected = {TokenTypes.VARIABLE_DEF}; + assertArrayEquals(expected, checkObj.getRequiredTokens()); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java index 2cbae6a67..274a5c8d3 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java @@ -123,7 +123,7 @@ public class ExecutableStatementCountCheckTest } @Test(expected = IllegalStateException.class) - public void testVisitTokenWhithWrongTokenType() { + public void testVisitTokenWithWrongTokenType() { ExecutableStatementCountCheck checkObj = new ExecutableStatementCountCheck(); DetailAST ast = new DetailAST(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java index 5fa4406fe..92dd5c526 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java @@ -62,7 +62,7 @@ public class MethodLengthCheckTest extends BaseCheckTestSupport { } @Test - public void testcountEmpty() throws Exception { + public void testCountEmpty() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(MethodLengthCheck.class); checkConfig.addAttribute("max", "19");