From d220d7c3cc74490c7f2923f2ea85d00133afe98c Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sat, 5 Sep 2015 01:39:36 +0200 Subject: [PATCH] Issue #2080: Fix typos in code Fixes some `SpellCheckingInspection` inspection violations. Description: >Spellchecker inspection helps locate typos and misspelling in your code, comments and literals. --- ...LocalVariableNameInput_OneCharVarName.java | 2 +- .../checks/imports/ImportOrderCheck.java | 2 +- .../checks/indentation/ForHandler.java | 4 +- .../checks/indentation/IndentationCheck.java | 2 +- .../checks/javadoc/JavadocMethodCheck.java | 10 +- .../checkstyle/doclets/package-info.java | 2 +- .../annotation/MissingOverrideCheckTest.java | 16 +-- .../imports/ImportControlCheckTest.java | 2 +- .../javadoc/AbstractJavadocCheckTest.java | 2 +- .../javadoc/AbstractTypeAwareCheckTest.java | 6 +- .../javadoc/JavadocMethodCheckTest.java | 108 +++++++++--------- .../AbbreviationAsWordInNameCheckTest.java | 2 +- .../naming/LocalVariableNameCheckTest.java | 2 +- ...Name.java => InputOneCharInitVarName.java} | 2 +- ...erride.java => BadAnnotationOverride.java} | 2 +- ...rride.java => GoodAnnotationOverride.java} | 2 +- ...va => InputTestNumberFormatException.java} | 2 +- 17 files changed, 84 insertions(+), 84 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/{InputOneCharInintVarName.java => InputOneCharInitVarName.java} (96%) rename src/test/resources/com/puppycrawl/tools/checkstyle/annotation/{BadAnnonOverride.java => BadAnnotationOverride.java} (96%) rename src/test/resources/com/puppycrawl/tools/checkstyle/annotation/{GoodAnnonOverride.java => GoodAnnotationOverride.java} (97%) rename src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/{InputTestNumberFomatException.java => InputTestNumberFormatException.java} (75%) diff --git a/src/it/resources/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameInput_OneCharVarName.java b/src/it/resources/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameInput_OneCharVarName.java index 2f17ab2af2e..462a5f76f1b 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameInput_OneCharVarName.java +++ b/src/it/resources/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameInput_OneCharVarName.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -class InputOneCharInintVarName +class InputOneCharInitVarName { public void fooMethod() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java index 0d2d16d14bf..c2ffd8b49b0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java @@ -192,7 +192,7 @@ public class ImportOrderCheck /** The special wildcard that catches all remaining groups. */ private static final String WILDCARD_GROUP_NAME = "*"; - /** Empty array of pattern type needed to initlialize check. */ + /** Empty array of pattern type needed to initialize check. */ private static final Pattern[] EMPTY_PATTERN_ARRAY = new Pattern[0]; /** List of import groups specified by the user. */ diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java index 1d72b9866dd..b13a495a513 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java @@ -56,9 +56,9 @@ private void checkForParams() { getMainAst().findFirstToken(TokenTypes.FOR_CONDITION); checkExpressionSubtree(cond, expected, false, false); - final DetailAST iter = + final DetailAST forIterator = getMainAst().findFirstToken(TokenTypes.FOR_ITERATOR); - checkExpressionSubtree(iter, expected, false, false); + checkExpressionSubtree(forIterator, expected, false, false); } // for each else { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java index 081a067259c..fc74b613ef6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java @@ -30,7 +30,7 @@ * *

* The basic idea behind this is that while - * pretty printers are sometimes convenient for. reformats of + * pretty printers are sometimes convenient for reformats of * legacy code, they often either aren't configurable enough or * just can't anticipate how format should be done. Sometimes this is * personal preference, other times it is practical experience. In any 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 3d25f51b5e8..36a1254a637 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 @@ -85,7 +85,7 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { * A key is pointing to the warning message text in "messages.properties" * file. */ - public static final String MSG_EXCPECTED_TAG = "javadoc.expectedTag"; + public static final String MSG_EXPECTED_TAG = "javadoc.expectedTag"; /** * A key is pointing to the warning message text in "messages.properties" @@ -766,12 +766,12 @@ private void checkParamTags(final List tags, // the user has chosen to suppress these problems if (!allowMissingParamTags && reportExpectedTags) { for (DetailAST param : params) { - log(param, MSG_EXCPECTED_TAG, + log(param, MSG_EXPECTED_TAG, JavadocTagInfo.PARAM.getText(), param.getText()); } for (DetailAST typeParam : typeParams) { - log(typeParam, MSG_EXCPECTED_TAG, + log(typeParam, MSG_EXPECTED_TAG, JavadocTagInfo.PARAM.getText(), "<" + typeParam.findFirstToken(TokenTypes.IDENT).getText() + ">"); @@ -912,7 +912,7 @@ private void checkThrowsTags(List tags, if (!ei.isFound()) { final Token fi = ei.getName(); log(fi.getLineNo(), fi.getColumnNo(), - MSG_EXCPECTED_TAG, + MSG_EXPECTED_TAG, JavadocTagInfo.THROWS.getText(), fi.getText()); } } @@ -976,7 +976,7 @@ private static class ExceptionInfo { /** * Creates new instance for {@code FullIdent}. * - * @param classInfo clas info + * @param classInfo class info */ ExceptionInfo(AbstractClassInfo classInfo) { this.classInfo = classInfo; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/doclets/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/doclets/package-info.java index f2a654a533a..ff37c3111eb 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/doclets/package-info.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/doclets/package-info.java @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// /** - * Contains the doclets used during the build of Checktyle. REally + * Contains the doclets used during the build of Checkstyle. *

* You should not be referring to this package. *

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java index d26e4419a60..ba03839d191 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java @@ -111,7 +111,7 @@ public void testBadOverrideFromOtherJ5Compat() throws Exception { * for only including the inheritDoc tag. */ @Test - public void testBadAnnonOverride() throws Exception { + public void testBadAnnotationOverride() throws Exception { DefaultConfiguration checkConfig = createCheckConfig(MissingOverrideCheck.class); final String[] expected = { "10: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_OVERRIDE), @@ -120,7 +120,7 @@ public void testBadAnnonOverride() throws Exception { "35: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_OVERRIDE), }; - verify(checkConfig, getPath("annotation" + File.separator + "BadAnnonOverride.java"), expected); + verify(checkConfig, getPath("annotation" + File.separator + "BadAnnotationOverride.java"), expected); } /** @@ -128,12 +128,12 @@ public void testBadAnnonOverride() throws Exception { * Java 5 compatibility mode. */ @Test - public void testBadAnnonOverrideJ5Compat() throws Exception { + public void testBadAnnotationOverrideJ5Compat() throws Exception { DefaultConfiguration checkConfig = createCheckConfig(MissingOverrideCheck.class); checkConfig.addAttribute("javaFiveCompatibility", "true"); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "BadAnnonOverride.java"), expected); + verify(checkConfig, getPath("annotation" + File.separator + "BadAnnotationOverride.java"), expected); } /** @@ -209,11 +209,11 @@ public void testGoodOverrideFromOtherJ5Compat() throws Exception { * for only including the inheritDoc tag. */ @Test - public void testGoodAnnonOverride() throws Exception { + public void testGoodAnnotationOverride() throws Exception { DefaultConfiguration checkConfig = createCheckConfig(MissingOverrideCheck.class); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "GoodAnnonOverride.java"), expected); + verify(checkConfig, getPath("annotation" + File.separator + "GoodAnnotationOverride.java"), expected); } /** @@ -221,12 +221,12 @@ public void testGoodAnnonOverride() throws Exception { * Java 5 compatibility mode. */ @Test - public void testGoodAnnonOverrideJ5Compat() throws Exception { + public void testGoodAnnotationOverrideJ5Compat() throws Exception { DefaultConfiguration checkConfig = createCheckConfig(MissingOverrideCheck.class); checkConfig.addAttribute("javaFiveCompatibility", "true"); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "GoodAnnonOverride.java"), expected); + verify(checkConfig, getPath("annotation" + File.separator + "GoodAnnotationOverride.java"), expected); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java index 8f5daefba31..05fe2e06dee 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java @@ -112,7 +112,7 @@ public void testUnknown() throws Exception { fail("should fail"); } catch (CheckstyleException ex) { - //do nothng + //do nothing } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java index de0e08320f9..85d231f8b52 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java @@ -44,7 +44,7 @@ public void testNumberFormatException() throws Exception { + "alternative at input '