Changeset 36134 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2023-09-07T18:20:01+02:00 (22 months ago)

Author:

taylor.smock

Message:

Use DeleteCommand.delete where possible and fix some potential NPEs from its usage

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -257 +257 @@
             }
             SplitWayCommand result = SplitWayCommand.splitWay(
-                    selectedWay, wayChunks, Collections.<OsmPrimitive>emptyList());
+                    selectedWay, wayChunks, Collections.emptyList());
             if (splitWay != null) {
                 result.executeCommand();
                 Command delCmd = DeleteCommand.delete(Collections.singletonList(splitWay));
-                delCmd.executeCommand();
-                UndoRedoHandler.getInstance().add(new SplitObjectCommand(Arrays.asList(result, delCmd)), false);
+                if (delCmd != null) {
+                    delCmd.executeCommand();
+                    UndoRedoHandler.getInstance().add(new SplitObjectCommand(Arrays.asList(result, delCmd)), false);
+                } else {
+                    UndoRedoHandler.getInstance().add(new SplitObjectCommand(Collections.singletonList(result)), false);
+                }
             } else {
                 UndoRedoHandler.getInstance().add(result);
@@ -542 +546 @@
                 if (wayChunks != null) {
                     SplitWayCommand result = SplitWayCommand.splitWay(
-                                    way, wayChunks, Collections.<OsmPrimitive>emptyList());
+                                    way, wayChunks, Collections.emptyList());
                     result.executeCommand(); // relation members are overwritten/broken if there are multiple unapplied splits
                     splitCmds.add(result);