Changeset 10546 for trunk/gli/src/org

Timestamp:

2005-08-21T13:49:36+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up the delete function so it is hopefully slightly more efficient: the exists() test is now only done on the top-level file or folder.

File:

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

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

@@ -35 +35 @@
  *########################################################################
  */
+
 package org.greenstone.gatherer.util;
+
 
 // Don't even think about adding import java.awt.* here!
@@ -44 +46 @@
 // Don't even think about adding import javax.swing.* here!
 // The functions in this class should not use any graphical classes. Put your function somewhere else buster!
-import org.apache.xerces.parsers.*;
-import org.apache.xerces.dom.DocumentImpl;
-import org.apache.xml.serialize.*;
 import org.greenstone.gatherer.Dictionary;
 // 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!
-import org.w3c.dom.*;
-import org.xml.sax.*;
 
 
@@ -91 +88 @@
     static final public String PROGRAM_VERSION = "v2.61";
     static final public String WORKSPACE_TREE = "Workspace";
-    
+
 
     /**
      * Delete a file or directory
-     * It turns out that in Java you have to make sure a directory is empty before you delete it (much like unix I suppose),
-     * and so just like unix I'll have to set up a recursive delete function.
-     *
      * @param file The <strong>File</strong> you want to delete.
      * @return A <i>boolean</i> which is <i>true</i> if the file specified was successfully deleted, <i>false</i> otherwise.
@@ -108 +102 @@
     }
 
+    return deleteInternal(file);
+    }
+
+
+    /** Convenience function. */
+    static public boolean delete(String filename)
+    {
+    return delete(new File(filename));
+    }
+
+
+    /** In Java you have to make sure a directory is empty before you delete it, so recursively delete. */
+    static private boolean deleteInternal(File file)
+    {
     // If file is a directory, we have to recursively delete its contents first
     if (file.isDirectory()) {
         File files[] = file.listFiles();
         for (int i = 0; i < files.length; i++) {
-        if (delete(files[i]) == false) {
+        if (deleteInternal(files[i]) == false) {
             System.err.println("Error: Could not delete folder " + file);
             return false;
@@ -126 +134 @@
 
     return true;
-    }
-
-
-    static public boolean delete(String filename) {
-    return delete(new File(filename));
     }