Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (7 diffs)

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

@@ -39 +39 @@
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
-import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.metadata.MetadataElement;
+import org.greenstone.gatherer.metadata.MetadataSetManager;
 import org.greenstone.gatherer.util.ExclusiveListSelectionListener;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -383 +384 @@
             Object source_object = sources_list.get(j);
             String source_str = null;
-            if(source_object instanceof ElementWrapper) {
-                source_str = ((ElementWrapper)source_object).getName();
+            if(source_object instanceof MetadataElement) {
+                source_str = ((MetadataElement) source_object).getFullName();
             }
             else {
@@ -519 +520 @@
         ArrayList new_data = new ArrayList();
         new_data.add(CollectionConfiguration.TEXT_STR);
-        new_data.addAll(Gatherer.c_man.getCollection().msm.getAssignedElements());
-
+        new_data.addAll(MetadataSetManager.getEveryMetadataSetElement());
         // Creation
         JPanel mgindexes_panel = new JPanel();
@@ -688 +688 @@
         ArrayList new_data = new ArrayList();
         new_data.add(CollectionConfiguration.TEXT_STR);
-        new_data.addAll(Gatherer.c_man.getCollection().msm.getAssignedElements());
+        new_data.addAll(MetadataSetManager.getEveryMetadataSetElement());
         // reset the model in the list and combobox
         source_list.setListData(new_data.toArray());
@@ -772 +772 @@
          * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
          */
-        public void valueChanged(ListSelectionEvent event) {
+        public void valueChanged(ListSelectionEvent event)
+        {
+        if (event.getValueIsAdjusting()) {
+            return;
+        }
+
         Object value = index_list.getSelectedValue();
         move_down_button.setEnabled(value != null);
@@ -1200 +1205 @@
         index_combobox.addItem(CollectionConfiguration.METADATA_STR);
         index_combobox.addItem(CollectionConfiguration.TEXT_STR);
-        java.util.List assigned_elements = Gatherer.c_man.getCollection().msm.getAssignedElements();
-        int assigned_elements_size = assigned_elements.size();
-        for(int i = 0; i < assigned_elements_size; i++) {
-        index_combobox.addItem(assigned_elements.get(i));
-        }
-        assigned_elements = null;
+        ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
+        for(int i = 0; i < every_metadata_set_element.size(); i++) {
+        index_combobox.addItem(every_metadata_set_element.get(i));
+        }
         // Ensure the level manager has at least documents assigned
         if(levels_model.getSize() == 0) {
@@ -1383 +1386 @@
             // Unfortunately we have to generate a valid id
             String id = null;
-            if(selected_object instanceof ElementWrapper) {
-            id = ((ElementWrapper)selected_object).getName();
+            if (selected_object instanceof MetadataElement) {
+            id = ((MetadataElement) selected_object).getFullName();
             }
             else {