Changeset 1397 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-02-14T12:25:54+01:00 (15 years ago)

Author:

stoecker

Message:

apply patches from xeen for #1977.

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -55 +56 @@
         JLabel label = new JLabel(tr("Please enter a search string."));
         final JTextField input = new JTextField(initialValues.text);
+        input.selectAll();
+        input.requestFocusInWindow();
         JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
         JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
@@ -99 +102 @@
         p.add(left);
         p.add(right);
-
-        JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
-            @Override
-            public void selectInitialValue() {
-                input.requestFocusInWindow();
-                input.selectAll();
-            }
-        };
-        pane.createDialog(Main.parent, tr("Search")).setVisible(true);
-        if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
-            return;
+        
+        int result = new ExtendedDialog(Main.parent, 
+            tr("Search"), 
+            p,
+            new String[] {tr("Start Search"), tr("Cancel")}, 
+            new String[] {"dialogs/search.png", "cancel.png"}).getValue();  
+        if(result != 1) return;
+
         // User pressed OK - let's perform the search
         SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace