Changeset 5947 in josm for trunk/src

Timestamp:

2013-05-09T03:29:40+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8692 - Handle null DeleteCommands in JoinAreaAction and ImproveWayAccuracyAction

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JoinAreasAction.java (modified) (1 diff)
• mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)

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

@@ -507 +507 @@
         // Delete the discarded inner ways
         if (discardedWays.size() > 0) {
-            cmds.add(DeleteCommand.delete(Main.map.mapView.getEditLayer(), discardedWays, true));
-            commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
+            Command deleteCmd = DeleteCommand.delete(Main.map.mapView.getEditLayer(), discardedWays, true);
+            if (deleteCmd != null) {
+                cmds.add(deleteCmd);
+                commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
+            }
         }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -469 +469 @@
                     nodeList.add(candidateNode);
                     Command deleteCmd = DeleteCommand.delete(getEditLayer(), nodeList, true);
-                    Main.main.undoRedo.add(deleteCmd);
+                    if (deleteCmd != null) {
+                        Main.main.undoRedo.add(deleteCmd);
+                    }
                 }