Changeset 5856 in josm for trunk/src

Timestamp:

2013-04-14T13:07:11+02:00 (12 years ago)

Author:

akks

Message:

fix #8601: Cancel-button doesn't cancel while downloading history

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -51 +51 @@
     private HashSet<PrimitiveId> toLoad;
     private HistoryDataSet loadedData;
+    private OsmServerHistoryReader reader = null;
 
     public HistoryLoadTask() {
@@ -159 +160 @@
     @Override
     protected void cancel() {
-        OsmApi.getOsmApi().cancel();
+        System.out.println("Cancel!");
+        //OsmApi.getOsmApi().cancel();
+        // fix #8601 : could not cancel when server is extremely slow
+        if (reader!=null) reader.cancel();
         canceled = true;
     }
@@ -191 +195 @@
                 progressMonitor.indeterminateSubTask(tr(msg,
                         Long.toString(pid.getUniqueId())));
-                OsmServerHistoryReader reader = null;
+                reader = null;
                 HistoryDataSet ds = null;
                 try {