Changeset 8979 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-11-02T21:19:19+01:00 (8 years ago)

Author:

simon04

Message:

see #9463 - Refactoring

• Refactor SearchCompiler to work with Tagged instances
• Extract CompileSearchTextDecorator from RelationListDialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (20 diffs)
• gui/dialogs/RelationListDialog.java (modified) (4 diffs)
• gui/widgets/CompileSearchTextDecorator.java (added)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -233 +234 @@
 
     /**
-     * Base class for all search operators.
+     * Base class for all search criteria. If the criterion only depends on an object's tags,
+     * inherit from {@link org.openstreetmap.josm.actions.search.SearchCompiler.TaggedMatch}.
      */
     public abstract static class Match implements Predicate<OsmPrimitive> {
 
+        /**
+         * Tests whether the primitive matches this criterion.
+         * @param osm the primitive to test
+         * @return true if the primitive matches this criterion
+         */
         public abstract boolean match(OsmPrimitive osm);
+
+        /**
+         * Tests whether the tagged object matches this criterion.
+         * @param tagged the tagged object to test
+         * @return true if the tagged object matches this criterion
+         */
+        public boolean match(Tagged tagged) {
+            return false;
+        }
 
         /**
@@ -271 +287 @@
     }
 
+    public abstract static class TaggedMatch extends Match {
+
+        @Override
+        public abstract boolean match(Tagged tags);
+
+        @Override
+        public final boolean match(OsmPrimitive osm) {
+            return match((Tagged) osm);
+        }
+    }
+
     /**
      * A unary search operator which may take data parameters.
@@ -318 +345 @@
      * Matches every OsmPrimitive.
      */
-    public static class Always extends Match {
+    public static class Always extends TaggedMatch {
         /** The unique instance/ */
         public static final Always INSTANCE = new Always();
         @Override
-        public boolean match(OsmPrimitive osm) {
+        public boolean match(Tagged osm) {
             return true;
         }
@@ -330 +357 @@
      * Never matches any OsmPrimitive.
      */
-    public static class Never extends Match {
-        @Override
-        public boolean match(OsmPrimitive osm) {
+    public static class Never extends TaggedMatch {
+        @Override
+        public boolean match(Tagged osm) {
             return false;
         }
@@ -351 +378 @@
 
         @Override
+        public boolean match(Tagged osm) {
+            return !match.match(osm);
+        }
+
+        @Override
         public String toString() {
             return "!" + match;
@@ -363 +395 @@
      * Matches if the value of the corresponding key is ''yes'', ''true'', ''1'' or ''on''.
      */
-    private static class BooleanMatch extends Match {
+    private static class BooleanMatch extends TaggedMatch {
         private final String key;
         private final boolean defaultValue;
@@ -373 +405 @@
 
         @Override
-        public boolean match(OsmPrimitive osm) {
+        public boolean match(Tagged osm) {
             Boolean ret = OsmUtils.getOsmBoolean(osm.get(key));
             if (ret == null)
@@ -401 +433 @@
 
         @Override
+        public boolean match(Tagged osm) {
+            return lhs.match(osm) && rhs.match(osm);
+        }
+
+        @Override
         public String toString() {
             return lhs + " && " + rhs;
@@ -420 +457 @@
 
         @Override
+        public boolean match(Tagged osm) {
+            return lhs.match(osm) || rhs.match(osm);
+        }
+
+        @Override
         public String toString() {
             return lhs + " || " + rhs;
@@ -439 +481 @@
 
         @Override
+        public boolean match(Tagged osm) {
+            return lhs.match(osm) ^ rhs.match(osm);
+        }
+
+        @Override
         public String toString() {
             return lhs + " ^ " + rhs;
@@ -516 +563 @@
      * Matches objects with the given key-value pair.
      */
-    private static class KeyValue extends Match {
+    private static class KeyValue extends TaggedMatch {
         private final String key;
         private final Pattern keyPattern;
@@ -559 +606 @@
 
         @Override
-        public boolean match(OsmPrimitive osm) {
+        public boolean match(Tagged osm) {
 
             if (keyPattern != null) {
@@ -589 +636 @@
                 String mv = null;
 
-                if ("timestamp".equals(key)) {
-                    mv = DateUtils.fromTimestamp(osm.getRawTimestamp());
+                if ("timestamp".equals(key) && osm instanceof OsmPrimitive) {
+                    mv = DateUtils.fromTimestamp(((OsmPrimitive) osm).getRawTimestamp());
                 } else {
                     mv = osm.get(key);
@@ -623 +670 @@
     }
 
-    public static class ValueComparison extends Match {
+    public static class ValueComparison extends TaggedMatch {
         private final String key;
         private final String referenceValue;
@@ -648 +695 @@
 
         @Override
-        public boolean match(OsmPrimitive osm) {
+        public boolean match(Tagged osm) {
             final String currentValue = osm.get(key);
             final int compareResult;
@@ -676 +723 @@
      * Matches objects with the exact given key-value pair.
      */
-    public static class ExactKeyValue extends Match {
+    public static class ExactKeyValue extends TaggedMatch {
 
         private enum Mode {
@@ -749 +796 @@
 
         @Override
-        public boolean match(OsmPrimitive osm) {
+        public boolean match(Tagged osm) {
 
             if (!osm.hasKeys())
@@ -806 +853 @@
      * Match a string in any tags (key or value), with optional regex and case insensitivity.
      */
-    private static class Any extends Match {
+    private static class Any extends TaggedMatch {
         private final String search;
         private final Pattern searchRegex;
@@ -833 +880 @@
 
         @Override
-        public boolean match(OsmPrimitive osm) {
-            if (!osm.hasKeys() && osm.getUser() == null)
+        public boolean match(Tagged osm) {
+            if (!osm.hasKeys())
                 return search.isEmpty();
 

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

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29 +30 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -70 +68 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
+import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -283 +282 @@
         final JosmTextField f = new DisableShortcutsOnFocusGainedTextField();
         f.setToolTipText(tr("Relation list filter"));
-        f.getDocument().addDocumentListener(new DocumentListener() {
-
-            private void setFilter() {
-                try {
-                    f.setBackground(UIManager.getColor("TextField.background"));
-                    f.setToolTipText(tr("Relation list filter"));
-                    model.setFilter(SearchCompiler.compile(filter.getText()));
-                } catch (SearchCompiler.ParseError ex) {
-                    f.setBackground(new Color(255, 224, 224));
-                    f.setToolTipText(ex.getMessage());
-                    model.setFilter(new SearchCompiler.Always());
-                }
-            }
-
+        final CompileSearchTextDecorator decorator = CompileSearchTextDecorator.decorate(f);
+        f.addPropertyChangeListener("filter", new PropertyChangeListener() {
             @Override
-            public void insertUpdate(DocumentEvent e) {
-                setFilter();
-            }
-
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                setFilter();
-            }
-
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-                setFilter();
+            public void propertyChange(PropertyChangeEvent evt) {
+                model.setFilter(decorator.getMatch());
             }
         });