Changeset 10129 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java

Timestamp:

2016-04-09T23:24:01+02:00 (8 years ago)

Author:

Don-vip

Message:

refactor duplicated code

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -20 +17 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ExceptionUtil;
-import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 import org.xml.sax.SAXException;
 
@@ -74 +69 @@
                 ExceptionDialogUtil.explainException(lastException);
             }
-            Runnable r = new Runnable() {
-                @Override
-                public void run() {
-                    ChangesetCache.getInstance().update(downloadedChangesets);
-                }
-            };
-
-            if (SwingUtilities.isEventDispatchThread()) {
-                r.run();
-            } else {
-                try {
-                    SwingUtilities.invokeAndWait(r);
-                } catch (InterruptedException e) {
-                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
-                } catch (InvocationTargetException e) {
-                    Throwable t = e.getTargetException();
-                    if (t instanceof RuntimeException) {
-                        BugReportExceptionHandler.handleException(t);
-                    } else if (t instanceof Exception) {
-                        ExceptionUtil.explainException(e);
-                    } else {
-                        BugReportExceptionHandler.handleException(t);
-                    }
-                }
-            }
+            updateChangesets();
         }
     }