Changeset 13561 in josm for trunk

Timestamp:

2018-03-25T04:44:43+02:00 (7 years ago)

Author:

Don-vip

Message:

extract KeyValueVisitor from AbstractPrimitive, support Tagged objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/KeyValueVisitor.java (added)
• data/validation/tests/UntaggedNode.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -26 +26 @@
 */
 public abstract class AbstractPrimitive implements IPrimitive {
-
-    /**
-     * This is a visitor that can be used to loop over the keys/values of this primitive.
-     *
-     * @author Michael Zangl
-     * @since 8742
-     * @since 10600 (functional interface)
-     */
-    @FunctionalInterface
-    public interface KeyValueVisitor {
-
-        /**
-         * This method gets called for every tag received.
-         *
-         * @param primitive This primitive
-         * @param key   The key
-         * @param value The value
-         */
-        void visitKeyValue(AbstractPrimitive primitive, String key, String value);
-    }
 
     private static final AtomicLong idCounter = new AtomicLong(0);

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
+import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -20 +21 @@
  * @author frsantos
  */
-public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisitor {
+public class UntaggedNode extends Test implements KeyValueVisitor {
 
     protected static final int UNTAGGED_NODE_BLANK = 201;
@@ -54 +55 @@
     }
 
-    private static OsmPrimitive[] castPrim(AbstractPrimitive n) {
+    private static OsmPrimitive[] castPrim(Tagged n) {
         return n instanceof OsmPrimitive ? (new OsmPrimitive[]{(OsmPrimitive) n}) : (new OsmPrimitive[0]);
     }
 
     @Override
-    public void visitKeyValue(AbstractPrimitive n, String key, String value) {
+    public void visitKeyValue(Tagged n, String key, String value) {
         if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) {
             /* translation note: don't translate quoted words */

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -30 +30 @@
 
 import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive.KeyValueVisitor;
+import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
@@ -197 +197 @@
 
             @Override
-            public void visitKeyValue(AbstractPrimitive p, String key, String value) {
+            public void visitKeyValue(Tagged p, String key, String value) {
                 MapCSSKeyRules v = index.get(key);
                 if (v != null) {