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

Timestamp:

2009-09-12T06:45:07+02:00 (17 years ago)

Author:

Gubaer

Message:

applied #3318: patch by dmuecke: josm opens modal error dialog for every block that fails to download

Location:

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

Files:

• DownloadOsmTask.java (modified) (4 diffs)
• DownloadOsmTaskList.java (modified) (1 diff)

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

@@ -17 +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;
@@ -28 +27 @@
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.xml.sax.SAXException;
 
@@ -107 +107 @@
                 return;
             if (lastException != null) {
-                ExceptionDialogUtil.explainException(lastException);
+                getProgressMonitor().setErrorMessage(ExceptionUtil.explainException(lastException));
                 DownloadOsmTask.this.setFailed(true);
                 return;
@@ -113 +113 @@
             if (dataSet == null)
                 return; // user canceled download or error occurred
-            if (currentBounds == null) {
+            if (currentBounds == null)
                 return; // no data retrieved
-            }
             if (dataSet.allPrimitives().isEmpty()) {
                 progressMonitor.setErrorMessage(tr("No data imported."));

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

@@ -95 +95 @@
         String errors = "";
 
+        LinkedList<Integer> shown = new LinkedList<Integer>();
         for(DownloadTask dt : osmTasks) {
             String err = dt.getErrorMessage();
-            if(err.equals("")) {
+            // avoid display of identical messages
+            if (err.equals("") || shown.contains(err.hashCode())) {
                 continue;
             }
+            shown.add(err.hashCode());
             errors += "<br>* " + err;
         }