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

Timestamp:

2016-05-18T17:44:31+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR

Location:

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

Files:

• AbstractChangesetDownloadTask.java (modified) (1 diff)
• ChangesetContentDownloadTask.java (modified) (3 diffs)
• ChangesetHeaderDownloadTask.java (modified) (2 diffs)
• ChangesetQueryTask.java (modified) (2 diffs)
• DownloadTaskList.java (modified) (2 diffs)

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

@@ -127 +127 @@
      */
     public final Future<?> download() {
-        return Main.worker.submit(downloadTaskRunnable);
+        return downloadTaskRunnable != null ? Main.worker.submit(downloadTaskRunnable) : null;
     }
 
     @Override
     public final Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
-        return Main.worker.submit(downloadTaskRunnable);
+        return downloadTaskRunnable != null ? Main.worker.submit(downloadTaskRunnable) : null;
     }
 
     @Override
     public final void cancel() {
-        downloadTaskRunnable.cancel();
+        if (downloadTaskRunnable != null) {
+            downloadTaskRunnable.cancel();
+        }
     }
 

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

@@ -26 +26 @@
  */
 public class ChangesetContentDownloadTask extends AbstractChangesetDownloadTask {
-
-    private final DownloadTask downloadTask;
 
     class DownloadTask extends RunnableDownloadTask {
@@ -129 +127 @@
             throw new IllegalArgumentException(
                     MessageFormat.format("Expected integer value > 0 for parameter ''{0}'', got ''{1}''", "changesetId", changesetId));
-        downloadTask = new DownloadTask(parent, Collections.singleton(changesetId));
-        setDownloadTask(downloadTask);
+        setDownloadTask(new DownloadTask(parent, Collections.singleton(changesetId)));
     }
 
@@ -142 +139 @@
      */
     public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) {
-        downloadTask = new DownloadTask(parent, changesetIds);
-        setDownloadTask(downloadTask);
+        setDownloadTask(new DownloadTask(parent, changesetIds));
     }
 

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

@@ -27 +27 @@
  */
 public class ChangesetHeaderDownloadTask extends AbstractChangesetDownloadTask {
-
-    private final DownloadTask downloadTask;
 
     class DownloadTask extends RunnableDownloadTask {
@@ -112 +110 @@
      */
     public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids, boolean includeDiscussion) {
-        downloadTask = new DownloadTask(dialogParent, ids, includeDiscussion);
-        setDownloadTask(downloadTask);
+        setDownloadTask(new DownloadTask(dialogParent, ids, includeDiscussion));
     }
 

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

@@ -26 +26 @@
  */
 public class ChangesetQueryTask extends AbstractChangesetDownloadTask {
-
-    private final DownloadTask downloadTask;
 
     class DownloadTask extends RunnableDownloadTask {
@@ -134 +132 @@
     public ChangesetQueryTask(Component parent, ChangesetQuery query) {
         CheckParameterUtil.ensureParameterNotNull(query, "query");
-        downloadTask = new DownloadTask(parent, query);
-        setDownloadTask(downloadTask);
+        setDownloadTask(new DownloadTask(parent, query));
     }
 }

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

@@ -51 +51 @@
     private ProgressMonitor progressMonitor;
 
-    private void addDownloadTask(DownloadTask dt, Rectangle2D td, int i, int n) {
+    private void addDownloadTask(ProgressMonitor progressMonitor, DownloadTask dt, Rectangle2D td, int i, int n) {
         ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
         childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, n, n - i));
@@ -82 +82 @@
             i++;
             if (osmData) {
-                addDownloadTask(new DownloadOsmTask(), td, i, n);
+                addDownloadTask(progressMonitor, new DownloadOsmTask(), td, i, n);
             }
             if (gpxData) {
-                addDownloadTask(new DownloadGpsTask(), td, i, n);
+                addDownloadTask(progressMonitor, new DownloadGpsTask(), td, i, n);
             }
         }