From eed363942642b2293ed4c44552f0b7491c9a1b9b Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 16 Oct 2025 11:26:31 +0200 Subject: [PATCH] Update build-tools from 34 to 35 And fix/suppress violations --- pom.xml | 4 ++-- .../sourceforge/pmd/util/fxdesigner/DesignerVersion.java | 2 +- .../pmd/util/fxdesigner/app/services/LogEntry.java | 1 + .../fxdesigner/model/testing/LiveViolationRecord.java | 1 + .../pmd/util/fxdesigner/model/testing/TestXmlDumper.java | 6 +----- .../fxdesigner/util/autocomplete/CompletionResult.java | 1 + .../util/autocomplete/matchers/MatchResult.java | 1 + .../pmd/util/fxdesigner/util/controls/ControlUtil.java | 6 +----- .../fxdesigner/util/controls/NodeEditionCodeArea.java | 9 +++++++-- .../pmd/util/fxdesigner/util/controls/PopOverUtil.java | 2 -- .../fxdesigner/util/reactfx/DistinctBetweenStream.java | 1 + 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 954dd797..5acf77e6 100644 --- a/pom.xml +++ b/pom.xml @@ -76,9 +76,9 @@ UTF-8 UTF-8 - 34 + 35 3.27.0 - 7.15.0 + 7.17.0 ${project.build.directory}/generated-sources/jflex diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java index d63b17c9..be43275f 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java @@ -24,7 +24,7 @@ public final class DesignerVersion { private static final String PMD_CORE_MIN_VERSION; private static final String UNKNOWN_VERSION = "unknown"; - /** + /* * Determines the version from maven's generated designer.properties file. */ static { diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/LogEntry.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/LogEntry.java index 32224b47..ccbfd463 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/LogEntry.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/LogEntry.java @@ -74,6 +74,7 @@ public Var messageProperty() { } @Override + @SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") // not used in a sorted set/map public int compareTo(LogEntry o) { return getTimestamp().compareTo(o.getTimestamp()); } diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java index bdf4d961..993e5c56 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java @@ -41,6 +41,7 @@ public LiveViolationRecord(int line, @NonNull TextRegion region, String message) @Override + @SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") // not used in a sorted set/map public int compareTo(LiveViolationRecord o) { TextRegion mine = getRegion(); TextRegion theirs = o.getRegion(); diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestXmlDumper.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestXmlDumper.java index bc312496..57526b39 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestXmlDumper.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestXmlDumper.java @@ -4,8 +4,6 @@ package net.sourceforge.pmd.util.fxdesigner.model.testing; -import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; import java.nio.file.Files; @@ -142,9 +140,7 @@ public static String dumpXmlTests(TestCollection collection) throws Exception { public static void dumpXmlTests(Path path, TestCollection collection) throws Exception { - try (OutputStream is = Files.newOutputStream(path); - Writer out = new OutputStreamWriter(is)) { - + try (Writer out = Files.newBufferedWriter(path)) { dumpXmlTests(out, collection); } } diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/CompletionResult.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/CompletionResult.java index 5b27961e..0666fc41 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/CompletionResult.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/CompletionResult.java @@ -47,6 +47,7 @@ int getScore() { @Override + @SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") // not used in a sorted set/map public int compareTo(CompletionResult o) { return Integer.compare(score, o.score); } diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/matchers/MatchResult.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/matchers/MatchResult.java index 758bea2d..0249e777 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/matchers/MatchResult.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/matchers/MatchResult.java @@ -73,6 +73,7 @@ public int getScore() { @Override + @SuppressWarnings("PMD.OverrideBothEqualsAndHashCodeOnComparable") // not used in a sorted set/map public int compareTo(MatchResult o) { return Integer.compare(score, o.score); } diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ControlUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ControlUtil.java index 8f2e1856..e3d97905 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ControlUtil.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ControlUtil.java @@ -4,11 +4,8 @@ package net.sourceforge.pmd.util.fxdesigner.util.controls; -import java.io.BufferedWriter; import java.io.File; import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.file.Files; import java.util.function.Function; @@ -243,8 +240,7 @@ public static void saveToFileButton(Button button, Stage popupStage, Supplier testCaseLineNumberFactory(LiveTestCase liv liveTestCase.addCommitHandler(t -> pin.unsubscribe()); - Val>> map1 = mapVal.map(it -> (int j) -> Optional.ofNullable(it.get(j)).orElse(new LiveArrayList<>()).sizeProperty()); + Val>> map1 = mapVal.map(it -> (int j) -> it.entrySet().stream() + // TODO: this is probably wrong - j is not the offset, but the line number + .filter((entry) -> entry.getKey().contains(j)) + .findFirst() + .map(Map.Entry::getValue) + .orElse(new LiveArrayList<>()) + .sizeProperty()); IntFunction> numViolationsPerLine = i -> map1.flatMap(it -> it.apply(i)); diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PopOverUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PopOverUtil.java index 3f335038..a2596134 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PopOverUtil.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PopOverUtil.java @@ -64,8 +64,6 @@ public static void showAt(PopOver popOver, Window owner, javafx.scene.Node ancho popOver.show(owner, bounds.getMinX() + bounds.getWidth() / 2, bounds.getMinY() + bounds.getHeight() - offset); break; - default: - break; } } diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/DistinctBetweenStream.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/DistinctBetweenStream.java index f9cdfa0a..7719b956 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/DistinctBetweenStream.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/reactfx/DistinctBetweenStream.java @@ -33,6 +33,7 @@ public final class DistinctBetweenStream extends EventStreamBase { private final Timer timer; private Object previous = NONE; + @SuppressWarnings("PMD.AssignmentInOperand") // https://github.com/pmd/pmd/issues/6075 private DistinctBetweenStream(EventStream input, Function timerFactory) { this.input = input; this.timer = timerFactory.apply(() -> previous = NONE);