Changeset 36132 in osm for applications/editors/josm/plugins/buildings_tools/src/org

Timestamp:

2023-09-07T16:52:05+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix some potential DataIntegrityProblemException sources

This also fixes some lint issues.

merge-overlap: See #19627
reltoolbox: See #23074, #23077, #23123

File:

• applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java (modified) (3 diffs)

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

@@ -49 +49 @@
     private double width;
     private double heading;
-    private AngleSnap angleSnap = new AngleSnap();
+    private final AngleSnap angleSnap = new AngleSnap();
     private Double drawingAngle;
     private static final double EQUAL_NODE_DIST_TOLERANCE = 1e-6;
@@ -471 +471 @@
 
     private static void addAddress(Way w, Collection<Command> cmdList) {
-        if (ToolSettings.PROP_USE_ADDR_NODE.get()) {
+        if (Boolean.TRUE.equals(ToolSettings.PROP_USE_ADDR_NODE.get())) {
             Node addrNode = getAddressNode(w);
             if (addrNode != null) {
@@ -487 +487 @@
                     addressCmds.add(new ChangeMembersCommand(r, members));
                 }
-                addressCmds.add(new DeleteCommand(addrNode));
+                addressCmds.add(DeleteCommand.delete(Collections.singleton(addrNode)));
                 if (cmdList == null) {
                     Command c = new SequenceCommand(tr("Add address for building"), addressCmds);