Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4831) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4832) @@ -8,9 +8,13 @@ import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -26,4 +30,6 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; +import javax.swing.JTextField; +import javax.swing.text.BadLocationException; import org.openstreetmap.josm.Main; @@ -42,4 +48,5 @@ import org.openstreetmap.josm.tools.Property; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Utils; public class SearchAction extends JosmAction implements ParameterizedAction { @@ -151,4 +158,45 @@ public String toString() { return s.toString(); + } + } + + private static class SearchKeywordRow extends JPanel { + + private final HistoryComboBox hcb; + + public SearchKeywordRow(HistoryComboBox hcb) { + super(new FlowLayout(FlowLayout.LEFT)); + this.hcb = hcb; + } + + public SearchKeywordRow addTitle(String title) { + add(new JLabel(tr("{0}: ", title))); + return this; + } + + public SearchKeywordRow addKeyword(String displayText, final String insertText, String description, String... examples) { + JLabel label = new JLabel("
" + displayText + "
"); + add(label); + if (description != null || examples.length > 0) { + label.setToolTipText("" + + description + + (examples.length > 0 ? ("") : "") + + ""); + } + if (insertText != null) { + label.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + try { + JTextField tf = (JTextField) hcb.getEditor().getEditorComponent(); + tf.getDocument().insertString(tf.getCaretPosition(), " " + insertText, null); + } catch (BadLocationException ex) { + throw new RuntimeException(ex.getMessage(), ex); + } + } + }); + } + return this; } } @@ -188,5 +236,5 @@ allElements.setToolTipText(tr("Also include incomplete and deleted objects in search.")); final JCheckBox regexSearch = new JCheckBox(tr("regular expression"), initialValues.regexSearch); - final JCheckBox addOnToolbar = new JCheckBox(tr("Add toolbar button"), false); + final JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false); JPanel top = new JPanel(new GridBagLayout()); @@ -206,5 +254,78 @@ } - JPanel right = new JPanel(); + final JPanel right; + if (Main.pref.getBoolean("dialog.search.new", false)) { + right = new JPanel(new GridBagLayout()); + buildHintsNew(right, hcbSearchString); + } else { + right = new JPanel(); + buildHints(right); + } + + final JPanel p = new JPanel(new GridBagLayout()); + p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0)); + p.add(left, GBC.std().anchor(GBC.NORTH).insets(5, 10, 10, 0)); + p.add(right, GBC.eol()); + ExtendedDialog dialog = new ExtendedDialog( + Main.parent, + initialValues instanceof Filter ? tr("Filter") : tr("Search"), + new String[] { + initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"), + tr("Cancel")} + ) { + @Override + protected void buttonAction(int buttonIndex, ActionEvent evt) { + if (buttonIndex == 0) { + try { + SearchCompiler.compile(hcbSearchString.getText(), caseSensitive.isSelected(), regexSearch.isSelected()); + super.buttonAction(buttonIndex, evt); + } catch (ParseError e) { + JOptionPane.showMessageDialog( + Main.parent, + tr("Search expression is not valid: \n\n {0}", e.getMessage()), + tr("Invalid search expression"), + JOptionPane.ERROR_MESSAGE); + } + } else { + super.buttonAction(buttonIndex, evt); + } + } + }; + dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"}); + dialog.configureContextsensitiveHelp("/Action/Search", true /* show help button */); + dialog.setContent(p); + dialog.showDialog(); + int result = dialog.getValue(); + + if(result != 1) return null; + + // User pressed OK - let's perform the search + SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace + : (add.isSelected() ? SearchAction.SearchMode.add + : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection)); + initialValues.text = hcbSearchString.getText(); + initialValues.mode = mode; + initialValues.caseSensitive = caseSensitive.isSelected(); + initialValues.allElements = allElements.isSelected(); + initialValues.regexSearch = regexSearch.isSelected(); + + if (addOnToolbar.isSelected()) { + ToolbarPreferences.ActionDefinition aDef = + new ToolbarPreferences.ActionDefinition(Main.main.menu.search); + aDef.getParameters().put("searchExpression", initialValues); + // parametrized action definition is now composed + ActionParser actionParser = new ToolbarPreferences.ActionParser(null); + String res = actionParser.saveAction(aDef); + + Collection t = new LinkedList(ToolbarPreferences.getToolString()); + // add custom search button to toolbar preferences + if (!t.contains(res)) t.add(res); + Main.pref.putCollection("toolbar", t); + Main.toolbar.refreshToolbarControl(); + } + return initialValues; + } + + private static void buildHints(JPanel right) { DescriptionTextBuilder descriptionText = new DescriptionTextBuilder(); descriptionText.append("