Changeset 7275

Timestamp:

2004-05-05T11:23:40+12:00 (20 years ago)

Author:

kjdon

Message:

renamed Utility.CONFIG_DIR to Utility.CONFIG_FILE cos it refers to the file, not the directory. Also getConfigDir renamed to getConfigFile

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/SuperCollectionManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (3 diffs)
• file/FileNode.java (modified) (1 diff)
• gui/NewCollectionDetailsPrompt.java (modified) (2 diffs)
• gui/OpenCollectionDialog.java (modified) (2 diffs)
• gui/SimpleOpenCollectionDialog.java (modified) (1 diff)
• mem/MEMNode.java (modified) (1 diff)
• util/Utility.java (modified) (2 diffs)

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

@@ -196 +196 @@
         for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
         // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
-        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
+        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
         if(collect_cfg_file.exists()) {
             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);

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

@@ -356 +356 @@
         // Now we update our collect.cfg
         Gatherer.println("Copy and update collect.cfg from base collection.");
-        updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_DIR), new File(a_dir, Utility.CONFIG_DIR), description, email, title);
+        updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_FILE), new File(a_dir, Utility.CONFIG_FILE), description, email, title);
         }
 
@@ -512 +512 @@
      */
     public String getCollectionConfig() {
-    return Utility.getConfigDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+    return Utility.getConfigFile(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
     }
 
@@ -840 +840 @@
         }
 
-        collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_DIR));
+        collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_FILE));
         if (non_gatherer_collection) {
         // We first recurse the Import folder tree, reading in any metadata.xml files, and then altering the non-namespaced element names to be valid GLI names

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

@@ -283 +283 @@
             File import_dir = new File(cols[i], StaticStrings.IMPORT_FOLDER);
             if(import_dir.exists()) {
-                BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], Utility.CONFIG_DIR));
+                BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], Utility.CONFIG_FILE));
                 FileNode collection_root = new FileNode(import_dir, collect_cfg.toString(), true);
                 collection_root.setParent(this);

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

@@ -55 +55 @@
     for(int i = 0; children != null && i < children.length; i++) {
         if(children[i].isDirectory()) {
-        File config_file = new File(children[i], Utility.CONFIG_DIR);
+        File config_file = new File(children[i], Utility.CONFIG_FILE);
         if(current_config_file == null || !config_file.equals(current_config_file)) {
             BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(config_file);
@@ -108 +108 @@
     for (int i = 0; possible_collections != null && i < possible_collections.length; i++) {
         // If the directory has a etc/collect.cfg file then it looks like a collection
-        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
+        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
         if (collect_cfg_file.exists()) {
         // If the directory has a metadata/ then the collection can be used as a base

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

@@ -169 +169 @@
         else {
             // Build a wrapper around the collection configuration file.
-            File config_file = new File(file.getParentFile(), Utility.CONFIG_DIR);
+            File config_file = new File(file.getParentFile(), Utility.CONFIG_FILE);
             if(config_file.exists()) {
             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(config_file);
@@ -212 +212 @@
         File[] files = default_system_view.getFiles(dir, useFileHiding);
         // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import.
-        File collect_cfg_file = new File(dir, Utility.CONFIG_DIR);
+        File collect_cfg_file = new File(dir, Utility.CONFIG_FILE);
         File import_dir_file = new File(dir, Utility.IMPORT_DIR);
         if(collect_cfg_file.exists() && import_dir_file.exists()) {

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

@@ -215 +215 @@
         String collection_foldername = collection_folder.getName();
         if(!collection_folder.isFile() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-           BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(new File(collection_folder, Utility.CONFIG_DIR));
+           BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(new File(collection_folder, Utility.CONFIG_FILE));
            if(!collection_configuration.getName().equals(StaticStrings.ERROR_STR)) {
               data.add(collection_configuration);

trunk/gli/src/org/greenstone/gatherer/mem/MEMNode.java

@@ -160 +160 @@
             if(is_descendant) {
                 // Create a basic config class
-                BasicCollectionConfiguration config = new BasicCollectionConfiguration(new File(source_path, Utility.CONFIG_DIR));
+                BasicCollectionConfiguration config = new BasicCollectionConfiguration(new File(source_path, Utility.CONFIG_FILE));
                 text = config.toString();
                 config = null;

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

@@ -89 +89 @@
     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. */
-    static final public String CONFIG_DIR = "etc" + File.separator + "collect.cfg";
+    static final public String CONFIG_FILE = "etc" + File.separator + "collect.cfg";
     /** The default file name for the urls missing any file. */
     static final public String DEFAULT_FILE = "index.html";
@@ -505 +505 @@
      * @return The location of the given collections configuration file, also as a <strong>String</strong>.
      */
-    static public String getConfigDir(String col_dir) {
-    return col_dir + CONFIG_DIR;
+    static public String getConfigFile(String col_dir) {
+    return col_dir + CONFIG_FILE;
     }