Changeset 9021

Timestamp:

2005-02-14T13:15:59+13:00 (19 years ago)

Author:

mdewsnip

Message:

Some applet bug fixes, by Matthew Whyte.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileQueue.java (modified) (3 diffs)
• shell/GShell.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -70 +70 @@
      */
     public FileQueue() {
+    DebugStream.println("FileQueue started.");
     this.queue = new ArrayList();
     file_status = new JLabel();
@@ -502 +503 @@
             }
         }
-        else {
+        else { // job == null
             // Disable stop button
             if (stop_button != null) {
@@ -519 +520 @@
             progress.setString(Dictionary.get("FileActions.No_Activity"));
             yes_to_all = false;
-            wait();
+            try {
+                wait();
+            }
+            catch (InterruptedException exception) {}
             }
         }

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -475 +475 @@
         String col_dir = Utility.getCollectionDir(Configuration.gsdl_path, col_name);
         File img_dir = new File(Utility.getImagesDir(col_dir));
-        if (img_dir.exists()) {
+        if (img_dir.exists() && img_dir.list().length > 0) {
             // upload images/ directory to server
             Utility.zipup(col_name,"images");

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

@@ -756 +756 @@
         fos.close();
     } 
-    catch (IOException e) {
-        e.printStackTrace();
+    catch (IOException exception) {
+        DebugStream.printStackTrace(exception);
     } 
     }