Changeset 6329 in josm

Timestamp:

2013-10-27T02:53:37+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9217 - tagchecker: allow auto-fix for single test/alternative

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyKeyCommand.java (modified) (2 diffs)
• data/validation/tests/DeprecatedTags.java (modified) (3 diffs)
• data/validation/tests/TagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java

@@ -17 +17 @@
 
 /**
- * Command that replaces the key of several objects
+ * Command that replaces the key of one or several objects
  *
  */
@@ -35 +35 @@
 
     /**
-     * Constructor
+     * Constructs a new {@code ChangePropertyKeyCommand}.
+     *
+     * @param object the object subject to change replacement
+     * @param key The key to replace
+     * @param newKey the new value of the key
+     * @since 6329
+     */
+    public ChangePropertyKeyCommand(OsmPrimitive object, String key, String newKey) {
+        this(Collections.singleton(object), key, newKey);
+    }
+    
+    /**
+     * Constructs a new {@code ChangePropertyKeyCommand}.
      *
      * @param objects all objects subject to change replacement

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.ChangePropertyKeyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -213 +214 @@
                 cmds.add(new ChangePropertyCommand(p, tag.getKey(), tag.getValue()));
             }
+            if (test.size() == 1 && alternatives.size() == 1) {
+                cmds.add(new ChangePropertyKeyCommand(p, test.get(0).getKey(), alternatives.get(0).getKey())); 
+            }
             return new SequenceCommand(tr("Deprecation fix of {0}", Utils.join(", ", test)), cmds);
         }
@@ -237 +241 @@
         @Override
         public boolean isFixable() {
-            return !check.change.isEmpty();
+            return !check.change.isEmpty() || (check.test.size() == 1 && check.alternatives.size() == 1);
         }
 

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

@@ -19 +19 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -671 +670 @@
 
     @Override
-    public boolean ok()
-    {
+    public boolean ok() {
         enabled = prefCheckKeys.isSelected() || prefCheckValues.isSelected() || prefCheckComplex.isSelected() || prefCheckFixmes.isSelected();
         testBeforeUpload = prefCheckKeysBeforeUpload.isSelected() || prefCheckValuesBeforeUpload.isSelected()
@@ -716 +714 @@
                 String value = prop.getValue();
                 if (value == null || value.trim().length() == 0) {
-                    commands.add(new ChangePropertyCommand(Collections.singleton(p), key, null));
+                    commands.add(new ChangePropertyCommand(p, key, null));
                 } else if (value.startsWith(" ") || value.endsWith(" ")) {
-                    commands.add(new ChangePropertyCommand(Collections.singleton(p), key, value.trim()));
+                    commands.add(new ChangePropertyCommand(p, key, value.trim()));
                 } else if (key.startsWith(" ") || key.endsWith(" ")) {
-                    commands.add(new ChangePropertyKeyCommand(Collections.singleton(p), key, key.trim()));
+                    commands.add(new ChangePropertyKeyCommand(p, key, key.trim()));
                 } else {
                     String evalue = entities.unescape(value);
                     if (!evalue.equals(value)) {
-                        commands.add(new ChangePropertyCommand(Collections.singleton(p), key, evalue));
+                        commands.add(new ChangePropertyCommand(p, key, evalue));
                     } else {
                         String replacementKey = spellCheckKeyData.get(key);
                         if (replacementKey != null) {
-                            commands.add(new ChangePropertyKeyCommand(Collections.singleton(p),
-                                    key, replacementKey));
+                            commands.add(new ChangePropertyKeyCommand(p, key, replacementKey));
                         }
                     }