Changeset 11625

Timestamp:

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

Author:

mdewsnip

Message:

Removed some more stuff from Utility.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• collection/LegacyCollectionImporter.java (modified) (1 diff)
• file/FileQueue.java (modified) (2 diffs)
• file/WorkspaceTreeNode.java (modified) (1 diff)
• gui/OpenCollectionDialog.java (modified) (1 diff)
• gui/SimpleOpenCollectionDialog.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

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

@@ -845 +845 @@
 
     // Ensure that an import directory exists for this collection
-    File collection_import_directory = new File(collection_directory, Utility.IMPORT_DIR);
+    File collection_import_directory = new File(collection_directory, "import");
     if (!collection_import_directory.exists()) {
         collection_import_directory.mkdir();

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

@@ -34 +34 @@
     static public void backupMetadataXMLFiles(File collection_dir)
     {
-    File import_dir = new File(collection_dir, Utility.IMPORT_DIR);
+    File import_dir = new File(collection_dir, "import");
     File import_bak_dir = new File(collection_dir, IMPORT_BAK_DIR);
     import_bak_dir.mkdir();

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

@@ -53 +53 @@
     extends Thread
 {
+    /** The size of the io buffer, in bytes. */
+    static final private int BUFFER_SIZE = 1024;
+
     /** When someone requests the movement queue to be dumped this cancel flag is set to true. */
     private boolean cancel_action = false;
@@ -796 +799 @@
 
     // Copy the file
-    byte data[] = new byte[Utility.BUFFER_SIZE];
+    byte data[] = new byte[BUFFER_SIZE];
     int data_size = 0;
-    while ((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1 && !cancel_action) {
+    while ((data_size = f_in.read(data, 0, BUFFER_SIZE)) != -1 && !cancel_action) {
         long destination_size = destination.length();
         try {

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

@@ -141 +141 @@
         for (int i = 0; cols != null && i < cols.length; i++) {
             if (!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File import_dir = new File(cols[i], Utility.IMPORT_DIR);
+            File import_dir = new File(cols[i], "import");
             if (!import_dir.exists()) {
                 continue;

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

@@ -213 +213 @@
         // 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_FILE);
-        File import_dir_file = new File(dir, Utility.IMPORT_DIR);
+        File import_dir_file = new File(dir, "import");
         if(collect_cfg_file.exists() && import_dir_file.exists()) {
         // Create a new dummy collection file.

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

@@ -319 +319 @@
         File etc_folder = collect_cfg_file.getParentFile();
         File collection_folder = etc_folder.getParentFile();
-        filename = collection_folder.getAbsolutePath() + File.separator + collection_folder.getName() + Utility.GLI_EXTENSION;
+        filename = collection_folder.getAbsolutePath() + File.separator + collection_folder.getName() + ".col";
         collection_folder = null;
         etc_folder = null;

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

@@ -57 +57 @@
 public class Utility
 {
-    /** 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 file the collection configuration is expect to be in. */
     static final public String CONFIG_FILE = "etc" + File.separator + "collect.cfg";
-    static final public String GLI_EXTENSION = ".col";
-
-    /** Definition of an important directory name, in this case the import directory for the collection. */
-    static final public String IMPORT_DIR = "import" + File.separator;
     /** The default name of the perl executable under unix. */
     static final public String PERL_EXECUTABLE_UNIX = "perl";