Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

02.08.2009 14:36:40 (3 years ago)

Author:

Gubaer

Message:

towards a fix for #3142: JOSM applet class no longer functional

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (6 diffs)

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

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.concurrent.Future;
+import java.util.logging.Logger;
 
 import javax.swing.JCheckBox;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
@@ -34 +36 @@
  */
 public class DownloadOsmTask implements DownloadTask {
+    private static final Logger logger = Logger.getLogger(DownloadOsmTask.class.getName());
+
     private static Bounds currentBounds;
     private Future<Task> task = null;
@@ -42 +46 @@
         private DataSet dataSet;
         private boolean newLayer;
+        private boolean cancelled;
+        private Exception lastException;
 
         public Task(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
@@ -50 +56 @@
 
         @Override public void realRun() throws IOException, SAXException, OsmTransferException {
-            dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            try {
+                dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            } catch(Exception e) {
+                if (cancelled) {
+                    logger.warning(tr("Ignoring exception because download has been cancelled. Exception was: {0}" + e.toString()));
+                    return;
+                }
+                if (e instanceof OsmTransferException) {
+                    lastException = e;
+                } else {
+                    lastException = new OsmTransferException(e);
+                }
+            }
         }
 
@@ -84 +102 @@
 
         @Override protected void finish() {
+            if (cancelled)
+                return;
+            if (lastException != null) {
+                ExceptionDialogUtil.explainException(lastException);
+                return;
+            }
             if (dataSet == null)
                 return; // user canceled download or error occurred