Changeset 10342

Timestamp:

2005-07-28T15:50:17+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up a lot of path variables. These were all over the place, and were often duplicated. Now all GLI related paths are accessed via static methods in the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (8 diffs)
• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• cdm/ClassifierManager.java (modified) (3 diffs)
• cdm/MetadataSetView.java (modified) (1 diff)
• cdm/PluginManager.java (modified) (3 diffs)
• collection/CollectionManager.java (modified) (4 diffs)
• collection/DownloadJob.java (modified) (2 diffs)
• file/FileManager.java (modified) (1 diff)
• file/FileSystem.java (modified) (2 diffs)
• file/RecycleBin.java (modified) (1 diff)
• file/WorkspaceTreeNode.java (modified) (1 diff)
• gems/GEMS.java (modified) (6 diffs)
• gems/MetadataSetManager.java (modified) (2 diffs)
• gui/DownloadPane.java (modified) (2 diffs)
• gui/FileAssociationDialog.java (modified) (1 diff)
• gui/HelpFrame.java (modified) (2 diffs)
• gui/NewCollectionMetadataPrompt.java (modified) (1 diff)
• gui/PreviewCommandDialog.java (modified) (1 diff)
• shell/GShell.java (modified) (1 diff)
• util/Utility.java (modified) (7 diffs)

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

@@ -155 +155 @@
 
     // If the existing user config.xml file isn't recent enough, backup the old version and update it
-    File config_xml_file = new File(Utility.getGLIUserFolder(), config_xml_file_name);
+    File config_xml_file = new File(Gatherer.getGLIUserDirectoryPath() + config_xml_file_name);
     if (config_xml_file != null && config_xml_file.exists()) {
         just_updated_config_xml_file = updateUserConfigXMLFileIfNecessary(config_xml_file);
@@ -732 +732 @@
     }
     try {
-        user_config_xml = new File(Utility.getGLIUserFolder(), config_xml_name);
+        user_config_xml = new File(Gatherer.getGLIUserDirectoryPath() + config_xml_name);
         ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
         ///ystem.err.println("Writing.");
@@ -740 +740 @@
     catch(Exception exception) {
         user_config_xml = null;
-    }
-    // Always do this if the above fails.
-    if(user_config_xml == null || !user_config_xml.exists()) {
-        // But failing that we produce a general copy
-        XMLTools.writeXMLFile(new File(Utility.BASE_DIR + config_xml_name), general_config);
     }
     }

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

@@ -69 +69 @@
     static public boolean exit = false;
 
+    static private String gli_directory_path = null;
+    static private String gli_user_directory_path = null;
+
     /** All of the external applications that must exit before we close the Gatherer. */
     public Vector apps = new Vector();
@@ -131 +134 @@
     // Set the Greenstone path and collect directory specially when running with a remote Greenstone
     if (isGsdlRemote) {
-        go.gsdl_path = Utility.getGLIUserFolder() + File.separator;
-        Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
+        go.gsdl_path = getGLIUserDirectoryPath();
+        setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
+    }
+    else {
+        setGLIDirectoryPath(go.gsdl_path + "gli");
     }
 
     // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)
     if (go.collect_directory_path != null) {
-        Gatherer.setCollectDirectoryPath(go.collect_directory_path);
+        setCollectDirectoryPath(go.collect_directory_path);
     }
 
     // Special code for running with a remote Greenstone
     if (isGsdlRemote) {
-        File gli_user_directory = Utility.getGLIUserFolder();
-
-        Utility.BASE_DIR = go.gsdl_path;
-        Utility.METADATA_DIR = Utility.BASE_DIR + "metadata" + File.separator;
-        Utility.TMP_DIR = Utility.BASE_DIR + "tmp" + File.separator;
-
         Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
         Configuration.CONFIG_XML = "configRemote.xml";
@@ -160 +160 @@
             //   for documented example collections so "base this on
             //   existing collection" works
-            ZipTools.unzipFromJar(Utility.COLLECT_ZIP, gli_user_directory.toString());
+            ZipTools.unzipFromJar(Utility.COLLECT_ZIP, getGLIUserDirectoryPath());
         }
         else {
@@ -170 +170 @@
         }
 
-        File tmp_dir = new File(Utility.TMP_DIR);
-        if (!tmp_dir.exists()) {
-        if (!tmp_dir.mkdir()) {
-            System.err.println("Warning: Unable to make directory: " + tmp_dir.toString());
-        }
-
-        String username = System.getProperty("user.name");
-        if ((username != null) && (username != "")) {
-            File user_tmp_dir = new File(Utility.TMP_DIR + File.separator + username);
-            if (!user_tmp_dir.exists()) {
-            if (!user_tmp_dir.mkdir()) {
-                System.err.println("Warning: Unable to make directory: " + user_tmp_dir.toString());
-            }
-            }
-        }
-        }
-
-        File metadata_directory = new File(Utility.METADATA_DIR);
+        File metadata_directory = new File(Gatherer.getGLIMetadataDirectoryPath());
         if (!metadata_directory.exists()) {
         // dig out metadata.zip from JAR file and unzip it
-        ZipTools.unzipFromJar(Utility.METADATA_ZIP, gli_user_directory.toString());
-        }
-
-        File plug_dat = new File(Utility.BASE_DIR + "plugins.dat");
+        ZipTools.unzipFromJar(Utility.METADATA_ZIP, getGLIUserDirectoryPath());
+        }
+
+        File plug_dat = new File(getGLIUserDirectoryPath() + "plugins.dat");
         if (!plug_dat.exists()) {
-        JarTools.extractFromJar("plugins.dat", Utility.BASE_DIR, false);
-        }
-
-        File class_dat = new File(Utility.BASE_DIR + "classifiers.dat");
+        JarTools.extractFromJar("plugins.dat", getGLIUserDirectoryPath(), false);
+        }
+
+        File class_dat = new File(getGLIUserDirectoryPath() + "classifiers.dat");
         if (!class_dat.exists()) {
-        JarTools.extractFromJar("classifiers.dat", Utility.BASE_DIR, false);
+        JarTools.extractFromJar("classifiers.dat", getGLIUserDirectoryPath(), false);
         }
     }
@@ -229 +212 @@
 
         // Debug file is created in the user's GLI directory
-        debug_file_path = Utility.getGLIUserFolder().toString() + File.separator + debug_file_path;
+        debug_file_path = getGLIUserDirectoryPath() + debug_file_path;
         DebugStream.println("Debug file path: " + debug_file_path);
         DebugStream.setDebugFile(debug_file_path);
@@ -541 +524 @@
 
 
+    /** Returns the path of the Greenstone "collect" directory. */
     static public String getCollectDirectoryPath()
     {
@@ -553 +537 @@
         return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
     }
+    }
+
+
+    /** Returns the path of the GLI directory. */
+    static public String getGLIDirectoryPath()
+    {
+    return gli_directory_path;
+    }
+
+
+    /** Returns the path of the GLI "metadata" directory. */
+    static public String getGLIMetadataDirectoryPath()
+    {
+    return getGLIDirectoryPath() + "metadata" + File.separator;
+    }
+
+
+    /** Returns the path of the GLI user directory. */
+    static public String getGLIUserDirectoryPath()
+    {
+    return gli_user_directory_path;
+    }
+
+
+    /** Returns the path of the GLI user "cache" directory. */
+    static public String getGLIUserCacheDirectoryPath()
+    {
+    return getGLIUserDirectoryPath() + "cache" + File.separator;
+    }
+
+
+    /** Returns the path of the GLI user "log" directory. */
+    static public String getGLIUserLogDirectoryPath()
+    {
+    return getGLIUserDirectoryPath() + "log" + File.separator;
     }
 
@@ -568 +587 @@
         non_standard_collect_directory_path = non_standard_collect_directory_path + File.separator;
     }
+    }
+
+
+    static public void setGLIDirectoryPath(String gli_directory_path_arg)
+    {
+    gli_directory_path = gli_directory_path_arg;
+    }
+
+
+    static public void setGLIUserDirectoryPath(String gli_user_directory_path_arg)
+    {
+    gli_user_directory_path = gli_user_directory_path_arg;
     }
 

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

@@ -89 +89 @@
     }
 
+    // Determine the GLI user directory path
+    String gli_user_directory_path = System.getProperty("user.home") + File.separator;
+        if (Utility.isWindows()) {
+        String windows_home_parameter = getParameter("windowsHome");
+        if (windows_home_parameter != null && !windows_home_parameter.equals("")) {
+        gli_user_directory_path = windows_home_parameter + File.separator + "GLI" + File.separator;
+        }
+        else {
+        gli_user_directory_path += "Application Data" + File.separator + "Greenstone" + File.separator + "GLI" + File.separator;
+        }
+    }
+        else {
+            gli_user_directory_path += ".gli" + File.separator;
+        }
+    Gatherer.setGLIUserDirectoryPath(gli_user_directory_path);
+    Gatherer.setGLIDirectoryPath(gli_user_directory_path);
+
     // Ensure the GLI user directory exists
-        File gli_user_directory = Utility.setGLIUserFolder(getParameter("windowsHome"));
+        File gli_user_directory = new File(gli_user_directory_path);
     if (!gli_user_directory.exists() && !gli_user_directory.mkdirs()) {
         System.err.println("Error: Unable to make directory: " + gli_user_directory.toString());

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

@@ -61 +61 @@
     }
 
+    // Determine the GLI user directory path
+    String gli_user_directory_path = System.getProperty("user.home") + File.separator;
+        if (Utility.isWindows()) {
+        gli_user_directory_path += "Application Data" + File.separator + "Greenstone" + File.separator + "GLI" + File.separator;
+        }
+        else {
+            gli_user_directory_path += ".gli" + File.separator;
+        }
+    Gatherer.setGLIUserDirectoryPath(gli_user_directory_path);
+
     // Ensure the GLI user directory exists
-        File gli_user_directory = Utility.setGLIUserFolder(null);  // Defaults to user's home area
+        File gli_user_directory = new File(gli_user_directory_path);
     if (!gli_user_directory.exists() && !gli_user_directory.mkdirs()) {
         System.err.println("Error: Unable to make directory: " + gli_user_directory.toString());

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -103 +103 @@
 
     DebugStream.println("deleting classifiers.dat");
-    File class_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+    File class_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
     if (class_file.exists()) {
         return Utility.delete(class_file);
@@ -261 +261 @@
     private void saveClassifiers() {
     try {
-        File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+        File classifiers_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
         FileOutputStream file = new FileOutputStream(classifiers_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
@@ -369 +369 @@
     private void loadClassifiers() {
     // Attempt to restore the cached file.
-    File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+    File classifiers_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
     try {
         FileInputStream file = new FileInputStream(classifiers_dat_file);

trunk/gli/src/org/greenstone/gatherer/cdm/MetadataSetView.java

@@ -289 +289 @@
         public void actionPerformed(ActionEvent event)
         {
-        JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
+        JFileChooser chooser = new JFileChooser(new File(Gatherer.getGLIMetadataDirectoryPath()));
         chooser.setFileFilter(new MetadataSet.MetadataSetFileFilter());
         int return_val = chooser.showDialog(Gatherer.g_man, Dictionary.get("CDM.MetadataSetManager.Add"));

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -107 +107 @@
 
     DebugStream.println("deleting plugins.dat");
-    File plugin_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+    File plugin_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
     if (plugin_file.exists()) {
         return Utility.delete(plugin_file);
@@ -359 +359 @@
     private void savePlugins() {
     try {
-        File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+        File plugins_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
         FileOutputStream file = new FileOutputStream(plugins_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
@@ -499 +499 @@
     private void loadPlugins() {
     // Attempt to restore the cached file.
-    File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+    File plugins_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
     try {
         FileInputStream file = new FileInputStream(plugins_dat_file);

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -317 +317 @@
         //check that this creation has worked - simply by checking for the existence of the collect.cfg file
         String collection_directory_path = getCollectionDirectoryPath(name);
-        File config_file = new File(Utility.getConfigFile(collection_directory_path));
-        if (!config_file.exists()) {
+        File collect_cfg_file = new File(collection_directory_path + "collect.cfg");
+        if (!collect_cfg_file.exists()) {
         // no point continuing
         System.err.println("Error: no collect.cfg file has been created!");
@@ -327 +327 @@
         
         // ACTIVE_DIR/log/
-        File log_dir_temp = new File(Utility.getLogDir(collection_directory_path)+"temp.dat");
-        File log_dir = log_dir_temp.getParentFile();
+        File log_dir = new File(collection_directory_path + "log");
         log_dir.mkdirs();
         progress.setNote(Dictionary.get("CollectionManager.Log_Created"));
 
         // Make sure an import folder exists
-        File import_directory = new File(Utility.getImportDir(collection_directory_path));
+        File import_directory = new File(collection_directory_path + "import");
         if (!import_directory.exists()) {
         import_directory.mkdirs();
@@ -396 +395 @@
         // Always import the extracted metadata set if we didn't already
         if (MetadataSetManager.getMetadataSet(MetadataSetManager.EXTRACTED_METADATA_NAMESPACE) == null) {
-        File extracted_metadata_set_file = new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
+        File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
         importMetadataSet(new MetadataSet(extracted_metadata_set_file));
         }
@@ -1147 +1146 @@
 
     // Always import the extracted metadata set
-    File extracted_metadata_set_file = new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
+    File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
     importMetadataSet(new MetadataSet(extracted_metadata_set_file));
 

trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

@@ -101 +101 @@
     // this.model = model;
 
-    String log_filename = Utility.getLogDir(null) + "wget" + initial.hashCode() + ".log";
+    String log_filename = Gatherer.getGLIUserLogDirectoryPath() + "wget" + initial.hashCode() + ".log";
     File log_file = new File(log_filename);
     if(log_file.exists()) {
@@ -413 +413 @@
 
     // Parse arguments into array.
-    args.add(Utility.BASE_DIR + "wget");
+    args.add(Configuration.getWGetPath());
     args.add("-d");
     args.add("-o");

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

@@ -111 +111 @@
 
         // ...except for files from the "Downloaded Files" folder
-        String downloaded_files_folder_path = Utility.getCacheDir().getAbsolutePath();
+        String downloaded_files_folder_path = Gatherer.getGLIUserCacheDirectoryPath();
         for (int i = 0; i < source_nodes.length; i++) {
         // Is this the "Downloaded Files" folder?

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

@@ -4 +4 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.Utility;
 
@@ -59 +60 @@
     {
     // Return a mapping to the downloaded files folder
-    return new WorkspaceTreeNode(Utility.getCacheDir(), Dictionary.get("Tree.DownloadedFiles"));
+    return new WorkspaceTreeNode(new File(Gatherer.getGLIUserCacheDirectoryPath()), Dictionary.get("Tree.DownloadedFiles"));
     }
 }

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

@@ -81 +81 @@
     setOpaque(true);
 
-    this.model = new FileSystemModel(new RecycleBinNode(new File(Utility.getGLIUserFolder(), "recycle")));
+    this.model = new FileSystemModel(new RecycleBinNode(new File(Gatherer.getGLIUserDirectoryPath() + "recycle")));
     }
 

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

@@ -112 +112 @@
         ArrayTools.sort(sites);
         for (int i = 0; sites != null && i < sites.length; i++) {
-            File collect_dir = new File(sites[i], Utility.COL_DIR);
+            File collect_dir = new File(sites[i], "collect");
             if (!collect_dir.exists()) {
             continue;

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -197 +197 @@
     // Load all the core metadata sets (in the GLI "metadata" directory)
     model = new GEMSModel();
-    File metadata_directory = new File(Utility.METADATA_DIR);
+    File metadata_directory = new File(getGLIMetadataDirectoryPath());
     if (metadata_directory.exists()) {
         // Load just those .mds files in this directory, and return them
@@ -385 +385 @@
 
 
+    static public String getGLIDirectoryPath()
+    {
+    return System.getProperty("user.dir") + File.separator;
+    }
+
+
+    static public String getGLIMetadataDirectoryPath()
+    {
+    return getGLIDirectoryPath() + "metadata" + File.separator;
+    }
+
     
     private class GEMSMenuBar
@@ -514 +525 @@
                 //we first launch the dialog to determine where the jfilechooser should be opened
                 //ie: for collection specific sets - attila dec10-04
-                String set_directory = Utility.METADATA_DIR;
+                String set_directory = getGLIMetadataDirectoryPath();
                 
                 SetSelectionDialog m = new SetSelectionDialog();
@@ -1559 +1570 @@
                 //setup to write to filename from existing file
                 try {
-                out = new FileOutputStream(Utility.METADATA_DIR + File.separator+ namespace_str + ".mds");
+                out = new FileOutputStream(getGLIMetadataDirectoryPath() + namespace_str + ".mds");
                 OutputStreamWriter pout = new OutputStreamWriter(out, "UTF8");
                 p = new PrintWriter(pout);
@@ -1576 +1587 @@
                 p.close();
                 
-                MetadataSet loadedset = msm.loadMetadataSet(new File(Utility.METADATA_DIR + File.separator + namespace_str + ".mds"));
+                MetadataSet loadedset = msm.loadMetadataSet(new File(getGLIMetadataDirectoryPath() + namespace_str + ".mds"));
                 model.add(null, loadedset, GEMSNode.SET);
                 }
@@ -2244 +2255 @@
         if(current_set != null) {
                 
-                //If the current_set_filename is dls or dublin or ex and in the METADATA_DIR, then do
+                //If the current_set_filename is dls or dublin or ex and in the GLI metadata directory, then do
                 //not let anyone remove them --Attila
                 File current_set_filename = current_set.getFile();
-                if(current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"dls.mds")) == 0 ||
-                    current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"dublin.mds")) == 0 ||
-                    current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"ex.mds")) == 0){
+                if(current_set_filename.toString().compareTo(new String(getGLIMetadataDirectoryPath() + "dls.mds")) == 0 ||
+                    current_set_filename.toString().compareTo(new String(getGLIMetadataDirectoryPath() + "dublin.mds")) == 0 ||
+                    current_set_filename.toString().compareTo(new String(getGLIMetadataDirectoryPath() + "ex.mds")) == 0){
                   
                     JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Cannot_Delete_Core_Sets_Error"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

@@ -85 +85 @@
     mds.setName(name);
     // this is the location for a global metadata set
-    File mds_file = new File(Utility.METADATA_DIR, namespace + ".mds");
+    File mds_file = new File(GEMS.getGLIMetadataDirectoryPath() + namespace + ".mds");
     mds.setFile(mds_file);
     mds_hashtable.put(namespace, mds);
@@ -399 +399 @@
 
     public void save() {
-    File file = new File(Utility.METADATA_DIR);
+    File file = new File(GEMS.getGLIMetadataDirectoryPath());
        
     if (!file.exists()) {

trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -307 +307 @@
     public void actionPerformed(ActionEvent event) {
         // Retrieve the cache folder and delete it.
-        Utility.delete(Utility.getCacheDir());
+        Utility.delete(Gatherer.getGLIUserCacheDirectoryPath());
         // ...and refresh the node in the workspace tree to show it's all gone
         Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.DOWNLOADED_FILES_CHANGED);
@@ -369 +369 @@
         depth_object = null;
     
-        File destination_file = Utility.getCacheDir();
-        destination_file.mkdirs(); // If they aren't already
-        String destination_filename = destination_file.getAbsolutePath();
-        if(!destination_filename.endsWith(File.separator)) {
-        destination_filename = destination_filename + File.separator;
-        }
+        String destination_file_path = Gatherer.getGLIUserCacheDirectoryPath();
+        (new File(destination_file_path)).mkdirs(); // If they aren't already
 
         if(url != null) {
-        getter.newDownloadJob(higher_checkbox.isSelected(), (higher_checkbox.isSelected()? false : !same_host_checkbox.isSelected()), !requisite_checkbox.isSelected(), url, depth_value, destination_filename);
+        getter.newDownloadJob(higher_checkbox.isSelected(), (higher_checkbox.isSelected()? false : !same_host_checkbox.isSelected()), !requisite_checkbox.isSelected(), url, depth_value, destination_file_path);
         }
     }

trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java

@@ -290 +290 @@
      */
     public void actionPerformed(ActionEvent event) {
-        JFileChooser chooser = new JFileChooser(new File(Utility.BASE_DIR));
+        JFileChooser chooser = new JFileChooser(new File(Gatherer.getGLIUserDirectoryPath()));
         OpenCollectionDialog.disableRename(chooser);
         chooser.setDialogTitle(Dictionary.get("FileAssociationDialog.Browse_Title"));

trunk/gli/src/org/greenstone/gatherer/gui/HelpFrame.java

@@ -47 +47 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -322 +323 @@
         url = JarTools.getResource("/" + help_file);
         if (url == null) {
-            File file = new File(Utility.BASE_DIR + help_file);
+            File file = new File(Gatherer.getGLIUserDirectoryPath() + help_file);
             try {
             url = file.toURL();

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionMetadataPrompt.java

@@ -70 +70 @@
 
     // Show the metadata sets (except extracted!) available in the GLI "metadata" folder 
-    ArrayList metadata_sets = MetadataSetManager.listMetadataSets(new File(Utility.METADATA_DIR));
+    ArrayList metadata_sets = MetadataSetManager.listMetadataSets(new File(Gatherer.getGLIMetadataDirectoryPath()));
     ArrayList metadata_set_list_entries = new ArrayList();
     for (int i = 0; i < metadata_sets.size(); i++) {

trunk/gli/src/org/greenstone/gatherer/gui/PreviewCommandDialog.java

@@ -176 +176 @@
      */
     public void actionPerformed(ActionEvent event) {
-        JFileChooser chooser = new JFileChooser(new File(Utility.BASE_DIR));
+        JFileChooser chooser = new JFileChooser(new File(Gatherer.getGLIUserDirectoryPath()));
         OpenCollectionDialog.disableRename(chooser);
         chooser.setDialogTitle(Dictionary.get("FileAssociationDialog.Browse_Title"));

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

@@ -627 +627 @@
             progress.messageOnProgressBar("Downloading CD-ROM data from server");
             }
+
+            // !! TO DO
             
-            //Export directory derrived from -cdname argument
-            //This needs to be exactly the same as derrived by exportcol.pl - perhaps it should be passed in as an argument?
-            String cd_dir = "exported_collections";
-            for(int i=0; i<args.length-1; i++) {
-            if(args[i] == "-cdname") {
-                //Remove all spaces
-                String cdName = args[i+1];
-                Pattern pattern = Pattern.compile("\\s");
-                Matcher matcher = pattern.matcher(cdName);
-                cd_dir = "exported_" + matcher.replaceAll("");
-            }
-            }
-            //DebugStream.println("cd_dir is: " + cd_dir);
-
-            String tmp_dir = Utility.TMP_DIR;
-            String user_tmp_dir = "/tmp";
-
-            //String username = System.getProperty("user.name");
-            //if ((username != null) && (username != "")) {
-            // user_cd_dir = username + File.separator + cd_dir;
-            //user_tmp_dir = user_tmp_dir + File.separator + username;
-            //}
-
-            String full_local_cd_dir = tmp_dir + cd_dir; //Need to tell user this!
-
-            Utility.delete(full_local_cd_dir); // remove current cd-rom dir, if it exists
-            RemoteGreenstoneServer.download_url_zip(user_tmp_dir,cd_dir,this,"","");
-
-            ZipTools.unzip(Configuration.gsdl_path, user_tmp_dir.substring(1));
-
-            if (progress!=null) {
-            System.err.println("Asking progress bar to be empty string");
-            progress.messageOnProgressBar("");
-            }
-            
-            //The string needs to start with exportcol.pl> otherwise it won't be displayed in the final dialog
-            String message = "exportcol.pl>\nThese files have been copied from the server to " + full_local_cd_dir + " and are ready to written to CD-ROM";
-            fireMessage(type, message, status, bos); //Hopefully this works
-            System.err.println("Finished download of /tmp ...");
-        }
-        
+            if (progress!=null) {
+            progress.messageOnProgressBar("");
+            }
+        }
         }
     }

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

@@ -65 +65 @@
     /** The size of the io buffer, in bytes. */
     static final public int BUFFER_SIZE = 1024;
-    /** Definition of an important directory name, in this case the base dir, or the working directory of the Gatherer. */
-
-    static public String BASE_DIR  = System.getProperty("user.dir") + File.separator;
     static final public String BUILD_CFG_FILENAME = "build.cfg";
     static final public String CFG_COLLECTIONMETA_COLLECTIONNAME = "collectionmeta\tcollectionname";
@@ -80 +77 @@
     static final public String CFG_FORMAT = "format";
     static final public String CFG_MAINTAINER = "maintainer";
-    /** Definition of an important directory name, in this case the parent directory of all the collections in the gsdl. */
-    static final public String COL_DIR = "collect" + File.separator;
     static final public String COLLECTION_TREE = "Collection";
     /** Definition of an important directory name, in this case the file the collection configuration is expect to be in. */
@@ -91 +86 @@
     static final public String GLI_EXTENSION = ".col";
 
-    static public String TMP_DIR  = BASE_DIR + "tmp" + File.separator;
-
     /** Definition of an important directory name, in this case the images directory for the collection. */
     static final public String IMAGES_DIR = "images" + File.separator;
@@ -99 +92 @@
     /** Definition of an important directory name, in this case the backup import directory for the collection. */
     static final public String IMPORT_BAK_DIR = "import.bak" + File.separator;
-    /** Definition of an important directory name, in this case the log directory for the collection. */
-    static final public String LOG_DIR = "log" + File.separator;
     /** Definition of an important directory name, in this case the macros directory for the collection. */
     static final public String MACROS_DIR = "macros" + File.separator;
     /** Definition of an important directory name, in this case the location of the expected collection metadata sets.. */
     static final public String META_DIR = "metadata" + File.separator; // Col. Copy
-    /** Definition of an important directory name, in this case the location of the default metadata sets. */
-    static public String METADATA_DIR = BASE_DIR + "metadata" + File.separator;
     /** Definition of an important zip file, in this case zipped up version of metadata file stored in JAR file */
     static final public String METADATA_ZIP = "metadata.zip";
@@ -119 +108 @@
     static final public String PROGRAM_VERSION = "v2.60";
     static final public String WORKSPACE_TREE = "Workspace";
-    static final public String XML_DIRECTORY = "xml" + File.separator;
-
-    static protected File gli_user_folder = null;
     
 
@@ -326 +312 @@
 
 
-    /** Builds the cache dir by appending the user path and 'cache'.
-     * @return a File representing the path to the private file cache within the current collection.
-     */
-    public static File getCacheDir() {
-    return new File(getGLIUserFolder(), StaticStrings.CACHE_FOLDER);
-    }
-
-    
-    /** Method which constructs the configuration file given a certain collection.
-     * @param col_dir The location of the collection directory as a <strong>String</strong>.
-     * @return The location of the given collections configuration file, also as a <strong>String</strong>.
-     */
-    static public String getConfigFile(String col_dir) {
-    return col_dir + CONFIG_FILE;
-    }
-
     static public String getDateString() {
     Calendar current = Calendar.getInstance();
@@ -381 +351 @@
 
 
-    static final private String APPLICATION_DATA_FOLDER = "Application Data";
-    static final private String UNIX_GLI_CONFIG_FOLDER = ".gli";
-    static final private String USER_HOME_PROPERTY = "user.home";
-    static final private String WIN_GLI_CONFIG_FOLDER = "Greenstone" + File.separator + "GLI";
-
-    static public File setGLIUserFolder(String windows_home) {
-        gli_user_folder = null;
-        if(Utility.isWindows()) {
-            if ((windows_home != null) && (windows_home != "")) {
-                gli_user_folder = new File(windows_home + File.separator + "GLI" + File.separator);
-            }
-            else {
-                gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + APPLICATION_DATA_FOLDER + File.separator + WIN_GLI_CONFIG_FOLDER + File.separator);
-            }
-        }
-        else {
-            gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) +
-File.separator + UNIX_GLI_CONFIG_FOLDER + File.separator);
-        }
-        return gli_user_folder;
-    }
-
-    static public File getGLIUserFolder()
-    {
-    return gli_user_folder;
-    }
-
-
-    /** Method which constructs the import directory given a certain collection.
-     * @param col_dir The location of the collection directory as a <strong>String</strong>.
-     * @return The location of the given collections import directory, also as a <strong>String</strong>.
-     */
-    public static String getImportDir(String col_dir) {
-    return col_dir + IMPORT_DIR;
-    }
-
-    /** Method which constructs the log directory given a certain collection.
-     * @param col_dir The location of the collection directory as a <strong>String</strong>.
-     * @return The location of the given collections log directory, also as a <strong>String</strong>.
-     */
-    public static String getLogDir(String col_dir) {
-    if(col_dir != null) {
-        return col_dir + LOG_DIR;
-    }
-    else {
-        return getGLIUserFolder().getAbsolutePath() + File.separator + LOG_DIR;
-    }
-    }
     /** Determine this machines name.
      * @return The name as a <strong>String</strong>.