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

Timestamp:

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

Author:

taylor.smock

Message:

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

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Files:

• ReconstructPolygonAction.java (modified) (1 diff)
• TheRing.java (modified) (1 diff)

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