Changeset 12728 in josm for trunk/src

Timestamp:

2017-09-05T01:22:57+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - fix more unit tests

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -61 +61 @@
     private final transient LinkedList<Command> cmds = new LinkedList<>();
     private int cmdsCount;
+    private DataSet ds;
     private final transient List<Relation> addedRelations = new LinkedList<>();
 
@@ -538 +539 @@
             // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
             // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
-            DataSet ds = ways.iterator().next().getDataSet();
+            ds = ways.iterator().next().getDataSet();
 
             // Do the job of joining areas
@@ -1539 +1540 @@
 
         Relation newRel;
+        RelationRole soleOuter;
         switch (multiouters.size()) {
         case 0:
@@ -1544 +1546 @@
         case 1:
             // Found only one to be part of a multipolygon relation, so just add it back as well
-            newRel = new Relation(multiouters.get(0).rel);
-            newRel.addMember(new RelationMember(multiouters.get(0).role, outer));
-            cmds.add(new ChangeCommand(multiouters.get(0).rel, newRel));
+            soleOuter = multiouters.get(0);
+            newRel = new Relation(soleOuter.rel);
+            newRel.addMember(new RelationMember(soleOuter.role, outer));
+            cmds.add(new ChangeCommand(ds, soleOuter.rel, newRel));
             return;
         default:
@@ -1566 +1569 @@
             }
             newRel.addMember(new RelationMember("outer", outer));
-            cmds.add(new AddCommand(outer.getDataSet(), newRel));
+            cmds.add(new AddCommand(ds, newRel));
         }
     }