Changeset 34807 in osm for applications/editors/josm/plugins

Timestamp:

2019-01-03T12:52:40+01:00 (6 years ago)

Author:

stoecker

Message:

fix #josm17158 - wrong order of commands

File:

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

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

@@ -337 +337 @@
         w = ways.get(0);
 
-        addAddress(w);
+        addAddress(w, null);
 
         return w;
@@ -386 +386 @@
         cmds.add(new AddCommand(ds, w));
 
-        addAddress(w);
+        addAddress(w, cmds);
 
         if (snap) {
@@ -452 +452 @@
     }
 
-    private void addAddress(Way w) {
+    private void addAddress(Way w, Collection<Command> cmdList) {
         if (ToolSettings.PROP_USE_ADDR_NODE.get()) {
             Node addrNode = getAddressNode();
             if (addrNode != null) {
-                Collection<Command> addressCmds = new LinkedList<>();
+                Collection<Command> addressCmds = cmdList != null ? cmdList : new LinkedList<>();
                 for (Entry<String, String> entry : addrNode.getKeys().entrySet()) {
                     w.put(entry.getKey(), entry.getValue());
@@ -473 +473 @@
                 }
                 addressCmds.add(new DeleteCommand(addrNode));
-                Command c = new SequenceCommand(tr("Add address for building"), addressCmds);
-                UndoRedoHandler.getInstance().add(c);
+                if (cmdList == null) {
+                    Command c = new SequenceCommand(tr("Add address for building"), addressCmds);
+                    UndoRedoHandler.getInstance().add(c);
+                }
             }
         }