Changeset 6738 in josm for trunk/src/org

Timestamp:

2014-01-19T18:47:49+01:00 (11 years ago)

Author:

simon04

Message:

Add "Search for objects by preset" action

This allows to use presets for searching for objects.
SHIFT+F3 displays the preset dialog and after confirmation, the objects matching the preset are selected.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (4 diffs)
• tagging/TaggingPreset.java (modified) (2 diffs)
• tagging/TaggingPresetSearchDialog.java (modified) (1 diff)
• tagging/TaggingPresetSearchPrimitiveDialog.java (added)
• tagging/TaggingPresetSelector.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -114 +114 @@
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchPrimitiveDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -375 +376 @@
 
     public final TaggingPresetSearchAction presetSearchAction = new TaggingPresetSearchAction();
+    public final TaggingPresetSearchPrimitiveDialog.Action presetSearchPrimitiveAction = new TaggingPresetSearchPrimitiveDialog.Action();
     public final DialogsToggleAction dialogsToggleAction = new DialogsToggleAction();
     public FullscreenToggleAction fullscreenToggleAction = null;
@@ -640 +642 @@
         editMenu.addSeparator();
         add(editMenu, search);
+        add(editMenu, presetSearchPrimitiveAction);
         editMenu.addSeparator();
         add(editMenu, preferences);
@@ -700 +703 @@
 
         add(presetsMenu, presetSearchAction);
+        add(presetsMenu, presetSearchPrimitiveAction);
         add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
                 tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -66 +66 @@
  * @since 294
  */
-public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener {
+public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener, Predicate<OsmPrimitive> {
 
     public static final int DIALOG_ANSWER_APPLY = 1;
@@ -463 +463 @@
     }
 
+    @Override
+    public boolean evaluate(OsmPrimitive p) {
+        return matches(EnumSet.of(TaggingPresetType.forPrimitive(p)), p.getKeys(), false);
+    }
+
     public boolean matches(Collection<TaggingPresetType> t, Map<String, String> tags, boolean onlyShowable) {
         if (onlyShowable && !isShowable())

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java

@@ -34 +34 @@
     private TaggingPresetSearchDialog() {
         super(Main.parent, tr("Presets"), new String[] {tr("Select"), tr("Cancel")});
-        selector = new TaggingPresetSelector();
+        selector = new TaggingPresetSelector(true, true);
         setContent(selector);
         DataSet.addSelectionListener(selector);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java

@@ -201 +201 @@
      * Constructs a new {@code TaggingPresetSelector}.
      */
-    public TaggingPresetSelector() {
+    public TaggingPresetSelector(boolean displayOnlyApplicable, boolean displaySearchInTags) {
         super(new BorderLayout());
         if (TaggingPresetPreference.taggingPresets!=null) {
@@ -260 +260 @@
         pnChecks.setLayout(new BoxLayout(pnChecks, BoxLayout.Y_AXIS));
 
-        ckOnlyApplicable = new JCheckBox();
-        ckOnlyApplicable.setText(tr("Show only applicable to selection"));
-        pnChecks.add(ckOnlyApplicable);
-        ckOnlyApplicable.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                filterPresets();
-            }
-        });
-
-        ckSearchInTags = new JCheckBox();
-        ckSearchInTags.setText(tr("Search in tags"));
-        ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
-        ckSearchInTags.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                filterPresets();
-            }
-        });
-        pnChecks.add(ckSearchInTags);
+        if (displayOnlyApplicable) {
+            ckOnlyApplicable = new JCheckBox();
+            ckOnlyApplicable.setText(tr("Show only applicable to selection"));
+            pnChecks.add(ckOnlyApplicable);
+            ckOnlyApplicable.addItemListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    filterPresets();
+                }
+            });
+        }
+
+        if (displaySearchInTags) {
+            ckSearchInTags = new JCheckBox();
+            ckSearchInTags.setText(tr("Search in tags"));
+            ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
+            ckSearchInTags.addItemListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    filterPresets();
+                }
+            });
+            pnChecks.add(ckSearchInTags);
+        }
 
         add(pnChecks, BorderLayout.SOUTH);
@@ -317 +321 @@
         }
 
-        boolean onlyApplicable = ckOnlyApplicable.isSelected();
-        boolean inTags = ckSearchInTags.isSelected();
+        boolean onlyApplicable = ckOnlyApplicable != null && ckOnlyApplicable.isSelected();
+        boolean inTags = ckSearchInTags != null && ckSearchInTags.isSelected();
 
         List<PresetClassification> result = new ArrayList<PresetClassification>();
@@ -402 +406 @@
 
     public void init() {
-        ckOnlyApplicable.setEnabled(!getTypesInSelection().isEmpty());
-        ckOnlyApplicable.setSelected(!getTypesInSelection().isEmpty() && ONLY_APPLICABLE.get());
+        if (ckOnlyApplicable != null) {
+            ckOnlyApplicable.setEnabled(!getTypesInSelection().isEmpty());
+            ckOnlyApplicable.setSelected(!getTypesInSelection().isEmpty() && ONLY_APPLICABLE.get());
+        }
         edSearchText.setText("");
         filterPresets();
@@ -423 +429 @@
      */
     public void savePreferences() {
-        SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
-        if (ckOnlyApplicable.isEnabled()) {
+        if (ckSearchInTags != null) {
+            SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
+        }
+        if (ckOnlyApplicable != null && ckOnlyApplicable.isEnabled()) {
             ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected());
         }