Changeset 9095 for trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

Timestamp:

2005-02-18T12:31:54+13:00 (19 years ago)

Author:

mdewsnip

Message:

GLI applet: collection building is now much happier about being cancelled. By Matthew Whyte.

File:

• trunk/gli/src/org/greenstone/gatherer/GathererApplet.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -42 +42 @@
 import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.shell.GShell;
 
 
@@ -208 +209 @@
 
 
-    static public void download_url_zip(String col_name, String dir)
+    static public void download_url_zip(String col_name, String dir, GShell source)
     {
     try {
@@ -247 +248 @@
         int len;
 
-        while ((len = dl_dbis.read(buf)) >= 0) {
+        while ((len = dl_dbis.read(buf)) >= 0 && !source.hasSignalledStop()) {
         zip_bfos.write(buf,0,len);
         }
@@ -261 +262 @@
 
 
-    static public void upload_url_zip(String col_name, String dir)
+    static public void upload_url_zip(String col_name, String dir, GShell source)
     {
     final String lineEnd = "\r\n";
@@ -320 +321 @@
         // read file and write it into form...
         int bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-        
+
         while (bytesRead > 0) {
+        // Check to see if action has been cancelled.
+        if (source != null && source.hasSignalledStop()) {
+            break;
+        }
         dos.write(buffer, 0, bufferSize);
         bytesAvailable = fileInputStream.available();