Changeset 36134 in osm for applications/editors/josm/plugins/buildings_tools

Timestamp:

2023-09-07T18:20:01+02:00 (2 years ago)

Author:

taylor.smock

Message:

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

Location:

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools

Files:

• Building.java (modified) (1 diff)
• MergeAddrPointsAction.java (modified) (2 diffs)

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