Skip to content

Commit aa724cb

Browse files
committed
Issue #287: update to Checkstyle 8.42
1 parent 96b60ab commit aa724cb

File tree

10 files changed

+9
-9
lines changed

10 files changed

+9
-9
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.41.1-all.jar" sourcepath="checkstyle-checkstyle-8.41.1.zip"/>
3+
<classpathentry exported="true" kind="lib" path="checkstyle-8.42-all.jar" sourcepath="checkstyle-checkstyle-8.42.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.41.1"
4848
Bundle-ClassPath: .,
49-
checkstyle-8.41.1-all.jar
49+
checkstyle-8.42-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.41.1-all.jar
4+
checkstyle-8.42-all.jar
55
jars.compile.order = .
66
source.. = metadata/

net.sf.eclipsecs.checkstyle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>Checkstyle Core Library Plugin</name>
1212

1313
<properties>
14-
<checkstyle.version>8.41.1</checkstyle.version>
14+
<checkstyle.version>8.42</checkstyle.version>
1515
</properties>
1616
<build>
1717
<plugins>

net.sf.eclipsecs.core/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<classpathentry exported="true" kind="lib" path="lib/dom4j-2.1.3.jar"/>
1111
<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.26.jar"/>
1212
<classpathentry exported="true" kind="lib" path="lib/reflections-0.9.10.jar"/>
13-
<classpathentry kind="lib" path="lib/checkstyle-8.41.1-all.jar"/>
13+
<classpathentry kind="lib" path="lib/checkstyle-8.42-all.jar"/>
1414
<classpathentry kind="output" path="target/classes"/>
1515
</classpath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bundle-ClassPath: .,
88
lib/dom4j-2.1.3.jar,
99
lib/snakeyaml-1.26.jar,
1010
lib/reflections-0.9.10.jar,
11-
lib/checkstyle-8.41.1-all.jar
11+
lib/checkstyle-8.42-all.jar
1212
Bundle-Activator: net.sf.eclipsecs.core.CheckstylePlugin
1313
Bundle-ActivationPolicy: lazy
1414
Bundle-Vendor: Eclipse Checkstyle Project

net.sf.eclipsecs.core/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bin.includes = .,\
1010
lib/dom4j-2.1.3.jar, \
1111
lib/reflections-0.9.10.jar, \
1212
lib/snakeyaml-1.26.jar, \
13-
lib/checkstyle-8.41.1-all.jar
13+
lib/checkstyle-8.42-all.jar
1414

1515
source.. = src/
1616

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/Auditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public void addError(AuditEvent error) {
324324

325325
mMarkerAttributes.put(CheckstyleMarker.MODULE_NAME, metaData.getInternalName());
326326
mMarkerAttributes.put(CheckstyleMarker.MESSAGE_KEY,
327-
error.getLocalizedMessage().getKey());
327+
error.getViolation().getKey());
328328
mMarkerAttributes.put(IMarker.PRIORITY, Integer.valueOf(IMarker.PRIORITY_NORMAL));
329329
mMarkerAttributes.put(IMarker.SEVERITY, Integer.valueOf(getSeverityValue(severity)));
330330
mMarkerAttributes.put(IMarker.LINE_NUMBER, Integer.valueOf(error.getLine()));
@@ -417,7 +417,7 @@ private void calculateMarkerOffset(AuditEvent error, Map<String, Object> markerA
417417

418418
// annotate from the error column until the end of
419419
// the line
420-
int offset = error.getLocalizedMessage().getColumnCharIndex();
420+
final int offset = error.getViolation().getColumnCharIndex();
421421

422422
markerAttributes.put(IMarker.CHAR_START, Integer.valueOf(lineOffset + offset));
423423
markerAttributes.put(IMarker.CHAR_END, Integer.valueOf(lineOffset + lineLength));

0 commit comments

Comments
 (0)