From ed595de84fba2db507adaf01d04cb089a5e0bac5 Mon Sep 17 00:00:00 2001 From: Ilja Dubinin Date: Wed, 26 Aug 2015 23:08:12 +0100 Subject: [PATCH] Utils classes have been moved to utils package. Issue #1898 --- .../test/base/ConfigurationBuilder.java | 2 +- .../base/IndentationConfigurationBuilder.java | 2 +- .../puppycrawl/tools/checkstyle/Checker.java | 1 + .../com/puppycrawl/tools/checkstyle/Main.java | 1 + .../tools/checkstyle/PackageNamesLoader.java | 1 + .../tools/checkstyle/TreeWalker.java | 1 + .../tools/checkstyle/XMLLogger.java | 1 + .../checkstyle/api/AbstractFileSetCheck.java | 2 +- .../tools/checkstyle/api/Check.java | 2 +- .../tools/checkstyle/api/DetailAST.java | 3 ++- .../checks/AbstractDeclarationCollector.java | 2 +- .../checks/DescendantTokenCheck.java | 3 ++- .../checks/FinalParametersCheck.java | 1 + .../checkstyle/checks/TodoCommentCheck.java | 2 +- .../checks/TrailingCommentCheck.java | 2 +- .../checks/UncommentedMainCheck.java | 2 +- .../checkstyle/checks/UpperEllCheck.java | 2 +- .../annotation/MissingDeprecatedCheck.java | 4 ++-- .../annotation/MissingOverrideCheck.java | 4 ++-- .../annotation/PackageAnnotationCheck.java | 2 +- .../annotation/SuppressWarningsCheck.java | 2 +- .../checks/blocks/EmptyCatchBlockCheck.java | 2 +- .../checks/blocks/LeftCurlyCheck.java | 2 +- .../checks/blocks/RightCurlyCheck.java | 6 ++--- .../checks/coding/AbstractSuperCheck.java | 2 +- .../checks/coding/CovariantEqualsCheck.java | 2 +- .../checks/coding/DeclarationOrderCheck.java | 2 +- .../coding/ExplicitInitializationCheck.java | 4 ++-- .../coding/FinalLocalVariableCheck.java | 2 +- .../checks/coding/HiddenFieldCheck.java | 4 ++-- .../coding/IllegalInstantiationCheck.java | 2 +- .../checks/coding/IllegalThrowsCheck.java | 2 +- .../checks/coding/IllegalTokenCheck.java | 2 +- .../checks/coding/IllegalTokenTextCheck.java | 2 +- .../checks/coding/IllegalTypeCheck.java | 4 ++-- .../checks/coding/MagicNumberCheck.java | 6 ++--- .../checks/coding/MissingCtorCheck.java | 2 +- .../coding/MissingSwitchDefaultCheck.java | 2 +- .../coding/MultipleStringLiteralsCheck.java | 2 +- .../MultipleVariableDeclarationsCheck.java | 2 +- .../checks/coding/NestedIfDepthCheck.java | 2 +- .../checks/coding/RequireThisCheck.java | 2 +- ...VariableDeclarationUsageDistanceCheck.java | 2 +- .../design/DesignForExtensionCheck.java | 2 +- .../checks/design/FinalClassCheck.java | 2 +- .../checks/design/InnerTypeLastCheck.java | 2 +- .../design/VisibilityModifierCheck.java | 6 ++--- .../checks/header/RegexpHeaderCheck.java | 2 +- .../imports/CustomImportOrderCheck.java | 2 +- .../checks/imports/ImportOrderCheck.java | 2 +- .../checks/imports/UnusedImportsCheck.java | 4 ++-- .../AbstractExpressionHandler.java | 2 +- .../indentation/CommentsIndentationCheck.java | 2 +- .../checks/indentation/HandlerFactory.java | 2 +- .../checks/javadoc/AbstractJavadocCheck.java | 1 + .../checks/javadoc/AtclauseOrderCheck.java | 3 ++- .../checks/javadoc/JavadocMethodCheck.java | 6 ++--- .../checks/javadoc/JavadocNodeImpl.java | 1 + .../checks/javadoc/JavadocParagraphCheck.java | 3 ++- .../checks/javadoc/JavadocStyleCheck.java | 4 ++-- ...avadocTagContinuationIndentationCheck.java | 1 + .../checks/javadoc/JavadocTagInfo.java | 2 +- .../checks/javadoc/JavadocTypeCheck.java | 7 +++--- .../checks/javadoc/JavadocVariableCheck.java | 4 ++-- .../NonEmptyAtclauseDescriptionCheck.java | 1 + .../javadoc/SingleLineJavadocCheck.java | 1 + .../checks/javadoc/SummaryJavadocCheck.java | 3 ++- .../checks/javadoc/WriteTagCheck.java | 2 +- .../metrics/AbstractClassCouplingCheck.java | 2 +- .../BooleanExpressionComplexityCheck.java | 2 +- .../checks/naming/ConstantNameCheck.java | 2 +- .../naming/LocalFinalVariableNameCheck.java | 2 +- .../checks/naming/LocalVariableNameCheck.java | 2 +- .../checks/naming/MemberNameCheck.java | 2 +- .../checks/naming/MethodNameCheck.java | 2 +- .../naming/StaticVariableNameCheck.java | 2 +- .../checks/sizes/LineLengthCheck.java | 2 +- .../checks/sizes/MethodCountCheck.java | 2 +- .../checks/sizes/ParameterNumberCheck.java | 2 +- .../whitespace/AbstractParenPadCheck.java | 2 +- .../EmptyForInitializerPadCheck.java | 2 +- .../whitespace/GenericWhitespaceCheck.java | 2 +- .../whitespace/MethodParamPadCheck.java | 2 +- .../checks/whitespace/OperatorWrapCheck.java | 2 +- .../checkstyle/filters/SuppressElement.java | 2 +- .../SuppressWithNearbyCommentFilter.java | 2 +- .../filters/SuppressionCommentFilter.java | 2 +- .../tools/checkstyle/gui/ParseTreeModel.java | 2 +- .../{ => utils}/AnnotationUtility.java | 2 +- .../{checks => utils}/CheckUtils.java | 3 +-- .../javadoc => utils}/JavadocUtils.java | 7 ++++-- .../checkstyle/{ => utils}/ScopeUtils.java | 2 +- .../tools/checkstyle/{ => utils}/Utils.java | 2 +- .../tools/checkstyle/utils/package-info.java | 23 +++++++++++++++++++ .../tools/checkstyle/api/TokenTypesTest.java | 2 +- .../indentation/IndentationCheckTest.java | 2 +- .../checks/javadoc/JavadocTagTest.java | 2 ++ .../checks/naming/TypeNameCheckTest.java | 2 +- .../{ => utils}/AnnotationUtilityTest.java | 2 +- .../{checks => utils}/CheckUtilsTest.java | 2 +- .../javadoc => utils}/JavadocUtilsTest.java | 6 ++++- .../{ => utils}/ScopeUtilsTest.java | 2 +- .../checkstyle/{ => utils}/UtilsTest.java | 2 +- .../coding/InputIllegalTypeStaticImports.java | 4 ++-- 104 files changed, 160 insertions(+), 112 deletions(-) rename src/main/java/com/puppycrawl/tools/checkstyle/{ => utils}/AnnotationUtility.java (99%) rename src/main/java/com/puppycrawl/tools/checkstyle/{checks => utils}/CheckUtils.java (99%) rename src/main/java/com/puppycrawl/tools/checkstyle/{checks/javadoc => utils}/JavadocUtils.java (97%) rename src/main/java/com/puppycrawl/tools/checkstyle/{ => utils}/ScopeUtils.java (99%) rename src/main/java/com/puppycrawl/tools/checkstyle/{ => utils}/Utils.java (99%) create mode 100644 src/main/java/com/puppycrawl/tools/checkstyle/utils/package-info.java rename src/test/java/com/puppycrawl/tools/checkstyle/{ => utils}/AnnotationUtilityTest.java (99%) rename src/test/java/com/puppycrawl/tools/checkstyle/{checks => utils}/CheckUtilsTest.java (98%) rename src/test/java/com/puppycrawl/tools/checkstyle/{checks/javadoc => utils}/JavadocUtilsTest.java (96%) rename src/test/java/com/puppycrawl/tools/checkstyle/{ => utils}/ScopeUtilsTest.java (99%) rename src/test/java/com/puppycrawl/tools/checkstyle/{ => utils}/UtilsTest.java (99%) diff --git a/src/it/java/com/google/checkstyle/test/base/ConfigurationBuilder.java b/src/it/java/com/google/checkstyle/test/base/ConfigurationBuilder.java index c4306f4ab..ac9d39e4d 100644 --- a/src/it/java/com/google/checkstyle/test/base/ConfigurationBuilder.java +++ b/src/it/java/com/google/checkstyle/test/base/ConfigurationBuilder.java @@ -13,9 +13,9 @@ import java.util.regex.Pattern; import com.puppycrawl.tools.checkstyle.ConfigurationLoader; import com.puppycrawl.tools.checkstyle.PropertiesExpander; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Configuration; +import com.puppycrawl.tools.checkstyle.utils.Utils; public class ConfigurationBuilder extends BaseCheckTestSupport { diff --git a/src/it/java/com/google/checkstyle/test/base/IndentationConfigurationBuilder.java b/src/it/java/com/google/checkstyle/test/base/IndentationConfigurationBuilder.java index e4b06187a..6d1ff4c5b 100644 --- a/src/it/java/com/google/checkstyle/test/base/IndentationConfigurationBuilder.java +++ b/src/it/java/com/google/checkstyle/test/base/IndentationConfigurationBuilder.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; +import com.puppycrawl.tools.checkstyle.utils.Utils; public class IndentationConfigurationBuilder extends ConfigurationBuilder { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java index d4773773b..a35a7a229 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java @@ -48,6 +48,7 @@ import com.puppycrawl.tools.checkstyle.api.LocalizedMessage; import com.puppycrawl.tools.checkstyle.api.MessageDispatcher; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; import com.puppycrawl.tools.checkstyle.api.SeverityLevelCounter; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * This class provides the functionality to check a set of files. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java index 3a81caaf1..9d25f7e90 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -42,6 +42,7 @@ import com.google.common.io.Closeables; import com.puppycrawl.tools.checkstyle.api.AuditListener; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Configuration; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Wrapper command line program for the Checker. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java index 86c633d5a..accea8da0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java @@ -39,6 +39,7 @@ import com.google.common.collect.Sets; import com.google.common.io.Closeables; import com.puppycrawl.tools.checkstyle.api.AbstractLoader; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Loads a list of package names from a package name XML file. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java index b3da34413..85f1608bd 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java @@ -55,6 +55,7 @@ import com.puppycrawl.tools.checkstyle.api.LocalizedMessage; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.grammars.GeneratedJavaLexer; import com.puppycrawl.tools.checkstyle.grammars.GeneratedJavaRecognizer; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Responsible for walking an abstract syntax tree and notifying interested diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java index 6cf903720..d5c6c0de4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java @@ -30,6 +30,7 @@ import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.AuditListener; import com.puppycrawl.tools.checkstyle.api.AutomaticBean; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Simple XML logger. 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 b38860f35..3df13fc5c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java @@ -26,7 +26,7 @@ import java.util.SortedSet; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.Utils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Provides common functionality for many FileSetChecks. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java index b9a07bab4..5e45e9841 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.commons.lang3.ArrayUtils; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.Utils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * The base class for checks. 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 c7ca339fe..2618ccb3f 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java @@ -24,7 +24,8 @@ import java.util.BitSet; import antlr.CommonASTWithHiddenTokens; import antlr.Token; import antlr.collections.AST; -import com.puppycrawl.tools.checkstyle.Utils; + +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * An extension of the CommonAST that records the line and column diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractDeclarationCollector.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractDeclarationCollector.java index 98c542257..18c6fb8f2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractDeclarationCollector.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractDeclarationCollector.java @@ -27,10 +27,10 @@ import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** * Abstract class for checks which need to collect information about diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java index 75adf4c12..77aaa8ba3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java @@ -25,9 +25,10 @@ import java.util.Set; import org.apache.commons.lang3.ArrayUtils; import antlr.collections.AST; -import com.puppycrawl.tools.checkstyle.Utils; + import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java index 21a82e8c8..b295865ad 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; /** * Check that method/constructor/catch/foreach parameters are final. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java index 888dce27c..0d18f7c2f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java @@ -21,10 +21,10 @@ package com.puppycrawl.tools.checkstyle.checks; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java index afae087c8..e0f357b5f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java @@ -27,9 +27,9 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.ArrayUtils; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TextBlock; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java index e76cb726f..d0290f0f5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java @@ -21,11 +21,11 @@ package com.puppycrawl.tools.checkstyle.checks; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Detects uncommented main methods. Basically detects diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java index d324b0df2..1a12aa2b7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

Checks that long constants are defined with an upper ell. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java index 0bb566b1d..37d3f5685 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java @@ -22,13 +22,13 @@ package com.puppycrawl.tools.checkstyle.checks.annotation; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TextBlock; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java index ad895898d..5f0430803 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java @@ -22,13 +22,13 @@ package com.puppycrawl.tools.checkstyle.checks.annotation; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TextBlock; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java index 1703644b6..c1bad9895 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.annotation; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; /** * This check makes sure that all package annotations are in the diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java index a465f809b..bacecb2e9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java @@ -23,10 +23,10 @@ import java.util.regex.Matcher; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractFormatCheck; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java index 0662155cf..04c18b4ca 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java @@ -21,10 +21,10 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java index 32b5dc6e3..678dc37c1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java @@ -21,10 +21,10 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java index 5fde8bf13..7f015caca 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java @@ -21,13 +21,13 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.ScopeUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.Scope; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java index 8d5fcdab7..84a074f1b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java @@ -24,10 +24,10 @@ import java.util.Deque; import antlr.collections.AST; import com.google.common.collect.Lists; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java index 46c4cea04..2436e0e0c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java @@ -26,7 +26,7 @@ import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; /** *

Checks that if a class defines a covariant method equals, diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java index ed0571c6b..ac1038aa2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java @@ -22,11 +22,11 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import java.util.ArrayDeque; import java.util.Deque; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.Scope; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java index e8741821b..425eef90e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java @@ -19,11 +19,11 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java index 3e0ab1079..230be87ed 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java @@ -26,10 +26,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java index 186873ce8..562b0276f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java @@ -25,11 +25,11 @@ import java.util.Set; import java.util.regex.Pattern; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.ScopeUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

Checks that a local variable or a parameter does not shadow diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java index 16f12e9a7..19c255d18 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java @@ -27,11 +27,11 @@ import org.apache.commons.lang3.ArrayUtils; import antlr.collections.AST; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java index 415df9c04..333dc2947 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java @@ -23,10 +23,10 @@ import java.util.Collections; import java.util.Set; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java index 80bd35bc1..c0167b9c6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java @@ -21,10 +21,10 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java index cbed10584..90c1b7973 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java @@ -23,9 +23,9 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.checks.AbstractFormatCheck; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java index 4f589bed9..4a46f87d3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java @@ -25,12 +25,12 @@ import java.util.List; import java.util.Set; import com.google.common.collect.Sets; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractFormatCheck; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java index eb4036d7e..93d1e413b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java @@ -23,12 +23,12 @@ import java.util.Arrays; import org.apache.commons.lang3.ArrayUtils; -import com.puppycrawl.tools.checkstyle.ScopeUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java index f2fa9db52..779e6db36 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.DescendantTokenCheck; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java index 35f69c6fc..6364e97c1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java @@ -19,9 +19,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.DescendantTokenCheck; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java index f5e341f25..e154c1341 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java @@ -26,10 +26,10 @@ import java.util.regex.Pattern; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Checks for multiple occurrences of the same string literal within a diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java index 1e3ec590c..d7b970d73 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java @@ -22,7 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java index 086ecbb04..2247a4700 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java @@ -21,7 +21,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; -import com.puppycrawl.tools.checkstyle.checks.CheckUtils; +import com.puppycrawl.tools.checkstyle.utils.CheckUtils; /** * Restricts nested if-else blocks to a specified depth (default = 1). diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java index f6de633ee..c655f5604 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractDeclarationCollector; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

Checks that code doesn't rely on the "this" default. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java index 770a7d605..bd6661eaa 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java @@ -28,11 +28,11 @@ import java.util.regex.Pattern; import antlr.collections.ASTEnumeration; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java index 127af0287..f112b048f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java @@ -19,11 +19,11 @@ package com.puppycrawl.tools.checkstyle.checks.design; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.Scope; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** * Checks that classes are designed for inheritance. 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 d7b70498d..9e02c4b46 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 @@ -22,10 +22,10 @@ package com.puppycrawl.tools.checkstyle.checks.design; import java.util.ArrayDeque; import java.util.Deque; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java index e7bc19f0a..99d7aed2b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java @@ -19,10 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.design; -import com.puppycrawl.tools.checkstyle.ScopeUtils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; /** *

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java index ae694653c..e6a360c67 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java @@ -28,13 +28,13 @@ import java.util.regex.Pattern; import antlr.collections.AST; import com.google.common.collect.ImmutableList; -import com.puppycrawl.tools.checkstyle.AnnotationUtility; -import com.puppycrawl.tools.checkstyle.ScopeUtils; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.AnnotationUtility; +import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Checks visibility of class members. Only static final, immutable or annotated diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java index b90dc3c73..95ba4782c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java @@ -29,7 +29,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; -import com.puppycrawl.tools.checkstyle.Utils; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** * Checks the header of the source against a header file that contains a 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 569ea35ea..fbd140983 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 @@ -24,11 +24,11 @@ import java.util.List; import java.util.StringTokenizer; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *

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 54f05f394..633c8b4b6 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 @@ -22,11 +22,11 @@ package com.puppycrawl.tools.checkstyle.checks.imports; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.FullIdent; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck; +import com.puppycrawl.tools.checkstyle.utils.Utils; /** *