--- D:\hps\josm\trunk\src\org\openstreetmap\josm\actions\search\SearchAction.java.orig	2009-01-11 19:17:18.156250000 +0100
+++ D:\hps\josm\trunk\src\org\openstreetmap\josm\actions\search\SearchAction.java	2009-01-11 19:28:35.015625000 +0100
@@ -54,7 +54,28 @@
     public void showSearchDialog(SearchSetting initialValues) {
         JLabel label = new JLabel(tr("Please enter a search string."));
         final JTextField input = new JTextField(initialValues.text);
-        input.setToolTipText(tr("<html>Fulltext search:<ul>"
+        JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
+        JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
+        JRadioButton remove = new JRadioButton(tr("remove from selection"), initialValues.mode == SearchMode.remove);
+        ButtonGroup bg = new ButtonGroup();
+        bg.add(replace);
+        bg.add(add);
+        bg.add(remove);
+
+        JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
+        JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
+
+        JPanel left = new JPanel(new GridBagLayout());
+        left.add(label, GBC.eop());
+        left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
+        left.add(replace, GBC.eol());
+        left.add(add, GBC.eol());
+        left.add(remove, GBC.eop());
+        left.add(caseSensitive, GBC.eol());
+        left.add(regexSearch, GBC.eol());
+        
+        JPanel right = new JPanel();
+        right.add(new JLabel(tr("<html><ul>"
                 + "<li><b>Baker Street</b> - 'Baker' and 'Street' in any key or name.</li>"
                 + "<li><b>\"Baker Street\"</b> - 'Baker Street' in any key or name.</li>"
                 + "<li><b>name:Bak</b> - 'Bak' anywhere in the name.</li>"
@@ -69,27 +90,12 @@
                 + "<li><b>incomplete</b> - all incomplete objects</li>"
                 + "<li>Use <b>|</b> or <b>OR</b> to combine with logical or</li>"
                 + "<li>Use <b>\"</b> to quote operators (e.g. if key contains :)</li>"
-                + "<li>Use <b>(</b> and <b>)</b> to group expressions</li>" + "</ul></html>"));
-
-        JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
-        JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
-        JRadioButton remove = new JRadioButton(tr("remove from selection"), initialValues.mode == SearchMode.remove);
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(replace);
-        bg.add(add);
-        bg.add(remove);
-
-        JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
-        JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
-
-        JPanel p = new JPanel(new GridBagLayout());
-        p.add(label, GBC.eop());
-        p.add(input, GBC.eop().fill(GBC.HORIZONTAL));
-        p.add(replace, GBC.eol());
-        p.add(add, GBC.eol());
-        p.add(remove, GBC.eop());
-        p.add(caseSensitive, GBC.eol());
-        p.add(regexSearch, GBC.eol());
+                + "<li>Use <b>(</b> and <b>)</b> to group expressions</li>" + "</ul></html>")));
+        
+        final JPanel p = new JPanel();
+        p.add(left);
+        p.add(right);
+        
         JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
             @Override
             public void selectInitialValue() {
