Changeset 10129 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

Don-vip

Message:

refactor duplicated code

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• AbstractChangesetDownloadTask.java (modified) (3 diffs)
• ChangesetHeaderDownloadTask.java (modified) (3 diffs)
• ChangesetQueryTask.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.HashSet;
@@ -8 +9 @@
 import java.util.concurrent.Future;
 
+import javax.swing.SwingUtilities;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
+import org.openstreetmap.josm.tools.ExceptionUtil;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
 /**
@@ -46 +52 @@
             lastException = e;
             setFailed(true);
+        }
+
+        protected final void updateChangesets() {
+            // update the global changeset cache with the downloaded changesets.
+            // this will trigger change events which views are listening to. They
+            // will update their views accordingly.
+            //
+            // Run on the EDT because UI updates are triggered.
+            //
+            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);
+                    }
+                }
+            }
         }
     }

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

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
@@ -22 +19 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ExceptionUtil;
-import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 import org.xml.sax.SAXException;
 
@@ -103 +99 @@
                 return;
             }
-
-            // update the global changeset cache with the downloaded changesets.
-            // this will trigger change events which views are listening to. They
-            // will update their views accordingly.
-            //
-            // Run on the EDT because UI updates are triggered.
-            //
-            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();
         }