Changeset 2333 in josm for trunk/src

Timestamp:

2009-10-27T19:03:58+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3753: Merging the ends of two node ways produces corrupt way

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeNodesAction.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -197 +197 @@
             }
         }
-        cmds.add(new DeleteCommand(waysToDelete));
+        if (!waysToDelete.isEmpty()) {
+            cmds.add(new DeleteCommand(waysToDelete));
+        }
         return cmds;
     }

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

@@ -51 +51 @@
      * Constructor. Deletes a collection of primitives in the current edit layer.
      * 
-     * @param data the primitives to delete
-     */
-    public DeleteCommand(Collection<? extends OsmPrimitive> data) {
-        if (data == null) {
-            data = Collections.emptyList();
-        }
+     * @param data the primitives to delete. Must neither be null nor empty.
+     * @throws IllegalArgumentException thrown if data is null or empty
+     */
+    public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException {
+        if (data == null) 
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
+        if (data.isEmpty())
+            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));            
         this.toDelete = data;
     }
@@ -93 +95 @@
      *
      * @param layer the layer context for deleting these primitives. Must not be null.
-     * @param data the primitives to delete
+     * @param data the primitives to delete. Must neither be null nor empty.
      * @throws IllegalArgumentException thrown if layer is null
+     * @throws IllegalArgumentException thrown if data is null or empty
      */
     public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{
         super(layer);
-        if (data == null) {
-            data = Collections.emptyList();
-        }
+        if (data == null) 
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
+        if (data.isEmpty())
+            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));            
         this.toDelete = data;
     }