Skip to content

Commit 5782eb8

Browse files
Calixteromani
authored andcommitted
#145 Update to Checkstyle 8.19
1 parent 125a714 commit 5782eb8

File tree

10 files changed

+12
-10
lines changed

10 files changed

+12
-10
lines changed

net.sf.eclipsecs.checkstyle/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="checkstyle-8.18-all.jar" sourcepath="checkstyle-checkstyle-8.18.zip"/>
3+
<classpathentry exported="true" kind="lib" path="checkstyle-8.19-all.jar" sourcepath="checkstyle-checkstyle-8.19.zip"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
55
<attributes>
66
<attribute name="maven.pomderived" value="true"/>

net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Export-Package: .,
4646
com.puppycrawl.tools.checkstyle.utils,
4747
org.apache.commons.beanutils;version="8.18.0"
4848
Bundle-ClassPath: .,
49-
checkstyle-8.18-all.jar
49+
checkstyle-8.19-all.jar
5050
Automatic-Module-Name: net.sf.eclipsecs.checkstyle
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bin.includes = META-INF/,\
22
.,\
33
license/,\
4-
checkstyle-8.18-all.jar
4+
checkstyle-8.19-all.jar
55
jars.compile.order = .
66
source.. = metadata/
-11 MB
Binary file not shown.
23.1 MB
Binary file not shown.

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/annotation/checkstyle-metadata.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,13 @@
9696
<alternative-name internal-name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck" />
9797
<description>%AnnotationLocation.desc</description>
9898
<property-metadata name="tokens" datatype="MultiCheck"
99-
default-value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF">
99+
default-value="CLASS_DEF,INTERFACE_DEF,PACKAGE_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF">
100100
<description>%AnnotationLocation.tokens</description>
101101
<enumeration>
102102
<property-value-option value="CLASS_DEF" />
103103
<property-value-option value="INTERFACE_DEF" />
104+
<property-value-option value="PACKAGE_DEF" />
105+
<property-value-option value="ENUM_CONSTANT_DEF" />
104106
<property-value-option value="ENUM_DEF" />
105107
<property-value-option value="METHOD_DEF" />
106108
<property-value-option value="CTOR_DEF" />

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checkstyle-metadata.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Checker.localeLanguage = locale language for messages
99
Checker.charset = name of the file charset (Note: eclipse-cs plugin sets this property to the projects default charset)
1010
Checker.fileExtensions = file extensions that are accepted (comma separated)
1111
Checker.haltOnException = Controls whether exceptions should halt execution or not.
12+
Checker.tabWidth = number of expanded spaces for a tab character ('\t'); used in messages and Checks that print violations on files with tabs
1213

1314
TreeWalker.name = TreeWalker
1415
TreeWalker.desc = FileSetCheck TreeWalker checks individual Java source files and defines properties that are applicable to checking such files.
15-
TreeWalker.tabWidth = number of expanded spaces for a tab character ('\t'); used in messages and Checks that require a tab width, such as LineLength
1616
TreeWalker.fileExtensions = file type extension to identify java files. Setting this property is typically only required if your java source code is preprocessed before compilation and the original files do not have the extension .java

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checkstyle-metadata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
<property-metadata name="haltOnException" datatype="Boolean" default-value="true">
3030
<description>%Checker.haltOnException</description>
3131
</property-metadata>
32+
<property-metadata name="tabWidth" datatype="Integer" default-value="8">
33+
<description>%Checker.tabWidth</description>
34+
</property-metadata>
3235
</rule-metadata>
3336

3437
<rule-metadata name="%TreeWalker.name" internal-name="TreeWalker" parent="Checker"
3538
singleton="true">
3639
<alternative-name internal-name="com.puppycrawl.tools.checkstyle.TreeWalker"/>
3740
<description>%TreeWalker.desc</description>
38-
<property-metadata name="tabWidth" datatype="Integer" default-value="8">
39-
<description>%TreeWalker.tabWidth</description>
40-
</property-metadata>
4141
<property-metadata name="fileExtensions" datatype="String" default-value="java">
4242
<description>%TreeWalker.fileExtensions</description>
4343
</property-metadata>

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/config/ConfigurationReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public final class ConfigurationReader {
115115
map.put(DTD_PUBLIC_CS_ID_1_1, DTD_CONFIGURATION_NAME_1_1);
116116
map.put(DTD_PUBLIC_CS_ID_1_2, DTD_CONFIGURATION_NAME_1_2);
117117
map.put(DTD_PUBLIC_CS_ID_1_3, DTD_CONFIGURATION_NAME_1_3);
118-
118+
119119
PUBLIC2INTERNAL_DTD_MAP = map;
120120
}
121121

@@ -172,7 +172,7 @@ public static AdditionalConfigData getAdditionalConfigData(InputSource in)
172172
for (final Module module : modules) {
173173

174174
if ((module.getMetaData() != null)
175-
&& module.getMetaData().getInternalName().equals(XMLTags.TREEWALKER_MODULE)) {
175+
&& module.getMetaData().getInternalName().equals(XMLTags.CHECKER_MODULE)) {
176176

177177
final ConfigProperty prop = module.getProperty("tabWidth"); //$NON-NLS-1$
178178

0 commit comments

Comments
 (0)