Changeset 31720 for main/trunk/gli/src/org/greenstone/gatherer/download/DownloadProgressBar.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/DownloadProgressBar.java (modified) (2 diffs)

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

@@ -132 +132 @@
     // However, now we additionally ensure that the wget launched by the perl is stopped before 
     // process.destroy(), so at least it cleans up better. I'm therefore changing it to a "Stop" button.
-    stop_start_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Pause"),Dictionary.get("Mirroring.DownloadJob.Pause_Tooltip"));
-    //stop_start_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Stop"),Dictionary.get("Mirroring.DownloadJob.Stop_Tooltip"));
+    stop_start_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Stop"),Dictionary.get("Mirroring.DownloadJob.Stop_Tooltip"));
     stop_start_button.addActionListener(this);
     stop_start_button.addActionListener(owner);
@@ -189 +188 @@
         if (current_action == DownloadJob.RUNNING) {
         current_action = DownloadJob.STOPPED;
-                stop_start_button.setText(Dictionary.get("Mirroring.DownloadJob.Resume"));
-                stop_start_button.setToolTipText(Dictionary.get("Mirroring.DownloadJob.Resume_Tooltip"));
+                stop_start_button.setText(Dictionary.get("Mirroring.DownloadJob.Stopped"));
+                stop_start_button.setToolTipText(Dictionary.get("Mirroring.DownloadJob.Stopped_Tooltip"));
             
         progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Stopped"));
         progress.setIndeterminate(false);
-        } else {
-        current_action = DownloadJob.RUNNING;
-        // we are stopped, so restart
-                stop_start_button.setText(Dictionary.get("Mirroring.DownloadJob.Pause"));
-                stop_start_button.setToolTipText(Dictionary.get("Mirroring.DownloadJob.Pause_Tooltip"));
-        progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Progress"));
-        progress.setIndeterminate(true);
+        stop_start_button.setEnabled(false);
         }
     }