Changeset 11889 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2017-04-12T22:22:52+02:00 (7 years ago)

Author:

Don-vip

Message:

PMD - fix some InefficientEmptyStringCheck (new in PMD 5.5.5)

File:

• trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java

@@ -10 +10 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.JLabel;
@@ -61 +62 @@
         }
 
-        String searchTerm = searchTermBox.getText();
-        if (searchTerm == null || searchTerm.trim().isEmpty()) {
+        String searchTerm = Optional.ofNullable(searchTermBox.getText()).orElse("").trim();
+        if (searchTerm.isEmpty()) {
             Notification notification = new Notification(tr("You must enter a search term"));
             notification.setIcon(JOptionPane.WARNING_MESSAGE);