Changeset 11623 for trunk

Timestamp:

2006-04-07T13:28:27+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed some pointless static variables from Utility.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (9 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• util/Utility.java (modified) (2 diffs)

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

@@ -298 +298 @@
     try {
         // do the macros dir
-        File base_coll_macros = new File(base_coll_dir, Utility.MACROS_DIR);
+        File base_coll_macros = new File(base_coll_dir, "macros");
         if (base_coll_macros.isDirectory()) {
         // copy all the macros over
-        File new_coll_macros = new File(new_coll_dir, Utility.MACROS_DIR);
+        File new_coll_macros = new File(new_coll_dir, "macros");
         new_coll_macros.mkdirs();
         
@@ -851 +851 @@
 
     // Special case of a user trying to open an old greenstone collection.
-    File collection_metadata_directory = new File(collection_directory, Utility.META_DIR);
+    File collection_metadata_directory = new File(collection_directory, "metadata");
     if (!collection_metadata_directory.exists()) {
         DebugStream.println("Loading non-gatherer collection...");
@@ -1382 +1382 @@
         } // if collectionmeta
 
-        if(command_type_str.equals(Utility.CFG_CLASSIFY)) {
+        if (command_type_str.equals("classify")) {
             StringBuffer text = new StringBuffer(command_type_str);
             // Read in the classifier command watching for hfile, metadata and sort arguments.
@@ -1392 +1392 @@
             while(tokenizer.hasMoreTokens()) {
             String token = tokenizer.nextToken();
-            if(token.equals(Utility.CFG_CLASSIFY_HFILE)) {
+            if (token.equals("-hfile")) {
                 if(tokenizer.hasMoreTokens()) {
                 text.append(" ");
@@ -1400 +1400 @@
                 }
             }
-            else if(token.equals(Utility.CFG_CLASSIFY_METADATA)) {
+            else if (token.equals("-metadata")) {
                 if(tokenizer.hasMoreTokens()) {
                 text.append(" ");
@@ -1418 +1418 @@
                 }
             }
-            else if(token.equals(Utility.CFG_CLASSIFY_SORT)) {
+            else if (token.equals("-sort")) {
                 if(tokenizer.hasMoreTokens()) {
                 text.append(" ");
@@ -1434 +1434 @@
                 }
             }
-            else if(token.equals(Utility.CFG_CLASSIFY_BUTTONNAME)) {
+            else if(token.equals("-buttonname")) {
                 buttonname = token;
             }
@@ -1445 +1445 @@
             if(old_metadata != null && new_metadata != null && buttonname == null) {
             text.append(' ');
-            text.append(Utility.CFG_CLASSIFY_BUTTONNAME);
+            text.append("-buttonname");
             text.append(' ');
             text.append(old_metadata);
@@ -1472 +1472 @@
             // There is still one special case, that of the format command. In such a command we have to search for [<target>] to ensure we don't change parts of the format which have nothing to do with the metadata elements.
             // we really want to build up the whole command here
-            boolean format_command = command_type_str.equals(Utility.CFG_FORMAT);
+            boolean format_command = command_type_str.equals("format");
             HashMap metadata_mapping = ProfileXMLFileManager.getMetadataMapping();
             if (metadata_mapping != null) {

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

@@ -280 +280 @@
         if (collect_cfg_file.exists()) {
         // If the directory has a metadata/ then the collection can be used as a base
-        File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
+        File metadata_directory = new File(possible_collections[i], "metadata");
         if (metadata_directory.exists()) {
             // Add to model

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

@@ -59 +59 @@
     /** The size of the io buffer, in bytes. */
     static final public int BUFFER_SIZE = 1024;
-    static final public String CFG_CLASSIFY = "classify";
-    static final public String CFG_CLASSIFY_BUTTONNAME = "-buttonname";
-    static final public String CFG_CLASSIFY_HFILE = "-hfile";
-    static final public String CFG_CLASSIFY_METADATA = "-metadata";
-    static final public String CFG_CLASSIFY_SORT = "-sort";
-    static final public String CFG_FORMAT = "format";
     /** Definition of an important directory name, in this case the file the collection configuration is expect to be in. */
     static final public String CONFIG_FILE = "etc" + File.separator + "collect.cfg";
@@ -71 +65 @@
     /** Definition of an important directory name, in this case the import directory for the collection. */
     static final public String IMPORT_DIR = "import" + 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
     /** The default name of the perl executable under unix. */
     static final public String PERL_EXECUTABLE_UNIX = "perl";