Skip to content

Commit eb185cd

Browse files
authored
Merge pull request #1232 from rubenporras/pmd3
chore(deps): bump pmd.version from 7.18.0 to 7.19.0
2 parents 8aeea7c + b2035dd commit eb185cd

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
1717
id: pmd
1818
with:
19-
version: '7.18.0'
19+
version: '7.19.0'
2020
rulesets: 'ddk-configuration/pmd/ruleset.xml'
2121
analyzeModifiedFilesOnly: false
2222
- name: Fail build if there are violations

com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Set<EReference> getTypeConformanceCheckedReferences() {
8787
*/
8888
@Check
8989
public void checkDisabledCheckIsNotConfigured(final ConfiguredCheck configuredCheck) {
90-
if (configuredCheck.getSeverity().equals(SeverityKind.IGNORE) && isParameterConfigured(configuredCheck)) {
90+
if (configuredCheck.getSeverity() == SeverityKind.IGNORE && isParameterConfigured(configuredCheck)) {
9191
warning(Messages.CheckCfgJavaValidator_DISABLED_CHECK_NOT_CONFIGURED, CheckcfgPackage.Literals.CONFIGURABLE_SECTION__PARAMETER_CONFIGURATIONS, IssueCodes.DISABLED_CHECK_NOT_CONFIGURED);
9292
}
9393
}

com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/outline/CheckCfgOutlineTreeProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected Object _text(final ConfiguredCheck configuredCheck) {
8080
// Unresolved reference
8181
ruleText = new StyledString("<Unresolved check>", //
8282
stylerFactory.createXtextStyleAdapterStyler(semanticHighlightingConfiguration.errorTextStyle()));
83-
} else if (configuredCheck.getSeverity().equals(SeverityKind.IGNORE)) {
83+
} else if (configuredCheck.getSeverity() == SeverityKind.IGNORE) {
8484
// Disabled
8585
ruleText = new StyledString(safeName(configuredCheck.getCheck().getLabel()), //
8686
stylerFactory.createXtextStyleAdapterStyler(semanticHighlightingConfiguration.disabledValue()));

com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/syntaxcoloring/SemanticHighlightingCalculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void provideHighlightingFor(final XtextResource resource, final IHighligh
4646
while (iter.hasNext()) {
4747
EObject current = iter.next();
4848

49-
if (current instanceof ConfiguredCheck && ((ConfiguredCheck) current).getSeverity().equals(SeverityKind.IGNORE)) {
49+
if (current instanceof ConfiguredCheck check && check.getSeverity() == SeverityKind.IGNORE) {
5050
INode node = getFirstParseTreeNode(current, CheckcfgPackage.Literals.CONFIGURED_CHECK__CHECK);
5151
highlightNode(node, SemanticHighlightingConfiguration.DISABLED_VALUE_ID, acceptor);
5252
}

com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/TestEntityAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class TestEntityAction {
3737
public TestEntityAction(final ITestEntity testEntity, final TestEntityOperation entityAction) {
3838
Assert.isNotNull(testEntity, TEST_ENTITY_ARGUMENT);
3939
Assert.isNotNull(entityAction, ENTITY_ACTION_ARGUMENT);
40-
if (entityAction.equals(TestEntityOperation.DISPOSE)) {
40+
if (entityAction == TestEntityOperation.DISPOSE) {
4141
testEntity.dispose();
4242
}
4343
this.testEntity = testEntity;

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/ExtendedFormattingConfigBasedStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private void handleNoFormatLocators(final Set<ElementLocator> locators) {
141141
for (ElementLocator locator : locators) {
142142
if (locator instanceof NoFormatLocator) {
143143
if (!this.noFormatLocators.remove(locator)) {
144-
if (locator.getType().equals(LocatorType.BETWEEN)) {
144+
if (locator.getType() == LocatorType.BETWEEN) {
145145
// In case we are dealing with a 'between' locator we only need to add a NoFormat 'memento'.
146146
// In this way we do not format anything until the following element
147147
this.noFormatLocators.add(noFormatMemento);

ddk-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<spotbugs.plugin.version>4.9.8.2</spotbugs.plugin.version>
5454
<spotbugs.version>4.9.8</spotbugs.version>
5555
<pmd.plugin.version>3.28.0</pmd.plugin.version>
56-
<pmd.version>7.18.0</pmd.version>
56+
<pmd.version>7.19.0</pmd.version>
5757
<tycho.version>5.0.1</tycho.version>
5858
<xtend.version>2.40.0</xtend.version>
5959
</properties>

0 commit comments

Comments
 (0)