diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java index 2329851f4..dce74f30b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -104,7 +104,7 @@ public final class Main { exitStatus = 0; } else { - // return error is smth is wrong in arguments + // return error if something is wrong in arguments final List messages = validateCli(commandLine); cliViolations = !messages.isEmpty(); if (cliViolations) { @@ -124,7 +124,7 @@ public final class Main { } } catch (ParseException pex) { - // smth wrong with arguments - print error and manual + // something wrong with arguments - print error and manual cliViolations = true; exitStatus = exitWithCliViolation; errorCounter = 1; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java index d7a2e5b4e..ef0530bd1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java @@ -114,7 +114,7 @@ public abstract class AbstractFileSetCheck * filter of this FileSetCheck. * @param extensions the set of file extensions. A missing * initial '.' character of an extension is automatically added. - * @throws IllegalArgumentException is arument is null + * @throws IllegalArgumentException is argument is null */ public final void setFileExtensions(String... extensions) { if (extensions == null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractLoader.java index 1327a4b68..9cca49778 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractLoader.java @@ -51,7 +51,7 @@ import com.google.common.collect.Maps; */ public abstract class AbstractLoader extends DefaultHandler { - /** Maps public id to resolve to esource name for the DTD. */ + /** Maps public id to resolve to resource name for the DTD. */ private final Map publicIdToResourceNameMap; /** Parser to read XML files. **/ private final XMLReader parser; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java index 509ead66a..db07fc2ec 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java @@ -83,7 +83,7 @@ public abstract class AbstractViolationReporter } /** - * Returns the message bundle name resourcebundle that contains the messages + * Returns the message bundle name resource bundle that contains the messages * used by this module. *

* The default implementation expects the resource files to be named diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java index 58675d174..559a2c289 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java @@ -37,8 +37,8 @@ public interface Context { Object get(String key); /** - * Returns the names of all atttributes of this context. - * @return the names of all atttributes of this context. + * Returns the names of all attributes of this context. + * @return the names of all attributes of this context. */ ImmutableCollection getAttributeNames(); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java index 7153886df..3b46850c3 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java @@ -338,7 +338,7 @@ public final class DetailAST extends CommonASTWithHiddenTokens { branchTokenTypes = new BitSet(); branchTokenTypes.set(getType()); - // add union of all childs + // add union of all children DetailAST child = getFirstChild(); while (child != null) { final BitSet childTypes = child.getBranchTokenTypes(); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java index 33d2a3cef..5c849381d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java @@ -55,7 +55,7 @@ public final class LocalizedMessage private static Locale sLocale = Locale.getDefault(); /** - * A cache that maps bundle names to RessourceBundles. + * A cache that maps bundle names to ResourceBundles. * Avoids repetitive calls to ResourceBundle.getBundle(). */ private static final Map BUNDLE_CACHE = diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java index 9803cf0a4..a923b1465 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java @@ -104,9 +104,9 @@ public abstract class BaseCheckTestSupport { verify(createChecker(aConfig), fileName, fileName, expected); } - protected void verify(Configuration aConfig, boolean printSeveriy, + protected void verify(Configuration aConfig, boolean printSeverity, String filename, String... expected) throws Exception { - verify(createChecker(aConfig, printSeveriy), filename, filename, expected); + verify(createChecker(aConfig, printSeverity), filename, filename, expected); } protected void verify(Checker checker, String fileName, String... expected) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java index 83a3a389d..fa489f68a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java @@ -88,10 +88,10 @@ public class CheckerTest { assertTrue("Checker.fireFileFinished() doesn't call listener", auditAdapter.wasCalled()); auditAdapter.resetListener(); - final SortedSet msgs = Sets.newTreeSet(); - msgs.add(new LocalizedMessage(0, 0, "a Bundle", "message.key", + final SortedSet messages = Sets.newTreeSet(); + messages.add(new LocalizedMessage(0, 0, "a Bundle", "message.key", new Object[] {"arg"}, null, getClass(), null)); - checker.fireErrors("Some File Name", msgs); + checker.fireErrors("Some File Name", messages); assertTrue("Checker.fireErrors() doesn't call listener", auditAdapter.wasCalled()); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CommitValidationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CommitValidationTest.java index 035bf8b4e..9af22a99e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/CommitValidationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/CommitValidationTest.java @@ -75,13 +75,13 @@ public class CommitValidationTest { private static final String ISSUE_COMMIT_MESSAGE_REGEX_PATTERN = "^Issue #\\d*: .*$"; private static final String PR_COMMIT_MESSAGE_REGEX_PATTERN = "^Pull #\\d*: .*$"; - private static final String OTHER_COMMIT_MESSAGE_REGEXPATTERN = + private static final String OTHER_COMMIT_MESSAGE_REGEX_PATTERN = "^(minor|config|infra|doc|spelling): .*$"; private static final String ACCEPTED_COMMIT_MESSAGE_REGEX_PATTERN = "(" + ISSUE_COMMIT_MESSAGE_REGEX_PATTERN + ")|" + "(" + PR_COMMIT_MESSAGE_REGEX_PATTERN + ")|" - + "(" + OTHER_COMMIT_MESSAGE_REGEXPATTERN + ")"; + + "(" + OTHER_COMMIT_MESSAGE_REGEX_PATTERN + ")"; private static final Pattern ACCEPTED_COMMIT_MESSAGE_PATTERN = Pattern.compile(ACCEPTED_COMMIT_MESSAGE_REGEX_PATTERN, Pattern.DOTALL); @@ -234,7 +234,7 @@ public class CommitValidationTest { + " 1) Must match one of the following patterns:\n" + " " + ISSUE_COMMIT_MESSAGE_REGEX_PATTERN + "\n" + " " + PR_COMMIT_MESSAGE_REGEX_PATTERN + "\n" - + " " + OTHER_COMMIT_MESSAGE_REGEXPATTERN + "\n" + + " " + OTHER_COMMIT_MESSAGE_REGEX_PATTERN + "\n" + " 2) It contains only one line"; } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java index 5b621f521..f2aa4e170 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java @@ -30,7 +30,7 @@ import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; /** - * Tests to ensure that default messagebundle is determined correctly. + * Tests to ensure that default message bundle is determined correctly. * * @author lkuehne */