Changeset 9161

Timestamp:

2005-02-23T17:02:05+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made the "assign partitions" tab in the "Partition Indexes" section look a lot like the "Search Indexes" pane.

Location:

trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (12 diffs)
• src/org/greenstone/gatherer/cdm/Subcollection.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/SubcollectionIndex.java (modified) (2 diffs)
• src/org/greenstone/gatherer/cdm/SubcollectionIndexManager.java (modified) (8 diffs)
• src/org/greenstone/gatherer/cdm/SubcollectionManager.java (modified) (3 diffs)

trunk/gli/classes/dictionary.properties

@@ -329 +329 @@
 CDM.SubcollectionIndexManager.Add_Subindex:Add Partition
 CDM.SubcollectionIndexManager.Add_Subindex_Tooltip:Add the specified partition to this collection
-CDM.SubcollectionIndexManager.Clear_Default_Subindex:Clear Default
-CDM.SubcollectionIndexManager.Clear_Default_Subindex_Tooltip:Clear the default partition
-CDM.SubcollectionIndexManager.Default_Subindex:Default:
+CDM.SubcollectionIndexManager.Default_Partition_Indicator:[Default Partition]
 CDM.SubcollectionIndexManager.PartitionName:Partition Name:
 CDM.SubcollectionIndexManager.PartitionName_Tooltip:The name of the new partition
 CDM.SubcollectionIndexManager.Remove_Subindex:Remove Partition
 CDM.SubcollectionIndexManager.Remove_Subindex_Tooltip:Remove the selected partition from this collection
+CDM.SubcollectionIndexManager.Replace_Subindex:Replace Partition
+CDM.SubcollectionIndexManager.Replace_Subindex_Tooltip:Update the selected partition
 CDM.SubcollectionIndexManager.Set_Default_Subindex:Set Default
 CDM.SubcollectionIndexManager.Set_Default_Subindex_Tooltip:Make the selected partition the default
-CDM.SubcollectionIndexManager.Subcollection:Defined Subcollection Filters
+CDM.SubcollectionIndexManager.Source:Build partition on:
+CDM.SubcollectionIndexManager.Source_Tooltip:The subcollection filters to build the partition on
 CDM.SubcollectionIndexManager.Subindexes:Assigned Subcollection Partitions
 CDM.SuperCollectionManager.Instructions:Cross-collection searching is where a single search is performed over several collections, as if all the collections were one. Specify the collections to include in a search by clicking on the appropriate collection's name in the list below. The current collection will automatically be included. \nWARNING: If the individual collections do not have the same indexes (including subcollection partitions and language partitions) as each other, cross-collection searching will not work properly. The user will only be able to search using indexes common to all collections.

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

@@ -200 +200 @@
     }
 
-    private void moveIndex(Index index, boolean move_up) {
-    // Determine the indexes current position
+
+    private void moveIndex(Index index, boolean move_up)
+    {
+    // Determine the current position of the index
     int position = indexOf(index);
-    // Determine if it can be moved, ie if its not already at the top trying to move up, or at the bottom trying to move down.
-    if(position == -1) {
+    if (position == -1) {
         return;
     }
-    if(position == 0 && move_up) {
-        return;
-    }
-    if(position == (getSize()) - 1 && !move_up) {
-        return;
-    }
-    // Ok, move the index
-    if(move_up) {
+
+    // Attempt to move the index up
+    if (move_up) {
+        // Check it's not already at the top
+        if (position == 0) {
+        return;
+        }
+
         // Retrieve the index at position - 1
-        Index previous_index = (Index) getElementAt(position - 1);
-        // And add before. This will automatically remove the index first, as an Element can only exist once in a particular document
-        addBefore(index, previous_index);
-    }
+        Index preceeding_index = (Index) getElementAt(position - 1);
+
+        // This automatically removes the index first, as an Element can only exist once in a particular document
+        addBefore(index, preceeding_index);
+    }
+
+    // Attempt to move the index down
     else {
+        // Check it's not already at the bottom
+        if (position == (getSize()) - 1) {
+        return;
+        }
+
         // Retrieve the index at position + 1
-        Index next_index = (Index) getElementAt(position + 1);
-        // And add after. This will automatically remove the index first, as an Element can only exist once in a particular document
-        addAfter(index, next_index);
-    }
+        Index following_index = (Index) getElementAt(position + 1);
+
+        // This automatically removes the index first, as an Element can only exist once in a particular document
+        addAfter(index, following_index);
+    }
+
     // Schedule the collection for saving
     Gatherer.c_man.configurationChanged();
     }
+
 
     private void moveLevel(Level level, boolean move_up) {
@@ -727 +739 @@
         return;
         }
-        String name = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER+selected_index.getID()).getValue(true);
+        String name = CollectionDesignManager.collectionmeta_manager.getMetadatum("." + id).getValue(true);
         name_textfield.setText(name);
         level_combobox.setSelectedIndex(selected_index.getLevel());
@@ -736 +748 @@
     }
     
-    private void validateAddButton() {
+    private void validateAddButton()
+    {
         boolean add_enabled = false;
         boolean replace_enabled = false;
+
         // Indexes must have a name
-        if(name_textfield.getText().length() == 0) {
+        if (name_textfield.getText().length() == 0) {
         add_enabled = false;
         }
@@ -747 +761 @@
         add_enabled = false;
         }
-        // If we get this far, create a dummy index and see if its already assigned in the collection
+        // If we get this far, create a dummy index and see if it's already assigned in the collection
         else {
         Object object[] = source_list.getSelected().toArray();
@@ -757 +771 @@
         Index index = new Index(level_combobox.getSelectedIndex(), sources);
         sources = null;
-        if(model.contains(index)) {
+        if (model.contains(index)) {
             add_enabled = false;
-            // here we need to check if we have changed the name - if so, we can enable the replace button
+
+            // Here we need to check if we have changed the name - if so, we can enable the replace button
             if (index_list.getSelectedIndex() != -1) {
             Index selected_index = (Index)index_list.getSelectedValue();
@@ -771 +786 @@
         else {
             add_enabled = true;
-            // we have a new index, do we have something selected in the index list? if so, enable the replace button
+
+            // We have a new index, do we have something selected in the index list? if so, enable the replace button
             if (index_list.getSelectedIndex() != -1) {
             replace_enabled = true;
             }
-            
-        }
-        }
+        }
+        }
+
         // We should now know the add_button state
         add_button.setEnabled(add_enabled);
@@ -783 +799 @@
     }
 
-    /** Listens for actions apon the 'add' button in the IndexManager controls, and if detected calls the add method of the manager with a newly created index. */
+
     private class AddListener
-        implements ActionListener {
-        /** Method called when an action is performed on a registered component, and when it does we check if we have enough data to create a new index, and if so we create one.
-         * @param event An <strong>ActionEvent</strong> providing extra information about the event.
-         * @see org.greenstone.gatherer.cdm.CollectionDesignManager
-         * @see org.greenstone.gatherer.cdm.CollectionMeta
-         * @see org.greenstone.gatherer.cdm.CollectionMetaManager
-         * @see org.greenstone.gatherer.cdm.Index
-         * @see org.greenstone.gatherer.cdm.Language
-         * @see org.greenstone.gatherer.cdm.LanguageManager
-         */
-        public void actionPerformed(ActionEvent event) {
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
         String name = name_textfield.getText();
-        System.err.println("Add button height: " + add_button.getHeight());
-        System.err.println("Set default button height: " + set_default_button.getHeight());
         if (source_list.getSelected().size() > 0 && 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.
+
+            // 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);
-            // Finally add index.
+
+            // Finally, add the index
             addIndex(index, metadatum);
             index_list.setSelectedValue(index, true);
-            metadatum = null;
-            index = null;
-        }
-        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 {
+        implements ListSelectionListener
+    {
         /** This method is called whenever the source list selection changes. When it does we need to fill in the various parts of the list description panel
          * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
@@ -837 +844 @@
             return;
         }
-        // enable the buttons appropriately
+
+        // Enable the buttons appropriately
         remove_button.setEnabled(true);
         set_default_button.setEnabled(default_index == null || !default_index.equals(value));
@@ -844 +852 @@
         if (i > 0) {
             move_up_button.setEnabled(true);
-        } else {
+        }
+        else {
             move_up_button.setEnabled(false);
         }
-        if (i<size-1){
+        if (i < size-1){
             move_down_button.setEnabled(true);
-        } else {
+        }
+        else {
             move_down_button.setEnabled(false);
         }
 
-        // need to fill in the rest of the bits
+        // Need to fill in the rest of the bits
         updateControlsWithSelectedIndex();      
         }
@@ -904 +914 @@
     }
 
-    /** 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. */
+
+    /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
+    private class NameListener
+        implements DocumentListener
+    {
+        public void changedUpdate(DocumentEvent e)
+        {
+        validateAddButton();
+        }
+
+        public void insertUpdate(DocumentEvent e)
+        {
+        validateAddButton();
+        }
+
+        public void removeUpdate(DocumentEvent e)
+        {
+        validateAddButton();
+        }
+    }
+
+
     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
-         */
-        public void actionPerformed(ActionEvent event) {
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
         int i = index_list.getSelectedIndex();
-        if(i != -1) {
-            removeIndex((Index)index_list.getSelectedValue());
-        }
+        if (i != -1) {
+            removeIndex((Index) index_list.getSelectedValue());
+        }
+
         int size = index_list.getModel().getSize();
         if (i == size) {
             i--;
         }
-        
         index_list.setSelectedIndex(i);
-        // this will produce an event on the list, updating the other buttons
+
+        // This will produce an event on the list, updating the other buttons
         if (size == 0) {
-            // we have removed the last index, should be able to add whats filled in currently, if valid
+            // We have removed the last index, should be able to add what's filled in currently, if valid
             validateAddButton();
-        }       
-        }
-    }
-
-    /** 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 ReplaceListener
-        implements ActionListener {
-        /** If called when an action occurs on a registered component, we replace the currently selected index, with the new details
-         * @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()) {
-            // this should never happen, but just in case..
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        if (index_list.isSelectionEmpty()) {
+            // This should never happen, but just in case...
             replace_button.setEnabled(false);
             return;
         }
-        // we'll just remove the old one and add the new one
-        removeIndex((Index)index_list.getSelectedValue());
+
+        // We'll just remove the old one and add the new one
+        removeIndex((Index) index_list.getSelectedValue());
         replace_button.setEnabled(false);
         add_button.setEnabled(true);
@@ -951 +980 @@
         }
     }
+
 
     private class SetDefaultListener
@@ -966 +996 @@
     }
 
-    /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+
     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.
-         */
-        public void valueChanged(ListSelectionEvent event) {
-        validateAddButton();
-        }
-    }
-
-    /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
-    private class NameListener
-        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) {
+        implements ListSelectionListener
+    {
+        public void valueChanged(ListSelectionEvent event)
+        {
         validateAddButton();
         }

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

@@ -97 +97 @@
      * @return an int which is >0, 0, or <0 if this subcollection is before, equal to, or after the target object respectively.
      */
-    public int compareTo(Object object) {
-    if(object == null) {
+    public int compareTo(Object object)
+    {
+    if (object == null) {
         return -1;
     }
-    return getName().compareTo(((Subcollection)object).getName());
-    }
+
+    // Object may be a String
+    if (object instanceof String) {
+        return getName().compareTo(object);
+    }
+
+    // Otherwise assume it is a Subcollection object
+    return getName().compareTo(((Subcollection) object).getName());
+    }
+
 
     public DOMProxyListEntry create(Element element) {

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

@@ -81 +81 @@
      */
     public int compareTo(Object object) {
-    return id.compareTo(((SubcollectionIndex)object).getID());
+    return getID().compareTo(((SubcollectionIndex)object).getID());
     }
     
@@ -168 +168 @@
         this.sources = sources;
     }
-    else {
-        DebugStream.println("Error! Called setSource() of index other than the default.");
-    }
     }
 

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
-import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.GLIButton;
-import org.greenstone.gatherer.util.ExclusiveListSelectionListener;
-import org.greenstone.gatherer.util.StaticStrings;
+import org.greenstone.gatherer.util.CheckList;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
+
+
 /** This class maintains a list of indexes partitions for the purpose of defining subcollections.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -46 +46 @@
  */
 public class SubcollectionIndexManager
-    extends DOMProxyListModel {
+    extends DOMProxyListModel
+{
+    static final private Dimension FIELD_SIZE = new Dimension(200, 30);
 
     private Control controls;
@@ -52 +54 @@
     private SubcollectionIndex default_index;
 
+
     /** Constructor. */
-    public SubcollectionIndexManager(Element subindexes) {
+    public SubcollectionIndexManager(Element subindexes)
+    {
     super(subindexes, CollectionConfiguration.INDEX_ELEMENT, new SubcollectionIndex());
     DebugStream.println("SubcollectionIndexManager: " + getSize() + " subcollection indexes parsed.");
     model = this;
+
     // Parse and retrieve the default index
     NodeList default_index_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(CollectionConfiguration.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
-    if(default_index_elements.getLength() > 0) {
-        default_index = new SubcollectionIndex((Element)default_index_elements.item(0));
-    }
-    }
+    if (default_index_elements.getLength() > 0) {
+        default_index = new SubcollectionIndex((Element) default_index_elements.item(0));
+    }
+    }
+
 
     /** Method to add a subindex.
@@ -69 +75 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    private void addSubcollectionIndex(SubcollectionIndex subindex) {
-    if(!contains(subindex)) {
-        add(getSize(), subindex);
+    private void addSubcollectionIndex(SubcollectionIndex subcollection_index)
+    {
+    if (!contains(subcollection_index)) {
+        add(getSize(), subcollection_index);
         Gatherer.c_man.configurationChanged();
     }
     }
 
-    public void destroy() {
-    if(controls != null) {
+
+    public void destroy()
+    {
+    if (controls != null) {
         controls.destroy();
         controls = null;
@@ -85 +94 @@
     }
 
-    public Control getControls() {
-    if(controls == null) {
-        controls = new SubcollectionIndexControl();
+
+    public Control getControls()
+    {
+    if (controls == null) {
+        controls = new SubcollectionIndexControls();
     }
     return controls;
     }
 
-    /** Method to retrieve the default index.
-     * @return the default Index, or null if no such index assigned
-     */
-    /* private SubcollectionIndex getDefaultSubcollectionIndex() {
-    if(default_index != null && default_index.isAssigned()) {
-        return default_index;
-    }
-    else {
-        return null;
-    }
-    } */
-
-    /** Retrieve a certain subindex given its name.
-     * @param id the String identifier of a subcollectionindex
-     * @return the SubcollectionIndex requested or null if no such subindex
-     */
-    private SubcollectionIndex getSubcollectionIndex(String id) {
-    int size = getSize();
-    for(int i = 0; i < size; i++) {
-        SubcollectionIndex subindex = (SubcollectionIndex) getElementAt(i);
-        if(subindex.getID().equals(id)) {
-        return subindex;
-        }
-    }
-    return null;
-    }
 
     /** Method to get all of the subindexes set.
      * @return an ArrayList containing all the defined indexes
      */
-    public ArrayList getSubcollectionIndexes() {
+    public ArrayList getSubcollectionIndexes()
+    {
     return children();
     }
 
-    /** Method to remove a certain subindex.
-     * @param subindex the Index you wish to remove
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.CollectionManager
-     */
-    private void removeSubcollectionIndex(SubcollectionIndex subindex) {
-    if(subindex != null) {
+
+    private int moveSubcollectionIndex(SubcollectionIndex subcollection_index, boolean move_up)
+    {
+    // Determine the current position of the subcollection index
+    int position = indexOf(subcollection_index);
+    int new_position;
+
+    // Attempt to move the subcollection index up
+    if (move_up) {
+        // Check it's not already at the top
+        if (position == 0) {
+        return position;
+        }
+
+        // This automatically removes the index first, as an Element can only exist once in a particular document
+        new_position = position - 1;
+        addBefore(subcollection_index, (SubcollectionIndex) getElementAt(new_position));
+    }
+
+    // Attempt to move the subcollection index down
+    else {
+        // Check it's not already at the bottom
+        if (position == (getSize()) - 1) {
+        return position;
+        }
+
+        // This automatically removes the index first, as an Element can only exist once in a particular document
+        new_position = position + 1;
+        addAfter(subcollection_index, (SubcollectionIndex) getElementAt(new_position));
+    }
+
+    // Schedule the collection for saving
+    Gatherer.c_man.configurationChanged();
+    return new_position;
+    }
+
+
+    /** Method to remove a certain subcollection index. */
+    private void removeSubcollectionIndex(SubcollectionIndex subcollection_index)
+    {
+    if (subcollection_index != null) {
         // Remove any current metadata from this index
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + subindex.getID());
+        CollectionDesignManager.collectionmeta_manager.removeMetadata("." + subcollection_index.getID());
+
         // Check if the index removed happens to be the default index
-        if(default_index != null && default_index.equals(subindex)) {
-        default_index.setAssigned(false);
-        ((SubcollectionIndexControl)controls).clearDefaultIndex();
-        }
+        if (default_index != null && default_index.equals(subcollection_index)) {
+        // If so our first solution is to set the first subcollection index to be the default
+        if (getSize() > 0) {
+            setDefaultSubcollectionIndex((SubcollectionIndex) getElementAt(0));
+        }
+        else {
+            default_index.setAssigned(false);
+        }
+        }
+
         // Remove the index
-        remove(subindex);
+        remove(subcollection_index);
         Gatherer.c_man.configurationChanged();
     }
     }
+
 
     /** Method to remove all of the subindexes that contain a certain subcollection.
@@ -151 +179 @@
      * @see org.greenstone.gatherer.cdm.SubcollectionIndex
      */
-    public void removeSubcollectionIndexes(Subcollection subcollection) {
+    public void removeSubcollectionIndexes(Subcollection subcollection)
+    {
     String subcollection_name = subcollection.getName();
     int size = getSize();
     for(int i = size - 1; i >= 0; i--) {
-        SubcollectionIndex subindex = (SubcollectionIndex)getElementAt(i);
-        if(subindex.getSources().contains(subcollection_name)) {
-        removeSubcollectionIndex(subindex);
-        }
-        subindex = null;
-    }
-    subcollection_name = null;
-    }
+        SubcollectionIndex subcollection_index = (SubcollectionIndex) getElementAt(i);
+        if (subcollection_index.getSources().contains(subcollection_name)) {
+        removeSubcollectionIndex(subcollection_index);
+        }
+    }
+    }
+
 
     /** Method to set the default subcollection index.
@@ -170 +198 @@
      * @see org.greenstone.gatherer.cdm.SubcollectionIndex
      */
-    private void setDefaultSubcollectionIndex(SubcollectionIndex index) {
-    if(index != null) {
-        if(default_index == null) {
+    private void setDefaultSubcollectionIndex(SubcollectionIndex subcollection_index)
+    {
+    if (subcollection_index != null) {
+        if (default_index == null) {
         // Create the default index element, and place immediately after indexes element.
         Element default_index_element = root.getOwnerDocument().createElement(CollectionConfiguration.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
         default_index = new SubcollectionIndex(default_index_element);
         Node target_node = CollectionConfiguration.findInsertionPoint(default_index_element);
-        if(target_node != null) {
+        if (target_node != null) {
             root.getOwnerDocument().getDocumentElement().insertBefore(default_index_element, target_node);
         }
@@ -183 +212 @@
             root.getOwnerDocument().getDocumentElement().appendChild(default_index_element);
         }
-        }
-        default_index.setAssigned(true);
-        default_index.setSources(index.getSources());
-    }
-    else {
-        if(default_index != null) {
-        default_index.setAssigned(false);
-        }
-    }
-    Gatherer.c_man.configurationChanged();
-    }
-
-    private class SubcollectionIndexControl
+        }
+        default_index.setAssigned(true);
+        default_index.setSources(subcollection_index.getSources());
+    }
+    else {
+        if (default_index != null) {
+        default_index.setAssigned(false);
+        }
+    }
+    Gatherer.c_man.configurationChanged();
+    }
+
+
+    /** This class creates a set of controls for editing the indexes. */
+    private class SubcollectionIndexControls
     extends JPanel
-    implements Control {
-
-    private JButton add_index_button;
-    private JButton clear_default_button;
-    private JButton remove_index_button;
+    implements Control
+    {
+    private CheckList source_list;
+    private JButton add_button;
+    private JButton move_down_button;
+    private JButton move_up_button;
+    private JButton remove_button;
+    private JButton replace_button;
     private JButton set_default_button;
-    private JList subcollection_list;
-    private JList subcollectionindexes_list;
-    private JTextField default_value_field;
-    private JTextField subcollectionindex_name_field;
-
-    public SubcollectionIndexControl() {
+    private JList subcollection_index_list;
+    private JTextField subcollection_index_name_textfield;
+
+
+    /** Constructor.
+     */
+    public SubcollectionIndexControls()
+    {
         super();
+
+        ArrayList sources = new ArrayList();
+        ListModel source_model = CollectionDesignManager.subcollection_manager;
+        for (int i = 0; i < source_model.getSize(); i++) {
+        sources.add(source_model.getElementAt(i));
+        }
+
         // Creation
-        JPanel subcollection_panel = new JPanel();
-        JPanel subindex_name_panel = new JPanel();
-        JLabel subindex_name_label = new JLabel();
-        Dictionary.registerText(subindex_name_label, "CDM.SubcollectionIndexManager.PartitionName");
-        subcollectionindex_name_field = new JTextField();
-        subcollectionindex_name_field.setPreferredSize(Utility.LABEL_SIZE);
-        Dictionary.registerTooltip(subcollectionindex_name_field, "CDM.SubcollectionIndexManager.PartitionName_Tooltip");
+        JPanel assigned_indexes_pane = new JPanel();
+        JLabel index_label = new JLabel();
+        Dictionary.registerText(index_label, "CDM.SubcollectionIndexManager.Subindexes");
+        subcollection_index_list = new JList(model);
+        subcollection_index_list.setCellRenderer(new SubcollectionIndexListCellRenderer());
+        subcollection_index_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        subcollection_index_list.setVisibleRowCount(2);
+
+        JPanel movement_pane = new JPanel();
+        move_up_button = new JButton("", Utility.getImage("arrow-up.gif"));
+        move_up_button.setEnabled(true);
+        move_up_button.setMnemonic(KeyEvent.VK_U);
+        Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
+
+        move_down_button = new JButton("", Utility.getImage("arrow-down.gif"));
+        move_down_button.setEnabled(true);
+        move_down_button.setMnemonic(KeyEvent.VK_D);
+        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
+
+        set_default_button = new GLIButton();
+        set_default_button.setEnabled(false);
+        set_default_button.setMnemonic(KeyEvent.VK_S);
+        Dictionary.registerBoth(set_default_button, "CDM.SubcollectionIndexManager.Set_Default_Subindex", "CDM.SubcollectionIndexManager.Set_Default_Subindex_Tooltip");
+
+        JPanel index_pane = new JPanel();
+        JPanel details_pane = new JPanel();
+        JPanel labels_pane = new JPanel();
+        JPanel boxes_pane = new JPanel();
+        JPanel content_pane = new JPanel();
+
+        JLabel name_label = new JLabel();
+        Dictionary.registerText(name_label, "CDM.SubcollectionIndexManager.PartitionName");
+        subcollection_index_name_textfield = new JTextField();
+        subcollection_index_name_textfield.setPreferredSize(FIELD_SIZE);
+        Dictionary.registerTooltip(subcollection_index_name_textfield, "CDM.SubcollectionIndexManager.PartitionName_Tooltip");
+
+        JLabel source_label = new JLabel();
+        Dictionary.registerText(source_label, "CDM.SubcollectionIndexManager.Source");
+        source_list = new CheckList(false);
+        source_list.setListData(sources);
+        Dictionary.registerTooltip(source_list, "CDM.SubcollectionIndexManager.Source_Tooltip");
 
         JPanel button_pane = new JPanel();
-
-        add_index_button = new GLIButton();
-        add_index_button.setMnemonic(KeyEvent.VK_A);
-        add_index_button.setEnabled(false);
-        Dictionary.registerBoth(add_index_button, "CDM.SubcollectionIndexManager.Add_Subindex", "CDM.SubcollectionIndexManager.Add_Subindex_Tooltip");
-
-        clear_default_button = new GLIButton();
-        clear_default_button.setMnemonic(KeyEvent.VK_C);
-        clear_default_button.setEnabled(default_index != null);
-        Dictionary.registerBoth(clear_default_button, "CDM.SubcollectionIndexManager.Clear_Default_Subindex", "CDM.SubcollectionIndexManager.Clear_Default_Subindex_Tooltip");
-
-        JLabel default_label = new JLabel();
-        Dictionary.registerText(default_label, "CDM.SubcollectionIndexManager.Default_Subindex");
-
-        JPanel default_pane = new JPanel();
-        if(default_index == null) {
-        default_value_field = new JTextField();
-        }
-        else {
-        default_value_field = new JTextField(default_index.toString());
-        }
-        default_value_field.setPreferredSize(Utility.LABEL_SIZE);
-        default_value_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
-        default_value_field.setEditable(false);
-
-        remove_index_button = new GLIButton();
-        remove_index_button.setMnemonic(KeyEvent.VK_R);
-        remove_index_button.setEnabled(false);
-        Dictionary.registerBoth(remove_index_button, "CDM.SubcollectionIndexManager.Remove_Subindex", "CDM.SubcollectionIndexManager.Remove_Subindex_Tooltip");
-
-        set_default_button = new GLIButton();
-        set_default_button.setMnemonic(KeyEvent.VK_S);
-        set_default_button.setEnabled(false);
-        Dictionary.registerBoth(set_default_button, "CDM.SubcollectionIndexManager.Set_Default_Subindex", "CDM.SubcollectionIndexManager.Set_Default_Subindex_Tooltip");
-
-        JLabel subcollection_label = new JLabel();
-        Dictionary.registerText(subcollection_label, "CDM.SubcollectionIndexManager.Subcollection");
-        subcollection_list = new JList(CollectionDesignManager.subcollection_manager);
-        JPanel list_pane = new JPanel();
-        JLabel subindexes_label = new JLabel();
-        Dictionary.registerText(subcollection_label, "CDM.SubcollectionIndexManager.Subindexes");
-        subcollectionindexes_list = new JList(model);
-        subcollectionindexes_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        JPanel subindexes_pane = new JPanel();
-
-        // Add listeners
-        ExclusiveListSelectionListener ell = new ExclusiveListSelectionListener();
-        ell.add(subcollection_list);
-        ell.add(subcollectionindexes_list);
-        add_index_button.addActionListener(new AddSubIndexListener());
-        clear_default_button.addActionListener(new ClearDefaultSubIndexListener());
-        remove_index_button.addActionListener(new RemoveSubIndexListener());
-        set_default_button.addActionListener(new SetDefaultSubIndexListener());
-
-        subcollectionindexes_list.addListSelectionListener(new SubcollectionListListener());
-
-        subcollectionindex_name_field.getDocument().addDocumentListener(new SubcollectionIndexListener());
-        subcollection_list.addListSelectionListener(new SubcollectionIndexListener());
+        add_button = new GLIButton();
+        add_button.setEnabled(false);
+        add_button.setMnemonic(KeyEvent.VK_A);
+        Dictionary.registerBoth(add_button, "CDM.SubcollectionIndexManager.Add_Subindex", "CDM.SubcollectionIndexManager.Add_Subindex_Tooltip");
+
+        remove_button = new GLIButton();
+        remove_button.setEnabled(false);
+        remove_button.setMnemonic(KeyEvent.VK_R);
+        Dictionary.registerBoth(remove_button, "CDM.SubcollectionIndexManager.Remove_Subindex", "CDM.SubcollectionIndexManager.Remove_Subindex_Tooltip");
+
+        replace_button = new GLIButton();
+        replace_button.setEnabled(false);
+        replace_button.setMnemonic(KeyEvent.VK_P);
+        Dictionary.registerBoth(replace_button, "CDM.SubcollectionIndexManager.Replace_Subindex", "CDM.SubcollectionIndexManager.Replace_Subindex_Tooltip");
+
+        // Listeners
+        add_button.addActionListener(new AddListener());
+        move_down_button.addActionListener(new MoveListener(false));
+        move_up_button.addActionListener(new MoveListener(true));
+        remove_button.addActionListener(new RemoveListener());
+        replace_button.addActionListener(new ReplaceListener());
+        set_default_button.addActionListener(new SetDefaultListener());
+        subcollection_index_name_textfield.getDocument().addDocumentListener(new NameListener());
+        subcollection_index_list.addListSelectionListener(new SubcollectionIndexListListener());
+        source_list.addListSelectionListener(new SourceListListener());
 
         // Layout
-        default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-
-        default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createRaisedBevelBorder(), BorderFactory.createEmptyBorder(2,2,2,2))));
-        default_pane.setLayout(new BorderLayout(5,0));
-        default_pane.add(default_label, BorderLayout.WEST);
-        default_pane.add(default_value_field, BorderLayout.CENTER);
-
-        subindexes_pane.setLayout(new BorderLayout());
-        subindexes_pane.add(subindexes_label, BorderLayout.NORTH);
-        subindexes_pane.add(new JScrollPane(subcollectionindexes_list), BorderLayout.CENTER);
-        subindexes_pane.add(default_pane, BorderLayout.SOUTH);
+        movement_pane.setBorder(BorderFactory.createEmptyBorder(0,2,0,0));
+        movement_pane.setLayout(new GridLayout(3,1));
+        movement_pane.add(move_up_button);
+        movement_pane.add(move_down_button);
+        movement_pane.add(set_default_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(subcollection_index_list), BorderLayout.CENTER);
+        assigned_indexes_pane.add(movement_pane, BorderLayout.EAST);
+
+        labels_pane.setLayout(new BorderLayout());
+        labels_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 10, 5));
+        labels_pane.add(name_label, BorderLayout.NORTH);
+        labels_pane.add(source_label, BorderLayout.CENTER);
         
-        subindex_name_panel.setBorder(BorderFactory.createEmptyBorder(2,0,0,0));
-        subindex_name_panel.setLayout(new BorderLayout(5,0));
-        subindex_name_panel.add(subindex_name_label, BorderLayout.WEST);
-        subindex_name_panel.add(subcollectionindex_name_field, BorderLayout.CENTER);
-
-        list_pane.setBorder(BorderFactory.createEmptyBorder(5,0,2,0));
-        list_pane.setLayout(new BorderLayout());
-        list_pane.add(subcollection_label, BorderLayout.NORTH);
-        list_pane.add(new JScrollPane(subcollection_list), BorderLayout.CENTER);
-        list_pane.add(subindex_name_panel, BorderLayout.SOUTH);
-
-        button_pane.setLayout(new GridLayout(2,2));
-        button_pane.add(add_index_button);
-        button_pane.add(remove_index_button);
-        button_pane.add(set_default_button);
-        button_pane.add(clear_default_button);
-
-        subcollection_panel.setLayout(new BorderLayout());
-        //subcollection_panel.add(subindex_name_panel, BorderLayout.NORTH);
-        subcollection_panel.add(list_pane, BorderLayout.CENTER);
-        subcollection_panel.add(button_pane, BorderLayout.SOUTH);
+        boxes_pane.setLayout(new BorderLayout());
+        boxes_pane.add(subcollection_index_name_textfield, BorderLayout.NORTH);
+        boxes_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
         
+        details_pane.setLayout(new BorderLayout());
+        details_pane.add(labels_pane, BorderLayout.WEST);
+        details_pane.add(boxes_pane, BorderLayout.CENTER);
+
+        button_pane.setLayout(new GridLayout(1,3));
+        button_pane.add(add_button);
+        button_pane.add(replace_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);
+
+        content_pane.setLayout(new BorderLayout());
+        content_pane.add(assigned_indexes_pane, BorderLayout.NORTH);
+        content_pane.add(index_pane, BorderLayout.CENTER);
+
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         setLayout(new BorderLayout());
-        add(subindexes_pane, BorderLayout.CENTER);
-        add(subcollection_panel, BorderLayout.SOUTH);
-    }
-
-    public void clearDefaultIndex() {
-        clear_default_button.doClick(); 
-    }
-
-    public void destroy() {
-    }
-
-    public void gainFocus() {
-    }
-
-    public void loseFocus() {
-    }
-
-    /** Listens for actions apon the 'add subindex' button in the SubcollectionManager controls, and if detected calls the addSubindex method of the manager with a newly created subindex. */
-    private class AddSubIndexListener
-        implements ActionListener {
-        /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a series of subcollections selected, and if so build an new subindex based apon them.
-         * @param event An <strong>ActionEvent</strong> containing information about the event.
-         * @see org.greenstone.gatherer.cdm.SubcollectionIndex
+        add(content_pane, BorderLayout.CENTER);
+    }
+
+
+    public void destroy()
+    {
+    }
+
+
+    public void gainFocus()
+    {
+        // Reload the source list
+        ArrayList sources = new ArrayList();
+        ListModel source_model = CollectionDesignManager.subcollection_manager;
+        for (int i = 0; i < source_model.getSize(); i++) {
+        sources.add(source_model.getElementAt(i));
+        }
+        source_list.setListData(sources);
+
+        // Refresh the subcollection index list
+        subcollection_index_list.updateUI();
+
+        // If there is one selected, fill in the controls
+        updateControlsWithSelectedIndex();
+    }
+
+
+    public void loseFocus()
+    {
+    }
+
+
+    private void updateControlsWithSelectedIndex()
+    {
+        SubcollectionIndex selected_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
+        if (selected_index == null) {
+        return;
+        }
+
+        // Display the selected subcollection index's name
+        String id = selected_index.getID();
+        String name = CollectionDesignManager.collectionmeta_manager.getMetadatum("." + id).getValue(true);
+        subcollection_index_name_textfield.setText(name);
+
+        // Display the selected subcollection index's sources
+        source_list.clearSelection();
+        source_list.setSelectedObjects(selected_index.getSources().toArray());
+    }
+
+
+    private void validateControls()
+    {
+        boolean add_enabled = false;
+        boolean replace_enabled = false;
+
+        // Indexes must have a name
+        if (subcollection_index_name_textfield.getText().length() == 0) {
+        add_enabled = false;
+        }
+        // Can't add a new index if no sources are selected
+        else if (source_list.getSelected().size() == 0) {
+        add_enabled = false;
+        }
+        // If we get this far, create a dummy index and see if it's already assigned in the collection
+        else {
+        ArrayList sources = source_list.getSelected();
+        SubcollectionIndex subcollection_index = new SubcollectionIndex(sources.toArray());
+
+        // Subcollection index already exists: can't add, but can replace if the name has changed
+        if (model.contains(subcollection_index)) {
+            add_enabled = false;
+
+            // Here we need to check if we have changed the name - if so, we can enable the replace button
+            if (subcollection_index_list.getSelectedIndex() != -1) {
+            String name = subcollection_index_name_textfield.getText();
+            SubcollectionIndex selected_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
+            String selected_name = CollectionDesignManager.collectionmeta_manager.getMetadatum("." + selected_index.getID()).getValue(true);
+            if (!name.equals(selected_name)) {
+                replace_enabled = true;
+            }
+            }
+        }
+
+        // Subcollection index doesn't already exist: can add, or replace if there is something selected
+        else {
+            add_enabled = true;
+            if (subcollection_index_list.getSelectedIndex() != -1) {
+            replace_enabled = true;
+            }
+        }
+        }
+
+        // We should now know the add_button state
+        add_button.setEnabled(add_enabled);
+        replace_button.setEnabled(replace_enabled);
+    }
+
+
+    private class AddListener
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        String name = subcollection_index_name_textfield.getText();
+        if (source_list.getSelected().size() > 0 && name.length() != 0) {
+            ArrayList sources = source_list.getSelected();
+            SubcollectionIndex subcollection_index = new SubcollectionIndex(sources.toArray());
+
+            // Before we add the index to the model, we have to add the collection metadata for this
+            CollectionMeta metadatum = new CollectionMeta("." + subcollection_index.getID());
+            metadatum.setValue(name);
+            CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
+
+            // Finally, add the subcollection index
+            addSubcollectionIndex(subcollection_index);
+            subcollection_index_list.setSelectedIndex(model.getSize() - 1);
+        }
+        }
+    }
+
+
+    private class MoveListener
+        implements ActionListener
+    {
+        private boolean move_up;
+
+        public MoveListener(boolean move_up)
+        {
+        this.move_up = move_up;
+        }
+
+        public void actionPerformed(ActionEvent event)
+        {
+        // Retrieve the selected subcollection index
+        SubcollectionIndex subcollection_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
+        if (subcollection_index != null) {
+            int new_position = moveSubcollectionIndex(subcollection_index, move_up);
+            // Ensure the subcollection index that moved is still selected
+            subcollection_index_list.setSelectedIndex(new_position);
+        }
+        }
+    }
+
+
+    /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
+    private class NameListener
+        implements DocumentListener
+    {
+        public void changedUpdate(DocumentEvent e)
+        {
+        validateControls();
+        }
+
+        public void insertUpdate(DocumentEvent e)
+        {
+        validateControls();
+        }
+
+        public void removeUpdate(DocumentEvent e)
+        {
+        validateControls();
+        }
+    }
+
+
+    private class RemoveListener
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        int i = subcollection_index_list.getSelectedIndex();
+        if (i != -1) {
+            removeSubcollectionIndex((SubcollectionIndex) subcollection_index_list.getSelectedValue());
+        }
+
+        int size = subcollection_index_list.getModel().getSize();
+        if (i == size) {
+            i--;
+        }
+        subcollection_index_list.setSelectedIndex(i);
+        validateControls();
+        }
+    }
+
+
+    private class ReplaceListener
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        if (subcollection_index_list.isSelectionEmpty()) {
+            // This should never happen, but just in case...
+            replace_button.setEnabled(false);
+            return;
+        }
+
+        // We'll just remove the old one and add the new one
+        removeSubcollectionIndex((SubcollectionIndex) subcollection_index_list.getSelectedValue());
+        replace_button.setEnabled(false);
+        add_button.setEnabled(true);
+        add_button.doClick();
+        add_button.setEnabled(false);
+        }
+    }
+
+
+    private class SetDefaultListener
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        SubcollectionIndex subcollection_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
+        if (subcollection_index != null) {
+            setDefaultSubcollectionIndex(subcollection_index);
+            // This should cause a repaint of just the desired row
+            subcollection_index_list.setSelectedValue(subcollection_index, true);
+        }
+        set_default_button.setEnabled(false);
+        }
+    }
+
+
+    private class SourceListListener
+        implements ListSelectionListener
+    {
+        public void valueChanged(ListSelectionEvent event)
+        {
+        validateControls();
+        }
+    }
+
+
+    /** Listens for selections within the list on the SubcollectionIndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class SubcollectionIndexListListener
+        implements ListSelectionListener
+    {
+        /** This method is called whenever the source list selection changes. When it does we need to fill in the various parts of the list description panel
+         * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
          */
-        public void actionPerformed(ActionEvent event) {
-        if(!subcollection_list.isSelectionEmpty() && subcollectionindex_name_field.getText().length() > 0) {
-            SubcollectionIndex subindex = new SubcollectionIndex(subcollection_list.getSelectedValues());
-            addSubcollectionIndex(subindex);
-            // Add the subindexes name.
-            CollectionMeta metadatum = new CollectionMeta("." + subindex.getID());
-            metadatum.setValue(subcollectionindex_name_field.getText());
-            CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
-        }
-        }
-    }
-
-    /** Listens for actions apon the 'clear default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubcollectionIndex() method of the manager with <i>null</i>. */
-    private class ClearDefaultSubIndexListener
-        implements ActionListener {
-        /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to clear the default subindex.
-         * @param event An <strong>ActionEvent</strong> containing information about the event.
-         */
-        public void actionPerformed(ActionEvent event) {
-        setDefaultSubcollectionIndex(null);
-        default_value_field.setText("");
-        clear_default_button.setEnabled(false);
-        set_default_button.setEnabled(!subcollectionindexes_list.isSelectionEmpty());
-        }
-    }
-
-    /** Listens for actions apon the 'remove subindex' button in the SubcollectionManager controls, and if detected calls the removeSubcollectionIndex method of the manager with the SubcollectionIndex selected for removal. */
-    private class RemoveSubIndexListener
-        implements ActionListener {
-        /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a subindex selected, and if so remove it.
-         * @param event An <strong>ActionEvent</strong> containing information about the event.
-         * @see org.greenstone.gatherer.cdm.SubcollectionIndex
-         */
-        public void actionPerformed(ActionEvent event) {
-        if(!subcollectionindexes_list.isSelectionEmpty()) {
-            removeSubcollectionIndex((SubcollectionIndex)subcollectionindexes_list.getSelectedValue());
-        }
-        }
-    }
-    /** Listens for actions apon the 'set default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubcollectionIndex method of the manager with the SubIndex selected for default. */
-    private class SetDefaultSubIndexListener
-        implements ActionListener {
-        /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a subindex selected, and if so set it as default.
-         * @param event An <strong>ActionEvent</strong> containing information about the event.
-         * @see org.greenstone.gatherer.cdm.SubcollectionIndex
-         */
-        public void actionPerformed(ActionEvent event) {
-        if(!subcollectionindexes_list.isSelectionEmpty()) {
-            setDefaultSubcollectionIndex((SubcollectionIndex)subcollectionindexes_list.getSelectedValue());
-            default_value_field.setText(default_index.toString());
-            clear_default_button.setEnabled(true);
-            set_default_button.setEnabled(false);
-        }
-        }
-    }
-    
-    private class SubcollectionIndexListener
-        implements DocumentListener, ListSelectionListener {
-
-        /** Gives notification that an attribute or set of attributes changed. */
-        public void changedUpdate(DocumentEvent e) {
-        update();
-        }
-        /** Gives notification that there was an insert into the document. */
-        public void insertUpdate(DocumentEvent e) {
-        update();
-        }
-        /** Gives notification that a portion of the document has been removed. */
-        public void removeUpdate(DocumentEvent e) {
-        update();
-        }
-
-        public void valueChanged(ListSelectionEvent event) {
-        if(!event.getValueIsAdjusting()) {
-            update();
-        }
-        }
-
-        /** The text area has changed in some way. Given that this can only happed when we are editing or adding a text fragment we better respond appropriately. */
-        private void update() {
-        if(!subcollection_list.isSelectionEmpty() && subcollectionindex_name_field.getText().length() > 0) {
-            if (getSubcollectionIndex(subcollectionindex_name_field.getText()) == null) {
-            SubcollectionIndex subindex = new SubcollectionIndex(subcollection_list.getSelectedValues());
-            add_index_button.setEnabled(!model.contains(subindex));
-            } else {
-            add_index_button.setEnabled(false);
-            }
-        }
-        else {
-            add_index_button.setEnabled(false);
-        }
-        }
-    }
-
-    private class SubcollectionListListener
-        implements ListSelectionListener {
-
-        public void valueChanged(ListSelectionEvent event) {
-        if(!event.getValueIsAdjusting()) {
-            boolean enable = !subcollectionindexes_list.isSelectionEmpty();
-            remove_index_button.setEnabled(enable);
-            set_default_button.setEnabled(enable);
-        }
+        public void valueChanged(ListSelectionEvent event)
+        {
+        if (event.getValueIsAdjusting()) {
+            return;
+        }
+
+        int i = subcollection_index_list.getSelectedIndex();
+        int size = subcollection_index_list.getModel().getSize();
+        if (i < 0 || i >= size) {
+            move_down_button.setEnabled(false);
+            move_up_button.setEnabled(false);
+            remove_button.setEnabled(false);
+            replace_button.setEnabled(false);
+            set_default_button.setEnabled(false);
+            return;
+        }
+
+        // Enable the buttons appropriately
+        remove_button.setEnabled(true);
+        SubcollectionIndex selected_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
+        set_default_button.setEnabled(default_index == null || !default_index.equals(selected_index));
+        if (i > 0) {
+            move_up_button.setEnabled(true);
+        }
+        else {
+            move_up_button.setEnabled(false);
+        }
+        if (i < size-1){
+            move_down_button.setEnabled(true);
+        }
+        else {
+            move_down_button.setEnabled(false);
+        }
+
+        // Need to fill in the rest of the bits
+        updateControlsWithSelectedIndex();
+        }
+    }
+
+
+    private class SubcollectionIndexListCellRenderer
+        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() + " " + Dictionary.get("CDM.SubcollectionIndexManager.Default_Partition_Indicator"));
+        }
+        return component;
         }
     }

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

@@ -158 +158 @@
     private class SubcollectionControl
     extends JPanel 
-    implements Control {
-
+    implements Control, ChangeListener
+    {
     private CardLayout card_layout;
     private JButton add_button;
@@ -190 +190 @@
 
         tabbed_pane = new JTabbedPane();
+        tabbed_pane.addChangeListener(this);
         JLabel title = new JLabel();
         title.setHorizontalAlignment(JLabel.CENTER);
@@ -380 +381 @@
         else {
         card_layout.show(border_pane, DISABLED_CONTROLS);
+        }
+    }
+
+    public void stateChanged(ChangeEvent event)
+    {
+        if (tabbed_pane.getSelectedIndex() == 1) {
+        CollectionDesignManager.subcollectionindex_manager.getControls().gainFocus();
+        }
+        if (tabbed_pane.getSelectedIndex() == 2) {
+        CollectionDesignManager.language_manager.getControls().gainFocus();
         }
     }