Changeset 8496 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2004-11-09T13:54:52+13:00 (20 years ago)

Author:

mdewsnip

Message:

Started off fixing a bug where the loaded collection wasn't being ticked on in the cross-collection searching page. Ended up removing a ton of stuff from the CheckList class, some of which was duplicated code and buggy.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• IndexManager.java (modified) (4 diffs)
• SuperCollectionManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

@@ -576 +576 @@
         JLabel source_label = new JLabel();
         Dictionary.registerText(source_label, "CDM.IndexManager.Source");
-        source_list = new CheckList(new_data, false);
+        source_list = new CheckList(false);
+        source_list.setListData(new_data);
         Dictionary.registerTooltip(source_list, "CDM.IndexManager.Source_Tooltip");
 
@@ -696 +697 @@
         new_data.addAll(MetadataSetManager.getEveryMetadataSetElement());
         // reset the model in the list and combobox
-        source_list.setListData(new_data.toArray());
+        source_list.setListData(new_data);
         new_data = null;
         // refresh the indexList
@@ -742 +743 @@
         }
         // Can't add a new index if no sources are selected
-        else if(source_list.isSelectionEmpty()) {
+        else if (source_list.getSelected().size() == 0) {
         add_enabled = false;
         }
@@ -795 +796 @@
         public void actionPerformed(ActionEvent event) {
         String name = name_textfield.getText();
-        if(!source_list.isSelectionEmpty() && name.length() != 0) {
+        if (source_list.getSelected().size() > 0 && name.length() != 0) {
             ArrayList sources = source_list.getSelected();
             Index index = new Index(level_combobox.getSelectedIndex(), sources);

trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

@@ -117 +117 @@
         super();
 
-        buildModel();
         // Creation
         JPanel header_panel = new JPanel();
@@ -135 +134 @@
         Dictionary.registerText(instructions, "CDM.SuperCollectionManager.Instructions");
 
-        collection_checklist = new CheckList(collection_checklist_model, false);
+        collection_checklist = new CheckList(false);
+        buildModel();
+        collection_checklist.setListData(collection_checklist_model);
 
         // Layout
@@ -189 +190 @@
     }
 
-    private void buildModel() {
-        // We start by building a model of the installed collections.
+
+    private void buildModel()
+    {
         collection_checklist_model = new ArrayList();
+        current_coll_name = Gatherer.c_man.getCollection().getName();
+
         File gsdl_collection_directory;
         if (Gatherer.GS3) {
         gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-        } else {
+        }
+        else {
         gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
         }
-        current_coll_name = Gatherer.c_man.getCollection().getName();
+
         File[] possible_collections = gsdl_collection_directory.listFiles();
         for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
-        // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
-        if(collect_cfg_file.exists()) {
+        if (collect_cfg_file.exists()) {
             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
             StringBuffer title_buffer = new StringBuffer(collect_cfg.getName());
@@ -213 +217 @@
             title_buffer = null;
             String collection_name = possible_collections[i].getName();
-            // We do have to block the model collection.
-            if(!collect_cfg.getName().equals("**title**")) {
-            Entry entry = new Entry(collection_title);
-            entry.setProperty(collection_name);
-            // Check if a collection with this name exists. The current collection is always selected.
-            entry.setSelected(getSuperCollection(collection_name) != null || collection_name.equals(current_coll_name));
-            entry.setFixed(collection_name.equals(current_coll_name));
-            collection_checklist_model.add(entry);
-            entry = null;
-
+
+            // We have to block the model collection.
+            if (collect_cfg.getName().equals("**title**")) {
+            continue;
             }
-            collection_name = null;
-            collection_title = null;
-            collect_cfg = null;
+
+            // The current collection is always selected.
+            Entry entry = new Entry(collection_title);
+            entry.setProperty(collection_name);
+            entry.setSelected(getSuperCollection(collection_name) != null || collection_name.equals(current_coll_name));
+            entry.setFixed(collection_name.equals(current_coll_name));
+            collection_checklist_model.add(entry);
         }
-        collect_cfg_file = null;
-        }
-        possible_collections = null;
-        gsdl_collection_directory = null;
-        // Sort the result.
-        Collections.sort(collection_checklist_model);
+        }
     }
     }