diff options
Diffstat (limited to 'src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java')
| -rw-r--r-- | src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java index c37302c5f..059e93c98 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java @@ -40,7 +40,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import com.puppycrawl.tools.checkstyle.api.AbstractLoader; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Configuration; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; @@ -76,7 +75,7 @@ public final class ConfigurationLoader { "-//Puppy Crawl//DTD Check Configuration 1.0//EN"; /** The resource for version 1_0 of the configuration dtd. */ - private static final String DTD_RESOURCE_NAME_1_0 = + private static final String DTD_CONFIGURATION_NAME_1_0 = "com/puppycrawl/tools/checkstyle/configuration_1_0.dtd"; /** The public ID for version 1_1 of the configuration dtd. */ @@ -84,7 +83,7 @@ public final class ConfigurationLoader { "-//Puppy Crawl//DTD Check Configuration 1.1//EN"; /** The resource for version 1_1 of the configuration dtd. */ - private static final String DTD_RESOURCE_NAME_1_1 = + private static final String DTD_CONFIGURATION_NAME_1_1 = "com/puppycrawl/tools/checkstyle/configuration_1_1.dtd"; /** The public ID for version 1_2 of the configuration dtd. */ @@ -92,7 +91,7 @@ public final class ConfigurationLoader { "-//Puppy Crawl//DTD Check Configuration 1.2//EN"; /** The resource for version 1_2 of the configuration dtd. */ - private static final String DTD_RESOURCE_NAME_1_2 = + private static final String DTD_CONFIGURATION_NAME_1_2 = "com/puppycrawl/tools/checkstyle/configuration_1_2.dtd"; /** The public ID for version 1_3 of the configuration dtd. */ @@ -100,7 +99,7 @@ public final class ConfigurationLoader { "-//Puppy Crawl//DTD Check Configuration 1.3//EN"; /** The resource for version 1_3 of the configuration dtd. */ - private static final String DTD_RESOURCE_NAME_1_3 = + private static final String DTD_CONFIGURATION_NAME_1_3 = "com/puppycrawl/tools/checkstyle/configuration_1_3.dtd"; /** Prefix for the exception when unable to parse resource. */ @@ -166,10 +165,10 @@ public final class ConfigurationLoader { */ private static Map<String, String> createIdToResourceNameMap() { final Map<String, String> map = new HashMap<>(); - map.put(DTD_PUBLIC_ID_1_0, DTD_RESOURCE_NAME_1_0); - map.put(DTD_PUBLIC_ID_1_1, DTD_RESOURCE_NAME_1_1); - map.put(DTD_PUBLIC_ID_1_2, DTD_RESOURCE_NAME_1_2); - map.put(DTD_PUBLIC_ID_1_3, DTD_RESOURCE_NAME_1_3); + map.put(DTD_PUBLIC_ID_1_0, DTD_CONFIGURATION_NAME_1_0); + map.put(DTD_PUBLIC_ID_1_1, DTD_CONFIGURATION_NAME_1_1); + map.put(DTD_PUBLIC_ID_1_2, DTD_CONFIGURATION_NAME_1_2); + map.put(DTD_PUBLIC_ID_1_3, DTD_CONFIGURATION_NAME_1_3); return map; } @@ -224,7 +223,7 @@ public final class ConfigurationLoader { * 'ignore' should be omitted, {@code false} otherwise * @return the check configurations * @throws CheckstyleException if an error occurs - * @deprecated in order to fullfil demands of BooleanParameter IDEA check. + * @deprecated in order to fulfill demands of BooleanParameter IDEA check. * @noinspection BooleanParameter */ @Deprecated @@ -245,7 +244,7 @@ public final class ConfigurationLoader { * @param threadModeSettings the thread mode configuration * @return the check configurations * @throws CheckstyleException if an error occurs - * @deprecated in order to fullfil demands of BooleanParameter IDEA check. + * @deprecated in order to fulfill demands of BooleanParameter IDEA check. * @noinspection BooleanParameter, WeakerAccess */ @Deprecated @@ -297,7 +296,7 @@ public final class ConfigurationLoader { * 'ignore' should be omitted, {@code false} otherwise * @return the check configurations * @throws CheckstyleException if an error occurs - * @deprecated in order to fullfil demands of BooleanParameter IDEA check. + * @deprecated in order to fulfill demands of BooleanParameter IDEA check. * @noinspection BooleanParameter */ @Deprecated @@ -320,7 +319,7 @@ public final class ConfigurationLoader { * @param threadModeSettings the thread mode configuration * @return the check configurations * @throws CheckstyleException if an error occurs - * @deprecated in order to fullfil demands of BooleanParameter IDEA check. + * @deprecated in order to fulfill demands of BooleanParameter IDEA check. * @noinspection BooleanParameter, WeakerAccess */ @Deprecated @@ -580,7 +579,7 @@ public final class ConfigurationLoader { * appear in the public API of the ConfigurationLoader. */ private final class InternalLoader - extends AbstractLoader { + extends XmlLoader { /** Module elements. */ private static final String MODULE = "module"; /** Name attribute. */ |