Changeset 36134 in osm

Timestamp:

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

Author:

taylor.smock

Message:

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

Location:

applications/editors/josm/plugins

Files:

• addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (modified) (1 diff)
• buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java (modified) (1 diff)
• buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java (modified) (2 diffs)
• merge-overlap/src/mergeoverlap/MergeOverlapAction.java (modified) (1 diff)
• reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (1 diff)
• reltoolbox/src/relcontext/actions/TheRing.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (modified) (2 diffs)

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java

@@ -978 +978 @@
 
     private void removeAddressInterpolationWay() {
-
-        // Remove way - nodes of the way remain
-        commandGroup.add(DeleteCommand.delete(Collections.singleton(addrInterpolationWay)));
-
-        // Remove untagged nodes
-        for (int i = 1; i < addrInterpolationWay.getNodesCount()-1; i++) {
-            Node testNode = addrInterpolationWay.getNode(i);
-            if (!testNode.hasKeys()) {
-                commandGroup.add(DeleteCommand.delete(Collections.singleton(testNode)));
-            }
+        final Command deleteCommand = DeleteCommand.delete(Collections.singleton(addrInterpolationWay), true);
+        if (deleteCommand != null) {
+            commandGroup.add(deleteCommand);
         }
 

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java

@@ -487 +487 @@
                     addressCmds.add(new ChangeMembersCommand(r, members));
                 }
-                addressCmds.add(DeleteCommand.delete(Collections.singleton(addrNode)));
+                final Command deleteCommand = DeleteCommand.delete(Collections.singleton(addrNode));
+                if (deleteCommand != null) {
+                    addressCmds.add(deleteCommand);
+                }
                 if (cmdList == null) {
                     Command c = new SequenceCommand(tr("Add address for building"), addressCmds);

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Merge address points with a building
+ */
 public class MergeAddrPointsAction extends JosmAction {
 
+    /**
+     * Merge the address point with the building
+     */
     public MergeAddrPointsAction() {
         super(tr("Merge address points"), "mergeaddr",
@@ -173 +179 @@
         }
         if (!replaced.isEmpty()) {
-            cmds.add(new DeleteCommand(replaced.stream().map(p -> p.a).collect(Collectors.toList())));
+            final Command deleteCommand = DeleteCommand.delete(replaced.stream().map(p -> p.a).collect(Collectors.toList()));
+            if (deleteCommand != null) {
+                cmds.add(deleteCommand);
+            }
         }
 

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

@@ -225 +225 @@
         }
         if (!del.isEmpty()) {
-            cmds.add(DeleteCommand.delete(del));
+            final Command deleteCommand = DeleteCommand.delete(del);
+            if (deleteCommand != null) {
+                cmds.add(deleteCommand);
+            }
         }
 

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -174 +174 @@
                                 candidateWay = tmp;
                             }
-                            commands.add(DeleteCommand.delete(Collections.singleton(w)));
+                            final Command deleteCommand = DeleteCommand.delete(Collections.singleton(w));
+                            if (deleteCommand != null) {
+                                commands.add(deleteCommand);
+                            }
                         }
                     }

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

@@ -399 +399 @@
         }
         if (!foundOwnWay) {
-            commands.add(DeleteCommand.delete(Collections.singleton(source)));
+            final Command deleteCommand = DeleteCommand.delete(Collections.singleton(source));
+            if (deleteCommand != null) {
+                commands.add(deleteCommand);
+            }
         }
         commands.addAll(relationCommands);

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);