Changeset 9024

Timestamp:

2005-02-14T15:47:27+13:00 (19 years ago)

Author:

mdewsnip

Message:

Added toString() function to MetadataSet so multiple renderers are not needed.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/MetadataImportMappingPrompt.java (modified) (2 diffs)
• metadata/MetadataSet.java (modified) (2 diffs)

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

@@ -76 +76 @@
     metadata_sets_combobox = new GComboBox(metadata_sets);
     metadata_sets_combobox.addActionListener(new MetadataSetListSelectionListener());
-    metadata_sets_combobox.setRenderer(new MetadataSetListCellRenderer());
     metadata_sets_combobox.setSelectedIndex(0);
 
@@ -155 +154 @@
 
 
-    private class MetadataSetListCellRenderer
-    extends JLabel
-    implements ListCellRenderer
-    {
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean is_selected, boolean cell_has_focus)
-    {
-        MetadataSet metadata_set = (MetadataSet) value;
-        String interface_language_code = Configuration.getLanguage();
-        String metadata_set_name = MetadataTools.getMetadataSetAttribute(metadata_set, "Name", interface_language_code, "en");
-        setText(metadata_set_name);
-        return this;
-    }
-    }
-
-
     private class MetadataSetListSelectionListener
     implements ActionListener

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataSet.java

@@ -31 +31 @@
 import java.util.*;
 import javax.swing.filechooser.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.util.XMLTools;
@@ -189 +190 @@
 
 
+    /** This is used to display the metadata set in the metadata import mapping and explode metadata prompts */
+    public String toString()
+    {
+    return MetadataTools.getMetadataSetAttribute(this, "Name", Configuration.getLanguage(), "en");
+    }
+
+
     static public class MetadataSetFileFilter
     extends FileFilter