Changeset 31720 for main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

Timestamp:

2017-06-02T17:14:00+12:00 (7 years ago)

Author:

ak19

Message:

1. GLI's DownloadJobs don't allow pausing and resuming (the button used to work, but didn't ever pause/resume in the background, at least it's been stopping the wget download activity after wget related changes from some years back). Changing the Pause/Resume button in the DownloadProgressBar to the Stop/Stopped button. 2. Added another useful link on InterruptedException to SafeProgress and its documentation.

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (6 diffs)

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -75 +75 @@
 
     private final String download_url;
-    
+    private boolean wasClosed = false;
+
     //    private String current_url;
     //    private String destination;
@@ -212 +213 @@
         if (getState() == RUNNING) {
         //setState(STOPPED);
-        stopDownload(); // cancels any running SafeProcess      
+        stopDownload(); // cancels any running SafeProcess
         } else {
         //previous_state = getState();
@@ -220 +221 @@
     }
     else if (event.getSource() == progress.close_button) {
+        setClosed();
         SafeProcess.log("@@@ Progress bar close button pressed");
         if(getState() == RUNNING) {
         previous_state = getState();
         //setState(STOPPED); // do we need to do anything else to stop this? YES, we do:
-        stopDownload(); // cancels any running SafeProcess      
-        } 
+        stopDownload(); // cancels any running SafeProcess
+        }
         mummy.deleteDownloadJob(this);
     }
@@ -798 +800 @@
         // if the cancel button was clicked when it had already naturally terminated
 
+        // If the user had pressed the Close button to terminate the running job, then
         // we're now ready to remove the display of the until now running job
         // from the download progress bar interface
-        mummy.deleteCurrentDownloadJob(this); 
+        // But don't bother removing the progress bar if the user had only pressed the Stop button
+        if(wasClosed()) {
+        mummy.deleteCurrentDownloadJob(this); 
+        }
     } /*else {
         // If we've got to here and the state isn't STOPPED then the
@@ -962 +968 @@
     return state;
     }
+    
+    /** @return true if the close button of the DownloadProgressBar was pressed,
+     * false otherwise such as if the Stop button had been pressed.
+    */
+    private synchronized boolean wasClosed() {
+    return this.wasClosed;
+    }
 
     /** Returns the current state of the stop flag for this job.
@@ -978 +991 @@
     previous_state = this.state;
     this.state = state;
+    }
+
+    private synchronized void setClosed() {
+    this.wasClosed = true;
     }