Changeset 6452 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/advanced/ListEditor.java (modified) (4 diffs)
• tools/Predicate.java (modified) (1 diff)

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 @@
         }
     }
-
 }

trunk/src/org/openstreetmap/josm/tools/Predicate.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-// Used to identify objects that fulfill a certain condition, e.g. when filtering a collection
+/**
+ * Used to identify objects that fulfill a certain condition, e.g. when filtering a collection.
+ *
+ * @param <T> The objects type
+ * @since 3177
+ */
 public interface Predicate<T> {
-    // @return whether the object passes the test or not
+    
+    /**
+     * Determines whether the object passes the test or not
+     * @param object The object to evaluate
+     * @return {@code true} if the object passes the test, {@code false} otherwise
+     */
     public boolean evaluate(T object);
 }