Changeset 10345 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2005-07-28T16:19:40+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some more crap out of the Utility class.

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• BasicCollectionConfiguration.java (modified) (1 diff)
• Collection.java (modified) (1 diff)
• CollectionManager.java (modified) (3 diffs)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.StaticStrings;
-import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
 

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

@@ -48 +48 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.util.StaticStrings;
-import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;

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

@@ -173 +173 @@
     if(collection != null) {
         // Determine if the collection has been built by looking for the build.cfg file
-        File build_cfg_file = new File(getCollectionIndexDirectoryPath() + Utility.BUILD_CFG_FILENAME);
+        File build_cfg_file = new File(getCollectionIndexDirectoryPath() + "build.cfg");
         return build_cfg_file.exists();
     }
@@ -395 +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(Gatherer.getGLIMetadataDirectoryPath() + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
+        File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + MetadataSetManager.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
         importMetadataSet(new MetadataSet(extracted_metadata_set_file));
         }
@@ -1146 +1146 @@
 
     // Always import the extracted metadata set
-    File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
+    File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + MetadataSetManager.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
     importMetadataSet(new MetadataSet(extracted_metadata_set_file));