Skip to content

Commit 67c1fa0

Browse files
committed
Bump pmd from 6.26.0 to 6.34.0
1 parent e0fd2ab commit 67c1fa0

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<surefire.version>3.0.0-M5</surefire.version>
7070
<checkstyle.version>8.42</checkstyle.version>
7171
<checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
72-
<pmd.plugin.version>3.13.0</pmd.plugin.version>
72+
<pmd.plugin.version>3.14.0</pmd.plugin.version>
7373
<javadoc.plugin.version>3.0.1</javadoc.plugin.version>
7474
<source.plugin.version>3.0.1</source.plugin.version>
7575
<jar.plugin.version>3.1.0</jar.plugin.version>
@@ -78,7 +78,7 @@
7878
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7979

8080
<pmd.build-tools.version>12</pmd.build-tools.version>
81-
<pmd.check.version>6.26.0</pmd.check.version>
81+
<pmd.check.version>6.34.0</pmd.check.version>
8282

8383
<jflex-output>${project.build.directory}/generated-sources/jflex</jflex-output>
8484

src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Arrays;
2020
import java.util.Collections;
2121
import java.util.List;
22+
import java.util.Objects;
2223
import java.util.Stack;
2324
import java.util.stream.Collectors;
2425

@@ -193,7 +194,7 @@ protected void afterChildrenInit() {
193194
});
194195

195196
if (languageChoicebox.getItems().size() == 1
196-
&& languageChoicebox.getItems().get(0) == AuxLanguageRegistry.plainTextLanguage()) {
197+
&& AuxLanguageRegistry.plainTextLanguage().equals(languageChoicebox.getItems().get(0))) {
197198

198199
Platform.runLater(() -> SimplePopups.showStickyNotification(languageChoicebox, AlertType.ERROR,
199200
"No pmd language modules on classpath!",
@@ -235,7 +236,7 @@ private void loadSourceFromFile(File file) {
235236
"Pick a language?"
236237
);
237238
}
238-
} else if (guess != sourceEditorController.getLanguageVersion()) {
239+
} else if (!Objects.equals(guess, sourceEditorController.getLanguageVersion())) {
239240
// guess the language from the extension
240241
sourceEditorController.setLanguageVersion(guess);
241242
SimplePopups.showActionFeedback(

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void initialize(URL location, ResourceBundle resources) {
139139
alert.showAndWait();
140140

141141
exportResultArea.setSyntaxHighlighter(new XmlSyntaxHighlighter());
142-
if (alert.getResult() == ButtonType.YES) {
142+
if (ButtonType.YES.equals(alert.getResult())) {
143143
nameProperty().setValue("");
144144
descriptionProperty().setValue("");
145145
messageProperty().setValue("");

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PopOverWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void showOrFocus(Consumer<@NonNull PopOver> showMethod) {
5858
}
5959

6060
public void rebind(T identity) {
61-
if (identity != this.identity) {
61+
if (!Objects.equals(identity, this.identity)) {
6262
this.identity = identity;
6363
handleHiding(null);
6464
preload(() -> rebinder.apply(identity, myPopover.getValue()));

0 commit comments

Comments
 (0)