Changeset 11198 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-10-30T22:32:05+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13881 - handle cases where JOptionPane.showInputDialog returns an empty string

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• preferences/plugin/PluginPreference.java (modified) (2 diffs)
• widgets/EditableList.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -817 +817 @@
             while (true) {
                 s = JOptionPane.showInputDialog(this, tr("Please enter the number of recently added tags to display"), s);
-                if (s == null) {
+                if (s == null || s.isEmpty()) {
                     return;
                 }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -591 +591 @@
                             JOptionPane.QUESTION_MESSAGE
                             );
-                    if (s != null) {
+                    if (s != null && !s.isEmpty()) {
                         model.addElement(s);
                     }
@@ -617 +617 @@
                             list.getSelectedValue()
                             );
-                    if (s != null) {
+                    if (s != null && !s.isEmpty()) {
                         model.setElementAt(s, list.getSelectedIndex());
                     }

trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java

@@ -50 +50 @@
                     title,
                     JOptionPane.QUESTION_MESSAGE);
-            if (source != null) {
+            if (source != null && !source.isEmpty()) {
                 ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
             }
@@ -65 +65 @@
                 if (sourcesList.getModel().getSize() == 0) {
                     String source1 = JOptionPane.showInputDialog(Main.parent, title, title, JOptionPane.QUESTION_MESSAGE);
-                    if (source1 != null) {
+                    if (source1 != null && !source1.isEmpty()) {
                         ((DefaultListModel<String>) sourcesList.getModel()).addElement(source1);
                     }
@@ -82 +82 @@
                         JOptionPane.QUESTION_MESSAGE, null, null,
                         sourcesList.getSelectedValue());
-                if (source2 != null) {
+                if (source2 != null && !source2.isEmpty()) {
                     ((DefaultListModel<String>) sourcesList.getModel()).setElementAt(source2, row);
                 }