Changeset 16187 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-03-21T21:27:36+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18962 - introduce DataSet.update to avoid repetitive begin/endUpdate statements

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ValidatorDialog.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -694 +694 @@
          */
         private void tryUndo() {
-            final DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
-            int i = fixCommands.size() - 1;
-            ds.beginUpdate();
-            for (; i >= 0; i--) {
-                fixCommands.get(i).undoCommand();
-            }
-            ds.endUpdate();
-        }
-
+            MainApplication.getLayerManager().getActiveDataSet().update(() -> {
+                for (int i = fixCommands.size() - 1; i >= 0; i--) {
+                    fixCommands.get(i).undoCommand();
+                }
+            });
+        }
     }
 
@@ -723 +720 @@
         @Override
         public void undoCommand() {
-            getAffectedDataSet().beginUpdate();
-            super.undoCommand();
-            getAffectedDataSet().endUpdate();
+            getAffectedDataSet().update(super::undoCommand);
         }
 
         @Override
         public boolean executeCommand() {
-            getAffectedDataSet().beginUpdate();
-            boolean rc = super.executeCommand();
-            getAffectedDataSet().endUpdate();
-            return rc;
+            return getAffectedDataSet().update(super::executeCommand);
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -652 +652 @@
         // if uploaded, clean the modified flags as well
         data.cleanupDeletedPrimitives();
-        data.beginUpdate();
-        try {
+        data.update(() -> {
             for (OsmPrimitive p: data.allPrimitives()) {
                 if (processed.contains(p)) {
@@ -659 +658 @@
                 }
             }
-        } finally {
-            data.endUpdate();
-        }
+        });
     }