Changeset 6046 in josm

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (3 diffs)
• actions/UpdateSelectionAction.java (modified) (4 diffs)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (8 diffs)
• gui/io/AbstractUploadTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -44 +44 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (! isEnabled())
@@ -83 +84 @@
             // using a series of multi fetch requests
             //
-            new UpdateSelectionAction().updatePrimitives(getEditLayer().data.allPrimitives());
+            UpdateSelectionAction.updatePrimitives(getEditLayer().data.allPrimitives());
         } else {
             // bounds defined? => use the bbox downloader
@@ -91 +92 @@
             Main.worker.submit(
                     new Runnable() {
+                        @Override
                         public void run() {
                             try {

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -35 +35 @@
      * @param id the primitive id
      */
-    public void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
+    public static void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         reader.append(getCurrentDataSet(),id, type);
@@ -53 +53 @@
      *
      */
-    public void updatePrimitives(final Collection<OsmPrimitive> selection) {
+    public static void updatePrimitives(final Collection<OsmPrimitive> selection) {
         UpdatePrimitivesTask task = new UpdatePrimitivesTask(Main.main.getEditLayer(),selection);
         Main.worker.submit(task);
@@ -69 +69 @@
      *
      */
-    public void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{
+    public static void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{
         ensureParameterNotNull(id, "id");
         if (getEditLayer() == null)
@@ -114 +114 @@
      * action handler
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (! isEnabled())
             return;
         Collection<OsmPrimitive> toUpdate =getData();
-        if (toUpdate.size() == 0) {
+        if (toUpdate.isEmpty()) {
             JOptionPane.showMessageDialog(
                     Main.parent,

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);
+                        }
+                    });
                 }
             }

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

@@ -294 +294 @@
     protected void handleGone(OsmApiPrimitiveGoneException e) {
         if (e.isKnownPrimitive()) {
-            new UpdateSelectionAction().handlePrimitiveGoneException(e.getPrimitiveId(),e.getPrimitiveType());
+            UpdateSelectionAction.handlePrimitiveGoneException(e.getPrimitiveId(),e.getPrimitiveType());
         } else {
             ExceptionDialogUtil.explainGoneForUnknownPrimitive(e);