Changeset 8651

Timestamp:

2004-11-24T14:03:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some dead constants and code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• file/RecycleBin.java (modified) (1 diff)
• util/Utility.java (modified) (4 diffs)

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

@@ -132 +132 @@
     }
 
-    Utility.CACHE_DIR    = Utility.BASE_DIR + "cache"    + File.separator;
-    Utility.HELP_DIR     = Utility.BASE_DIR + "help"     + File.separator;
     Utility.METADATA_DIR = Utility.BASE_DIR + "metadata" + File.separator;
-    Utility.RECYCLE      = Utility.BASE_DIR + "recycle"  + File.separator;
-    Utility.RES_DIR      = Utility.BASE_DIR + "resource" + File.separator;
-    Utility.WELCOME_DIR  = Utility.BASE_DIR + "welcome"  + File.separator;
 
     Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";

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

@@ -569 +569 @@
     public String getCollectionBuild() {
     if (Gatherer.GS3) {
-        return Utility.getBuildDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
+        return Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()) + "building" + File.separator;
     } else {
-        return Utility.getBuildDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
+        return Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()) + "building" + File.separator;
     }
     }

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

@@ -80 +80 @@
     setOpaque(true);
 
-    this.model = new FileSystemModel(new FileNode(new File(Utility.RECYCLE), "Undo"));
+    this.model = new FileSystemModel(new FileNode(new File(Utility.getGLIUserFolder() + "recycle" + File.separator), "Undo"));
     }
 

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

@@ -73 +73 @@
     static public String BASE_DIR  = System.getProperty("user.dir") + File.separator;
     static final public String BUILD_CFG_FILENAME = "build.cfg";
-    /** Definition of an important directory name, in this case the building directory for the collection. */
-    static final public String BUILD_DIR = "building" + File.separator;
-    /** Definition of an important directory name, in this case the public web cache for the Gatherer. */
-    static public String CACHE_DIR = BASE_DIR + "cache" + File.separator;
     static final public String CFG_COLLECTIONMETA_COLLECTIONNAME = "collectionmeta\tcollectionname";
     static final public String CFG_COLLECTIONMETA_COLLECTIONEXTRA = "collectionmeta\tcollectionextra";
@@ -106 +102 @@
     /** The location of the default greenstone metadata file. */
     static final public String GREENSTONEDIRECTORYMETADATA_TEMPLATE = "xml/metadata.xml";
-    /** Definition of an important directory name, in this case the private web cache directory for the collection. */
-    static final public String GCACHE_DIR = "cache" + File.separator;
     static final public String GLI_ARCHIVE = "GLI.jar";
     static final public String GLI_EXTENSION = ".col";
-    /** Definition of an important directory name, in this case the location of help documentation. */
-    static public String HELP_DIR = BASE_DIR + "help" + 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;
@@ -144 +136 @@
     /** The current version of the Gatherer. */
     static final public String PROGRAM_VERSION = "v2.52";
-    /** Definition of an important directory name, in this case the location of the recycled files location. */
-    static public String RECYCLE = BASE_DIR + "recycle" + File.separator;
-    /** Definition of an important directory name, in this case the location of image and other resources. */
-    static public String RES_DIR = BASE_DIR + "resource" + File.separator;
-    /** Definition of an important directory name, in this case the location of opening (or welcome) screen html. */
-    static public String WELCOME_DIR = BASE_DIR + "welcome" + File.separator;
     static final public String WORKSPACE_TREE = "Workspace";
     static final public String XML_DIRECTORY = "xml" + File.separator;
@@ -428 +414 @@
     }
 
-    /** Method which constructs the build 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 build directory, also as a <strong>String</strong>.
-     */
-    static public String getBuildDir(String col_dir) {
-    if(col_dir == null) {
-        return BASE_DIR + BUILD_DIR;
-    }
-    return col_dir + BUILD_DIR;
-    }
     /** 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.