Changeset 9201

Timestamp:

2005-02-25T17:29:54+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed NewCollectionMetadataPrompt to use CheckList rather than a lot of custom code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/NewCollectionMetadataPrompt.java (modified) (8 diffs)
• metadata/MetadataSet.java (modified) (1 diff)

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

@@ -37 +37 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.metadata.MetadataElement;
 import org.greenstone.gatherer.metadata.MetadataSet;
 import org.greenstone.gatherer.metadata.MetadataSetManager;
-import org.greenstone.gatherer.metadata.MetadataTools;
+import org.greenstone.gatherer.util.CheckList;
+import org.greenstone.gatherer.util.CheckListEntry;
 import org.greenstone.gatherer.util.Utility;
 
 
 public class NewCollectionMetadataPrompt
-    extends ModalDialog {
-
+    extends ModalDialog
+{
     private boolean cancelled = true;
     private JDialog self;
     private JList elements_list;
-    private MetadataSetList sets_list;
+    private CheckList metadata_sets_list;
     static private Dimension size = new Dimension(700, 380);
 
@@ -70 +70 @@
 
     // Show the metadata sets (except extracted!) available in the GLI "metadata" folder 
-    ArrayList sets = MetadataSetManager.listMetadataSets(new File(Utility.METADATA_DIR));
+    ArrayList metadata_sets = MetadataSetManager.listMetadataSets(new File(Utility.METADATA_DIR));
     ArrayList metadata_set_list_entries = new ArrayList();
-    for (int i = 0; i < sets.size(); i++) {
-        MetadataSet metadata_set = (MetadataSet) sets.get(i);
+    for (int i = 0; i < metadata_sets.size(); i++) {
+        MetadataSet metadata_set = (MetadataSet) metadata_sets.get(i);
 
         // Don't show the extracted metadata set
@@ -79 +79 @@
         continue;
         }
-        // Hack: add dublin caore at the top
-        if (metadata_set.getNamespace().equals("dc")) {
-        metadata_set_list_entries.add(0, new MetadataSetListEntry(metadata_set));
-        } else {
-        metadata_set_list_entries.add(new MetadataSetListEntry(metadata_set));
-        }
+
+        metadata_set_list_entries.add(metadata_set);
     }
 
@@ -102 +98 @@
     sets_list_label.setOpaque(false);
     Dictionary.setText(sets_list_label, "NewCollectionPrompt.Select_MDS");
-    sets_list = new MetadataSetList();
-    sets_list.setListData(new Vector(metadata_set_list_entries));
-    sets_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    metadata_sets_list = new CheckList(true);
+    metadata_sets_list.addListSelectionListener(new MetadataSetListSelectionListener());
+    metadata_sets_list.setListData(metadata_set_list_entries);
+    metadata_sets_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
     JPanel elements_list_pane = new JPanel();
@@ -116 +113 @@
     elements_list.setSelectionForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
 
-    // Select the Dublin Core metadata set by default, at Ian's request
-    sets_list.selectDublinCoreMetadataSet();
+    // Set Dublin Core to be ticked initially, at Ian's request
+    for (int i = 0; i < metadata_set_list_entries.size(); i++) {
+        MetadataSet metadata_set = (MetadataSet) metadata_set_list_entries.get(i);
+        if (metadata_set.getMetadataSetFile().getName().equals("dublin.mds")) {
+        metadata_sets_list.setTickedObjects(new Object[] { metadata_set });
+        }
+    }
 
     JPanel button_pane = new JPanel();
@@ -138 +140 @@
     sets_list_pane.setLayout(new BorderLayout());
     sets_list_pane.add(sets_list_label, BorderLayout.NORTH);
-    sets_list_pane.add(new JScrollPane(sets_list), BorderLayout.CENTER);
+    sets_list_pane.add(new JScrollPane(metadata_sets_list), BorderLayout.CENTER);
 
     elements_list_pane.setLayout(new BorderLayout());
@@ -167 +169 @@
 
     public ArrayList getSets() {
-    return sets_list.getSelectedMetadataSets();
+    return metadata_sets_list.getTicked();
     }
 
@@ -184 +186 @@
 
 
-    private class MetadataSetList
-    extends JList
+    private class MetadataSetListSelectionListener 
+    implements ListSelectionListener
     {
-    public MetadataSetList()
+    public void valueChanged(ListSelectionEvent event)
     {
-        super();
-        addListSelectionListener(new MetadataSetListSelectionListener());
-        addMouseListener(new MetadataSetListSelectionListener());
-        setCellRenderer(new MetadataSetListCellRenderer());
-    }
-
-
-    public ArrayList getSelectedMetadataSets()
+        if (!metadata_sets_list.isSelectionEmpty()) {
+        // Retrieve the selected set
+        MetadataSet metadata_set = (MetadataSet) ((CheckListEntry) metadata_sets_list.getSelectedValue()).getObject();
+        elements_list.setListData(new Vector(metadata_set.getMetadataSetElements()));
+        }
+        else {
+        elements_list.setListData(new String[0]);
+        }
+    }
+    }
+
+
+    private class OKButtonListener
+    implements ActionListener
+    {
+    public void actionPerformed(ActionEvent event)
     {
-        ArrayList selected_metadata_sets = new ArrayList();
-
-        ListModel model = (ListModel) getModel();
-        for (int i = 0; i < model.getSize(); i++) {
-        MetadataSetListEntry metadata_set_list_entry = (MetadataSetListEntry) model.getElementAt(i);
-        if (metadata_set_list_entry.isSelected()) {
-            selected_metadata_sets.add(metadata_set_list_entry.getMetadataSet());
-        }
-        }
-
-        return selected_metadata_sets;
-    }
-
-
-    /** Hack special-case code, used to select the Dublin Core metadata set by default */
-    public void selectDublinCoreMetadataSet()
-    {
-        ListModel model = (ListModel) getModel();
-        for (int i = 0; i < model.getSize(); i++) {
-        MetadataSetListEntry metadata_set_list_entry = (MetadataSetListEntry) model.getElementAt(i);
-        if (metadata_set_list_entry.getMetadataSet().getNamespace().equals("dc")) {
-            metadata_set_list_entry.setSelected(true);
-            metadata_set_list_entry.grabFocus();
-            setSelectedIndex(i);
-            break;
-        }
-        }
-    }
-
-
-    private class MetadataSetListCellRenderer
-        extends JLabel
-        implements ListCellRenderer {
-
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean is_selected, boolean cell_has_focus)
-        {
-        JCheckBox checkbox = (JCheckBox) value;
-        checkbox.setBackground(is_selected ? list.getSelectionBackground() : list.getBackground());
-        checkbox.setForeground(is_selected ? list.getSelectionForeground() : list.getForeground());
-        checkbox.setBorderPainted(true);
-        checkbox.setEnabled(list.isEnabled());
-        checkbox.setFont(list.getFont());
-        checkbox.setFocusPainted(false);
-        checkbox.setBorder((is_selected) ? UIManager.getBorder("List.focusCellHighlightBorder") : new EmptyBorder(1, 1, 1, 1));
-        return checkbox;
-        }
-    }
-
-
-    private class MetadataSetListSelectionListener
-        extends MouseAdapter
-        implements ListSelectionListener {
-
-        public void mousePressed(MouseEvent e)
-        {
-        JList list = (JList) e.getSource();
-        int index = list.locationToIndex(e.getPoint());
-        MetadataSetListEntry metadata_set_list_entry = (MetadataSetListEntry) list.getModel().getElementAt(index);
-        metadata_set_list_entry.setSelected(!metadata_set_list_entry.isSelected());
-        metadata_set_list_entry.grabFocus();
-        list.ensureIndexIsVisible(index);
-
-        // Fire a selection changed event
-        fireSelectionValueChanged(index, index, false);
-        }
-
-        public void valueChanged(ListSelectionEvent event)
-        {
-        if (!sets_list.isSelectionEmpty()) {
-            // Retrieve the selected set
-            MetadataSetListEntry metadata_set_list_entry = (MetadataSetListEntry) sets_list.getSelectedValue();
-            MetadataSet set = (MetadataSet) metadata_set_list_entry.getMetadataSet();
-            elements_list.setListData(new Vector(set.getMetadataSetElements()));
-        }
-        else {
-            elements_list.setListData(new String[0]);
-        }
-        }
-    }
-    }
-
-
-    private class MetadataSetListEntry
-    extends JCheckBox
-    {
-    private MetadataSet metadata_set = null;
-
-    public MetadataSetListEntry(MetadataSet metadata_set)
-    {
-        this.metadata_set = metadata_set;
-    }
-
-    public MetadataSet getMetadataSet()
-    {
-        return metadata_set;
-    }
-
-    public String getText()
-    {
-        if (metadata_set == null) {
-        return null;
-        }
-
-        String interface_language_code = Configuration.getLanguage();
-        String metadata_set_name = MetadataTools.getMetadataSetAttribute(metadata_set, "Name", interface_language_code, "en");
-        return metadata_set_name + " (" + metadata_set.getNamespace() + ")";
-    }
-    }
-
-
-    private class OKButtonListener
-    implements ActionListener {
-    public void actionPerformed(ActionEvent event) {
         // See if the user has selected no metadata sets, and if so confirm thats what they really want.
-        ArrayList selected_sets = sets_list.getSelectedMetadataSets();
         cancelled = false;
-        if(selected_sets.size() == 0) {
+        if (metadata_sets_list.isNothingTicked()) {
         WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", null, true);
-        if(dialog.display() == JOptionPane.OK_OPTION) {
+        if (dialog.display() == JOptionPane.OK_OPTION) {
             // Otherwise we are free to go
             self.dispose();

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

@@ -193 +193 @@
     public String toString()
     {
-    return MetadataTools.getMetadataSetAttribute(this, "Name", Configuration.getLanguage(), "en");
+    return MetadataTools.getMetadataSetAttribute(this, "Name", Configuration.getLanguage(), "en") + " (" + metadata_set_namespace + ")";
     }