Changeset 9209

Timestamp:

2005-02-28T14:50:03+13:00 (19 years ago)

Author:

mdewsnip

Message:

Some tidy ups to the applet code.

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (3 diffs)

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

@@ -137 +137 @@
     static public boolean delete(File file)
     {
+    // Nothing to do if it doesn't exist
+    if (!file.exists()) {
+        return true;
+    }
+
     // If file is a directory, we have to recursively delete its contents first
     if (file.isDirectory()) {
@@ -558 +563 @@
 
         if (zipentry.isDirectory()) {
-            // Create named directory
-            boolean success = (new File(zentryname)).mkdir();
-            if (!success) {
-            System.err.println("Error: unable to create directory '"+zentryname+"'");
+            // Create named directory, if it doesn't already exist
+            File zip_entry_file = new File(zentryname);
+            if (!zip_entry_file.exists() && !zip_entry_file.mkdirs()) {
+            System.err.println("Error: unable to create directory " + zip_entry_file);
             }
         }
@@ -843 +848 @@
 
         if (zipentry.isDirectory()) {
-            if(!file.exists()) {
-            // Create named directory, if it doesn't already exist.
-            boolean success = (file.mkdir());
-            if (!success) {
-                System.err.println("Error: unable to create directory '"+zentryname+"'");
-            }
+            // Create named directory, if it doesn't already exist
+            if (!file.exists() && !file.mkdirs()) {
+            System.err.println("Error: unable to create directory " + file);
             }
         }