Changeset 8971 in josm for trunk

Timestamp:

2015-10-31T01:32:04+01:00 (9 years ago)

Author:

Don-vip

Message:

Search dialog: provide real-time visual feedback on valid/invalid search expressions typed by user

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (4 diffs)
• SearchCompiler.java (modified) (1 diff)

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

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -228 +229 @@
         JLabel label = new JLabel(initialValues instanceof Filter ? tr("Filter string:") : tr("Search string:"));
         final HistoryComboBox hcbSearchString = new HistoryComboBox();
+        final String tooltip = tr("Enter the search expression");
         hcbSearchString.setText(initialValues.text);
-        hcbSearchString.setToolTipText(tr("Enter the search expression"));
+        hcbSearchString.setToolTipText(tooltip);
         // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         //
@@ -280 +282 @@
         right = new JPanel(new GridBagLayout());
         buildHints(right, hcbSearchString);
+
+        final JTextComponent editorComponent = (JTextComponent) hcbSearchString.getEditor().getEditorComponent();
+        editorComponent.getDocument().addDocumentListener(new AbstractTextComponentValidator(editorComponent) {
+
+            @Override
+            public void validate() {
+                if (!isValid()) {
+                    feedbackInvalid(tr("Invalid search expression"));
+                } else {
+                    feedbackValid(tooltip);
+                }
+            }
+
+            @Override
+            public boolean isValid() {
+                try {
+                    SearchSetting ss = new SearchSetting();
+                    ss.text = hcbSearchString.getText();
+                    ss.caseSensitive = caseSensitive.isSelected();
+                    ss.regexSearch = regexSearch.isSelected();
+                    ss.mapCSSSearch = mapCSSSearch.isSelected();
+                    SearchCompiler.compile(ss);
+                    return true;
+                } catch (ParseError e) {
+                    return false;
+                }
+            }
+        });
 
         final JPanel p = new JPanel(new GridBagLayout());
@@ -619 +649 @@
         }
 
+        /**
+         * Constructs a new {@code SearchSetting} from an existing one.
+         * @param original original search settings
+         */
         public SearchSetting(SearchSetting original) {
             text = original.text;

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

@@ -635 +635 @@
             Double v = null;
             try {
-                v = Double.valueOf(referenceValue);
+                if (referenceValue != null) {
+                    v = Double.valueOf(referenceValue);
+                }
             } catch (NumberFormatException ignore) {
                 if (Main.isTraceEnabled()) {