Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.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/SubcollectionManager.java (modified) (8 diffs)

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
-/**************************************************************************************
- * Written:      ??/??/02
- * Revised:      04/07/03 - DOM support
- **************************************************************************************/
+
 import java.awt.*;
 import java.awt.event.*;
@@ -42 +39 @@
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.NonWhitespaceField;
-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;
@@ -245 +243 @@
         JLabel source_label = new JLabel();
         Dictionary.registerText(source_label, "CDM.SubcollectionManager.Source");
-        Vector source_model = Gatherer.c_man.getCollection().msm.getAssignedElements();
+        ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
+        Vector source_model = new Vector(every_metadata_set_element);
         source_model.add(0, StaticStrings.FILENAME_STR);
         source_combobox = new JComboBox(source_model);
@@ -364 +363 @@
     public void gainFocus() {
         // Rebuild the sources combobox
-        Vector source_model = Gatherer.c_man.getCollection().msm.getAssignedElements();
+        ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
+        Vector source_model = new Vector(every_metadata_set_element);
         source_model.add(0, "Filename"); // Add filename as a possible source.
         source_combobox.setModel(new DefaultComboBoxModel(source_model));
@@ -395 +395 @@
         String source = null;
         Object object = source_combobox.getSelectedItem();
-        if(object instanceof ElementWrapper) {
-            ElementWrapper element_wrapper = (ElementWrapper)object;
-            source = element_wrapper.getName();
-            if(source.indexOf(StaticStrings.NS_SEP) == -1) {
-            source = StaticStrings.EXTRACTED_NAMESPACE + source;
-            }
+        if (object instanceof MetadataElement) {
+            MetadataElement metadata_element = (MetadataElement) object;
+            source = metadata_element.getFullName();
         }
         else {
@@ -481 +478 @@
             String source = null;
             Object object = source_combobox.getSelectedItem();
-            if(object instanceof ElementWrapper) {
-            ElementWrapper element_wrapper = (ElementWrapper)object;
-            source = element_wrapper.getName();
-            if(source.indexOf(StaticStrings.NS_SEP) == -1) {
-                source = StaticStrings.EXTRACTED_NAMESPACE + source;
-            }
+            if (object instanceof MetadataElement) {
+            MetadataElement metadata_element = (MetadataElement) object;
+            source = metadata_element.getFullName();
             }
             else {
@@ -508 +502 @@
          */
         public void valueChanged(ListSelectionEvent event) {
+        // Wait until the event stabilises to avoid processing it multiple times
+        if (event.getValueIsAdjusting() == true) {
+            return;
+        }
         // Now the entry
         if(!subcollection_list.isSelectionEmpty()) {
@@ -520 +518 @@
             Object value = source_combobox.getItemAt(pos);
             //ystem.err.println("Search for: " + s);
-            while(value != null) {
-            if(value instanceof ElementWrapper) {
-                ElementWrapper e = (ElementWrapper) value;
-                String e_name = e.getName();
-                if(e_name.indexOf(StaticStrings.NS_SEP) == -1) {
-                e_name = StaticStrings.EXTRACTED_NAMESPACE + e_name;
-                }
+            while (value != null) {
+            if (value instanceof MetadataElement) {
+                MetadataElement metadata_element = (MetadataElement) value;
+                String metadata_element_name = metadata_element.getFullName();
                 //ystem.err.print("Compare to: " + e_name);
-                if(e_name.equals(s)) {
+                if (metadata_element_name.equals(s)) {
                 source_combobox.setSelectedIndex(pos);
                 value = null;