Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: pmd/[email protected]
id: pmd
with:
version: '7.18.0'
version: '7.19.0'
rulesets: 'ddk-configuration/pmd/ruleset.xml'
analyzeModifiedFilesOnly: false
- name: Fail build if there are violations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Set<EReference> getTypeConformanceCheckedReferences() {
*/
@Check
public void checkDisabledCheckIsNotConfigured(final ConfiguredCheck configuredCheck) {
if (configuredCheck.getSeverity().equals(SeverityKind.IGNORE) && isParameterConfigured(configuredCheck)) {
if (configuredCheck.getSeverity() == SeverityKind.IGNORE && isParameterConfigured(configuredCheck)) {
warning(Messages.CheckCfgJavaValidator_DISABLED_CHECK_NOT_CONFIGURED, CheckcfgPackage.Literals.CONFIGURABLE_SECTION__PARAMETER_CONFIGURATIONS, IssueCodes.DISABLED_CHECK_NOT_CONFIGURED);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected Object _text(final ConfiguredCheck configuredCheck) {
// Unresolved reference
ruleText = new StyledString("<Unresolved check>", //
stylerFactory.createXtextStyleAdapterStyler(semanticHighlightingConfiguration.errorTextStyle()));
} else if (configuredCheck.getSeverity().equals(SeverityKind.IGNORE)) {
} else if (configuredCheck.getSeverity() == SeverityKind.IGNORE) {
// Disabled
ruleText = new StyledString(safeName(configuredCheck.getCheck().getLabel()), //
stylerFactory.createXtextStyleAdapterStyler(semanticHighlightingConfiguration.disabledValue()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void provideHighlightingFor(final XtextResource resource, final IHighligh
while (iter.hasNext()) {
EObject current = iter.next();

if (current instanceof ConfiguredCheck && ((ConfiguredCheck) current).getSeverity().equals(SeverityKind.IGNORE)) {
if (current instanceof ConfiguredCheck check && check.getSeverity() == SeverityKind.IGNORE) {
INode node = getFirstParseTreeNode(current, CheckcfgPackage.Literals.CONFIGURED_CHECK__CHECK);
highlightNode(node, SemanticHighlightingConfiguration.DISABLED_VALUE_ID, acceptor);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class TestEntityAction {
public TestEntityAction(final ITestEntity testEntity, final TestEntityOperation entityAction) {
Assert.isNotNull(testEntity, TEST_ENTITY_ARGUMENT);
Assert.isNotNull(entityAction, ENTITY_ACTION_ARGUMENT);
if (entityAction.equals(TestEntityOperation.DISPOSE)) {
if (entityAction == TestEntityOperation.DISPOSE) {
testEntity.dispose();
}
this.testEntity = testEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private void handleNoFormatLocators(final Set<ElementLocator> locators) {
for (ElementLocator locator : locators) {
if (locator instanceof NoFormatLocator) {
if (!this.noFormatLocators.remove(locator)) {
if (locator.getType().equals(LocatorType.BETWEEN)) {
if (locator.getType() == LocatorType.BETWEEN) {
// In case we are dealing with a 'between' locator we only need to add a NoFormat 'memento'.
// In this way we do not format anything until the following element
this.noFormatLocators.add(noFormatMemento);
Expand Down
2 changes: 1 addition & 1 deletion ddk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<spotbugs.plugin.version>4.9.8.2</spotbugs.plugin.version>
<spotbugs.version>4.9.8</spotbugs.version>
<pmd.plugin.version>3.28.0</pmd.plugin.version>
<pmd.version>7.18.0</pmd.version>
<pmd.version>7.19.0</pmd.version>
<tycho.version>5.0.1</tycho.version>
<xtend.version>2.40.0</xtend.version>
</properties>
Expand Down