Changeset 5037

Timestamp:

2003-07-25T16:35:22+12:00 (21 years ago)

Author:

jmt12

Message:

CDM now recognizes G2-1.4 collect.cfg commands

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (1 diff)
• cdm/CollectionConfiguration.java (modified) (6 diffs)
• cdm/DOMProxyListModel.java (modified) (1 diff)
• cdm/FormatManager.java (modified) (1 diff)
• cdm/Index.java (modified) (5 diffs)
• cdm/IndexManager.java (modified) (17 diffs)
• cdm/Level.java (modified) (6 diffs)
• cdm/SearchType.java (modified) (1 diff)
• cdm/SearchTypeManager.java (modified) (3 diffs)
• cdm/SuperCollectionManager.java (modified) (4 diffs)
• collection/CollectionManager.java (modified) (1 diff)

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

@@ -536 +536 @@
 
         classifier = new GComboBox(library.toArray());
-        classifier.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable", false));
+        classifier.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
         classifier.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
         classifier.setEditable(true);

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

@@ -404 +404 @@
         Element collect_config_element = document.getDocumentElement();
         NodeList command_elements = collect_config_element.getChildNodes();
+        boolean just_wrote_newline = false; // Prevent two or more newlines in a row
         for(int i = 0; i < command_elements.getLength(); i++) {
             Node command_node = command_elements.item(i);
@@ -409 +410 @@
             Element command_element = (Element) command_node;
             // The only thing left are NewLine elements
-            if(command_element.getNodeName().equals(NEWLINE_ELEMENT)) {
+            if(command_element.getNodeName().equals(NEWLINE_ELEMENT) && !just_wrote_newline) {
                 buffered_writer.newLine();
+                just_wrote_newline = true;
             }
-            // Anything else we write to file, but only if it has been assigned
-            else if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)){
+            // Anything else we write to file, but only if it has been assigned, the exception being the Indexes element which just get commented if unassigned (a side effect of MG && MGPP compatibility)
+            else if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR) || command_element.getNodeName().equals(INDEXES_ELEMENT)){
                 String command = toString(command_element, false);
                 if(command != null && command.length() > 0) {
                 write(buffered_writer, command);
                 buffered_writer.newLine();
+                just_wrote_newline = false;
                 }
             }
@@ -532 +535 @@
 
     private String indexesToString(Element command_element, boolean show_extracted_namespace) {
+    boolean comment_only = false;
     StringBuffer text = new StringBuffer("");
     if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
         text.append("#");
+        comment_only = true;
     }
     text.append(INDEX_STR);
     text.append(TAB_CHARACTER);
-    text.append(TAB_CHARACTER);
+    if(!comment_only) {
+        text.append(TAB_CHARACTER);
+    }
     NodeList index_elements = command_element.getElementsByTagName(INDEX_ELEMENT);
     // For each index, write its level, a colon, then concatenate its child content elements into a single comma separated list
@@ -551 +558 @@
         NodeList content_elements = index_element.getElementsByTagName(CONTENT_ELEMENT);
         int content_elements_length = content_elements.getLength();
+        // Don't output anything if no indexes are set
+        if(content_elements_length == 0) {
+        return null;
+        }
         for(int k = 0; k < content_elements_length; k++) {
         Element content_element = (Element) content_elements.item(k);
@@ -575 +586 @@
 
     private String indexDefaultToString(Element command_element, boolean show_extracted_namespace) {
-    StringBuffer text = new StringBuffer(INDEX_DEFAULT_STR);
+    boolean comment_only = false;
+    StringBuffer text = new StringBuffer("");
+    if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
+        text.append("#");
+        comment_only = true;
+    }
+    text.append(INDEX_DEFAULT_STR);
     text.append(TAB_CHARACTER);
     text.append(command_element.getAttribute(LEVEL_ATTRIBUTE));
@@ -625 +642 @@
 
     private String levelsToString(Element command_element) {
-    if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
-        StringBuffer text = new StringBuffer(LEVELS_STR);
-        text.append(TAB_CHARACTER);
-        text.append(TAB_CHARACTER);
-        NodeList content_elements = command_element.getElementsByTagName(CONTENT_ELEMENT);
-        int content_elements_length = content_elements.getLength();
-        for(int i = 0; i < content_elements_length; i++) {
-        Element content_element = (Element) content_elements.item(i);
-        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
-        text.append(SPACE_CHARACTER);
-        }
-        return text.substring(0, text.length() - 1);
-    }
-    else {
+    StringBuffer text = new StringBuffer("");
+    if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
+        text.append("#");
+    }
+    text.append(LEVELS_STR);
+    text.append(TAB_CHARACTER);
+    text.append(TAB_CHARACTER);
+    NodeList content_elements = command_element.getElementsByTagName(CONTENT_ELEMENT);
+    int content_elements_length = content_elements.getLength();
+    // Don't output anything if no levels are set.
+    if(content_elements_length == 0) {
         return null;
     }
+    for(int i = 0; i < content_elements_length; i++) {
+        Element content_element = (Element) content_elements.item(i);
+        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
+        text.append(SPACE_CHARACTER);
+    }
+    return text.substring(0, text.length() - 1);
     }
 

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

@@ -91 +91 @@
     else {
         // Retrieve the currently last entry
-        Node sibling = children.item(children.getLength() - 1);
-        Node parent_node = sibling.getParentNode();
-        sibling = sibling.getNextSibling();
-        if(sibling != null) {
+        index = children.getLength() - 1;
+        Node sibling = null;
+        Node parent_node = null;
+        if(index >= 0) {
+        sibling = children.item(index);
+        parent_node = sibling.getParentNode();
+        sibling = sibling.getNextSibling();
+        }
+        if(sibling != null && parent_node != null) {
         parent_node.insertBefore(element, sibling);
         }
         // Add to the root node
         else {
+        index = 0;
         root.appendChild(element);
         }

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

@@ -227 +227 @@
         control_pane = new JPanel();
         editor = new JTextArea();
-        editor.setBackground(Gatherer.config.getColor("coloring.editable", false));
+        editor.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
         editor.setCaretPosition(0);
         editor.setLineWrap(true);

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());
         content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, ((ElementWrapper)source_object).getName());
         }
         else {
+        System.err.println("Found String as source: " + source_object.toString());
         content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
         }
@@ -110 +112 @@
      */
     public int compareTo(Object object) {
+    if(object == null) {
+        return -1;
+    }
+    String id = getID();
     return id.compareTo(((Index)object).getID());
     }
@@ -159 +165 @@
         for(int i = 0; i < sources_size; i++) {
         Object source_object = sources.get(i);
+        // If its an element wrapper use the unique name rather than the 
         if(source_object instanceof ElementWrapper) {
-            id_buffer.append(((ElementWrapper)source_object).getName());
+            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()));
+            }
+            else {
+            id_buffer.append(full_element_name);
+            }
         }
         else {
@@ -183 +196 @@
         for(int i = 0; i < content_elements_length; i++) {
         Element content_element = (Element) content_elements.item(i);
-        sources.add(content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE));
+        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);
+            }
+        }
+        else {
+            sources.add(source_str);
+        }
         }
         content_elements = null;
@@ -249 +274 @@
      */
     public String toString() {
-    String id = getID();
-    StringBuffer text = new StringBuffer(id);
-    CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + id, false);
+    StringBuffer text_buffer = new StringBuffer("");
+    // Generate language dependant id (include extracted metadata namespace)
+    // Write level information, if any.
+    int level = getLevel();
+    if(0 <= level && level < 3) {
+        text_buffer.append(LEVEL[level]);
+        text_buffer.append(StaticStrings.COLON_CHARACTER);
+    }
+    // Write data information. Retrieve each of the content sources and add them in a comma separated list.
+    ArrayList sources = getSources();
+    int sources_size = sources.size();
+    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) {
+        text_buffer.append(StaticStrings.COMMA_CHARACTER);
+        }
+    }
+    sources = null;
+    CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + getID(), false);
     if(metadatum != null) {
-        text.append(" \"");
-        text.append(metadatum.getValue());
-        text.append("\"");
-    }
-    return text.toString();
+        text_buffer.append(" \"");
+        text_buffer.append(metadatum.getValue());
+        text_buffer.append("\"");
+    }
+    return text_buffer.toString();
     }
 }

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.gui.GComboBox;
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.ExclusiveListSelectionListener;
-import org.greenstone.gatherer.util.StaticStrings;
+import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
 /** This class is resposible for storing the indexes which have been assigned to this collection and the default index, and providing methods for interacting with both these data pools. It also knows how to turn itself into a String as it would be displayed in the collection configuration file.
@@ -48 +49 @@
 public class IndexManager
     extends DOMProxyListModel {
+
+    static final private Dimension LABEL_SIZE = new Dimension(150,30);
+    static final private String MGINDEXES = "mg indexes";
+    static final private String MGPPINDEXES = "mgpp indexes";
+
     /** The controls for editing the indexes. */
     private Control controls = null;
@@ -56 +62 @@
     /** The default index. */
     private Index default_index = null;
+
     /** Constructor. */
     public IndexManager(Element indexes) {
@@ -81 +88 @@
         CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
         // Retrieve the currently last index
-        Index last_index = (Index)getElementAt(getSize() - 1);
-        addAfter(index, last_index);
+        if(getSize() > 0) {
+        Index last_index = (Index)getElementAt(getSize() - 1);
+        addAfter(index, last_index);
+        }
+        else {
+        add(index);
+        }
         Gatherer.c_man.configurationChanged();
     }
     else {
         JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.IndexManager.Index_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+    }
+    }
+
+    public void addLevel(Level level, CollectionMeta metadatum) {
+    if(!levels_model.contains(level)) {
+        CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
+        // Retrieve the currently last index
+        if(getSize() > 0) {
+        Level last_level = (Level)levels_model.getElementAt(levels_model.getSize() - 1);
+        levels_model.addAfter(level, last_level);
+        }
+        else {
+        add(level);
+        }
+        Gatherer.c_man.configurationChanged();
+    }
+    else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.IndexManager.Level_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -152 +182 @@
     }
 
+    public Level getLevel(String name) {
+    int levels_model_size = levels_model.getSize();
+    for(int i = 0; i < levels_model_size; i++) {
+        Level level = (Level) levels_model.getElementAt(i);
+        if(level.getName().equals(name)) {
+        return level;
+        }
+    }
+    return null;
+    }
+
+    public void moveIndex(Index index, boolean move_up) {
+    // Determine the indexes current position
+    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) {
+        return;
+    }
+    if(position == 0 && move_up) {
+        return;
+    }
+    if(position == (getSize()) - 1 && !move_up) {
+        return;
+    }
+    // Ok, move the index
+    if(move_up) {
+        // 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);
+    }
+    else {
+        // 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);
+    }
+    // Schedule the collection for saving
+    Gatherer.c_man.configurationChanged();
+    }
+
+    public void moveLevel(Level level, boolean move_up) {
+    // Determine the leveles current position
+    int position = levels_model.indexOf(level);
+    // 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) {
+        return;
+    }
+    if(position == 0 && move_up) {
+        return;
+    }
+    if(position == (levels_model.getSize()) - 1 && !move_up) {
+        return;
+    }
+    // Ok, move the level
+    if(move_up) {
+        // Retrieve the level at position - 1
+        Level previous_level = (Level) levels_model.getElementAt(position - 1);
+        // And add before. This will automatically remove the level first, as an Element can only exist once in a particular document
+        levels_model.addBefore(level, previous_level);
+    }
+    else {
+        // Retrieve the level at position + 1
+        Level next_level = (Level) levels_model.getElementAt(position + 1);
+        // And add after. This will automatically remove the level first, as an Element can only exist once in a particular document
+        levels_model.addAfter(level, next_level);
+    }
+    // Schedule the collection for saving
+    Gatherer.c_man.configurationChanged();
+    }
+
     /** Method to remove a certain index.
      * @param index the Index to remove.
@@ -162 +263 @@
     if(index != null) {
         // Remove any current metadata from this index
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + index.getID());
+        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + index.getID());
         // Check if the index removed happens to be the default index
         if(default_index != null && default_index.equals(index)) {
@@ -169 +270 @@
         // Remove the index
         remove(index);
+        Gatherer.c_man.configurationChanged();
+    }
+    }
+
+    public void removeLevel(Level level) {
+    if(level != null) {
+        // Remove any current metadata from this level
+        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getName());
+        // Remove the level
+        levels_model.remove(level);
         Gatherer.c_man.configurationChanged();
     }
@@ -268 +379 @@
             source_object = null;
             Index new_index = new Index(new_sources);
-            // Before we add the index to the model, we have to add the collection metadata for this.
-            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + source_str);
-            metadatum.setValue(source_str);
+            // Try to retrieve existing metadatum
+            source_str = new_index.getID();
+            CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + source_str, false);
+            // If no metadata was found, add new pseudo metadata using the id
+            if(metadatum == null) {
+                metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + source_str);
+                metadatum.setAssigned(true);
+                metadatum.setValue(source_str);
+            }
+            // If it was found, ensure it is assigned
+            else {
+                metadatum.setAssigned(true);
+            }
+            source_str = null;
             addIndex(new_index, metadatum);
             metadatum = null;
@@ -312 +434 @@
             for(int i = 0; i < level_size; i++) {
                 Level level = (Level) levels_model.getElementAt(i);
-                Index new_index = new Index(level.toString(), index.getSources());
+                Index new_index = new Index(level.getName(), index.getSources());
                 // Try to retrieve existing metadatum
-                CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(new_index.getID(), false);
+                String source_str = new_index.getID();
+                CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + source_str, false);
+                // If no metadata was found, add new pseudo metadata using the id
+                if(metadatum == null) {
+                metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + source_str);
+                metadatum.setAssigned(true);
+                metadatum.setValue(source_str);
+                }
+                // If it was found, ensure it is assigned
+                else {
+                metadatum.setAssigned(true);
+                }
+                source_str = null;
                 addIndex(new_index, metadatum);
                 new_index = null;
@@ -359 +493 @@
     extends JPanel 
     implements Control {
+
+    private CardLayout card_layout;
+
     /** The default size of a label on this control. */
     private Dimension LABEL_SIZE = new Dimension(125,25);
@@ -413 +550 @@
     /** A text field for controlling the name of the new index. */
     private JTextField name = null;
-    /** A model containing all of the available index sources. */
-    private Vector source_model = null;
+
+    private MGPPControl mgppindexes_control = null;
+
     /** Constructor.
      * @see org.greenstone.gatherer.Configuration
@@ -430 +568 @@
     public IndexControl() {
         super();
-        source_model = new Vector();
-        source_model.add("text");
-        source_model.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);
@@ -485 +623 @@
         set_default.setMnemonic(KeyEvent.VK_S);
         source_label = new JLabel(get("Source"));
-        source_list = new JList(source_model);
+        source_list = new JList();
         title = new JLabel(get("Title"));
         title.setHorizontalAlignment(JLabel.CENTER);
+
+        // This class is getting a little crowded, so I'll generate the many mgpp controls in a inner class.
+        mgppindexes_control = new MGPPControl();
 
         // Listeners
@@ -563 +704 @@
         button_pane.add(set_default);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        setLayout(new BorderLayout());
-        add(header_pane, BorderLayout.NORTH);
-        add(central_pane, BorderLayout.CENTER);
-        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);
+
+        setLayout(card_layout);
+        add(mgindexes_panel, MGINDEXES);
+        add(mgppindexes_control, MGPPINDEXES);
     }
     /* Destructor, removes persistant listeners from the Dictionary.
      */
     public void destroy() {
+        mgppindexes_control.destroy();
+        mgppindexes_control = null;
     }
 
     public void gainFocus() {
+        boolean mgpp_enabled = CollectionDesignManager.searchtype_manager.isMGPPEnabled();
         if(instructions != null) {
         instructions.setCaretPosition(0);
         }
-        // Reload the assigned indexes list.
-        if(source_model != null) {
-        source_model.clear();
-        source_model.add("text");
-        source_model.addAll(Gatherer.c_man.getCollection().msm.getAssignedElements());
-        // reset the model in the list - needed if the model is larger than when it was first created, the list doesn't display
-        source_list.setListData(source_model);
-        
+        if(mgpp_enabled) {
+        mgppindexes_control.gainFocus();
+        }
+        else {
+        // Reload the assigned indexes list.
+        ArrayList new_data = new ArrayList();
+        new_data.add(CollectionConfiguration.TEXT_STR);
+        new_data.addAll(Gatherer.c_man.getCollection().msm.getAssignedElements());
+        // reset the model in the list and combobox
+        source_list.setListData(new_data.toArray());
+        new_data = null;
+        }
+        // Bring the appropriate card to the front
+        if(mgpp_enabled) {
+        card_layout.show(this, MGPPINDEXES);
+        }
+        else {
+        card_layout.show(this, MGINDEXES);
         }
     }
@@ -615 +773 @@
             sources = null;
             // Before we add the index to the model, we have to add the collection metadata for this.
-            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
+            CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
             metadatum.setValue(name.getText());
             // Finally add index.
@@ -653 +811 @@
         }
     }
+
+    /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class ListListener
+        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) {
+        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 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
@@ -673 +880 @@
         }
     }
-    /** 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);
+    }
+
+    private class MGPPControl
+    extends JPanel {
+
+    private GComboBox index_combobox;
+    private GComboBox level_combobox;
+    private JButton add_index_button;
+    private JButton add_level_button;
+    private JButton move_index_down_button;
+    private JButton move_level_down_button;
+    private JButton move_index_up_button;
+    private JButton move_level_up_button;
+    private JButton remove_index_button;
+    private JButton remove_level_button;
+    private JLabel current_levels_label;
+    private JLabel current_indexes_label;
+    private JLabel index_label;
+    private JLabel index_name_label;
+    private JLabel level_label;
+    private JLabel level_name_label;
+    private JLabel move_index_down_label;
+    private JLabel move_level_down_label;
+    private JLabel move_index_up_label;
+    private JLabel move_level_up_label;
+    private JLabel title_label;
+    private JList current_levels_list;
+    private JList current_indexes_list;
+    private JTabbedPane tabbed_pane;
+    private JTextArea instructions_textarea;
+    private JTextField index_name_field;
+    private JTextField level_name_field;
+
+    public MGPPControl() {
+        // Create Indexes
+        JPanel indexes_panel = new JPanel();
+        
+        JPanel current_indexes_panel = new JPanel();
+
+        current_indexes_label = new JLabel("CDM.IndexManager.MGPP.Current_Indexes");
+
+        current_indexes_list = new JList(model);
+        current_indexes_list.setVisibleRowCount(5);
+
+        JPanel index_movement_panel = new JPanel();
+
+        ImageIcon move_index_up_icon = Utility.getImage("arrow-up.gif");
+        move_index_up_button = new JButton();
+        move_index_up_label = new JLabel("CDM.Move.Move_Up");
+        move_index_up_label.setHorizontalAlignment(JLabel.CENTER);
+        move_index_up_label.setPreferredSize(LABEL_SIZE);
+        move_index_up_button.setLayout(new BorderLayout());
+        move_index_up_button.add(new JLabel(move_index_up_icon), BorderLayout.WEST);
+        move_index_up_button.add(move_index_up_label, BorderLayout.CENTER);
+        move_index_up_button.add(new JLabel(move_index_up_icon), BorderLayout.EAST);
+        move_index_up_button.setMnemonic(KeyEvent.VK_U);
+
+        ImageIcon move_index_down_icon = Utility.getImage("arrow-down.gif");
+        move_index_down_button = new JButton();
+        move_index_down_label = new JLabel("CDM.Move.Move_Down");
+        move_index_down_label.setHorizontalAlignment(JLabel.CENTER);
+        move_index_down_label.setPreferredSize(LABEL_SIZE);
+        move_index_down_button.setLayout(new BorderLayout());
+        move_index_down_button.add(new JLabel(move_index_down_icon), BorderLayout.WEST);
+        move_index_down_button.add(move_index_down_label, BorderLayout.CENTER);
+        move_index_down_button.add(new JLabel(move_index_down_icon), BorderLayout.EAST);
+        move_index_down_button.setMnemonic(KeyEvent.VK_D);
+
+        JPanel index_spacer_panel = new JPanel();
+
+        JPanel index_body_panel = new JPanel();
+
+        JPanel index_details_panel = new JPanel();
+
+        JPanel index_name_panel = new JPanel();
+
+        index_name_label = new JLabel("CDM.IndexManager.MGPP.Index_Name");
+        index_name_label.setPreferredSize(LABEL_SIZE);
+
+        index_name_field = new JTextField();
+
+        JPanel index_panel = new JPanel();
+
+        index_label = new JLabel("CDM.IndexManager.MGPP.Index");
+        index_label.setPreferredSize(LABEL_SIZE);
+
+        index_combobox = new GComboBox();
+        index_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
+        index_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        index_combobox.setEditable(true);
+        index_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
+        index_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+
+        JPanel index_button_panel = new JPanel();
+
+        add_index_button = new JButton("CDM.IndexManager.MGPP.Add_Index");
+        add_index_button.setEnabled(false);
+        add_index_button.setMnemonic(KeyEvent.VK_A);
+        
+        remove_index_button = new JButton("CDM.IndexManager.MGPP.Remove_Index");
+        remove_index_button.setEnabled(false);
+        remove_index_button.setMnemonic(KeyEvent.VK_A);
+
+        JPanel index_empty_panel = new JPanel();
+
+        // Connect Indexes
+        EnableAddIndexListener index_eal = new EnableAddIndexListener();
+        add_index_button.addActionListener(new AddIndexActionListener());
+        current_indexes_list.addListSelectionListener(new CurrentIndexesListSelectionListener());
+        Gatherer.dictionary.register(add_index_button, null, false);
+        Gatherer.dictionary.register(current_indexes_label, null, false);
+        Gatherer.dictionary.register(index_label, null, false);
+        Gatherer.dictionary.register(index_name_label, null, false);
+        Gatherer.dictionary.register(move_index_down_label, null, false);
+        Gatherer.dictionary.register(move_index_up_label, null, false);
+        Gatherer.dictionary.register(remove_index_button, null, false);
+        index_combobox.addActionListener(index_eal);
+        ((JTextField)index_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(index_eal);
+        index_name_field.getDocument().addDocumentListener(index_eal);
+        move_index_down_button.addActionListener(new MoveIndexDownListener());
+        move_index_up_button.addActionListener(new MoveIndexUpListener());
+        remove_index_button.addActionListener(new RemoveIndexActionListener(index_eal));
+        // Layout Indexes
+        index_movement_panel.setLayout(new GridLayout(2,1));
+        index_movement_panel.add(move_index_up_button);
+        index_movement_panel.add(move_index_down_button);
+
+        current_indexes_panel.setLayout(new BorderLayout());
+        current_indexes_panel.add(current_indexes_label, BorderLayout.NORTH);
+        current_indexes_panel.add(new JScrollPane(current_indexes_list), BorderLayout.CENTER);
+        current_indexes_panel.add(index_movement_panel, BorderLayout.EAST);
+
+        index_name_panel.setLayout(new BorderLayout());
+        index_name_panel.add(index_name_label, BorderLayout.WEST);
+        index_name_panel.add(index_name_field, BorderLayout.CENTER);
+
+        index_panel.setLayout(new BorderLayout());
+        index_panel.add(index_label, BorderLayout.WEST);
+        index_panel.add(index_combobox, BorderLayout.CENTER);
+
+        index_details_panel.setLayout(new GridLayout(2,1,0,5));
+        index_details_panel.add(index_name_panel);
+        index_details_panel.add(index_panel);
+
+        index_button_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        index_button_panel.setLayout(new GridLayout(1,2,5,0));
+        index_button_panel.add(add_index_button);
+        index_button_panel.add(remove_index_button);
+
+        index_body_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        index_body_panel.setLayout(new BorderLayout());
+        index_body_panel.add(index_details_panel, BorderLayout.CENTER);
+        index_body_panel.add(index_button_panel, BorderLayout.SOUTH);
+
+        index_spacer_panel.setLayout(new BorderLayout());
+        index_spacer_panel.add(index_body_panel, BorderLayout.NORTH);
+        index_spacer_panel.add(index_empty_panel, BorderLayout.CENTER);
+        
+        indexes_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        indexes_panel.setLayout(new BorderLayout());
+        indexes_panel.add(current_indexes_panel, BorderLayout.NORTH);
+        indexes_panel.add(index_spacer_panel, BorderLayout.CENTER);
+
+        // Create Levels
+        JPanel levels_panel = new JPanel();
+        
+        JPanel current_levels_panel = new JPanel();
+
+        current_levels_label = new JLabel("CDM.IndexManager.MGPP.Current_Levels");
+
+        current_levels_list = new JList(levels_model);
+        current_levels_list.setVisibleRowCount(5);
+
+        JPanel level_movement_panel = new JPanel();
+
+        ImageIcon move_level_up_icon = Utility.getImage("arrow-up.gif");
+        move_level_up_button = new JButton();
+        move_level_up_label = new JLabel("CDM.Move.Move_Up");
+        move_level_up_label.setHorizontalAlignment(JLabel.CENTER);
+        move_level_up_label.setPreferredSize(LABEL_SIZE);
+        move_level_up_button.setLayout(new BorderLayout());
+        move_level_up_button.add(new JLabel(move_level_up_icon), BorderLayout.WEST);
+        move_level_up_button.add(move_level_up_label, BorderLayout.CENTER);
+        move_level_up_button.add(new JLabel(move_level_up_icon), BorderLayout.EAST);
+        move_level_up_button.setMnemonic(KeyEvent.VK_U);
+
+        ImageIcon move_level_down_icon = Utility.getImage("arrow-down.gif");
+        move_level_down_button = new JButton();
+        move_level_down_label = new JLabel("CDM.Move.Move_Down");
+        move_level_down_label.setHorizontalAlignment(JLabel.CENTER);
+        move_level_down_label.setPreferredSize(LABEL_SIZE);
+        move_level_down_button.setLayout(new BorderLayout());
+        move_level_down_button.add(new JLabel(move_level_down_icon), BorderLayout.WEST);
+        move_level_down_button.add(move_level_down_label, BorderLayout.CENTER);
+        move_level_down_button.add(new JLabel(move_level_down_icon), BorderLayout.EAST);
+        move_level_down_button.setMnemonic(KeyEvent.VK_D);
+
+        JPanel level_spacer_panel = new JPanel();
+
+        JPanel level_body_panel = new JPanel();
+
+        JPanel level_details_panel = new JPanel();
+
+        JPanel level_name_panel = new JPanel();
+
+        level_name_label = new JLabel("CDM.IndexManager.MGPP.Level_Name");
+        level_name_label.setPreferredSize(LABEL_SIZE);
+
+        level_name_field = new JTextField();
+
+        JPanel level_panel = new JPanel();
+
+        level_label = new JLabel("CDM.IndexManager.MGPP.Level");
+        level_label.setPreferredSize(LABEL_SIZE);
+
+        level_combobox = new GComboBox(Index.LEVEL);
+        level_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
+        level_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        level_combobox.setEditable(true);
+        level_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
+        level_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+
+        JPanel level_button_panel = new JPanel();
+
+        add_level_button = new JButton("CDM.IndexManager.MGPP.Add_Level");
+        add_level_button.setEnabled(false);
+        add_level_button.setMnemonic(KeyEvent.VK_A);
+        
+        remove_level_button = new JButton("CDM.IndexManager.MGPP.Remove_Level");
+        remove_level_button.setEnabled(false);
+        remove_level_button.setMnemonic(KeyEvent.VK_A);
+
+        JPanel level_empty_panel = new JPanel();
+
+        // Connect Levels
+        EnableAddLevelListener level_eal = new EnableAddLevelListener();
+        add_level_button.addActionListener(new AddLevelActionListener());
+        current_levels_list.addListSelectionListener(new CurrentLevelsListSelectionListener());
+        Gatherer.dictionary.register(add_level_button, null, false);
+        Gatherer.dictionary.register(current_levels_label, null, false);
+        Gatherer.dictionary.register(level_label, null, false);
+        Gatherer.dictionary.register(level_name_label, null, false);
+        Gatherer.dictionary.register(move_level_down_label, null, false);
+        Gatherer.dictionary.register(move_level_up_label, null, false);
+        Gatherer.dictionary.register(remove_level_button, null, false);
+        level_combobox.addActionListener(level_eal);
+        ((JTextField)level_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(level_eal);
+        level_name_field.getDocument().addDocumentListener(level_eal);
+        move_level_down_button.addActionListener(new MoveLevelDownListener());
+        move_level_up_button.addActionListener(new MoveLevelUpListener());
+        remove_level_button.addActionListener(new RemoveLevelActionListener(level_eal));
+        // Layout Levels
+
+        level_movement_panel.setLayout(new GridLayout(2,1));
+        level_movement_panel.add(move_level_up_button);
+        level_movement_panel.add(move_level_down_button);
+
+        current_levels_panel.setLayout(new BorderLayout());
+        current_levels_panel.add(current_levels_label, BorderLayout.NORTH);
+        current_levels_panel.add(new JScrollPane(current_levels_list), BorderLayout.CENTER);
+        current_levels_panel.add(level_movement_panel, BorderLayout.EAST);
+
+        level_name_panel.setLayout(new BorderLayout());
+        level_name_panel.add(level_name_label, BorderLayout.WEST);
+        level_name_panel.add(level_name_field, BorderLayout.CENTER);
+
+        level_panel.setLayout(new BorderLayout());
+        level_panel.add(level_label, BorderLayout.WEST);
+        level_panel.add(level_combobox, BorderLayout.CENTER);
+
+        level_details_panel.setLayout(new GridLayout(2,1,0,5));
+        level_details_panel.add(level_name_panel);
+        level_details_panel.add(level_panel);
+
+        level_button_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        level_button_panel.setLayout(new GridLayout(1,2,5,0));
+        level_button_panel.add(add_level_button);
+        level_button_panel.add(remove_level_button);
+
+        level_body_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        level_body_panel.setLayout(new BorderLayout());
+        level_body_panel.add(level_details_panel, BorderLayout.CENTER);
+        level_body_panel.add(level_button_panel, BorderLayout.SOUTH);
+
+        level_spacer_panel.setLayout(new BorderLayout());
+        level_spacer_panel.add(level_body_panel, BorderLayout.NORTH);
+        level_spacer_panel.add(level_empty_panel, BorderLayout.CENTER);
+        
+        levels_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        levels_panel.setLayout(new BorderLayout());
+        levels_panel.add(current_levels_panel, BorderLayout.NORTH);
+        levels_panel.add(level_spacer_panel, BorderLayout.CENTER);
+
+        // Create General
+        JPanel header_panel = new JPanel();
+        
+        title_label = new JLabel("CDM.IndexManager.MGPP.Title");
+
+        instructions_textarea = new JTextArea("CDM.IndexManager.MGPP.Instructions");
+        instructions_textarea.setEditable(false);
+        instructions_textarea.setLineWrap(true);
+        instructions_textarea.setRows(5);
+        instructions_textarea.setWrapStyleWord(true);
+
+        tabbed_pane = new JTabbedPane();
+
+        // Layout General
+        header_panel.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+        header_panel.setLayout(new BorderLayout());
+        header_panel.add(title_label, BorderLayout.NORTH);
+        header_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
+
+        tabbed_pane.add("CDM.IndexManager.MGPP.Indexes", indexes_panel);
+        tabbed_pane.add("CDM.IndexManager.MGPP.Levels", levels_panel);
+
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_panel, BorderLayout.NORTH);
+        add(tabbed_pane, BorderLayout.CENTER);
+
+        // Connect General
+        Gatherer.dictionary.register(instructions_textarea, null, false);
+        Gatherer.dictionary.register(tabbed_pane, null, false);
+        Gatherer.dictionary.register(title_label, null, false);
+    }
+
+    public void destroy() {
+        Gatherer.dictionary.deregister(add_index_button);
+        Gatherer.dictionary.deregister(current_indexes_label);
+        Gatherer.dictionary.deregister(index_label);
+        Gatherer.dictionary.deregister(index_name_label);
+        Gatherer.dictionary.deregister(move_index_down_label);
+        Gatherer.dictionary.deregister(move_index_up_label);
+        Gatherer.dictionary.deregister(remove_index_button);
+
+        Gatherer.dictionary.deregister(instructions_textarea);
+        Gatherer.dictionary.deregister(tabbed_pane);
+        Gatherer.dictionary.deregister(title_label);
+    }
+
+    public void gainFocus() {
+        // Reload the assigned indexes list.
+        index_combobox.removeAllItems();
+        index_combobox.addItem(CollectionConfiguration.ALLFIELDS_STR);
+        index_combobox.addItem(CollectionConfiguration.TEXT_STR);
+        java.util.List assigned_elements = Gatherer.c_man.getCollection().msm.getAssignedElements();
+        int assigned_elements_size = assigned_elements.size();
+        for(int i = 0; i < assigned_elements_size; i++) {
+        index_combobox.addItem(assigned_elements.get(i));
+        }
+        assigned_elements = null;
+    }
+
+    private class AddIndexActionListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the name
+        String name = index_name_field.getText();
+        // Retrieve the source
+        Object source = index_combobox.getSelectedItem();
+        // If this object isn't yet in the combobox add it.
+        if(index_combobox.getSelectedIndex() == -1) {
+            index_combobox.insertItemAt(source, index_combobox.getItemCount());
+        }
+        // Create new index
+        ArrayList sources = new ArrayList();
+        sources.add(source);
+        Index index = new Index(sources);
+        // Create new metadatum
+        CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
+        metadatum.setValue(name);
+        // Assign new index
+        addIndex(index, metadatum);
+        // Done. Disable add
+        add_index_button.setEnabled(false);
+        }
+    }
+
+    private class AddLevelActionListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the name
+        String name = level_name_field.getText();
+        // Retrieve the source
+        String source = (String)level_combobox.getSelectedItem();
+        // If this object isn't yet in the combobox add it.
+        if(level_combobox.getSelectedIndex() == -1) {
+            level_combobox.insertItemAt(source, level_combobox.getItemCount());
+        }
+        Level level = new Level(source);
+        // Create new metadatum
+        CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + source);
+        metadatum.setValue(name);
+        // Assign new level
+        addLevel(level, metadatum);
+        // Done. Disable add
+        add_level_button.setEnabled(false);
+        }
+    }
+
+    private class CurrentIndexesListSelectionListener
+        implements ListSelectionListener {
+        public void valueChanged(ListSelectionEvent event) {
+        if(!event.getValueIsAdjusting()) {
+            Index index = (Index)current_indexes_list.getSelectedValue();
+            if(index != null) {
+            move_index_down_button.setEnabled((model.indexOf(index) < model.getSize() - 1));
+            move_index_up_button.setEnabled((model.indexOf(index) > 0));
+            remove_index_button.setEnabled(true);
+            }
+            else {
+            move_index_down_button.setEnabled(false);
+            move_index_up_button.setEnabled(false);
+            remove_index_button.setEnabled(false);
+            }
+        }
+        }
+    }
+
+    private class CurrentLevelsListSelectionListener
+        implements ListSelectionListener {
+        public void valueChanged(ListSelectionEvent event) {
+        if(!event.getValueIsAdjusting()) {
+            Level level = (Level)current_levels_list.getSelectedValue();
+            if(level != null) {
+            move_level_down_button.setEnabled((levels_model.indexOf(level) < levels_model.getSize() - 1));
+            move_level_up_button.setEnabled((levels_model.indexOf(level) > 0));
+            remove_level_button.setEnabled(true);
+            }
+            else {
+            move_level_down_button.setEnabled(false);
+            move_level_up_button.setEnabled(false);
+            remove_level_button.setEnabled(false);
+            }
+        }
+        }
+    }
+
+    private class EnableAddIndexListener
+        implements ActionListener, DocumentListener {
+        /** Called whenever a selection action occurs on the combobox.
+         * @param  event an ActionEvent containing information about the selection event
+         */
+        public void actionPerformed(ActionEvent event) {
+        validateAddButton();
+        }
+
+        /** Gives notification that an attribute or set of attributes changed.
+         * @param  event a DocumentEvent containing information about the text changed
+         */
+        public void changedUpdate(DocumentEvent event) {
+        validateAddButton();
+        }
+
+        /** Gives notification that there was an insert into the document.
+         * @param  event a DocumentEvent containing information about the text added
+         */
+        public void insertUpdate(DocumentEvent event) {
+        validateAddButton();
+        }
+          
+        /** Gives notification that a portion of the document has been removed.
+         * @param  event a DocumentEvent containing information about the text removed
+         */
+        public void removeUpdate(DocumentEvent e) {
+        validateAddButton();
+        }
+        
+        /** Change the enable state of the add button depending on the current value in the search type combobox. */
+        public void validateAddButton() {
+        String name = index_name_field.getText();
+        Object selected_object = index_combobox.getSelectedItem();
+        if(name.length() > 0 && selected_object != null) {
+            // Unfortunately we have to generate a valid id
+            String id = null;
+            if(selected_object instanceof ElementWrapper) {
+            id = ((ElementWrapper)selected_object).getName();
+            }
+            else {
+            id = selected_object.toString();
+            }
+            add_index_button.setEnabled(getIndex(id) == null);
         }
         else {
-            add.setEnabled(true);
-        }
-        if(index_list.isSelectionEmpty()) {
-            remove.setEnabled(false);
-            set_default.setEnabled(false);
+            add_index_button.setEnabled(false);
+        }
+        }
+    }
+
+    private class EnableAddLevelListener
+        implements ActionListener, DocumentListener {
+        /** Called whenever a selection action occurs on the combobox.
+         * @param  event an ActionEvent containing information about the selection event
+         */
+        public void actionPerformed(ActionEvent event) {
+        validateAddButton();
+        }
+
+        /** Gives notification that an attribute or set of attributes changed.
+         * @param  event a DocumentEvent containing information about the text changed
+         */
+        public void changedUpdate(DocumentEvent event) {
+        validateAddButton();
+        }
+
+        /** Gives notification that there was an insert into the document.
+         * @param  event a DocumentEvent containing information about the text added
+         */
+        public void insertUpdate(DocumentEvent event) {
+        validateAddButton();
+        }
+          
+        /** Gives notification that a portion of the document has been removed.
+         * @param  event a DocumentEvent containing information about the text removed
+         */
+        public void removeUpdate(DocumentEvent e) {
+        validateAddButton();
+        }
+        
+        /** Change the enable state of the add button depending on the current value in the search type combobox. */
+        public void validateAddButton() {
+        String name = level_name_field.getText();
+        Object selected_object = level_combobox.getSelectedItem();
+        if(name.length() > 0 && selected_object != null) {
+            add_level_button.setEnabled(getLevel((String)selected_object) == null);
         }
         else {
-            remove.setEnabled(true);
-            set_default.setEnabled(true);
-        }
-        }
-    }
-    /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
-    private class ListListener
-        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) {
-        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);
-        }
+            add_level_button.setEnabled(false);
+        }
+        }
+    }
+
+    private class MoveIndexDownListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the first selected item
+        Index index = (Index) current_indexes_list.getSelectedValue();
+        moveIndex(index, false);
+        current_indexes_list.setSelectedValue(index, true);
+        }
+    }
+
+    private class MoveLevelDownListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the first selected item
+        Level level = (Level) current_levels_list.getSelectedValue();
+        moveLevel(level, false);
+        current_levels_list.setSelectedValue(level, true);
+        }
+    }
+
+    private class MoveIndexUpListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the first selected item
+        Index index = (Index) current_indexes_list.getSelectedValue();
+        moveIndex(index, true);
+        current_indexes_list.setSelectedValue(index, true);
+        }
+    }
+
+    private class MoveLevelUpListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the first selected item
+        Level level = (Level) current_levels_list.getSelectedValue();
+        moveLevel(level, true);
+        current_levels_list.setSelectedValue(level, true);
+        }
+    }
+
+    private class RemoveIndexActionListener
+        implements ActionListener {
+
+        private EnableAddIndexListener eal = null;
+
+        public RemoveIndexActionListener(EnableAddIndexListener eal) {
+        this.eal = eal;
+        }
+
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the selected items
+        Object[] selected_objects = current_indexes_list.getSelectedValues();
+        // Clear selection
+        current_indexes_list.clearSelection();
+        for(int i = 0; i < selected_objects.length; i++) {
+            Index index = (Index) selected_objects[i];
+            // Remove any related metadata
+            CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + index.getID());
+            // Remove the index
+            removeIndex(index);
+        }
+        // Disable remove button
+        remove_index_button.setEnabled(false);
+        // Check if add should be reenabled
+        eal.validateAddButton();
+        }
+    }
+
+    private class RemoveLevelActionListener
+        implements ActionListener {
+
+        private EnableAddLevelListener eal = null;
+
+        public RemoveLevelActionListener(EnableAddLevelListener eal) {
+        this.eal = eal;
+        }
+
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the selected items
+        Object[] selected_objects = current_levels_list.getSelectedValues();
+        // Clear selection
+        current_levels_list.clearSelection();
+        for(int i = 0; i < selected_objects.length; i++) {
+            Level level = (Level) selected_objects[i];
+            // Remove any related metadata
+            CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getName());
+            // Remove the index
+            removeLevel(level);
+        }
+        // Disable remove button
+        remove_level_button.setEnabled(false);
+        // Check if add should be reenabled
+        eal.validateAddButton();
         }
     }

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

@@ -62 +62 @@
      */
     public Level(String name) {
-
+    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
+    element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
+    text = null;
     }
 
@@ -103 +105 @@
      */
     public String getName() {
-    return toString();
+    return element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
     }
 
@@ -109 +111 @@
      * @return true if this command has been assigned, false otherwise
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
-     * @see org.greenstone.gatherer.util.StaticStrings
      */
     public boolean isAssigned() {
@@ -118 +119 @@
      * @param  assigned the desired state of assigned as a boolean
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
-     * @see org.greenstone.gatherer.util.StaticStrings
      */
     public void setAssigned(boolean assigned) {
@@ -137 +137 @@
      * @param  name the new name for this level, as a String
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
-     * @see org.greenstone.gatherer.util.StaticStrings
      */
     public void setName(String name) {
@@ -149 +148 @@
      * @return a String showing this level
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
-     * @see org.greenstone.gatherer.util.StaticStrings
      */
     public String toString() {
-    if(text == null && element != null) {
-        text = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+    if(text == null) {
+        if(element == null) {
+        text = "#Error";
+        }
+        else {
+        String name = getName();
+        StringBuffer text_buffer = new StringBuffer(name);
+        CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + name, false);
+        if(metadatum != null) {
+            text_buffer.append(" \"");
+            text_buffer.append(metadatum.getValue());
+            text_buffer.append("\"");
+        }
+        text = text_buffer.toString();
+        text_buffer = null;
+        }
     }
     return text;

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

@@ -62 +62 @@
      */
     public SearchType(String name) {
-
+    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
+    element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
+    text = null;
     }
 

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

@@ -164 +164 @@
         move_down_button.add(move_down_label, BorderLayout.CENTER);
         move_down_button.add(new JLabel(move_down_icon), BorderLayout.EAST);
-        move_down_button.setMnemonic(KeyEvent.VK_U);
+        move_down_button.setMnemonic(KeyEvent.VK_D);
 
         JPanel search_type_panel = new JPanel();
@@ -178 +178 @@
         JPanel button_panel = new JPanel();
         add_button = new JButton("CDM.SearchTypeManager.Add");
+        add_button.setEnabled(false);
+        add_button.setMnemonic(KeyEvent.VK_A);
+
         remove_button = new JButton("CDM.SearchTypeManager.Remove");
+        remove_button.setEnabled(false);
+        remove_button.setMnemonic(KeyEvent.VK_R);
 
         // Connection
@@ -240 +245 @@
 
     public void destroy() {
-
+        Gatherer.dictionary.deregister(add_button);
+        Gatherer.dictionary.deregister(current_search_types_label);
+        Gatherer.dictionary.deregister(enable_advanced_searches_checkbox);
+        Gatherer.dictionary.deregister(instructions_textarea);
+        Gatherer.dictionary.deregister(move_down_label);
+        Gatherer.dictionary.deregister(move_up_label);
+        Gatherer.dictionary.deregister(remove_button);
+        Gatherer.dictionary.deregister(search_type_label);
+        Gatherer.dictionary.deregister(title_label);
     }
     

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

@@ -48 +48 @@
     static final public String SUPERCOLLECTION_COMMAND = "supercollection";
     static final public String CCS_COMMAND = "ccs";
-
+    private ArrayList collection_checklist_model = null; // Model used to actually populate list
+    private Control controls = null;
+    private DOMProxyListModel model = null;
     private String current_coll_name = null;
-    private Control controls = null;
-    private ArrayList collection_checklist_model = null; // Model used to actually populate list
+
 
     public SuperCollectionManager(Element supercollections_element) {
     super(supercollections_element, StaticStrings.COLLECTION_ELEMENT, new SuperCollection());
     Gatherer.println("SuperCollectionManager: " + getSize() + " supercollection members parsed.");
+    this.model = this;
     }
 
@@ -167 +169 @@
 
     public void loseFocus() {
+        int super_collections_count = 0;
         // Retrieve the current supercollections
         ArrayList supercollections = children();
@@ -187 +190 @@
             }
             supercollection.setAssigned(true);
+            super_collections_count++;
         }
         }
@@ -193 +197 @@
         SuperCollection supercollection = (SuperCollection) supercollections.get(j - 1);
         removeSuperCollection(supercollection);
-        } 
+        }
+        // Now we only assign supercollections if more than one is selected
+        model.root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (super_collections_count > 1 ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
 

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -696 +696 @@
     Gatherer.println("CollectionManager.importCollection()");
     if(!saved()) {
+        import_monitor.saving();
         // Force save.
         try {