Changeset 8941 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2015-10-24T21:32:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12004 - suggest to replace source:maxspeed=UK:* by source:maxspeed=GB:* as per ISO 3166-2

File:

• trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -17 +17 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -106 +106 @@
     }
 
-    @Override public boolean executeCommand() {
-        Main.main.getCurrentDataSet().beginUpdate();
+    @Override
+    public boolean executeCommand() {
+        final DataSet dataSet = objects.get(0).getDataSet();
+        dataSet.beginUpdate();
         try {
             super.executeCommand(); // save old
@@ -129 +131 @@
             return true;
         } finally {
-            Main.main.getCurrentDataSet().endUpdate();
-        }
-    }
-
-    @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+            dataSet.endUpdate();
+        }
+    }
+
+    @Override
+    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
         modified.addAll(objects);
     }