Changeset 17379 in josm

Timestamp:

2020-11-30T16:33:56+01:00 (4 years ago)

Author:

GerdP

Message:

see #17196 Undo/Redo may change data in inactive layer

• fix sonar issue: Make UndoRedoHandler.clean(Dataset dataset) static

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/UndoRedoHandler.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/io/AsynchronousUploadPrimitivesTask.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -470 +470 @@
      * @since 12718
      */
-    public synchronized void clean(DataSet dataSet) {
+    public static synchronized void clean(DataSet dataSet) {
         if (dataSet == null)
             return;

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -222 +222 @@
             Layer layer = e.getRemovedLayer();
             if (layer instanceof OsmDataLayer) {
-                UndoRedoHandler.getInstance().clean(((OsmDataLayer) layer).getDataSet());
+                UndoRedoHandler.clean(((OsmDataLayer) layer).getDataSet());
             }
         }

trunk/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java

@@ -121 +121 @@
         GuiHelper.runInEDTAndWait(() -> {
             // Remove the commands from the undo stack
-            UndoRedoHandler.getInstance().clean(uploadDataLayer.getDataSet());
+            UndoRedoHandler.clean(uploadDataLayer.getDataSet());
             MainApplication.getLayerManager().prepareLayerForUpload(uploadDataLayer);
 

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

@@ -654 +654 @@
             return;
 
-        UndoRedoHandler.getInstance().clean(data);
+        UndoRedoHandler.clean(data);
 
         // if uploaded, clean the modified flags as well