Changeset 6452 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

Timestamp:

2013-12-07T14:47:47+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9360 - listed Values in Enhanced Preferences cannot be removed completely

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -28 +30 @@
     PrefEntry entry;
 
+    /**
+     * Constructs a new {@code ListEditor}.
+     */
     public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
         super(gui, tr("Change list setting"), new String[] {tr("OK"), tr("Cancel")});
@@ -42 +47 @@
     }
 
+    /**
+     * Returns the list of values.
+     * @return The list of values.
+     */
     public List<String> getData() {
-        return data;
+        return new ArrayList<String>(Utils.filter(data, new Predicate<String>() {
+            @Override
+            public boolean evaluate(String object) {
+                return object != null && !object.isEmpty();
+            }
+        }));
     }
 
@@ -101 +115 @@
         }
     }
-
 }