Changeset 6146 for trunk

Timestamp:

2003-12-08T14:20:09+13:00 (20 years ago)

Author:

jmt12

Message:

Changed how a collection name appears. It now displays the collection title, followed by the shorter filename in curved brackets. Accomplished this by removing crazy CollectionEntry class

Location:

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

Files:

• DeleteCollectionPrompt.java (modified) (5 diffs)
• ExportCollectionPrompt.java (modified) (6 diffs)

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

@@ -61 +61 @@
     extends ModalDialog {
     /** The currently selected collection for deletion. */
-    private CollectionEntry collection = null;
+    private BasicCollectionConfiguration collection = null;
     /** The model behind the list. */
     private DefaultListModel list_model = null;
@@ -228 +228 @@
             if (config_file != null) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
-            if (config != null) {
-                CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
-                list_model.addElement(col);
+            if(!config.getName().equals(StaticStrings.EMPTY_STR)) {
+                list_model.addElement(config);
             }    
             }
@@ -263 +262 @@
         if(!list.isSelectionEmpty()) {
         confirmation.setEnabled(true);
-        collection = (CollectionEntry) list.getSelectedValue();
+        collection = (BasicCollectionConfiguration) list.getSelectedValue();
         args = new String[5];
-        args[0] = collection.getTitle();
-        args[1] = collection.getName();
+        args[0] = collection.getName();
+        args[1] = collection.getShortName();
         args[2] = collection.getCreator();
         args[3] = collection.getMaintainer();
@@ -308 +307 @@
         ///ystem.err.println("Local Library Found!");
         //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
-        Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
-        }
-
-        File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+        Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getShortName());
+        }
+
+        File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getShortName() + File.separator);
         if(Utility.delete(delete_me)) {
-        if (Gatherer.c_man.getCollection() != null && collection.getName().equals(Gatherer.c_man.getCollection().getName())) {
+        if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(Gatherer.c_man.getCollection().getName())) {
             current_coll_deleted = true;
         }
@@ -333 +332 @@
     }
     }
-
-    private class CollectionEntry {
-
-    private String name = null;
-    private BasicCollectionConfiguration config = null;
-
-    public CollectionEntry(String name, BasicCollectionConfiguration config) {
-        this.name = name;
-        this.config = config;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTitle() {
-        return config.getName();
-    }
-
-    public String getCreator() {
-        return config.getCreator();
-    }
-
-    public String getDescription() {
-        return config.getDescription();
-    }
-    
-    public String getMaintainer() {
-        return config.getMaintainer();
-    }
-
-    public String toString() {
-        return name + " - \"" + config.getName() + "\"";        
-    }
-    }
 }

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

@@ -74 +74 @@
     private CheckList list = null;
     /** The currently selected collection for deletion. */
-    private CollectionEntry collection = null;
+    private BasicCollectionConfiguration collection = null;
     /** The model behind the list. */
     private DefaultListModel list_model = null;
@@ -283 +283 @@
     }
     for (int i=0; i<num_collections;i++,next_arg++) {
-        args[next_arg] = ((CollectionEntry)selected_collections.get(i)).getName();
+        args[next_arg] = ((BasicCollectionConfiguration)selected_collections.get(i)).getShortName();
     }
     
@@ -308 +308 @@
         coll_names.append(", ");
         }
-        coll_names.append(((CollectionEntry)selected_collections.get(i)).getName());
+        BasicCollectionConfiguration complete_collection = (BasicCollectionConfiguration)selected_collections.get(i);
+        coll_names.append(complete_collection.getName() + StaticStrings.SPACE_CHAR + StaticStrings.OPEN_PARENTHESIS_CHAR + complete_collection.getShortName() + StaticStrings.CLOSE_PARENTHESIS_CHAR);
+        complete_collection = null;
     }
     
@@ -352 +354 @@
             if (config_file != null) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
-            if (config != null) {
-                CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
-                //list_model.addElement(col);
-                all_collections.add(col);
+            if (!config.getName().equals(StaticStrings.EMPTY_STR)) {
+                all_collections.add(config);
             }    
+            config = null;
             }
         }
@@ -419 +420 @@
         ok_button.setEnabled(false);
         if(!list.isSelectionEmpty()) {
-        collection = (CollectionEntry) ((Entry)list.getSelectedValue()).getObject();
+        collection = (BasicCollectionConfiguration) ((Entry)list.getSelectedValue()).getObject();
         args = new String[5];
-        args[0] = collection.getTitle();
-        args[1] = collection.getName();
+        args[0] = collection.getName();
+        args[1] = collection.getShortName();
         args[2] = collection.getCreator();
         args[3] = collection.getMaintainer();
@@ -520 +521 @@
     }
 
-    private class CollectionEntry {
-
-    private String name = null;
-    private BasicCollectionConfiguration config = null;
-
-    public CollectionEntry(String name, BasicCollectionConfiguration config) {
-        this.name = name;
-        this.config = config;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTitle() {
-        return config.getName();
-    }
-
-    public String getCreator() {
-        return config.getCreator();
-    }
-
-    public String getDescription() {
-        return config.getDescription();
-    }
-    
-    public String getMaintainer() {
-        return config.getMaintainer();
-    }
-
-    public String toString() {
-        return name + " - \"" + config.getName() + "\"";        
-    }
-    }
-
     private class ResultDialog
     extends ModalDialog {