Changeset 19414 in josm for trunk/src

Timestamp:

2025-06-23T07:29:59+02:00 (2 weeks ago)

Author:

GerdP

Message:

fix #24333: Search dialog should not offer some options when nothing is selected and a selection is needed

• disable radio buttons which need a selection, set mode to replace if search dialog is opened with empty collection (but not when a Filter is created)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java

@@ -29 +29 @@
 import javax.swing.text.JTextComponent;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Filter;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -92 +93 @@
         this.searchSettings = new SearchSetting(initialValues);
         setContent(buildPanel(options));
+
+        // See #24333
+        if (!(initialValues instanceof Filter)) {
+            DataSet data = MainApplication.getLayerManager().getActiveDataSet();
+            if (data != null && data.getSelected().isEmpty()) {
+                remove.setEnabled(false);
+                inSelection.setEnabled(false);
+                if (this.searchSettings.mode == SearchMode.in_selection
+                        || this.searchSettings.mode == SearchMode.remove) {
+                    this.searchSettings.mode = SearchMode.replace;
+                    replace.setSelected(true);
+                }
+            }
+        }
     }