Skip to content

Commit 2c64716

Browse files
authored
chore: Use pmd 7.1.0 for checks (#195)
* chore: Use pmd 7.1.0 for checks * [doc] Update release notes (#195)
1 parent ec7f6fe commit 2c64716

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

ReleaseNotes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ This is a minor release.
1717

1818
### Merged pull requests
1919
* [#194](https://github.com/pmd/pmd-eclipse-plugin/pull/194): \[ci] Support macos on arm64/aarch64
20+
* [#195](https://github.com/pmd/pmd-eclipse-plugin/pull/195): chore: Use pmd 7.1.0 for checks
2021

2122
### API Changes
2223

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/ast/ASTViewPage.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
package net.sourceforge.pmd.eclipse.ui.views.ast;
66

7-
import java.util.HashSet;
87
import java.util.List;
9-
import java.util.Set;
108
import javax.xml.xpath.XPath;
119
import javax.xml.xpath.XPathExpressionException;
1210
import javax.xml.xpath.XPathFactory;
@@ -47,7 +45,6 @@
4745
import net.sourceforge.pmd.lang.ast.Node;
4846
import net.sourceforge.pmd.lang.ast.ParseException;
4947
import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
50-
import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
5148
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
5249
import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
5350
import net.sourceforge.pmd.reporting.RuleViolation;
@@ -72,13 +69,6 @@ public class ASTViewPage extends AbstractStructureInspectorPage {
7269

7370
// private static Set<String> keywords = new HashSet<String>();
7471

75-
private static Set<Class<?>> hiddenNodeTypes;
76-
77-
static {
78-
hiddenNodeTypes = new HashSet<>();
79-
hiddenNodeTypes.add(ASTImportDeclaration.class);
80-
}
81-
8272
public ASTViewPage(IWorkbenchPart part, FileRecord record) {
8373
super(part, record);
8474
}

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/ast/NodeImageDeriver.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,62 +27,62 @@
2727
*/
2828
public class NodeImageDeriver {
2929

30-
private static NodeImageDeriver compilationUnitDeriver = new NodeImageDeriver(ASTCompilationUnit.class) {
30+
private static final NodeImageDeriver COMPILATION_UNIT_DERIVER = new NodeImageDeriver(ASTCompilationUnit.class) {
3131
@Override
3232
public String deriveFrom(Node node) {
3333
dumpComments((ASTCompilationUnit) node);
3434
return "Comments: " + ((ASTCompilationUnit) node).getComments().size();
3535
}
3636
};
3737

38-
private static NodeImageDeriver importDeriver = new NodeImageDeriver(ASTImportDeclaration.class) {
38+
private static final NodeImageDeriver IMPORT_DERIVER = new NodeImageDeriver(ASTImportDeclaration.class) {
3939
@Override
4040
public String deriveFrom(Node node) {
4141
// TODO show package name as well?
4242
return ((ASTImportDeclaration) node).getImportedName();
4343
}
4444
};
4545

46-
private static NodeImageDeriver methodDeclarationDeriver = new NodeImageDeriver(ASTMethodDeclaration.class) {
46+
private static final NodeImageDeriver METHOD_DECLARATION_DERIVER = new NodeImageDeriver(ASTMethodDeclaration.class) {
4747
@Override
4848
public String deriveFrom(Node node) {
4949
return ASTUtil.getMethodLabel((ASTMethodDeclaration) node, true);
5050
}
5151
};
5252

53-
private static NodeImageDeriver throwStatementDeriver = new NodeImageDeriver(ASTThrowStatement.class) {
53+
private static final NodeImageDeriver THROW_STATEMENT_DERIVER = new NodeImageDeriver(ASTThrowStatement.class) {
5454
@Override
5555
public String deriveFrom(Node node) {
5656
final ASTClassType t = node.descendants(ASTClassType.class).first();
5757
return t == null ? null : t.getSimpleName();
5858
}
5959
};
6060

61-
private static NodeImageDeriver fieldDeclarationDeriver = new NodeImageDeriver(ASTFieldDeclaration.class) {
61+
private static final NodeImageDeriver FIELD_DECLARATION_DERIVER = new NodeImageDeriver(ASTFieldDeclaration.class) {
6262
@Override
6363
public String deriveFrom(Node node) {
6464
return ASTUtil.getFieldLabel((ASTFieldDeclaration) node);
6565
}
6666
};
6767

68-
private static NodeImageDeriver localVariableDeclarationDeriver = new NodeImageDeriver(
68+
private static final NodeImageDeriver LOCAL_VARIABLE_DECLARATION_DERIVER = new NodeImageDeriver(
6969
ASTLocalVariableDeclaration.class) {
7070
@Override
7171
public String deriveFrom(Node node) {
7272
return ASTUtil.getLocalVarDeclarationLabel((ASTLocalVariableDeclaration) node);
7373
}
7474
};
7575

76-
private static NodeImageDeriver annotationDeriver = new NodeImageDeriver(ASTAnnotation.class) {
76+
private static final NodeImageDeriver ANNOTATION_DERIVER = new NodeImageDeriver(ASTAnnotation.class) {
7777
@Override
7878
public String deriveFrom(Node node) {
7979
return ASTUtil.getAnnotationLabel((ASTAnnotation) node);
8080
}
8181
};
8282

83-
private static final NodeImageDeriver[] ALL_DERIVERS = new NodeImageDeriver[] { importDeriver,
84-
methodDeclarationDeriver, localVariableDeclarationDeriver, fieldDeclarationDeriver, annotationDeriver,
85-
compilationUnitDeriver, throwStatementDeriver };
83+
private static final NodeImageDeriver[] ALL_DERIVERS = new NodeImageDeriver[] { IMPORT_DERIVER,
84+
METHOD_DECLARATION_DERIVER, LOCAL_VARIABLE_DECLARATION_DERIVER, FIELD_DECLARATION_DERIVER, ANNOTATION_DERIVER,
85+
COMPILATION_UNIT_DERIVER, THROW_STATEMENT_DERIVER };
8686

8787
private static final Map<Class<?>, NodeImageDeriver> DERIVERS_BY_TYPE = new HashMap<>(
8888
NodeImageDeriver.ALL_DERIVERS.length);

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<checkstyle.version>10.14.0</checkstyle.version>
2727
<checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
2828
<pmd.plugin.version>3.22.0</pmd.plugin.version>
29-
<pmd.check.version>7.0.0</pmd.check.version>
29+
<pmd.check.version>7.1.0</pmd.check.version>
3030

3131
<keystorePath>.ci/files/pmd-eclipse-plugin.p12</keystorePath>
3232
<keystore>${basedir}/${keystorePath}</keystore>

0 commit comments

Comments
 (0)