Changeset 9095 for trunk/gli/src/org/greenstone/gatherer/util/Utility.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/util/Utility.java (modified) (10 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -49 +49 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.shell.GShell;
 // Don't even think about adding import org.greenstone.gatherer.Gatherer in here!
 // The functions in this class should be independent of the Gatherer class. Put your function somewhere else buster!
@@ -601 +602 @@
     }
 
-    static protected void zipFunc (ZipOutputStream zos, String file_path, int prefix_strip) 
+    static protected void zipFunc (ZipOutputStream zos, String file_path, int prefix_strip, GShell source) 
     {
     // Using try is required because of file io.
     try {
+        // Exit if pressed cancel.
+        if (source != null && source.hasSignalledStop()) {
+        return;
+        }
         // Create a Zip Entry and put it into the archive (no data yet).
 
@@ -624 +629 @@
         // to the zip output stream until the bis has been entirely read.
         while ((byteCount = bis.read(data, 0, 1024)) > -1) {
+        //Check for cancell
+        if(source != null) {
+            if(source.hasSignalledStop()) {
+            break;
+            }
+        }
         zos.write(data, 0, byteCount);
         }
@@ -634 +645 @@
     }
 
-    static protected void dirFunc (ZipOutputStream zos, String dir_name, int prefix_strip) 
+    static protected void dirFunc (ZipOutputStream zos, String dir_name, int prefix_strip, GShell source) 
     {
     File dirObj = new File(dir_name);
@@ -645 +656 @@
         // Loop through File array and display.
         for (int i = 0; i < fileList.length; i++) {
+            if(source != null) {
+            if(source.hasSignalledStop()) {
+                break;
+            }
+            }
             File file = fileList[i];
             if (file.isDirectory()) {
@@ -661 +677 @@
             }
 
-            dirFunc(zos,dir_path,prefix_strip);
+            dirFunc(zos,dir_path,prefix_strip, source);
             } else if (file.isFile()) {
             // Call the zipFunc function
             String file_path = fileList[i].getPath();
-            zipFunc(zos,file_path,prefix_strip);
+            zipFunc(zos,file_path,prefix_strip, source);
             }
         } 
@@ -680 +696 @@
 
 
-    static public void zipup(String col_dir, String col_name, String dir_or_file)
+    static public void zipup(String col_dir, String col_name, String dir_or_file, GShell source)
     {
     int prefix_strip = col_dir.length();
@@ -695 +711 @@
         if (zip_dof.isDirectory()) {
             String zip_dir = zip_dir_or_file;
-            dirFunc(zos,zip_dir,prefix_strip);
+            dirFunc(zos,zip_dir,prefix_strip, source);
         }
         else {
@@ -714 +730 @@
             }
             }
-            zipFunc(zos,zip_full_file,prefix_strip);
+            zipFunc(zos,zip_full_file,prefix_strip, source);
         }
         }
@@ -728 +744 @@
     catch (IOException exception) {
         DebugStream.printStackTrace(exception);
-    } 
+    }
     }