Changeset 15779 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

Timestamp:

2020-01-26T20:10:39+01:00 (4 years ago)

Author:

simon04

Message:

fix #14197 - Advanced Preferences: support search keywords "modified", "default", "changed"

File:

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

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

@@ -20 +20 @@
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -476 +477 @@
             String prefValue = valueSetting.getValue() == null ? "" : valueSetting.getValue().toString();
 
-            String[] input = txtFilter.getText().split("\\s+");
-            boolean canHas = true;
 
             // Make 'wmsplugin cache' search for e.g. 'cache.wmsplugin'
             final String prefKeyLower = prefKey.toLowerCase(Locale.ENGLISH);
             final String prefValueLower = prefValue.toLowerCase(Locale.ENGLISH);
-            for (String bit : input) {
-                bit = bit.toLowerCase(Locale.ENGLISH);
-                if (!prefKeyLower.contains(bit) && !prefValueLower.contains(bit)) {
-                    canHas = false;
-                    break;
-                }
-            }
+            final boolean canHas = Pattern.compile("\\s+").splitAsStream(txtFilter.getText())
+                    .map(bit -> bit.toLowerCase(Locale.ENGLISH))
+                    .anyMatch(bit -> {
+                        switch (bit) {
+                            // syntax inspired by SearchCompiler
+                            case "changed":
+                                return e.isChanged();
+                            case "modified":
+                            case "-default":
+                                return !e.isDefault();
+                            case "-modified":
+                            case "default":
+                                return e.isDefault();
+                            default:
+                                return prefKeyLower.contains(bit) || prefValueLower.contains(bit);
+                        }
+                    });
             if (canHas) {
                 displayData.add(e);