Changeset 18221 for gli

Timestamp:

2008-12-16T18:12:21+13:00 (15 years ago)

Author:

ak19

Message:

Fixed a bug I had introduced which closed the download panel even when the download terminated naturally. A download's display panel is only removed when its prematurely terminated, not when it ends naturally (at which point the user can manually close this).

File:

• gli/trunk/src/org/greenstone/gatherer/download/DownloadScrollPane.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/download/DownloadScrollPane.java

@@ -93 +93 @@
         }       
     }
-    // Get rid of this download's dedicated pane
-    finishedDownloadJob(delete_me);
+    // Close button pressed, get rid of this download's dedicated pane
+    finishedDownloadJob(delete_me, true);
     }
 
     /** To be called when a download job has terminated naturally or was prematurely stopped
-     *  via the close button. Gets rid of this download's pane with buttons and progress bar. */
-    protected void finishedDownloadJob(DownloadJob delete_me) {
+     *  via the close button. 
+     *  Gets rid of this download's pane with buttons and progress bar if prematurely stopped. */
+    protected void finishedDownloadJob(DownloadJob delete_me, boolean removeDisplay) {
     if (delete_me.hasSignalledStop()) {
-        list_pane.remove(delete_me.getProgressBar());
+        if(removeDisplay) {
+        list_pane.remove(delete_me.getProgressBar());
+        list_pane.remove(filler_pane);
+        }
         job_queue.remove(delete_me);
-        list_pane.remove(filler_pane);
         if(job_queue.size() > 0) {
         Dimension progress_bar_size = delete_me.getProgressBar().getPreferredSize();
@@ -211 +214 @@
             System.err.println("DownloadJob " + job.port + " " + job.toString() + " Begun.");
             job.callDownload();
-            finishedDownloadJob(delete_me); // Job is done, get rid of the separate display panel for this download
+            // Job is done. Ended naturally, don't get rid of this download's separate display panel
+            finishedDownloadJob(delete_me, false); 
             System.err.println("DownloadJob " + jobDisplayString + " complete.");
             DebugStream.println("DownloadJob " + jobDisplayString + " complete."); // by this point job is null!