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

Timestamp:

2016-03-06T17:12:42+01:00 (9 years ago)

Author:

simon04

Message:

see #12554 - Allow to ignore keys/tags from recent tags

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• actions/search/SearchCompiler.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/properties/RecentTagCollection.java (modified) (6 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -773 +773 @@
         return Collections.<ActionParameter<?>>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION));
     }
-
-    public static String escapeStringForSearch(String s) {
-        return s.replace("\\", "\\\\").replace("\"", "\\\"");
-    }
 }

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1745 +1745 @@
         return searchFlags;
     }
+
+    static String escapeStringForSearch(String s) {
+        return s.replace("\\", "\\\\").replace("\"", "\\\"");
+    }
+
+    /**
+     * Builds a search string for the given tag. If value is empty, the existence of the key is checked.
+     *
+     * @param key   the tag key
+     * @param value the tag value
+     * @return a search string for the given tag
+     */
+    public static String buildSearchStringForTag(String key, String value) {
+        final String forKey = '"' + escapeStringForSearch(key) + '"' + '=';
+        if (value == null || value.isEmpty()) {
+            return forKey + "*";
+        } else {
+            return forKey + '"' + escapeStringForSearch(value) + '"';
+        }
+    }
 }

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

@@ -1401 +1401 @@
             String token = new StringBuilder(t).append(val).toString();
             if (consideredTokens.add(token)) {
-                s.append(sep).append('(').append(t).append('"').append(
-                        org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(key)).append("\"=\"").append(
-                        org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(val)).append("\")");
+                s.append(sep).append('(').append(t).append(SearchCompiler.buildSearchStringForTag(key, val)).append(")");
                 sep = " OR ";
             }

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

@@ -8 +8 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.preferences.CollectionProperty;
@@ -14 +16 @@
 
     private final Map<Tag, Void> recentTags;
+    private SearchCompiler.Match tagsToIgnore;
 
     RecentTagCollection(final int capacity) {
@@ -23 +26 @@
             }
         };
+        tagsToIgnore = new SearchCompiler.Never();
     }
 
@@ -31 +35 @@
             String key = it.next();
             String value = it.next();
-            recentTags.put(new Tag(key, value), null);
+            add(new Tag(key, value));
         }
     }
@@ -44 +48 @@
     }
 
-    public void add(Tag key) {
-        recentTags.put(key, null);
+    public void add(Tag tag) {
+        if (!tagsToIgnore.match(tag)) {
+            recentTags.put(tag, null);
+        }
     }
 
@@ -55 +61 @@
         return new ArrayList<>(recentTags.keySet());
     }
+
+    public void setTagsToIgnore(SearchCompiler.Match tagsToIgnore) {
+        this.tagsToIgnore = tagsToIgnore;
+        final Iterator<Tag> it = recentTags.keySet().iterator();
+        while (it.hasNext()) {
+            if (tagsToIgnore.match(it.next())) {
+                it.remove();
+            }
+        }
+    }
+
+    public void setTagsToIgnore(SearchAction.SearchSetting tagsToIgnore) throws SearchCompiler.ParseError {
+        setTagsToIgnore(tagsToIgnore.text.isEmpty() ? new SearchCompiler.Never() : SearchCompiler.compile(tagsToIgnore));
+    }
+
+    public SearchAction.SearchSetting ignoreTag(Tag tagToIgnore, SearchAction.SearchSetting settingToUpdate) throws SearchCompiler.ParseError {
+        final String forTag = SearchCompiler.buildSearchStringForTag(tagToIgnore.getKey(), tagToIgnore.getValue());
+        settingToUpdate.text = settingToUpdate.text.isEmpty()
+                ? forTag
+                : settingToUpdate.text + " OR " + forTag;
+        setTagsToIgnore(settingToUpdate);
+        return settingToUpdate;
+    }
 }

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

@@ -37 +37 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
@@ -57 +58 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.text.JTextComponent;
@@ -62 +64 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -71 +75 @@
 import org.openstreetmap.josm.data.preferences.EnumProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -125 +130 @@
             DEFAULT_LRU_TAGS_NUMBER);
     /** The preference storage of recent tags */
-    public static final CollectionProperty COLLECTION_PROPERTY = new CollectionProperty("properties.recent-tags",
+    public static final CollectionProperty PROPERTY_RECENT_TAGS = new CollectionProperty("properties.recent-tags",
             Collections.<String>emptyList());
+    public static final StringProperty PROPERTY_TAGS_TO_IGNORE = new StringProperty("properties.recent-tags.ignore",
+            new SearchAction.SearchSetting().writeToString());
 
     /**
@@ -159 +166 @@
 
     final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER);
+    SearchAction.SearchSetting tagsToIgnore;
 
     // Copy of recently added tags, used to cache initial status
@@ -286 +294 @@
      */
     public void loadTagsIfNeeded() {
+        loadTagsToIgnore();
         if (PROPERTY_REMEMBER_TAGS.get() && recentTags.isEmpty()) {
-            recentTags.loadFromPreference(COLLECTION_PROPERTY);
-        }
+            recentTags.loadFromPreference(PROPERTY_RECENT_TAGS);
+        }
+    }
+
+    void loadTagsToIgnore() {
+        final SearchAction.SearchSetting searchSetting = Utils.firstNonNull(
+                SearchAction.SearchSetting.readFromString(PROPERTY_TAGS_TO_IGNORE.get()), new SearchAction.SearchSetting());
+        if (!Objects.equals(tagsToIgnore, searchSetting)) {
+            try {
+                tagsToIgnore = searchSetting;
+                recentTags.setTagsToIgnore(tagsToIgnore);
+            } catch (SearchCompiler.ParseError parseError) {
+                warnAboutParseError(parseError);
+                tagsToIgnore = new SearchAction.SearchSetting();
+                recentTags.setTagsToIgnore(new SearchCompiler.Never());
+            }
+        }
+    }
+
+    private void warnAboutParseError(SearchCompiler.ParseError parseError) {
+        Main.warn(parseError);
+        JOptionPane.showMessageDialog(
+                Main.parent,
+                parseError.getMessage(),
+                tr("Error"),
+                JOptionPane.ERROR_MESSAGE
+        );
     }
 
@@ -296 +330 @@
     public void saveTagsIfNeeded() {
         if (PROPERTY_REMEMBER_TAGS.get() && !recentTags.isEmpty()) {
-            recentTags.saveToPreference(COLLECTION_PROPERTY);
+            recentTags.saveToPreference(PROPERTY_RECENT_TAGS);
         }
     }
@@ -924 +958 @@
                         public void mouseClicked(MouseEvent e) {
                             action.actionPerformed(null);
-                            if (e.isShiftDown()) {
+                            if (SwingUtilities.isRightMouseButton(e)) {
+                                new TagPopupMenu(t).show(e.getComponent(), e.getX(), e.getY());
+                            } else if (e.isShiftDown()) {
                                 // add tags on Shift-Click
                                 performTagAdding();
@@ -952 +988 @@
         }
 
+        class TagPopupMenu extends JPopupMenu {
+
+            TagPopupMenu(Tag t) {
+                add(new IgnoreTagAction(tr("Ignore key ''{0}''", t.getKey()), new Tag(t.getKey(), "")));
+                add(new IgnoreTagAction(tr("Ignore tag ''{0}''", t), t));
+                add(new EditIgnoreTagsAction());
+            }
+        }
+
+        class IgnoreTagAction extends AbstractAction {
+            final Tag tag;
+
+            IgnoreTagAction(String name, Tag tag) {
+                super(name);
+                this.tag = tag;
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    recentTags.ignoreTag(tag, tagsToIgnore);
+                    PROPERTY_TAGS_TO_IGNORE.put(tagsToIgnore.writeToString());
+                } catch (SearchCompiler.ParseError parseError) {
+                    throw new IllegalStateException(parseError);
+                }
+            }
+        }
+
+        class EditIgnoreTagsAction extends AbstractAction {
+
+            EditIgnoreTagsAction() {
+                super(tr("Edit ignore list"));
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final SearchAction.SearchSetting newTagsToIngore = SearchAction.showSearchDialog(tagsToIgnore);
+                if (newTagsToIngore == null) {
+                    return;
+                }
+                try {
+                    tagsToIgnore = newTagsToIngore;
+                    recentTags.setTagsToIgnore(tagsToIgnore);
+                    PROPERTY_TAGS_TO_IGNORE.put(tagsToIgnore.writeToString());
+                } catch (SearchCompiler.ParseError parseError) {
+                    warnAboutParseError(parseError);
+                }
+            }
+        }
+
         public void destroyActions() {
             for (JosmAction action : recentTagsActions) {