Changeset 5159

Timestamp:

2003-08-18T14:04:16+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B012

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/Index.java (modified) (7 diffs)
• cdm/IndexManager.java (modified) (11 diffs)
• cdm/SuperCollectionManager.java (modified) (1 diff)
• checklist/CheckList.java (modified) (7 diffs)
• checklist/Entry.java (modified) (3 diffs)
• gui/NewCollectionMetadataPrompt.java (modified) (3 diffs)

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

@@ -76 +76 @@
         Object source_object = sources.get(i);
         if(source_object instanceof ElementWrapper) {
-        System.err.println("Found ElementWrapper as source: " + ((ElementWrapper)source_object).getName());
+        ///Gatherer.println("Found ElementWrapper as source: " + ((ElementWrapper)source_object).getName());
         content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, ((ElementWrapper)source_object).getName());
         }
         else {
-        System.err.println("Found String as source: " + source_object.toString());
+        ///Gatherer.println("Found String as source: " + source_object.toString());
         content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
         }
@@ -152 +152 @@
 
     public String getID() {
-    if(id == null) {
+    if(element == null) {
+        id="";
+    }
+    else if(id == null) {
         StringBuffer id_buffer = new StringBuffer();
         // Write level information, if any.
@@ -169 +172 @@
             String full_element_name = ((ElementWrapper)source_object).getName();
             if(full_element_name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
-               id_buffer.append(full_element_name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length()));
+               id_buffer.append(full_element_name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1));
             }
             else {
@@ -197 +200 @@
         Element content_element = (Element) content_elements.item(i);
         String source_str = (String) content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
-        if(source_str.indexOf(MSMUtils.NS_SEP) != -1) {
-            ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(source_str);
-            if(element_wrapper != null) {
-            sources.add(element_wrapper);
-            }
-            else {
-            sources.add(source_str);
-            }
+        ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(source_str);
+        if(element_wrapper != null) {
+            sources.add(element_wrapper);
         }
         else {
@@ -237 +235 @@
      */
     public void setLevel(int new_level) {
+    System.err.println("SetLevel(" + new_level + ")");
     if(element != null && element.getNodeName().equals(CollectionConfiguration.INDEX_DEFAULT_ELEMENT)) {
         element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[new_level]);
@@ -258 +257 @@
         for(int i = 0; i < size; i++) {
         Element content_element = element.getOwnerDocument().createElement(CollectionConfiguration.CONTENT_ELEMENT);
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, (String) sources.get(i));
+        Object source_object = sources.get(i);
+        if(source_object instanceof ElementWrapper) {
+            //Gatherer.println("Found ElementWrapper as source: " + ((ElementWrapper)source_object).getName());
+            String name = ((ElementWrapper)source_object).getName();
+            content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
+            name = null;
+        }
+        else {
+            //Gatherer.println("Found String as source: " + source_object.toString());
+            content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
+        }
+        source_object = null;
         element.appendChild(content_element);
         content_element = null;
@@ -287 +297 @@
     for(int i = 0; i < sources_size; i++) {
         String source_name = (sources.get(i)).toString();
-        // Sometimes I wish they'd asked me to give extracted metadata a namespace, way back before I programmed so much of GLI to expect "" for extracted metadata, any namespace for normal metadata. That way I could just say 'ex' and be done with it, not add all of these special tests whenever it may come to displaying an extracted element.
-        if(source_name.indexOf(MSMUtils.NS_SEP) == -1 && !source_name.equals(CollectionConfiguration.TEXT_STR) && !source_name.equals(CollectionConfiguration.ALLFIELDS_STR)) {
-        text_buffer.append(Utility.EXTRACTED_METADATA_NAMESPACE);
-        text_buffer.append(MSMUtils.NS_SEP);
-        }
         text_buffer.append(source_name);
         if(i < sources_size - 1) {

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

@@ -37 +37 @@
 import org.greenstone.gatherer.cdm.DOMProxyListModel;
 import org.greenstone.gatherer.cdm.Index;
+import org.greenstone.gatherer.checklist.CheckList;
+import org.greenstone.gatherer.gui.DoubleImageButton;
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.msm.ElementWrapper;
@@ -94 +96 @@
         else {
         add(index);
+        // Also set this index as the default one, but only if there are levels available (ie mg only)
+        if(index.getLevel() != -1) {
+            setDefault(index);
+        }
         }
         Gatherer.c_man.configurationChanged();
@@ -266 +272 @@
         // Check if the index removed happens to be the default index
         if(default_index != null && default_index.equals(index)) {
-        default_index.setAssigned(false);
+        // If so our first solution is to set the first index to be default
+        if(getSize() > 0) {
+            Index another_index = (Index) getElementAt(0);
+            setDefault(another_index);
+            another_index = null;
+        }
+        else {
+            default_index.setAssigned(false);
+        }
         }
         // Remove the index
@@ -496 +510 @@
 
     private CardLayout card_layout;
-
-    /** The default size of a label on this control. */
-    private Dimension LABEL_SIZE = new Dimension(125,25);
-    /** The button used to add a new index. */
-    private JButton add = null;
-    /** The button used to clear the default index. */
-    private JButton clear_default = null;
-    /** The button used to remove an index. */
-    private JButton remove = null;
-    /** The button used to set the default index. */
-    private JButton set_default = null;
-    /** The combobox used to adjust what level the new index will built on. */
-    private JComboBox level = null;
-    /** The label denoting the default index to be built for this collection. */
-    private JLabel default_label = null;
-    /** The label denoting the list of assigned indexes. */
-    private JLabel index_label = null;
-    /** The label denoting the control for choosing index level. */
-    private JLabel level_label = null;
-    /** The label denoting the name of the index. */
-    private JLabel name_label = null;
-    /** The label denoting the list of possible sources for the index. */
-    private JLabel source_label = null;
-    /** The title shown at the top of the index controls. */
-    private JLabel title = null;
-    /** The list of assigned indexes. */
-    private JList index_list = null;
-    /** The list of possible sources on which the index could be built. */
-    private JList source_list = null;
-    /** The panel used to display the list of assigned indexes. */
-    private JPanel assigned_pane = null;
-    /** The panel which contains the buttons used to edit indexes. */
-    private JPanel button_pane = null;
-    /** The panel on which all other panels are displayed. */
-    private JPanel central_pane = null;
-    /** The control pane showing the editable controls. */
-    private JPanel control_pane = null;
-    /** The edit pane contains the list of possible sources. */
-    private JPanel edit_pane = null;
-    /** A panel used to correctly lay out the default index label. */
-    private JPanel default_pane = null;
-    /** The panel containing the title label and instructions. */
-    private JPanel header_pane = null;
-    /** The lvel panel contains the control for adjusting index level. */
-    private JPanel level_pane = null;
-    /** The pane in which the name control is set. */
-    private JPanel name_pane = null;
-    /** The scrollpane containing the instructions text area. */
-    private JScrollPane instructions_scroll = null;
-    /** A text area containing inline instructions. */
-    private JTextArea instructions = null;
-    /** A text field naming the default index. Non-editable. */
-    private JTextField default_value = null;
-    /** A text field for controlling the name of the new index. */
-    private JTextField name = null;
-
-    private MGPPControl mgppindexes_control = null;
+    private CheckList source_list;
+    private JButton add_button;
+    private JButton move_down_button;
+    private JButton move_up_button;
+    private JButton remove_button;
+    private JButton set_default_button;
+    private JComboBox level_combobox;
+    private JList index_list;
+    private JTextArea instruction_textarea;
+    private JTextField name_textfield ;
+
+    private MGPPControl mgppindexes_control;
 
     /** Constructor.
@@ -569 +538 @@
     public IndexControl() {
         super();
+
+        ArrayList new_data = new ArrayList();
+        new_data.add(CollectionConfiguration.TEXT_STR);
+        new_data.addAll(Gatherer.c_man.getCollection().msm.getAssignedElements());
+
         // Creation
         JPanel mgindexes_panel = new JPanel();
         card_layout = new CardLayout();
 
-        add = new JButton(get("Add"));
-        add.setEnabled(false);
-        add.setMnemonic(KeyEvent.VK_A);
-        assigned_pane = new JPanel();
-        button_pane = new JPanel();
-        central_pane = new JPanel();
-        control_pane = new JPanel();
-        clear_default = new JButton(get("Clear_Default"));
-        clear_default.setMnemonic(KeyEvent.VK_C);
-        if(default_index == null) {
-        clear_default.setEnabled(false);
-        }
-        default_label = new JLabel(get("Default_Index"));
-        default_pane = new JPanel();
-        if(default_index != null) {
-        default_value = new JTextField(default_index.toString());
-        default_value.setCaretPosition(0);
-        }
-        else {
-        default_value = new JTextField();
-        }
-        default_value.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        default_value.setEditable(false);
-        edit_pane = new JPanel();
-        header_pane = new JPanel();
-        index_label = new JLabel(get("Indexes"));
+        // MG Index Controls
+
+        JPanel mg_indexes_pane = new JPanel();
+
+        JPanel instruction_pane = new JPanel();
+        JLabel title_label = new JLabel(get("Title"));
+        title_label.setHorizontalAlignment(JLabel.CENTER);
+        instruction_textarea = new JTextArea(get("Instructions"));
+        instruction_textarea.setEditable(false);
+        instruction_textarea.setLineWrap(true);
+        instruction_textarea.setRows(6);
+        instruction_textarea.setWrapStyleWord(true);
+
+        JPanel assigned_indexes_pane = new JPanel();
+        JLabel index_label = new JLabel(get("Indexes"));
         index_list = new JList(model);
-        instructions = new JTextArea(get("Instructions"));
-        instructions.setEditable(false);
-        instructions.setLineWrap(true);
-        instructions.setRows(6);
-        instructions.setWrapStyleWord(true);
-        level = new JComboBox();
-        level.addItem(get("Document"));
-        level.addItem(get("Paragraph"));
-        level.addItem(get("Section"));
-        level.setEditable(false);
-        level_label = new JLabel(get("Level"));
-        level_label.setPreferredSize(LABEL_SIZE);
-        level_pane = new JPanel();
-        name = new JTextField();
-        name_label = new JLabel(get("Name"));
-        name_label.setPreferredSize(LABEL_SIZE);
-        name_pane = new JPanel();
-        remove = new JButton(get("Remove"));
-        remove.setEnabled(false);
-        remove.setMnemonic(KeyEvent.VK_R);
-        set_default = new JButton(get("Set_Default"));
-        set_default.setEnabled(false);
-        set_default.setMnemonic(KeyEvent.VK_S);
-        source_label = new JLabel(get("Source"));
-        source_list = new JList();
-        title = new JLabel(get("Title"));
-        title.setHorizontalAlignment(JLabel.CENTER);
+        index_list.setCellRenderer(new IndexListRenderer());
+
+        JPanel movement_pane = new JPanel();
+        move_up_button = new DoubleImageButton(get("CDM.Move.Move_Up"), Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        move_up_button.setEnabled(false);
+        move_up_button.setMnemonic(KeyEvent.VK_U);
+        move_up_button.setPreferredSize(Utility.BUTTON_SIZE);
+        move_down_button = new DoubleImageButton(get("CDM.Move.Move_Down"), Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
+        move_down_button.setEnabled(false);
+        move_down_button.setMnemonic(KeyEvent.VK_D);
+        move_down_button.setPreferredSize(Utility.BUTTON_SIZE);
+
+        JPanel index_pane = new JPanel();
+
+        JPanel details_pane = new JPanel();
+
+        JPanel name_pane = new JPanel();
+        JLabel name_label = new JLabel(get("Name"));
+        name_label.setPreferredSize(Utility.LABEL_SIZE);
+        name_textfield = new JTextField();
+
+        JPanel source_pane = new JPanel();
+        JLabel source_label = new JLabel(get("Source"));
+        source_label.setPreferredSize(Utility.LABEL_SIZE);
+        source_list = new CheckList(new_data, false);
+
+        JPanel level_pane = new JPanel();
+        JLabel level_label = new JLabel(get("Level"));
+        level_label.setPreferredSize(Utility.LABEL_SIZE);
+        level_combobox = new JComboBox();
+        level_combobox.addItem(get("Document"));
+        level_combobox.addItem(get("Paragraph"));
+        level_combobox.addItem(get("Section"));
+        level_combobox.setEditable(false);
+
+        JPanel button_pane = new JPanel();
+        add_button = new JButton(get("Add"));
+        add_button.setEnabled(false);
+        add_button.setMnemonic(KeyEvent.VK_A);
+        set_default_button = new JButton(get("Set_Default"));
+        set_default_button.setEnabled(false);
+        set_default_button.setMnemonic(KeyEvent.VK_S);
+        remove_button = new JButton(get("Remove"));
+        remove_button.setEnabled(false);
+        remove_button.setMnemonic(KeyEvent.VK_R);
 
         // This class is getting a little crowded, so I'll generate the many mgpp controls in a inner class.
@@ -632 +613 @@
 
         // Listeners
-        add.addActionListener(new AddListener());
-        clear_default.addActionListener(new ClearDefaultListener());
-        remove.addActionListener(new RemoveListener());
-        set_default.addActionListener(new SetDefaultListener());
-        name.addKeyListener(new NameListener());
-        ListListener ll = new ListListener();
-        index_list.addListSelectionListener(ll);
-        source_list.addListSelectionListener(ll);
+        add_button.addActionListener(new AddListener());
+        move_down_button.addActionListener(new MoveListener(false));
+        move_up_button.addActionListener(new MoveListener(true));
+        remove_button.addActionListener(new RemoveListener());
+        set_default_button.addActionListener(new SetDefaultListener());
+        name_textfield.getDocument().addDocumentListener(new NameListener());
+        index_list.addListSelectionListener(new IndexListListener());
+        source_list.addListSelectionListener(new SourceListListener());
         ExclusiveListSelectionListener elsl = new ExclusiveListSelectionListener();
         elsl.add(index_list);
         elsl.add(source_list);
+        elsl = null; // We don't want to hold a reference to this
 
         // Layout
-        title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
-
-        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
-
-        header_pane.setLayout(new BorderLayout());
-        header_pane.add(title, BorderLayout.NORTH);
-        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
-
-        name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-
-        name_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
+        instruction_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        instruction_pane.setLayout(new BorderLayout());
+        instruction_pane.add(title_label, BorderLayout.NORTH);
+        instruction_pane.add(new JScrollPane(instruction_textarea), BorderLayout.CENTER);
+
+        movement_pane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+        movement_pane.setLayout(new GridLayout(2,1,0,5));
+        movement_pane.add(move_up_button);
+        movement_pane.add(move_down_button);
+
+        assigned_indexes_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        assigned_indexes_pane.setLayout(new BorderLayout());
+        assigned_indexes_pane.add(index_label, BorderLayout.NORTH);
+        assigned_indexes_pane.add(new JScrollPane(index_list), BorderLayout.CENTER);
+        assigned_indexes_pane.add(movement_pane, BorderLayout.EAST);
+
+        name_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
         name_pane.setLayout(new BorderLayout());
         name_pane.add(name_label, BorderLayout.WEST);
-        name_pane.add(name, BorderLayout.CENTER);
-
-        control_pane.setLayout(new BorderLayout());
-        control_pane.add(source_label, BorderLayout.NORTH);
-        control_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
-
-        level_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-
-        level_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
+        name_pane.add(name_textfield, BorderLayout.CENTER);
+
+        source_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        source_pane.setLayout(new BorderLayout());
+        source_pane.add(source_label, BorderLayout.WEST);
+        source_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
+
+        level_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
         level_pane.setLayout(new BorderLayout());
         level_pane.add(level_label, BorderLayout.WEST);
-        level_pane.add(level, BorderLayout.CENTER);
-
-        edit_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-        edit_pane.setLayout(new BorderLayout());
-        edit_pane.add(name_pane, BorderLayout.NORTH);
-        edit_pane.add(control_pane, BorderLayout.CENTER);
-        edit_pane.add(level_pane, BorderLayout.SOUTH);
-
-        default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-
-        default_pane.setBorder
-        (BorderFactory.createCompoundBorder
-         (BorderFactory.createCompoundBorder
-          (BorderFactory.createEmptyBorder(2,2,2,2),
-           BorderFactory.createRaisedBevelBorder()),
-          BorderFactory.createEmptyBorder(2,2,2,2)));
-        default_pane.setLayout(new BorderLayout());
-        default_pane.add(default_label, BorderLayout.WEST);
-        default_pane.add(default_value, BorderLayout.CENTER);
-
-        assigned_pane.setLayout(new BorderLayout());
-        assigned_pane.add(index_label, BorderLayout.NORTH);
-        assigned_pane.add(new JScrollPane(index_list), BorderLayout.CENTER);
-        assigned_pane.add(default_pane, BorderLayout.SOUTH);
-
-        central_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
-        central_pane.setLayout(new GridLayout(1,2));
-        central_pane.add(edit_pane);
-        central_pane.add(assigned_pane);
-
-        button_pane.setLayout(new GridLayout(2,2));
-        button_pane.add(add);
-        button_pane.add(remove);
-        button_pane.add(clear_default);
-        button_pane.add(set_default);
+        level_pane.add(level_combobox, BorderLayout.CENTER);
+
+        details_pane.setLayout(new BorderLayout());
+        details_pane.add(name_pane, BorderLayout.NORTH);
+        details_pane.add(source_pane, BorderLayout.CENTER);
+        details_pane.add(level_pane, BorderLayout.SOUTH);
+
+        button_pane.setLayout(new GridLayout(1,3,5,0));
+        button_pane.add(add_button);
+        button_pane.add(set_default_button);
+        button_pane.add(remove_button);
+
+        index_pane.setLayout(new BorderLayout());
+        index_pane.add(details_pane, BorderLayout.CENTER);
+        index_pane.add(button_pane, BorderLayout.SOUTH);
 
         mgindexes_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         mgindexes_panel.setLayout(new BorderLayout());
-        mgindexes_panel.add(header_pane, BorderLayout.NORTH);
-        mgindexes_panel.add(central_pane, BorderLayout.CENTER);
-        mgindexes_panel.add(button_pane, BorderLayout.SOUTH);
+        mgindexes_panel.add(instruction_pane, BorderLayout.NORTH);
+        mgindexes_panel.add(assigned_indexes_pane, BorderLayout.CENTER);
+        mgindexes_panel.add(index_pane, BorderLayout.SOUTH);
 
         setLayout(card_layout);
@@ -724 +691 @@
     public void gainFocus() {
         boolean mgpp_enabled = CollectionDesignManager.searchtype_manager.isMGPPEnabled();
-        if(instructions != null) {
-        instructions.setCaretPosition(0);
+        if(instruction_textarea != null) {
+        instruction_textarea.setCaretPosition(0);
         }
         if(mgpp_enabled) {
@@ -749 +716 @@
 
     public void loseFocus() {
+    }
+
+    private void validateAddButton() {
+        boolean add_enabled = false;
+        // Indexes must have a name
+        if(name_textfield.getText().length() == 0) {
+        add_enabled = false;
+        }
+        // Can't add a new index if no sources are selected
+        else if(source_list.isSelectionEmpty()) {
+        add_enabled = false;
+        } 
+        // If we get this far, create a dummy index and see if its already assigned in the collection
+        else {
+        Object object[] = source_list.getSelected().toArray();
+        ArrayList sources = new ArrayList();
+        for(int i = 0; i < object.length; i++) {
+            sources.add(object[i]);
+        }
+        object = null;
+        Index index = new Index(level_combobox.getSelectedIndex(), sources);
+        sources = null;
+        if(model.contains(index)) {
+            add_enabled = false;
+        }
+        else {
+            add_enabled = true;
+        }
+        }
+        // We should now know the add_button state
+        add_button.setEnabled(add_enabled);
     }
 
@@ -764 +762 @@
          */
         public void actionPerformed(ActionEvent event) {
-        if(!source_list.isSelectionEmpty() && name.getText().length() != 0) {
-            Object object[] = source_list.getSelectedValues();
-            ArrayList sources = new ArrayList();
-            for(int i = 0; i < object.length; i++) {
-            sources.add(object[i]);
-            }
-            object = null;
-            Index index = new Index(level.getSelectedIndex(), sources);
+        String name = name_textfield.getText();
+        if(!source_list.isSelectionEmpty() && name.length() != 0) {
+            ArrayList sources = source_list.getSelected();
+            Index index = new Index(level_combobox.getSelectedIndex(), sources);
             sources = null;
             // Before we add the index to the model, we have to add the collection metadata for this.
             CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
-            metadatum.setValue(name.getText());
+            metadatum.setValue(name);
             // Finally add index.
             addIndex(index, metadatum);
@@ -781 +775 @@
             index = null;
         }
-        }
-    }
-    /** Listens for actions apon the 'clear default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with <i>null</i>. */
-    private class ClearDefaultListener
+        name = null;
+        }
+    }
+
+    /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class IndexListListener
+        implements ListSelectionListener {
+        /** This method is called whenever the source list selection changes. When it does we need to check if the add button should now be enabled.
+         * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
+         */
+        public void valueChanged(ListSelectionEvent event) {
+        Object value = index_list.getSelectedValue();
+        move_down_button.setEnabled(value != null);
+        move_up_button.setEnabled(value != null);
+        remove_button.setEnabled(value != null);
+        set_default_button.setEnabled(value != null && (default_index == null || !default_index.equals(value)));
+        }
+    }
+
+    private class IndexListRenderer
+        extends DefaultListCellRenderer {
+
+        /** Return a component that has been configured to display the specified value. */
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        JLabel component = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        if(default_index != null && default_index.equals(value)) {
+            component.setText(component.getText() + " " + get("Default_Index_Indicator"));
+        }
+        return component;
+        }
+          
+    }
+
+    private class MoveListener
         implements ActionListener {
-        /** If called when an action occurs on a registered component, we clear the default index.
-         * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
-         */
+        
+        private boolean move_up;
+
+        public MoveListener(boolean move_up) {
+        this.move_up = move_up;
+        }
+
         public void actionPerformed(ActionEvent event) {
-        setDefault(null);
-        clear_default.setEnabled(false);
-        default_value.setText("");
-        }
-    }
+        // Retrieve the selected index
+        Index index = (Index) index_list.getSelectedValue();
+        if(index != null) {
+            moveIndex(index, move_up);
+            // Ensure the index that moved is still selected
+            index_list.setSelectedValue(index, true);
+            index = null;
+        }
+        }
+    }
+
     /** Listens for actions apon the 'remove' button in the IndexManager controls, and if detected calls the remove method of the manager with the index selected for removal. */
     private class RemoveListener
         implements ActionListener {
-                /** If called when an action occurs on a registered component, we remove the currently selected index, if there is one.
-                 * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
-                 * @see org.greenstone.gatherer.cdm.Index
-                 */
+        /** If called when an action occurs on a registered component, we remove the currently selected index, if there is one.
+         * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+         * @see org.greenstone.gatherer.cdm.Index
+         */
         public void actionPerformed(ActionEvent event) {
         if(!index_list.isSelectionEmpty()) {
             removeIndex((Index)index_list.getSelectedValue());
-            if(default_index == null) {
-            clear_default.setEnabled(false);
-            default_value.setText("");
-            }
-        }
+        }
+        move_down_button.setEnabled(false);
+        move_up_button.setEnabled(false);
+        remove_button.setEnabled(false);
+        }
+    }
+
+    private class SetDefaultListener
+        implements ActionListener {
+        
+        public void actionPerformed(ActionEvent event) {
+        Index index = (Index) index_list.getSelectedValue();
+        if(index != null) {
+            setDefault(index);
+            // This should cause a repaint of just the desired row
+            index_list.setSelectedValue(index, true);
+        }
+        set_default_button.setEnabled(false);
         }
     }
 
     /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
-    private class ListListener
+    private class SourceListListener
         implements ListSelectionListener {
-                /** This method is called whenever the source list selection changes. When it does we need to check if the add button should now be enabled.
-                 * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
-                */
+        /** This method is called whenever the source list selection changes. When it does we need to check if the add button should now be enabled.
+         * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
+         */
         public void valueChanged(ListSelectionEvent event) {
-        if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
-            add.setEnabled(false);
-        }
-        else {
-            add.setEnabled(true);
-        }
-        if(index_list.isSelectionEmpty()) {
-            remove.setEnabled(false);
-            set_default.setEnabled(false);
-        }
-        else {
-            remove.setEnabled(true);
-            set_default.setEnabled(true);
-        }
+        validateAddButton();
         }
     }
@@ -839 +873 @@
     /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
     private class NameListener
-        extends KeyAdapter {
-                /** Called when a key is released, this is the perfect time to enable the add button if the fields are appropriately set.
-                 * @param event A <strong>KeyEvent</strong> containing information about the key released.
-                */
-        public void keyReleased(KeyEvent event) {
-        if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
-            add.setEnabled(false);
-        }
-        else {
-            add.setEnabled(true);
-        }
-        if(index_list.isSelectionEmpty()) {
-            remove.setEnabled(false);
-            set_default.setEnabled(false);
-        }
-        else {
-            remove.setEnabled(true);
-            set_default.setEnabled(true);
-        }
-        }
-    }
-
-    /** Listens for actions apon the 'set default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with the index selected for default. */
-    private class SetDefaultListener
-        implements ActionListener {
-                /** If called when an action occurs on a registered component, we set the default index to the index currently selected.
-                 * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
-                 * @see org.greenstone.gatherer.cdm.Index
-                 */
-        public void actionPerformed(ActionEvent event) {
-        setDefault((Index)index_list.getSelectedValue());
-        if(default_index != null) {
-            clear_default.setEnabled(true);
-            default_value.setText(default_index.toString());
-            default_value.setCaretPosition(0);
-        }
-        else {
-            clear_default.setEnabled(false);
-            default_value.setText("");
-        }
+        implements DocumentListener {
+        /** Gives notification that an attribute or set of attributes changed. */
+        public void changedUpdate(DocumentEvent e) {
+        validateAddButton();
+        }
+        
+        /** Gives notification that there was an insert into the document. */
+        public void insertUpdate(DocumentEvent e) {
+        validateAddButton();
+        }
+        
+        /** Gives notification that a portion of the document has been removed. */
+        public void removeUpdate(DocumentEvent e) {
+        validateAddButton();
         }
     }

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

@@ -146 +146 @@
         instructions.setWrapStyleWord(true);
 
-        collection_checklist = new CheckList(collection_checklist_model);
+        collection_checklist = new CheckList(collection_checklist_model, false);
 
         // Layout

trunk/gli/src/org/greenstone/gatherer/checklist/CheckList.java

@@ -69 +69 @@
     /** The border used when a list row is not in focus. */
     protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+    
+    private boolean show_selected_row = true;
     /** Constructor. */
-    public CheckList() {
+    public CheckList(boolean show_selected_row) {
     super();
+    this.show_selected_row = show_selected_row;
     setCellRenderer(new CellRenderer());
     setModel(new DefaultListModel());
@@ -81 +84 @@
      * @see org.greenstone.gatherer.checklist.CheckList.Entry
      */
-    public CheckList(ArrayList list_data) {
+    public CheckList(ArrayList list_data, boolean show_selected_row) {
     super();
+    this.show_selected_row = show_selected_row;
     // Create a new model.
     DefaultListModel model = new DefaultListModel();
@@ -117 +121 @@
 
     /** Constructor. */
-    public CheckList(ListModel data_model) {
+    public CheckList(ListModel data_model, boolean show_selected_row) {
     super(data_model);
+    this.show_selected_row = show_selected_row;
     setCellRenderer(new CellRenderer());
     addMouseListener(new CheckListListener());
@@ -173 +178 @@
     }
 
+    public boolean isSelectionEmpty() {
+    DefaultListModel model = (DefaultListModel) getModel();
+    int size = model.size();
+    for(int i = 0; i < size; i++) {
+        Entry entry = (Entry) model.get(i);
+        if(entry.isSelected()) {
+        entry = null;
+        model = null;
+        return false;
+        }
+        entry = null;
+    }
+    model = null;
+    return true;
+    }
+
     public int getEntryCount() {
     return getModel().getSize();
+    }
+
+    public void setListData(Object[] list_data) {
+    // Create a new model.
+    DefaultListModel model = new DefaultListModel();
+    for(int i = 0; i < list_data.length; i++) {
+        Entry entry = null;
+        Object temp = list_data[i];
+        if(temp instanceof Entry) {
+        entry = (Entry) temp;
+        }
+        else {
+        entry = new Entry(temp);
+        }
+        temp = null;
+        String name = entry.toString();
+        int index = 0;
+        boolean found = false;
+        while(index < model.size() && !found) {
+        Object sibling = model.getElementAt(index);
+        if(name.compareTo(sibling.toString()) <= 0) {
+            model.add(index, entry);
+            found = true;
+        }
+        index++;
+        }
+        if(!found) {
+        model.addElement(entry);
+        }
+    }
+    setModel(model);
     }
 
@@ -193 +245 @@
     }         
     }
+
+    private void selectionChanged(int index) {
+    fireSelectionValueChanged(index, index, false);
+    }
+
     /** A custom list cell renderer for producing rows which contain clickable check boxes. */
     protected class CellRenderer 
@@ -206 +263 @@
     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());
+        if(show_selected_row) {
+        checkbox.setBackground(is_selected ? list.getSelectionBackground() : list.getBackground());
+        checkbox.setForeground(is_selected ? list.getSelectionForeground() : list.getForeground());
+        checkbox.setBorderPainted(true);
+        }
+        else {
+        checkbox.setBackground(list.getBackground());
+        checkbox.setForeground(list.getForeground());
+        checkbox.setBorderPainted(false);
+        }
         checkbox.setEnabled(list.isEnabled());
         checkbox.setFont(list.getFont());
         checkbox.setFocusPainted(false);
-        checkbox.setBorderPainted(true);
         checkbox.setBorder((is_selected) ? UIManager.getBorder("List.focusCellHighlightBorder") : noFocusBorder);
         return checkbox;
@@ -232 +296 @@
         }
         checkbox.grabFocus();
+        // Fire a selection changed event
+        selectionChanged(index);
     }
     }

trunk/gli/src/org/greenstone/gatherer/checklist/Entry.java

@@ -13 +13 @@
 
     /** Is this checkboxes state fixed. */
-    protected boolean fixed = false;
+    private boolean fixed = false;
     /** The original object this row is based on, and whose toString() is used to generate the check box label. */
-    protected Object object = null;
+    private Object object = null;
     /** A sundry string for storing original values (rather than strings retrieved from dictionary). */
-    protected String property;
+    private String property;
     /** Constructor. */
     public Entry(Object object) {
@@ -25 +25 @@
     if(object instanceof MetadataSet) {
         MetadataSet set = (MetadataSet) object;
-                // Build tooltip
+        // Build tooltip
         StringBuffer tip = new StringBuffer(Gatherer.dictionary.get("NewCollectionPrompt.Set_Contains"));
         tip.append(":\n");
@@ -64 +64 @@
       */
     public Object getObject() {
+    //Gatherer.println("Retrieving the object for " + toString());
     if(object == null) {
         return getText();

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

@@ -16 +16 @@
 import org.greenstone.gatherer.msm.MetadataSet;
 import org.greenstone.gatherer.msm.MetadataSetManager;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -43 +44 @@
     for(int i = 0; i < possible_mdses.length; i++) {
         String name = possible_mdses[i].getName();
-        if(name.endsWith(".mds")) {
+        if(name.endsWith(StaticStrings.METADATA_SET_EXTENSION) && !name.equals(Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION)) {
         sets.add(new MetadataSet(possible_mdses[i]));
         }
@@ -60 +61 @@
     JLabel sets_list_label = new JLabel(get("Select_MDS"));
     sets_list_label.setOpaque(false);
-    sets_list = new CheckList(sets);
+    sets_list = new CheckList(sets, true);
 
     JPanel elements_list_pane = new JPanel();