Changeset 9092

Timestamp:

2005-02-18T10:49:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Now ensures that the GLI user directory exists for both main program and applet.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (6 diffs)
• GathererProg.java (modified) (3 diffs)

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

@@ -28 +28 @@
 package org.greenstone.gatherer;
 
+import java.applet.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.*;
 import java.net.*;
 import javax.swing.JApplet;
-import java.applet.*;
 
 import java.awt.*;
+import java.io.*;
 import java.util.*;
 import javax.swing.*;
@@ -95 +95 @@
         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
     }
-    catch(Exception exception) {
+    catch (Exception exception) {
         exception.printStackTrace();
+    }
+
+    // Ensure the GLI user directory exists
+    File gli_user_directory = Utility.getGLIUserFolder();
+    if (!gli_user_directory.exists()) {
+        gli_user_directory.mkdirs();
     }
 
@@ -106 +112 @@
     gatherer = new Gatherer();
 
-    String gli_user_folder = Utility.getGLIUserFolder().toString();
-
-    String[] args = { "-gsdl", gli_user_folder,
+    String[] args = { "-gsdl", gli_user_directory.toString(),
               "-library", library_cgi,
                     };
@@ -138 +142 @@
     Configuration.GS3_CONFIG_XML = "config3Remote.xml";
 
-    File gli_user_dir = new File(gli_user_folder);
-    if (!gli_user_dir.exists()) {
-        gli_user_dir.mkdirs();
-    }
-
     Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
     File col_dir = new File(Gatherer.getCollectDirectoryPath());
@@ -152 +151 @@
     if (!metadata_directory.exists()) {
         // digout metadata.zip from JAR file and unzip it
-        Utility.unzipFromJar(Utility.METADATA_ZIP,gli_user_folder);
+        Utility.unzipFromJar(Utility.METADATA_ZIP, gli_user_directory.toString());
     }
 
@@ -166 +165 @@
     }
     
-
     g_man = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
                     go.library_url_string, go.debug, go.perl_path, 

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

@@ -29 +29 @@
 
 import java.awt.*;
+import java.io.*;
 import java.util.*;
 import javax.swing.*;
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
 import org.greenstone.gatherer.gui.GUIManager;
+import org.greenstone.gatherer.util.Utility;
 
 
@@ -54 +56 @@
      * @see org.greenstone.gatherer.Dictionary
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Gatherer
      */
     static public void main(String[] args) {
@@ -67 +68 @@
         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
     }
-    catch(Exception exception) {
+    catch (Exception exception) {
         exception.printStackTrace();
     }
-    
+
+    // Ensure the GLI user directory exists
+    File gli_user_directory = Utility.getGLIUserFolder();
+    if (!gli_user_directory.exists()) {
+        gli_user_directory.mkdirs();
+    }
+
     Gatherer gatherer = new Gatherer();