Changeset 8908 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2015-10-19T16:55:23+02:00 (9 years ago)

Author:

Don-vip

Message:

improve download tasks unit tests

Location:

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

Files:

• AbstractDownloadTask.java (modified) (2 diffs)
• DownloadGpsTask.java (modified) (2 diffs)
• DownloadNotesTask.java (modified) (4 diffs)
• DownloadOsmTask.java (modified) (3 diffs)

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

@@ -9 +9 @@
 /**
  * Common abstract implementation of other download tasks
+ * @param <T> The downloaded data type
  * @since 2322
  */
-public abstract class AbstractDownloadTask implements DownloadTask {
+public abstract class AbstractDownloadTask<T> implements DownloadTask {
     private List<Object> errorMessages;
     private boolean canceled;
     private boolean failed;
+    protected T downloadedData;
 
     public AbstractDownloadTask() {
@@ -36 +38 @@
     }
 
-    protected void rememberErrorMessage(String message) {
+    protected final void rememberErrorMessage(String message) {
         errorMessages.add(message);
     }
 
-    protected void rememberException(Exception exception) {
+    protected final void rememberException(Exception exception) {
         errorMessages.add(exception);
+    }
+
+    protected final void rememberDownloadedData(T data) {
+        this.downloadedData = data;
+    }
+
+    /**
+     * Replies the downloaded data.
+     * @return The downloaded data.
+     */
+    public final T getDownloadedData() {
+        return downloadedData;
     }
 

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

@@ -33 +33 @@
  * Task allowing to download GPS data.
  */
-public class DownloadGpsTask extends AbstractDownloadTask {
+public class DownloadGpsTask extends AbstractDownloadTask<GpxData> {
 
     private DownloadTask downloadTask;
@@ -128 +128 @@
         @Override
         protected void finish() {
+            rememberDownloadedData(rawData);
             if (isCanceled() || isFailed())
                 return;

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -27 +28 @@
 
 /** Task for downloading notes */
-public class DownloadNotesTask extends AbstractDownloadTask {
+public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
 
     private static final String PATTERN_API_URL = "https?://.*/api/0.6/notes.*";
@@ -38 +39 @@
     private DownloadTask downloadTask;
 
+    /**
+     * Download a specific note by its id.
+     * @param id Note identifier
+     * @param progressMonitor progress monitor
+     * @return the future representing the asynchronous task
+     */
     public Future<?> download(long id, ProgressMonitor progressMonitor) {
         final String url = OsmApi.getOsmApi().getBaseUrl() + "notes/" + id;
@@ -98 +105 @@
         @Override
         protected void finish() {
+            rememberDownloadedData(new NoteData(notesData));
             if (isCanceled() || isFailed()) {
                 return;

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

@@ -36 +36 @@
  * Run in the worker thread.
  */
-public class DownloadOsmTask extends AbstractDownloadTask {
+public class DownloadOsmTask extends AbstractDownloadTask<DataSet> {
 
     protected static final String PATTERN_OSM_API_URL           = "https?://.*/api/0.6/(map|nodes?|ways?|relations?|\\*).*";
@@ -44 +44 @@
 
     protected Bounds currentBounds;
-    protected DataSet downloadedData;
     protected DownloadTask downloadTask;
 
@@ -66 +65 @@
             return super.getTitle();
         }
-    }
-
-    protected void rememberDownloadedData(DataSet ds) {
-        this.downloadedData = ds;
-    }
-
-    /**
-     * Replies the {@link DataSet} containing the downloaded OSM data.
-     * @return The {@link DataSet} containing the downloaded OSM data.
-     */
-    public DataSet getDownloadedData() {
-        return downloadedData;
     }