Changeset 9997

Timestamp:

2005-06-01T14:14:45+12:00 (19 years ago)

Author:

kjdon

Message:

lots of changes. made the mgpp index and level lists behave like others - can only select one item at a time, adding and removing leaves the selected item a sensible one. when switching between mg and mgpp controls we remove and add the appropriate index list listeners - don't want the mg listener getting mgpp events and vice versa. I think thats about it.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (35 diffs)

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

@@ -112 +112 @@
     if(!levels_model.contains(level)) {
         CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
-        // Retrieve the currently last index
+        // Retrieve the currently last level
         if(levels_model.getSize() > 0) {
         Level last_level = (Level)levels_model.getElementAt(levels_model.getSize() - 1);
@@ -193 +193 @@
     for(int i = 0; i < levels_model_size; i++) {
         Level level = (Level) levels_model.getElementAt(i);
-        if(level.getName().equals(name)) {
+        if(level.getLevel().equals(name)) {
         return level;
         }
@@ -205 +205 @@
     // Determine the current position of the index
     int position = indexOf(index);
-    if (position == -1) {
+    // 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;
     }
-
-    // Attempt to move the index up
+    if(position == 0 && move_up) {
+        return;
+    }
+    if(position == (getSize()) - 1 && !move_up) {
+        return;
+    }
+    
+    // Ok, move up
     if (move_up) {
-        // Check it's not already at the top
-        if (position == 0) {
-        return;
-        }
-
-        // Retrieve the index at position - 1
-        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
+        position--;
+        remove(index);
+        add(position, index);
+    }
+
+    // Or move down
     else {
-        // Check it's not already at the bottom
-        if (position == (getSize()) - 1) {
-        return;
-        }
-
-        // Retrieve the index at position + 1
-        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);
+        position++;
+        remove(index);
+        add(position, index);
     }
 
@@ -255 +248 @@
         return;
     }
-    // Ok, move the level
+    // Ok, move up
     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);
-    }
+        position--;
+        levels_model.remove(level);
+        levels_model.add(position, level);
+    }
+    // Or move down
     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);
+        position++;
+        levels_model.remove(level);
+        levels_model.add(position, level);
     }
     // Schedule the collection for saving
     Gatherer.c_man.configurationChanged();
     }
-
+    
     /** Method to remove a certain index.
      * @param index the Index to remove.
@@ -304 +296 @@
     if(level != null) {
         // Remove any current metadata from this level
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getName());
+        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getLevel());
         // Remove the level
         levels_model.remove(level);
@@ -346 +338 @@
      */
     public void setMGPPEnabled(boolean state) {
-    if(state != root.getAttribute(CollectionConfiguration.MGPP_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR)) {
-        if(state) {
-        Element mg_element = root;
-        // Retrieve and assign the MGPP indexes element.
-        Element mgpp_element = CollectionDesignManager.collect_config.getMGPPIndexes();
-        mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-        levels_model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-        // If the MGPP indexes element is empty (ie was created by CollectionConfiguration), generate new MGPP index from the existing index
-        NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
-        if(indexes.getLength() == 0) {
-            ArrayList levels_list = new ArrayList();
-            ArrayList sources_list = new ArrayList();
-            // We first use details from the default index if any
-            if(default_index != null) {
-            int level_int = default_index.getLevel();
-            if(0 <= level_int && level_int < 3) {
-                String level = Index.LEVEL[level_int];
-                if(!levels_list.contains(level)) {
-                levels_list.add(level);
-                }
-                level = null;
+    if(state == root.getAttribute(CollectionConfiguration.MGPP_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR)) {
+        // we are not changing state
+        return;
+        
+    }
+    // change MG -> MGPP
+    if(state) {
+        Element mg_element = root;
+        // Retrieve and assign the MGPP indexes element.
+        Element mgpp_element = CollectionDesignManager.collect_config.getMGPPIndexes();
+        mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+        levels_model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+        // If the MGPP indexes element is empty (ie was created by CollectionConfiguration), generate new MGPP index from the existing index
+        NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
+        if(indexes.getLength() == 0) {
+        ArrayList levels_list = new ArrayList();
+        ArrayList sources_list = new ArrayList();
+        // We first use details from the default index if any
+        if(default_index != null) {
+            int level_int = default_index.getLevel();
+            if(0 <= level_int && level_int < 3) {
+            String level = Index.LEVEL[level_int];
+            if(!levels_list.contains(level)) {
+                levels_list.add(level);
             }
-            ArrayList sources = default_index.getSources();
-            sources.removeAll(sources_list);
-            sources_list.addAll(sources);
-            }
-            int size = getSize();
-            for(int i = 0; i < size; i++) {
-            Index index = (Index) getElementAt(i);
-            int level_int = index.getLevel();
-            if(0 <= level_int && level_int < 3) {
-                String level = Index.LEVEL[level_int];
-                if(!levels_list.contains(level)) {
-                levels_list.add(level);
-                }
-                level = null;
+            level = null;
+            }
+            ArrayList sources = default_index.getSources();
+            sources.removeAll(sources_list);
+            sources_list.addAll(sources);
+        }
+        int size = getSize();
+        for(int i = 0; i < size; i++) {
+            Index index = (Index) getElementAt(i);
+            int level_int = index.getLevel();
+            if(0 <= level_int && level_int < 3) {
+            String level = Index.LEVEL[level_int];
+            if(!levels_list.contains(level)) {
+                levels_list.add(level);
             }
-            ArrayList sources = index.getSources();
-            sources.removeAll(sources_list);
-            sources_list.addAll(sources);
-            index = null;
-            }
-            // Replace mg element with mgpp element
-            setRoot(mgpp_element);
-
-            // We now have a list of sources and a list of levels, so create new indexes and levels based on these
-            int sources_list_size = sources_list.size();
-            for(int j = 0; j < sources_list_size; j++) {
-            Object source_object = sources_list.get(j);
-            String source_str = null;
-            if(source_object instanceof MetadataElement) {
-                source_str = ((MetadataElement) source_object).getFullName();
-            }
-            else {
-                source_str = source_object.toString();
-            }
-            ArrayList new_sources = new ArrayList();
-            new_sources.add(source_object);
-            source_object = null;
-            Index new_index = new Index(new_sources);
+            level = null;
+            }
+            ArrayList sources = index.getSources();
+            sources.removeAll(sources_list);
+            sources_list.addAll(sources);
+            index = null;
+        }
+        // Replace mg element with mgpp element
+        setRoot(mgpp_element);
+        
+        // We now have a list of sources and a list of levels, so create new indexes and levels based on these
+        int sources_list_size = sources_list.size();
+        for(int j = 0; j < sources_list_size; j++) {
+            Object source_object = sources_list.get(j);
+            String source_str = null;
+            if(source_object instanceof MetadataElement) {
+            source_str = ((MetadataElement) source_object).getFullName();
+            }
+            else {
+            source_str = source_object.toString();
+            }
+            ArrayList new_sources = new ArrayList();
+            new_sources.add(source_object);
+            source_object = null;
+            Index new_index = new Index(new_sources);
+            // 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;
+            new_index = null;
+            new_sources = null;
+            source_str = null;
+        }
+        int levels_list_size = levels_list.size();
+        for(int k = 0; k < levels_list_size; k++) {
+            Level new_level = new Level((String)levels_list.get(k));
+            if(!levels_model.contains(new_level)) {
+            levels_model.add(levels_model.getSize(), new_level);
+            }
+            new_level = null;
+        }
+        }
+        else {
+        // Replace mg element with mgpp element
+        setRoot(mgpp_element);
+        }
+        // Unassign MG element and default index
+        mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+        mg_element = null;
+        if(default_index != null) {
+        default_index.setAssigned(false);
+        }
+    }
+    // change MGPP -> MG
+    else {
+        Element mgpp_element = root;
+        // Retrieve and assign MG element and default index element
+        Element mg_element = CollectionDesignManager.collect_config.getMGIndexes();
+        mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+        if(default_index != null) {
+        default_index.setAssigned(true);
+        }
+        // If mg element has no indexes, and the current mgpp index include a text one, then generate text indexes for each of the registered levels.
+        NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
+        if(indexes.getLength() == 0) {
+        Index index = getIndex(CollectionConfiguration.TEXT_STR);
+        if(index != null) {
+            // Replace mgpp element with mg element
+            setRoot(mg_element);
+            int level_size = levels_model.getSize();
+            for(int i = 0; i < level_size; i++) {
+            Level level = (Level) levels_model.getElementAt(i);
+            Index new_index = new Index(level.getLevel(), index.getSources());
             // Try to retrieve existing metadatum
-            source_str = new_index.getID();
+            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
@@ -421 +478 @@
             source_str = null;
             addIndex(new_index, metadatum);
-            metadatum = null;
             new_index = null;
-            new_sources = null;
-            source_str = null;
-            }
-            int levels_list_size = levels_list.size();
-            for(int k = 0; k < levels_list_size; k++) {
-            Level new_level = new Level((String)levels_list.get(k));
-            if(!levels_model.contains(new_level)) {
-                levels_model.add(levels_model.getSize(), new_level);
-            }
-            new_level = null;
-            }
-        }
-        else {
-            // Replace mg element with mgpp element
-            setRoot(mgpp_element);
-        }
-        // Unassign MG element and default index
-        mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
-        mg_element = null;
-        if(default_index != null) {
-            default_index.setAssigned(false);
+            level = null;
+            }
         }
         }
         else {
-        Element mgpp_element = root;
-        // Retrieve and assign MG element and default index element
-        Element mg_element = CollectionDesignManager.collect_config.getMGIndexes();
-        mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-        if(default_index != null) {
-            default_index.setAssigned(true);
-        }
-        // If mg element has no indexes, and the current mgpp index include a text one, then generate text indexes for each of the registered levels.
-        NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
-        if(indexes.getLength() == 0) {
-            Index index = getIndex(CollectionConfiguration.TEXT_STR);
-            if(index != null) {
-            // Replace mgpp element with mg element
-            setRoot(mg_element);
-            int level_size = levels_model.getSize();
-            for(int i = 0; i < level_size; i++) {
-                Level level = (Level) levels_model.getElementAt(i);
-                Index new_index = new Index(level.getName(), index.getSources());
-                // Try to retrieve existing metadatum
-                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;
-                level = null;
-            }
-            }
-        }
-        else {
-            // Replace mgpp element with mg element
-            setRoot(mg_element);
-        }
-        // Unassign mgpp element and levels
-        mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
-        levels_model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
-        }
-    }
+        // Replace mgpp element with mg element
+        setRoot(mg_element);
+        }
+        // Unassign mgpp element and levels
+        mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+        levels_model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+    }
+    
     }
-
+    
 
     /** This class creates a set of controls for editing the indexes. */
@@ -514 +512 @@
     private JTextArea instruction_textarea;
     private JTextField name_textfield ;
-
+    // when we are in mgpp mode, we want to remove the mg listener 
+    // the underlying model is the same between the two JLists, and
+    // both listeners get notified when the model changes, but the mg
+    // listener doesn't care about mgpp events
+    private ListSelectionListener index_list_listener;
+    
     private MGPPControl mgppindexes_control;
 
@@ -630 +633 @@
         name_textfield.getDocument().addDocumentListener(new NameListener());
         level_combobox.addItemListener(new LevelListener());
-        index_list.addListSelectionListener(new IndexListListener());
+        // Create the index_list_listener but don't add in to the list - this gets done in gainFocus, we don't want it twice.
+        index_list_listener = new IndexListListener();
         source_list.addListSelectionListener(new SourceListListener());
 
@@ -689 +693 @@
     }
 
+    
     /* Destructor, removes persistant listeners from the Dictionary.
      */
@@ -702 +707 @@
         }
         if(mgpp_enabled) {
+        // remove the mg index list listener first
+        index_list.removeListSelectionListener(index_list_listener);
         mgppindexes_control.gainFocus();
         }
         else {
+        // remove the mgpp listener first
+        mgppindexes_control.removeIndexListListener();
+        // add the mg listener back in
+        index_list.addListSelectionListener(index_list_listener);
         // Reload the assigned indexes list.
         ArrayList new_data = new ArrayList();
@@ -945 +956 @@
             removeIndex((Index) index_list.getSelectedValue());
         }
-
         int size = index_list.getModel().getSize();
         if (i == size) {
@@ -1019 +1029 @@
     private JButton move_index_up_button;
     private JButton move_level_up_button;
-    private JButton replace_button;
+    private JButton replace_index_button;
     private JButton remove_index_button;
     private JButton remove_level_button;
@@ -1039 +1049 @@
     private JTextField index_name_field;
     private JTextField level_name_field;
-
+    
+    // when we are in mg mode, we want to remove the mgpp listener 
+    // the underlying model is the same between the two JLists, and
+    // both listeners get notified when the model changes, but the mgpp
+    // listener doesn't care about mg events
+    private ListSelectionListener mgpp_index_list_listener;
+    
     public MGPPControl() {
         // Create Indexes
@@ -1050 +1066 @@
         current_indexes_list = new JList(model);
         current_indexes_list.setVisibleRowCount(5);
+        current_indexes_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
         JPanel index_movement_panel = new JPanel();
@@ -1101 +1118 @@
         Dictionary.registerBoth(add_all_button, "CDM.IndexManager.MGPP.Add_All_Metadata", "CDM.IndexManager.MGPP.Add_All_Metadata_Tooltip");
 
-        replace_button = new GLIButton();
-        replace_button.setEnabled(false);
-        replace_button.setMnemonic(KeyEvent.VK_C);
-        Dictionary.registerBoth(replace_button, "CDM.IndexManager.MGPP.Replace_Index", "CDM.IndexManager.MGPP.Replace_Index_Tooltip");
+        replace_index_button = new GLIButton();
+        replace_index_button.setEnabled(false);
+        replace_index_button.setMnemonic(KeyEvent.VK_C);
+        Dictionary.registerBoth(replace_index_button, "CDM.IndexManager.MGPP.Replace_Index", "CDM.IndexManager.MGPP.Replace_Index_Tooltip");
 
         remove_index_button = new GLIButton();
@@ -1117 +1134 @@
         add_index_button.addActionListener(new AddIndexActionListener());
         add_all_button.addActionListener(new AddAllActionListener());
-        current_indexes_list.addListSelectionListener(new CurrentIndexesListSelectionListener());
+        
+        // Create the index_list_listener but don't add in to the list - this gets done in gainFocus, we don't want it twice.
+        mgpp_index_list_listener = new CurrentIndexesListSelectionListener();
         index_combobox.addActionListener(index_eal);
         ((JTextField)index_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(index_eal);
@@ -1123 +1142 @@
         move_index_down_button.addActionListener(new MoveIndexDownListener());
         move_index_up_button.addActionListener(new MoveIndexUpListener());
-        replace_button.addActionListener(new ReplaceIndexActionListener());
+        replace_index_button.addActionListener(new ReplaceIndexActionListener());
         remove_index_button.addActionListener(new RemoveIndexActionListener(index_eal));
 
@@ -1153 +1172 @@
         index_button_panel.add(add_index_button);
         index_button_panel.add(add_all_button);
-        index_button_panel.add(replace_button);
+        index_button_panel.add(replace_index_button);
         index_button_panel.add(remove_index_button);
 
@@ -1180 +1199 @@
         current_levels_list = new JList(levels_model);
         current_levels_list.setVisibleRowCount(5);
-
+        current_levels_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         JPanel level_movement_panel = new JPanel();
 
@@ -1216 +1235 @@
         level_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
         level_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
-        level_combobox.setEditable(true);
+        level_combobox.setEditable(false);
         level_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
         level_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
@@ -1322 +1341 @@
 
     public void gainFocus() {
+        // add in the mgpp listener
+        current_indexes_list.addListSelectionListener(mgpp_index_list_listener);
         // Reload the assigned indexes list.
         index_combobox.removeAllItems();
@@ -1345 +1366 @@
         current_indexes_list.updateUI();
     }
-
+    
+    public void removeIndexListListener() {
+
+        current_indexes_list.removeListSelectionListener(mgpp_index_list_listener);
+    }
+    
     private class AddIndexActionListener
         implements ActionListener {
@@ -1368 +1394 @@
             // Assign new index
             addIndex(index, metadatum);
+            current_indexes_list.setSelectedValue(index, true);
         }
         // Done. Disable add
@@ -1413 +1440 @@
         // 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
@@ -1422 +1445 @@
         metadatum.setValue(name);
         // Assign new level
+        int size = levels_model.getSize();
         addLevel(level, metadatum);
-        // Done. Disable add
+        current_levels_list.setSelectedValue(level, true);
         add_level_button.setEnabled(false);
         }
@@ -1431 +1455 @@
         implements ListSelectionListener {
         public void valueChanged(ListSelectionEvent event) {
-        if(!event.getValueIsAdjusting()) {
-            Index index = (Index)current_indexes_list.getSelectedValue();
-            Object[] selected_objects = current_indexes_list.getSelectedValues();
-            if(selected_objects.length == 1) {
-            String full_text = index.toString();
-            if(full_text.indexOf("\"") != -1) {
-                index_name_field.setText(index.getName());
-            }
-            ArrayList sources = index.getSources();
-            index_combobox.setSelectedItem(sources.get(0));
-            }
-            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);
-            }
-        }
-        }
+        if(event.getValueIsAdjusting()) {
+            return;
+        }
+        
+        Index index = (Index)current_indexes_list.getSelectedValue();
+        if(index != null) {
+            String full_text = index.toString();
+            if(full_text.indexOf("\"") != -1) {
+            index_name_field.setText(index.getName());
+            }
+            ArrayList sources = index.getSources();
+            index_combobox.setSelectedItem(sources.get(0));
+            
+            
+            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);
+        }
+        }       
     }
 
@@ -1459 +1484 @@
         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(!level.getName().equals(CollectionConfiguration.DOCUMENT_STR) || levels_model.getSize() > 1);
-            }
-            else {
-            move_level_down_button.setEnabled(false);
-            move_level_up_button.setEnabled(false);
-            remove_level_button.setEnabled(false);
-            }
+        
+        if(event.getValueIsAdjusting()) {
+            return;
+        }
+        
+        Level level = (Level)current_levels_list.getSelectedValue();
+        if(level != null) {
+            String full_text = level.toString();
+            if(full_text.indexOf("\"") != -1) {
+            level_name_field.setText(level.getName());
+            }
+            String level_id = level.getLevel();
+            level_combobox.setSelectedItem(level_id);
+            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);
         }
         }
@@ -1509 +1543 @@
         String name = index_name_field.getText();
         Object selected_object = index_combobox.getSelectedItem();
+        boolean add_enabled = false;
+        boolean replace_enabled = false;
+
         if(name.length() > 0 && selected_object != null) {
             // Unfortunately we have to generate a valid id
@@ -1526 +1563 @@
             id = id.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
             }
+            
             Index index = getIndex(id);
             if(index == null) {
-            add_index_button.setEnabled(true);
-            replace_button.setEnabled(false);
+            add_enabled = true;
+            // we have a new index. is something selected? if so, we can replace
+            if (current_indexes_list.getSelectedIndex() != -1) {
+                replace_enabled = true;
+            }
             }
             else {
-            add_index_button.setEnabled(false);
-            replace_button.setEnabled(!name.equals(index.getName()));
+            // the index is already there
+            add_enabled = false;
+            // but if the name is changed, we can do a replace
+            if(!name.equals(index.getName())) {
+                replace_enabled = true;
+            }
+            
             }
         }
         else {
-            add_index_button.setEnabled(false);
-        }
+            add_enabled = false;
+            replace_enabled = false;
+            
+        }
+
+        // We should now know the button state
+        add_index_button.setEnabled(add_enabled);
+        replace_index_button.setEnabled(replace_enabled);
+        
         }
     }
@@ -1630 +1683 @@
 
         public void actionPerformed(ActionEvent event) {
-        Object[] selected_objects = current_indexes_list.getSelectedValues();
-        if(selected_objects.length == 1) {
-            Index index = (Index) selected_objects[0];
+        // We'll just remove the old one and add the new one
+        removeIndex((Index) current_indexes_list.getSelectedValue());
+        replace_index_button.setEnabled(false);
+        add_index_button.setEnabled(true);
+        add_index_button.doClick(); // this adds the new one
+        add_index_button.setEnabled(false);
+        
+        //Object[] selected_objects = current_indexes_list.getSelectedValues();
+        //if(selected_objects.length == 1) {
+        Index index = (Index)current_indexes_list.getSelectedValue();
+        if (index != null) {
+        //Index index = (Index) selected_objects[0];
             // Remove old name
             CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + index.getID());
@@ -1639 +1701 @@
             // Create new metadatum
             CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
-            index = null;
+            //index = null;
             metadatum.setValue(name);
             name = null;
@@ -1646 +1708 @@
             metadatum = null;
         }
-        current_indexes_list.setSelectedValue(selected_objects[0], true);
+        //current_indexes_list.setSelectedValue(selected_objects[0], true);
+        current_indexes_list.setSelectedValue(index, true);
         // Done. Disable add
         add_index_button.setEnabled(false);
-        replace_button.setEnabled(false);
+        replace_index_button.setEnabled(false);
         }
     }
@@ -1664 +1727 @@
         public void actionPerformed(ActionEvent event) {
         // Retrieve the selected items
-        Object[] selected_objects = current_indexes_list.getSelectedValues();
+        //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];
+        //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.validateAddButtonIndex();
+        int i = current_indexes_list.getSelectedIndex();
+        if (i != -1) {
+            Index index = (Index) current_indexes_list.getSelectedValue();
             // 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);
+            
+        //if (i != -1) {
+        //removeIndex((Index) index_list.getSelectedValue());
+            //}
+            int size = current_indexes_list.getModel().getSize();
+            if (i == size) {
+            i--;
+            }
+            current_indexes_list.setSelectedIndex(i);
+        }
+        if (i==-1) {
+            // empty list, disable remove button
+            remove_index_button.setEnabled(false);
+        }
         // Check if add should be reenabled
         eal.validateAddButtonIndex();
+
+        // 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 what's filled in currently, if valid
+        // validateAddButton();
+        //  }
         }
     }
@@ -1691 +1782 @@
 
         public void actionPerformed(ActionEvent event) {
+        
+        int i = current_levels_list.getSelectedIndex();
+        if (i != -1) {
+            Level level = (Level) current_levels_list.getSelectedValue();
+            CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getLevel());
+            removeLevel(level);
+            if (i == current_levels_list.getModel().getSize()) {
+            i--;
+            }
+            current_levels_list.setSelectedIndex(i);
+        }
         // Retrieve the selected items
-        Object[] selected_objects = current_levels_list.getSelectedValues();
+        //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];
+        //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());
+            //CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level.getLevel());
             // Remove the index
-            removeLevel(level);
-        }
-        // Disable remove button
-        remove_level_button.setEnabled(false);
+            //removeLevel(level);
+        //}
+        
+        if (i==-1) {
+            // Disable remove button
+            remove_level_button.setEnabled(false);
+        }
         // If there are no levels left, put document back in
-        if(levels_model.getSize() == 0) {
-            Level level = new Level(CollectionConfiguration.DOCUMENT_STR);
-            // Create new metadatum
-            CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + CollectionConfiguration.DOCUMENT_STR);
-            metadatum.setValue(CollectionConfiguration.DOCUMENT_STR);
-            // Assign new level
-            addLevel(level, metadatum);     
-            level = null;
-        }
+//      if(levels_model.getSize() == 0) {
+//          Level level = new Level(CollectionConfiguration.DOCUMENT_STR);
+//          // Create new metadatum
+//          CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + CollectionConfiguration.DOCUMENT_STR);
+//          metadatum.setValue(CollectionConfiguration.DOCUMENT_STR);
+//          // Assign new level
+//          addLevel(level, metadatum);     
+//          level = null;
+//      }
         // Check if add should be reenabled
         eal.validateAddButtonLevel();