Changeset 33694 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

Timestamp:

2017-10-03T22:34:26+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm15320

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

@@ -17 +17 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +23 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
@@ -329 +331 @@
         Way sourceCopy = new Way(source);
         if (createMultipolygon) {
-            Collection<String> linearTags = Main.pref.getCollection(PREF_MULTIPOLY + "lineartags", CreateMultipolygonAction.DEFAULT_LINEAR_TAGS);
+            Collection<String> linearTags = Main.pref.getList(PREF_MULTIPOLY + "lineartags", CreateMultipolygonAction.DEFAULT_LINEAR_TAGS);
             relation = new Relation();
             relation.put("type", "multipolygon");
@@ -369 +371 @@
         }
 
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         List<Command> commands = new ArrayList<>();
         boolean foundOwnWay = false;
@@ -375 +378 @@
             Way w = seg.constructWay(seg.isReference() ? null : sourceCopy);
             if (needAdding) {
-                commands.add(new AddCommand(w));
+                commands.add(new AddCommand(ds, w));
             }
             if (w.equals(source)) {
@@ -398 +401 @@
         commands.addAll(relationCommands);
         if (createMultipolygon) {
-            commands.add(new AddCommand(relation));
+            commands.add(new AddCommand(ds, relation));
         }
         return commands;