Changeset 8945 in josm

Timestamp:

2015-10-25T12:59:42+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12008 - do not create empty commands from tagging preset dialog + add robustness

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyCommand.java (modified) (7 diffs)
• command/Command.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)

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

@@ -28 +28 @@
  *
  * @author imi
+ * @since 24
  */
 public class ChangePropertyCommand extends Command {
@@ -33 +34 @@
      * All primitives that are affected with this command.
      */
-    private final List<OsmPrimitive> objects;
+    private final List<OsmPrimitive> objects = new LinkedList<>();
+
     /**
      * Key and value pairs. If value is <code>null</code>, delete all key references with the given
@@ -48 +50 @@
      */
     public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, Map<String, String> tags) {
-        this.objects = new LinkedList<>();
         this.tags = tags;
         init(objects);
@@ -61 +62 @@
      */
     public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, String key, String value) {
-        this.objects = new LinkedList<>();
         this.tags = new HashMap<>(1);
         this.tags.put(key, value);
@@ -108 +108 @@
     @Override
     public boolean executeCommand() {
+        if (objects.isEmpty())
+            return true;
         final DataSet dataSet = objects.get(0).getDataSet();
         dataSet.beginUpdate();
@@ -197 +199 @@
     }
 
-    @Override public Collection<PseudoCommand> getChildren() {
+    @Override
+    public Collection<PseudoCommand> getChildren() {
         if (objects.size() == 1)
             return null;
@@ -221 +224 @@
 
     /**
+     * Returns the number of objects that will effectively be modified, before the command is executed.
+     * @return the number of objects that will effectively be modified (can be 0)
+     * @see Command#getParticipatingPrimitives()
+     * @since 8945
+     */
+    public final int getObjectsNumber() {
+        return objects.size();
+    }
+
+    /**
      * Returns the tags to set (key/value pairs).
      * @return the tags to set (key/value pairs)

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

@@ -240 +240 @@
     /**
      * Return the primitives that take part in this command.
+     * The collection is computed during execution.
      */
     @Override

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -453 +453 @@
         List<Command> cmds = new ArrayList<>();
         for (Tag tag: changedTags) {
-            cmds.add(new ChangePropertyCommand(sel, tag.getKey(), tag.getValue()));
+            ChangePropertyCommand cmd = new ChangePropertyCommand(sel, tag.getKey(), tag.getValue());
+            if (cmd.getObjectsNumber() > 0) {
+                cmds.add(cmd);
+            }
         }