Changeset 6046 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2013-07-02T11:43:39+02:00 (11 years ago)

Author:

akks

Message:

fix #7436 (shortcut/toolbar redefinition) and EDT violations in Update Data [minor]
(3 methods of UpdateSelectionAction was made static)

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -19 +19 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -32 +31 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -74 +74 @@
         }
         progressMonitor.addCancelListener(new CancelListener() {
+            @Override
             public void operationCanceled() {
                 for (DownloadTask dt : osmTasks) {
@@ -134 +135 @@
         }
         EventQueue.invokeLater(new Runnable() {
-            public void run() {
-                new UpdateSelectionAction().updatePrimitives(toSelect);
+            @Override public void run() {
+                UpdateSelectionAction.updatePrimitives(toSelect);
             }
         });
@@ -217 +218 @@
          * Grabs and displays the error messages after all download threads have finished.
          */
+        @Override
         public void run() {
             progressMonitor.finishTask();
@@ -247 +249 @@
                 sb.append("</ul>");
 
-                SwingUtilities.invokeLater(new Runnable() {
+                GuiHelper.runInEDT(new Runnable() {
                     @Override
                     public void run() {
@@ -272 +274 @@
             final OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
             if (editLayer != null) {
-                Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
+                final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
                 for (DownloadTask task : osmTasks) {
                     if (task instanceof DownloadOsmTask) {
@@ -285 +287 @@
                 }
                 if (!myPrimitives.isEmpty()) {
-                    handlePotentiallyDeletedPrimitives(myPrimitives);
+                    GuiHelper.runInEDT(new Runnable() {
+                        @Override public void run() {
+                            handlePotentiallyDeletedPrimitives(myPrimitives);
+                        }
+                    });
                 }
             }