Changeset 3910 in josm for trunk

Timestamp:

2011-02-18T09:49:28+01:00 (14 years ago)

Author:

stoecker

Message:

apply #5209 - reduce repeated signaling

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyCommand.java (modified) (2 diffs)
• data/UndoRedoHandler.java (modified) (1 diff)

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

@@ -13 +13 @@
 import javax.swing.JLabel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -73 +74 @@
 
     @Override public boolean executeCommand() {
-        super.executeCommand(); // save old
-        if (value == null) {
-            for (OsmPrimitive osm : objects) {
-                osm.setModified(true);
-                osm.remove(key);
+        Main.main.getCurrentDataSet().beginUpdate();
+        try {
+            super.executeCommand(); // save old
+            if (value == null) {
+                for (OsmPrimitive osm : objects) {
+                    osm.setModified(true);
+                    osm.remove(key);
+                }
+            } else {
+                for (OsmPrimitive osm : objects) {
+                    osm.setModified(true);
+                    osm.put(key, value);
+                }
             }
-        } else {
-            for (OsmPrimitive osm : objects) {
-                osm.setModified(true);
-                osm.put(key, value);
-            }
+            return true;
         }
-        return true;
+        finally {
+            Main.main.getCurrentDataSet().endUpdate();
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -74 +74 @@
             return;
         Collection<? extends OsmPrimitive> oldSelection = Main.main.getCurrentDataSet().getSelected();
-        for (int i=1; i<=num; ++i) {
-            final Command c = commands.removeLast();
-            c.undoCommand();
-            redoCommands.addFirst(c);
-            if (commands.isEmpty()) {
-                break;
+        Main.main.getCurrentDataSet().beginUpdate();
+        try {
+            for (int i=1; i<=num; ++i) {
+                final Command c = commands.removeLast();
+                c.undoCommand();
+                redoCommands.addFirst(c);
+                if (commands.isEmpty()) {
+                    break;
+                }
             }
+        }
+        finally {
+            Main.main.getCurrentDataSet().endUpdate();
         }
         fireCommandsChanged();