Changeset 8581

Timestamp:

2004-11-17T10:42:21+13:00 (19 years ago)

Author:

mdewsnip

Message:

Updated GEMS, by Attila Aros.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GEMS.java (modified) (97 diffs)
• GEMSLanguageManager.java (added)
• GEMSPreferences.java (added)
• MSMUtils.java (modified) (3 diffs)
• MetadataSet.java (modified) (2 diffs)
• MetadataSetManager.java (modified) (5 diffs)
• SmarterTable.java (added)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -3 +3 @@
  *
  * A component of the Gatherer application, part of the Greenstone digital
- * library suite from the New Zealand Digital Library Project at the
- * University of Waikato, New Zealand.
+ * library suite from the New Zealand Digital Library Project at th * University of Waikato, New Zealand.
  *
  * <BR><BR>
@@ -37 +36 @@
 package org.greenstone.gatherer.gems;
 
+
+
 import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
+import java.io.PrintStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
 import java.util.*;
 import javax.swing.*;
@@ -54 +60 @@
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
-import org.greenstone.gatherer.gui.SmarterTable;
+//import org.greenstone.gatherer.gui.SmarterTable;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.NonWhitespaceField;
 import org.greenstone.gatherer.gui.TransformCharacterTextField;
-import org.greenstone.gatherer.help.HelpFrame;
-//import org.greenstone.gatherer.cdm.*;
+import org.greenstone.gatherer.gui.HelpFrame;
+import org.greenstone.gatherer.cdm.*;
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
+
+
 
 /** Provides a GUI and relevant suite of tools for the editing of the metadata set associated with this collection. Again I have tried to capture a file manager type feel, with a tree showing the various set-element relations to the left of the dialog, and the right side showing details on the current tree selection. When a set is selected these details include a list of attributes, while when an element is selected this list is joined by another showing assigned values. In order for the editor to be stable and consistant with the rest of the tool, care must be taken for fire appropriate events whenever the sets are changed. There is also the addded complexity of determining what actions have to occur in order for a users edit of an assigned value to be completed, i.e. if the user chooses to remove a value then a call must be made to record_set.root.removeMetadata() to ensure all such values are actually removed, so it is not enough just to remove the value from the value model. 
@@ -77 +85 @@
     static final private Dimension ADD_ELEMENT_SIZE = new Dimension(400,125);
     static final private Dimension ADD_FILE_SIZE = new Dimension(400,125);
-    static final private Dimension ADD_SET_SIZE = new Dimension(400,125);
+    static final private Dimension ADD_SET_SIZE = new Dimension(400,150);
     static final private Dimension ADD_OR_EDIT_ATTRIBUTE_SIZE = new Dimension(600,325);
     static final private Dimension ADD_OR_EDIT_VALUE_SIZE = new Dimension(600,440);
@@ -141 +149 @@
     private SmarterTable set_attributes = null;
     private SmarterTree element_values = null;
+    public org.w3c.dom.Element rootelement;
+   
+   // public LanguageManager languageManager = new LanguageManager(rootelement);
     //PopupListener provides right-click functionality to any component that needs it
     //It is a centralized manager for all popups, then we use evt.Source() and determine where the
     //event was performed
-    private PopupListener popupListener = new PopupListener();
-    private boolean set_changed = false;
+    private PopupListener popupListener = new PopupListener(this);
     /** A tree that represents the current metadata sets associated with this collection. */
     private SmarterTree mds_tree = null;
     private String current_collection_file = null;
     private String dialog_options[] = null;
-   
+    private boolean atLeastOneSetChanged = false;
 
     static public void main(String[] args)
@@ -166 +176 @@
        // }
     // Debugging control
+      //  Configuration.setLocale("general.locale", true, new Locale("ar"));
+        
     if (go.debug) {
         DebugStream.enableDebugging();
@@ -185 +197 @@
         DebugStream.printStackTrace(exception);
     }
-        GEMS gems;
-    gems = new GEMS();
+        GEMS GEMS;
+    GEMS = new GEMS();
     }
 
@@ -213 +225 @@
     setSize(SIZE);
     setJMenuBar(new GEMSMenuBar());
-    Dictionary.setText(this, "MEM.Title");
+    Dictionary.setText(this, "GEMS.Title");
 
     JPanel content_pane = (JPanel) getContentPane();
@@ -241 +253 @@
     mds_tree_pane.setPreferredSize(new Dimension(300,500));
     mds_tree = new SmarterTree(model);
-    mds_tree.setCellRenderer(new MEMTreeCellRenderer());
+    mds_tree.setCellRenderer(new GEMSTreeCellRenderer());
     mds_tree.setRootVisible(false);
     mds_tree.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -262 +274 @@
     JLabel set_name_label = new JLabel();
     set_name_label.setOpaque(false);
-    //Dictionary.setText(set_name_label, "MEM.Name");
+    //Dictionary.setText(set_name_label, "GEMS.Name");
     set_name = new JLabel();
     //set_name.setBorder(BorderFactory.createLoweredBevelBorder());
@@ -290 +302 @@
     JLabel element_name_label = new JLabel();
     element_name_label.setOpaque(false);
-    //Dictionary.setText(element_name_label, "MEM.Name");
+    //Dictionary.setText(element_name_label, "GEMS.Name");
     //element_name = new JLabel();
     //element_name.setBorder(BorderFactory.createLoweredBevelBorder());
@@ -334 +346 @@
     JLabel profile_name_label = new JLabel();
     profile_name_label.setOpaque(false);
-    //Dictionary.setText(profile_name_label, "MEM.Name");
+    //Dictionary.setText(profile_name_label, "GEMS.Name");
     profile_name = new JLabel();
     profile_name.setBorder(BorderFactory.createLoweredBevelBorder());
@@ -362 +374 @@
     JLabel attribute_label = new JLabel();
     attribute_label.setOpaque(false);
-    Dictionary.setText(attribute_label, "MEM.Attribute");
+    Dictionary.setText(attribute_label, "GEMS.Attribute");
 
     JLabel element_label = new JLabel();
     element_label.setOpaque(false);
-    Dictionary.setText(element_label, "MEM.Element");
+    Dictionary.setText(element_label, "GEMS.Element");
 
     JLabel file_label = new JLabel();
     file_label.setOpaque(false);
-    Dictionary.setText(file_label, "MEM.File");
+    Dictionary.setText(file_label, "GEMS.File");
 
     JLabel set_label = new JLabel();
     set_label.setOpaque(false);
-    Dictionary.setText(set_label, "MEM.Set");
+    Dictionary.setText(set_label, "GEMS.Set");
 
     JLabel value_label = new JLabel();
     value_label.setOpaque(false);
-    Dictionary.setText(value_label, "MEM.Value");
+    Dictionary.setText(value_label, "GEMS.Value");
 
     JPanel inner_button_pane = new JPanel();
@@ -384 +396 @@
     add_attribute = new GLIButton();
     add_attribute.setMnemonic(KeyEvent.VK_4);
-    Dictionary.setBoth(add_attribute, "MEM.Add", "MEM.Add_Attribute_Tooltip");
+    Dictionary.setBoth(add_attribute, "GEMS.Add", "GEMS.Add_Attribute_Tooltip");
     add_element = new GLIButton();
     add_element.setMnemonic(KeyEvent.VK_3);
-    Dictionary.setBoth(add_element, "MEM.Add", "MEM.Add_Element_Tooltip");
+    Dictionary.setBoth(add_element, "GEMS.Add", "GEMS.Add_Element_Tooltip");
     add_file = new GLIButton();
     add_file.setMnemonic(KeyEvent.VK_2);
-    Dictionary.setBoth(add_file, "MEM.Add", "MEM.Add_File_Tooltip");
+    Dictionary.setBoth(add_file, "GEMS.Add", "GEMS.Add_File_Tooltip");
     add_set = new GLIButton();
     add_set.setMnemonic(KeyEvent.VK_1);
-    Dictionary.setBoth(add_set, "MEM.Add", "MEM.Add_Set_Tooltip");
+    Dictionary.setBoth(add_set, "GEMS.Add", "GEMS.Add_Set_Tooltip");
     add_value = new GLIButton();
     add_value.setMnemonic(KeyEvent.VK_5);
-    Dictionary.setBoth(add_value, "MEM.Add", "MEM.Add_Value_Tooltip");
+    Dictionary.setBoth(add_value, "GEMS.Add", "GEMS.Add_Value_Tooltip");
 
     edit_attribute = new GLIButton();
     edit_attribute.setMnemonic(KeyEvent.VK_6);
-    Dictionary.setBoth(edit_attribute, "MEM.Edit", "MEM.Edit_Attribute_Tooltip");
+    Dictionary.setBoth(edit_attribute, "GEMS.Edit", "GEMS.Edit_Attribute_Tooltip");
     edit_value = new GLIButton();
     edit_value.setMnemonic(KeyEvent.VK_7);
-    Dictionary.setBoth(edit_value, "MEM.Edit", "MEM.Edit_Value_Tooltip");
+    Dictionary.setBoth(edit_value, "GEMS.Edit", "GEMS.Edit_Value_Tooltip");
 
     remove_attribute = new GLIButton();
     remove_attribute.setMnemonic(KeyEvent.VK_MINUS);
-    Dictionary.setBoth(remove_attribute, "MEM.Remove", "MEM.Remove_Attribute_Tooltip");
+    Dictionary.setBoth(remove_attribute, "GEMS.Remove", "GEMS.Remove_Attribute_Tooltip");
     remove_element = new GLIButton();
     remove_element.setMnemonic(KeyEvent.VK_0);
-    Dictionary.setBoth(remove_element, "MEM.Remove", "MEM.Remove_Element_Tooltip");
+    Dictionary.setBoth(remove_element, "GEMS.Remove", "GEMS.Remove_Element_Tooltip");
     remove_file = new GLIButton();
     remove_file.setMnemonic(KeyEvent.VK_9);
-    Dictionary.setBoth(remove_file, "MEM.Remove", "MEM.Remove_File_Tooltip");
+    Dictionary.setBoth(remove_file, "GEMS.Remove", "GEMS.Remove_File_Tooltip");
     remove_set = new GLIButton();
     remove_set.setMnemonic(KeyEvent.VK_8);
-    Dictionary.setBoth(remove_set, "MEM.Remove", "MEM.Remove_Set_Tooltip");
+    Dictionary.setBoth(remove_set, "GEMS.Remove", "GEMS.Remove_Set_Tooltip");
     remove_value = new GLIButton();
     remove_value.setMnemonic(KeyEvent.VK_EQUALS);
-    Dictionary.setBoth(remove_value, "MEM.Remove", "MEM.Remove_Value_Tooltip");
-    setControls(false, false, false, false, false, false, false, false, false, false, false, false);
+    Dictionary.setBoth(remove_value, "GEMS.Remove", "GEMS.Remove_Value_Tooltip");
+    //setControls(false, false, false, false, false, false, false, false, false, false, false, false);
 
     add_element_action_listener = new AddElementActionListener();
     add_file_action_listener = new AddFileActionListener();
     add_set_action_listener = new AddSetActionListener();
+        
+        
+ 
     add_or_edit_attribute_action_listener = new AddOrEditAttributeActionListener();
     add_or_edit_value_action_listener = new AddOrEditValueActionListener();
@@ -467 +482 @@
     set_attributes_scroll.setViewportView(set_attributes);
 
-    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     set_attributes_pane.setLayout(new BorderLayout());
     set_attributes_pane.add(set_attributes_scroll, BorderLayout.CENTER);
         
-    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     set_details_pane.setLayout(new BorderLayout());
     set_details_pane.add(set_name_pane, BorderLayout.NORTH);
@@ -482 +497 @@
     element_attributes_scroll.setViewportView(element_attributes);
 
-    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     element_attributes_pane.setLayout(new BorderLayout());
     element_attributes_pane.add(element_attributes_scroll, BorderLayout.CENTER);
           
-    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
     element_values_pane.setLayout(new BorderLayout());
     element_values_pane.add(new JScrollPane(element_values), BorderLayout.CENTER);
@@ -497 +512 @@
         //element_inner_pane.add(element_values_pane);
           
-    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     element_details_pane.setLayout(new BorderLayout());
     //element_details_pane.add(element_name_pane, BorderLayout.NORTH);
@@ -508 +523 @@
     profile_attributes_scroll.setViewportView(profile_attributes);
 
-    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
     profile_attributes_pane.setLayout(new BorderLayout());
     profile_attributes_pane.add(profile_attributes_scroll, BorderLayout.CENTER);
 
-    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     profile_details_pane.setLayout(new BorderLayout());
     //profile_details_pane.add(profile_name_pane, BorderLayout.NORTH);
@@ -578 +593 @@
         //System.out.println("Final exit func");
     DebugStream.closeDebugStream();
-        if(set_changed == true) {
-            
-            int result = JOptionPane.showOptionDialog(self, Dictionary.get("Gems.Menu.Confirm_Exit_Save", Dictionary.get("MEM.Element")), Dictionary.get("Gems.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        if(atLeastOneSetChanged == true) {
+            
+            int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
 
          //   System.out.println("Exit: "+result);
@@ -615 +630 @@
         file = new JMenu();
         file.setMnemonic(KeyEvent.VK_F);
-        Dictionary.registerText(file, "Gems.Menu.File");
+        Dictionary.registerText(file, "Menu.File");
 
         file_exit = new JMenuItem();
         file_exit.addActionListener(this);
         file_exit.setMnemonic(KeyEvent.VK_X);
-        Dictionary.registerText(file_exit, "Gems.Menu.File_Exit");
+        Dictionary.registerText(file_exit, "Menu.File_Exit");
 
         file_new = new JMenuItem();
         file_new.addActionListener(this);
         file_new.setMnemonic(KeyEvent.VK_N);
-        Dictionary.registerText(file_new, "Gems.Menu.File_New");
+        Dictionary.registerText(file_new, "Menu.File_New");
 
         file_open = new JMenuItem();
         file_open.addActionListener(this);
         file_open.setMnemonic(KeyEvent.VK_O);
-        Dictionary.registerText(file_open, "Gems.Menu.File_Open");
+        Dictionary.registerText(file_open, "Menu.File_Open");
 
         file_save = new JMenuItem();
         file_save.addActionListener(this);
         file_save.setMnemonic(KeyEvent.VK_S);
-        Dictionary.registerText(file_save, "Gems.Menu.File_Save");
+       // Dictionary.registerText(file_save, "GEMS.Menu.File_Save");
+            Dictionary.registerText(file_save, "Menu.File_Save");
             
             file_delete = new JMenuItem();
         file_delete.addActionListener(new RemoveSetActionListener());
         file_delete.setMnemonic(KeyEvent.VK_S);
-        Dictionary.registerText(file_delete, "Gems.Menu.File_Delete");
+       // Dictionary.registerText(file_delete, "GEMS.Menu.File_Delete");
+            Dictionary.registerText(file_delete, "Menu.File_Delete");
             
             file_preferences = new JMenuItem();
         file_preferences.addActionListener(this);
         file_preferences.setMnemonic(KeyEvent.VK_S);
-        Dictionary.registerText(file_preferences, "Gems.Menu.File_Preferences");
+        //Dictionary.registerText(file_preferences, "GEMS.Menu.File_Preferences");
+            Dictionary.registerText(file_preferences, "Menu.File_Options");
 
         // Layout (file menu)
@@ -652 +670 @@
         file.add(file_save);
             file.add(file_delete);
-       // file.add(new JSeparator());
-           // file.add(file_preferences);
+        file.add(new JSeparator());
+            file.add(file_preferences);
             file.add(new JSeparator());
         file.add(file_exit);
@@ -660 +678 @@
         edit = new JMenu();
         edit.setMnemonic(KeyEvent.VK_E);
-        Dictionary.registerText(edit, "Gems.Menu.Edit");
+        Dictionary.registerText(edit, "Menu.Edit");
 
         edit_cut = new JMenuItem();
         edit_cut.addActionListener(this);
         edit_cut.setMnemonic(KeyEvent.VK_X);
-        Dictionary.registerText(edit_cut, "Gems.Menu.Edit_Cut");
+        Dictionary.registerText(edit_cut, "Menu.Edit_Cut");
 
         edit_copy = new JMenuItem();
         edit_copy.addActionListener(this);
         edit_copy.setMnemonic(KeyEvent.VK_C);
-        Dictionary.registerText(edit_copy, "Gems.Menu.Edit_Copy");
+        Dictionary.registerText(edit_copy, "Menu.Edit_Copy");
 
         edit_paste = new JMenuItem();
         edit_paste.addActionListener(this);
         edit_paste.setMnemonic(KeyEvent.VK_V);
-        Dictionary.registerText(edit_paste, "Gems.Menu.Edit_Paste");
+        Dictionary.registerText(edit_paste, "Menu.Edit_Paste");
 
         // Layout (edit menu)
@@ -685 +703 @@
         help = new JMenu();
         help.setIcon(Utility.HELP_ICON);
-        Dictionary.setText(help, "Gems.Menu.Help");
+        Dictionary.setText(help, "GEMS.Menu.Help");
 
         help_help = new JMenuItem();
         help_help.addActionListener(this);
-        Dictionary.registerText(help_help, "Gems.Menu.Help");
+        Dictionary.registerText(help_help, "GEMS.Menu.Help");
 
         // Layout (help menu)
@@ -699 +717 @@
         this.add(edit);
         this.add(Box.createHorizontalGlue());
-        this.add(help);
+        //this.add(help);
     }
 
@@ -710 +728 @@
         if (event_source == file_new) {
         add_set.doClick();
-                set_changed = true;
+               // set_changed = true;
         return;
         }
@@ -734 +752 @@
         if (event_source == file_save) {
         msm.save();
-                set_changed = false;
+                atLeastOneSetChanged = false;
         return;
         }
@@ -743 +761 @@
               /*  
                 if(set_changed == true) {
-                    int result = JOptionPane.showOptionDialog(self, Dictionary.get("Gems.Menu.Confirm_Exit_Save", Dictionary.get("MEM.Element")), Dictionary.get("Gems.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+                    int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         
                  //   System.out.println("Exit: "+result);
@@ -762 +780 @@
 
         // Edit -> Cut
+            if(event_source == file_preferences){
+              GEMSPreferences GemsPreferences = new GEMSPreferences();  
+  
+                
+            }
         if (event_source == edit_cut) {
         try {
@@ -838 +861 @@
 
 
-    private class ActionTask
-    extends Thread {
-    private int action;
-    public ActionTask(int action) {
-        this.action = action;
-    }
-    public void run() {
-        boolean complete = false;
-        while(!complete) {
-        if(self.isVisible()) {
-            switch(action) {
-            case ADD_SET:
-            add_set_action_listener.actionPerformed(new ActionEvent(this, 0, "Blarg!"));
-            break;
-            case REMOVE_SET:
-            if(!mds_tree.isSelectionEmpty()) {
-                remove_set_action_listener.actionPerformed(new ActionEvent(this, 0, "Blarg!"));
-            }
-            break;
-            }
-            complete = true;
-        }
-        else {
-            try {
-            synchronized(this) {
-                wait(100);
-            }
-            }
-            catch(Exception exception) {
-            }
-        }
-        }
-    }
-    }
     //callback method
      protected void processWindowEvent(WindowEvent evt){
@@ -885 +874 @@
  
    public void warn_cant_load_set(){
-            JOptionPane.showMessageDialog(self, Dictionary.get("Gems.Already_Loaded_Set_Error"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-     
+            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Already_Loaded_Set_Error"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     public void dispose() {
@@ -892 +880 @@
         
          //if anything has changed, warn user that they should save
-        if(set_changed == true) {
-            
-            int result = JOptionPane.showOptionDialog(self, Dictionary.get("Gems.Menu.Confirm_Exit_Save", Dictionary.get("MEM.Element")), Dictionary.get("Gems.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        if(atLeastOneSetChanged == true) {
+            
+            int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
          //   System.out.println("Exit: "+result);
             if(result == 0) {
@@ -901 +889 @@
             }
         }
-        set_changed = false;
+        atLeastOneSetChanged = false;
     // Destructor
     card_layout = null;
@@ -963 +951 @@
     }
 
-    private class AddOrEditAttributeActionListener
+   private class AddOrEditAttributeActionListener
     extends ModalDialog
     implements ActionListener {
@@ -974 +962 @@
     private HashMap name_to_values = null;
     private JLabel target = null;
+        private Vector attributeLists = null;
+        
+       
+        //org.w3c.dom.Document lang = Utility.parse("/home/arosmain/gsdl/gli/classes/xml/languages.xml", false);
+          org.w3c.dom.Document lang = Utility.parse(Configuration.gsdl_path + "/gli/classes/xml/languages.xml", false);
+          
     /** Constructor. */
     public AddOrEditAttributeActionListener() {
         super(self);
         setModal(true);
+            attributeLists = new Vector();
+            //
+            attributeLists.add("identifier");
+            attributeLists.add("comment");
+            attributeLists.add("definition");
+            attributeLists.add("name");
+            
+            attributeLists.add("creator");
+            attributeLists.add("date");
+            attributeLists.add("contact");
+            attributeLists.add("family");
+            
+            attributeLists.add("lastchanged");
+            attributeLists.add("language_dependant");
+            attributeLists.add("version");
+            attributeLists.add("datatype");
+            
+            attributeLists.add("obligation");
+            attributeLists.add("maximum_occurence");
+            attributeLists.add("registration_authority");
+            
+            
+            //
         setSize(ADD_OR_EDIT_ATTRIBUTE_SIZE);
         name_to_values = new HashMap();
@@ -992 +1009 @@
         JLabel target_label = new JLabel();
         target_label.setOpaque(false);
-        Dictionary.setText(target_label, "MEM.Target");
+        Dictionary.setText(target_label, "GEMS.Target");
         target = new JLabel();
         target.setOpaque(false);
@@ -998 +1015 @@
         JLabel name_label = new JLabel();
         name_label.setOpaque(false);
-        Dictionary.setText(name_label, "MEM.Name");
+        Dictionary.setText(name_label, "GEMS.Name");
         name = new GComboBox();
         name.setEditable(true);
-        Dictionary.setTooltip(name, "MEM.Attribute_Name_Tooltip");
+        Dictionary.setTooltip(name, "GEMS.Attribute_Name_Tooltip");
 
         JLabel language_label = new JLabel();
         language_label.setOpaque(false);
-        Dictionary.setText(language_label, "MEM.Language");
+        Dictionary.setText(language_label, "GEMS.Language");
         language_box = new JComboBox();  // !!! Gatherer.g_man.design_pane.getLanguageCodes().toArray());
-            //LanguageManager languageManager = new LanguageManager(org.w3c.dom.Element());
+            
+            
+            for(int n = 0; n < attributeLists.size(); n++){
+                
+                name.add(attributeLists.get(n));
+                
+            }
+           // org.w3c.dom.Element myelem = new org.w3c.dom.Element();
+            
+           // LanguageManager languageManager = new LanguageManager(myelem);
             
          
         // !!! language_box.setRenderer(new LanguageListCellRenderer());
-        Dictionary.setTooltip(language_box, "MEM.Attribute_Language_Tooltip");
+        Dictionary.setTooltip(language_box, "GEMS.Attribute_Language_Tooltip");
 
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
-        value = new ComboArea(Dictionary.get("MEM.Values"), COMPONENT_SIZE);
+        value = new ComboArea(Dictionary.get("GEMS.Values"), COMPONENT_SIZE);
         value.setOpaque(false);
 
@@ -1023 +1049 @@
         v_text_area.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         v_text_area.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(v_text_area, "MEM.Attribute_Value_Tooltip");
+        Dictionary.setTooltip(v_text_area, "GEMS.Attribute_Value_Tooltip");
 
         JPanel button_pane = new JPanel();
@@ -1072 +1098 @@
 
         setLocation((config.screen_size.width - ADD_OR_EDIT_ATTRIBUTE_SIZE.width) / 2, (config.screen_size.height - ADD_OR_EDIT_ATTRIBUTE_SIZE.height) / 2);
-    }
+    
+            
+           // create dom object for language_Box 
+            //GEMSLanguageManager GemsLangManager = new GEMSLanguageManager("/home/arosmain/gsdl/gli/classes/xml/languages.xml");
+        GEMSLanguageManager GemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + "/gli/classes/xml/languages.xml");
+        
+            Vector languagecodes = GemsLangManager.getLanguageCodes();
+            
+            for(int p = 0; p < languagecodes.size(); p++){
+             
+                language_box.addItem(languagecodes.get(p).toString());
+            }
+            
+        }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to add a new attribute to the selected set or element.
      * @param event An <strong>ActionEvent</strong> containing information about the event.
      */
+        
+       
     public void actionPerformed(ActionEvent event) {
         Object source = event.getSource();
-        if(source == ok_button) {
+            AttributeTableModel tablemodel;
+            String prevLang = new String("");
+            String prevValue = new String("");
+           
+          //allow user to choose language when they create attr
+          
+            
+          if(source == popupListener.menuAddAttributeAttribute) {  
+            add_type =  true;
+           language_box.setEnabled(true);
+          }//end if source== menuaddattributeattribute
+          else if (source == popupListener.menuEditValue){
+              add_type = false;
+              //grab the table model based on what is currently selected
+                switch(current_attribute_type) {
+        case GEMSNode.COLLECTION:
+            tablemodel = (AttributeTableModel) profile_attributes.getModel();
+                    //String prevLang =  tablemodel.getValueAt(current_attribute,0).toString();
+                    //String prevValue = tablemodel.getValueAt(current_attribute,1).toString();
+            
+            break;
+        case GEMSNode.SET:
+            tablemodel = (AttributeTableModel) set_attributes.getModel();
+                    //grab value in table(
+            prevLang =  tablemodel.getValueAt(current_attribute,0).toString();
+                    prevValue = tablemodel.getValueAt(current_attribute,1).toString();
+                
+            break;
+        case GEMSNode.ELEMENT:
+            tablemodel = (AttributeTableModel) element_attributes.getModel();
+                    //grab values in table( lang and value)
+                    prevLang =  tablemodel.getValueAt(current_attribute,1).toString();
+                    prevValue = tablemodel.getValueAt(current_attribute,2).toString();
+            
+            break;
+                    default:
+                        //by default grab element_attr's
+                    tablemodel = (AttributeTableModel) element_attributes.getModel();
+                    prevLang =  tablemodel.getValueAt(current_attribute,1).toString();
+                    prevValue = tablemodel.getValueAt(current_attribute,2).toString();
+            
+                    break;
+        }         
+              language_box.setEnabled(false);
+              
+           //if a set attr is selected, then do not do any lang operations, other than setting index to -1
+              if(current_attribute_type != GEMSNode.SET) {
+
+                //set the current language to show up in language_box(no lang if no lang specified)
+                if(prevLang == null || prevLang.compareTo(" ")==0 || prevLang.compareTo("") == 0 || prevLang.compareTo("  ")==0) {
+                    language_box.setSelectedIndex(-1);
+             
+                }
+                else {
+                    language_box.setSelectedItem(prevLang.toLowerCase());
+                }
+              }// end currattr != GEMSnode.set
+              else {
+                  
+                 language_box.setSelectedIndex(-1);
+                  
+              }// end currattr == GEMSnode.set
+              
+              value.setText(prevValue);
+              
+          }//end if source == popupListener.menuEditValue)
+        /////////////////////////////////////////////// 
+            if(source == ok_button) {
         boolean success = true;
         AttributeTableModel model;
@@ -1090 +1198 @@
         case GEMSNode.SET:
             model = (AttributeTableModel) set_attributes.getModel();
-            success = addOrEditSetAttribute(model);         
+            success = addOrEditSetAttribute(model); 
+                   
             break;
         case GEMSNode.ELEMENT:
@@ -1097 +1206 @@
             break;
         }
-
+                 
         if (success) {
             // Hide dialog
-                     set_changed = true;
+                
             setVisible(false);
+                    return;
         }
         }
@@ -1107 +1217 @@
         // Hide dialog
         setVisible(false);
+                return;
         }
         else if(source == name) {
-        Object object = name.getSelectedItem();
+                Object object = name.getSelectedItem();
         if(object != null) {
             java.util.List values = (java.util.List) name_to_values.get(object.toString());
@@ -1115 +1226 @@
             values = msm.getElements();
             }
-            value.clear();
-            for(int i = 0; i < values.size(); i++) {
-            value.add(values.get(i));
-            }
-        }
-        }
-        else {
+                    
+                    if(value != null && values != null){
+                        value.clear();
+                        for(int i = 0; i < values.size(); i++) {
+                            value.add(values.get(i));
+                        }
+                    }
+        }
+        }
+        else if (source == popupListener.menuAddAttributeAttribute){
+                 
+                   for(int i = 0; i < attributeLists.size(); i++) {
+                        name.add(attributeLists.get(i).toString());    
+                    
+                        }
+                 name.setEnabled(true);
+            }
+           /* else if (source == popupListener.menuAddAttributeAttribute){
+                System.out.println("add attr\n");
+                
+                name.setEnabled(true);
+                
+            }*/
+          /* else{
         // Name combo box is enabled except when attributes are edited
-        //name.setEnabled((source != edit_attribute));
+        //name.setEnabled((source != popupListener.menuEditValue));
                 //System.out.println("elsed");
         name_to_values.clear();
@@ -1217 +1345 @@
         if(source == add_attribute || source == popupListener.menuAddAttributeSet || source == popupListener.menuAddAttributeElement || source == popupListener.menuAddAttributeAttribute) {
             add_type = true;
-            Dictionary.setText(this, "MEM.AddAttribute");
+            Dictionary.setText(this, "GEMS.AddAttribute");
             if(current_collection_file != null) {
             // Name is empty in this one, however values must be the current elements in the collection.    
@@ -1227 +1355 @@
             }
             setVisible(true);
-        }
+        }*/
                // else if(source == popupListener.menuAddAttributeAttribute){
                     
@@ -1235 +1363 @@
                     
                  //   System.out.println("from elements");
-               // }
+               // }*/
         else if(current_attribute != -1) {
+                    
+                    //System.out.println(source.toString()+"\n");
             AttributeTableModel model = null;
             switch(current_attribute_type) {
@@ -1250 +1380 @@
             }
             add_type = false;
-            Dictionary.setText(this, "MEM.EditAttribute");
+            Dictionary.setText(this, "GEMS.EditAttribute");
             String name_str = (String) model.getValueAt(current_attribute, 0);
             String value_str = (String) model.getValueAt(current_attribute, model.getColumnCount() - 1);
@@ -1274 +1404 @@
             value.setSelectedItem(value_str);
             value_str = null;
-            setVisible(true);
-        }
-        }
+            
+        }
+       // }
+            setVisible(true);
         source = null;
     }
-
 
     private boolean addOrEditCollectionAttribute(AttributeTableModel model)
@@ -1305 +1435 @@
         else {
         cont = false;
-        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
 
@@ -1320 +1450 @@
 
         // Remove the existing attribute if this is an edit
+             
         if(!add_type && current_attribute != -1) {
+              
         current_set.removeAttribute(name_str);
         // Update attribute table
-        model.removeRow(current_attribute);
-        }
-
+               model.removeRow(current_attribute);
+        }
+            current_set.addAttribute(name_str, value_str);
+        // Update the attribute table
+        model.add(new Attribute(name_str, value_str));
         boolean cont = true;
-        // Check that there isn't already an entry for this attribute
+          
+      /*  // Check that there isn't already an entry for this attribute
+           *
+           
         if (!model.contains(name_str, 0)) {
         // Add the new attribute
@@ -1337 +1474 @@
         else {
         cont = false;
-        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        }
+        JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }*/
 
         value_str = null;
@@ -1351 +1488 @@
         String name_str = name.getSelectedItem().toString();
         String language_code = (String) language_box.getSelectedItem();
+           
         String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
-
+              
         // Remove the existing attribute if this is an edit
         if(!add_type && current_attribute != -1) {
@@ -1409 +1547 @@
         JLabel set_label = new JLabel();
         set_label.setOpaque(false);
-        Dictionary.setText(set_label, "MEM.Set");
+        Dictionary.setText(set_label, "GEMS.Set");
         set_field = new JLabel();
         set_field.setOpaque(false);
@@ -1417 +1555 @@
         JLabel name_label = new JLabel();
         name_label.setOpaque(false);
-        Dictionary.setText(name_label, "MEM.Name");
+        Dictionary.setText(name_label, "GEMS.Name");
         name_field = new NonWhitespaceField();
         name_field.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1423 +1561 @@
         name_field.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         name_field.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(name_field, "MEM.Element_Name_Tooltip");
+        Dictionary.setTooltip(name_field, "GEMS.Element_Name_Tooltip");
 
         JPanel button_pane = new JPanel();
@@ -1490 +1628 @@
             element = null;
             setVisible(false);
-                     set_changed = true;
+                    
+                    //mark as changed
+                    atLeastOneSetChanged = true;
+                    current_set.setSetChanged(true);
+                 
         }
         // Otherwise show an error message and do not proceed.
         else {
-            JOptionPane.showMessageDialog(self, Dictionary.get("Gems.Element_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Element_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         name_str = null;
@@ -1513 +1655 @@
             // Warn the user that they can't do that dave.
             else {
-                        set_changed = false;
-            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                        
+            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
         }
@@ -1550 +1692 @@
         JLabel profile_label = new JLabel();
         profile_label.setOpaque(false);
-        Dictionary.setText(profile_label, "MEM.Profile");
+        Dictionary.setText(profile_label, "GEMS.Profile");
 
         JPanel name_pane = new JPanel();
@@ -1556 +1698 @@
         JLabel name_label = new JLabel();
         name_label.setOpaque(false);
-        Dictionary.setText(name_label, "MEM.Name");
+        Dictionary.setText(name_label, "GEMS.Name");
         name_field = new JTextField();
         name_field.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1562 +1704 @@
         name_field.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         name_field.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(name_field, "MEM.Profile_Name_Tooltip"); 
+        Dictionary.setTooltip(name_field, "GEMS.Profile_Name_Tooltip"); 
 
         JPanel button_pane = new JPanel();
@@ -1623 +1765 @@
         // Otherwise warn the user and don't hide the prompt.
         // else {
-        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.File_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.File_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         // }
         name_str = null;
@@ -1653 +1795 @@
     private JTextField name_field = null;
     private JTextField namespace_field = null;
+        private JComboBox existingSetJComboBox = new JComboBox();
+            
     public AddSetActionListener() {
         super(self);
         setModal(true);
         setSize(ADD_SET_SIZE);
-        Dictionary.setText(this, "MEM.AddSet");
+        Dictionary.setText(this, "GEMS.AddSet");
 
         // Creation
@@ -1670 +1814 @@
         JLabel namespace_label = new JLabel();
         namespace_label.setOpaque(false);
-        Dictionary.setText(namespace_label, "MEM.Namespace");
+        Dictionary.setText(namespace_label, "GEMS.Namespace");
         namespace_field = TransformCharacterTextField.createNamespaceTextField();
         namespace_field.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1676 +1820 @@
         namespace_field.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         namespace_field.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(namespace_field, "MEM.Set_Namespace_Tooltip");
+        Dictionary.setTooltip(namespace_field, "GEMS.Set_Namespace_Tooltip");
 
         JLabel name_label = new JLabel();
         name_label.setOpaque(false);
-        Dictionary.setText(name_label, "MEM.Name");
+        Dictionary.setText(name_label, "GEMS.Name");
         name_field = new JTextField();
         name_field.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1686 +1830 @@
         name_field.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         name_field.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(name_field, "MEM.Set_Name_Tooltip");
+        Dictionary.setTooltip(name_field, "GEMS.Set_Name_Tooltip");
 
         JPanel button_pane = new JPanel();
@@ -1706 +1850 @@
 
         // Layout
-        label_pane.setLayout(new GridLayout(2,1,0,5));
+        label_pane.setLayout(new GridLayout(3,1));
         label_pane.add(name_label);
         label_pane.add(namespace_label);
-
-        boxes_pane.setLayout(new GridLayout(2,1,0,5));
+           // label_pane.add
+      //  boxes_pane.setLayout(new GridLayout(2,1,0,5));
+            boxes_pane.setLayout(new GridLayout(3,1));
         boxes_pane.add(name_field);
         boxes_pane.add(namespace_field);
-
+            
+            JLabel inheritJLabel = new JLabel(); 
+            Dictionary.setText(inheritJLabel, "GEMS.inheritMetadataSet");
+       
+            label_pane.add(inheritJLabel);
+        
+            
+            //add inherit metadata set functionality
+           // String[] s = msm.getSets().toArray();
+            
+          //JComboBox existingSetJComboBox = new JComboBox(new String(msm.getSetsForInherit().toArray()));
+           
+            int getSetsLen = msm.getSets().toArray().length;
+            Vector theSets = msm.getSets();
+            
+            for(int k = 0; k < theSets.size(); k++){
+                MetadataSet ms = (MetadataSet)theSets.elementAt(k);
+                
+                existingSetJComboBox.addItem(new String(ms.getName() + "                                                                             #% " + ms.getFile().toString()));
+                
+            }
+            //add sets to existingSetJComboBox
+            
+            
+            //String tempstr = new String();
+            JLabel dummyl = new JLabel();
+            Dictionary.setText(dummyl, "GEMS.Add_Set.No_Inherit");
+            
+            
+            
+            existingSetJComboBox.addItem("Do not inherit");
+            existingSetJComboBox.setSelectedIndex(getSetsLen);
+            boxes_pane.add(existingSetJComboBox);
+             
         center_pane.setLayout(new BorderLayout(5,0));
         center_pane.add(label_pane, BorderLayout.WEST);
@@ -1726 +1904 @@
         content_pane.add(center_pane, BorderLayout.CENTER);
         content_pane.add(button_pane, BorderLayout.SOUTH);
-
+         
         setLocation((config.screen_size.width - ADD_SET_SIZE.width) / 2, (config.screen_size.height - ADD_SET_SIZE.height) / 2);
     }
@@ -1732 +1910 @@
      * @param event An <strong>ActionEvent</strong> containing information about the event.
      */
+        private boolean a_set_exists_with_this_namespace(String namespace){
+            Vector p = msm.getSets();
+            boolean flag = false;
+            for(int k = 0; k < p.size(); k++){
+                MetadataSet s = (MetadataSet)p.get(k);
+                
+                if(s.getNamespace().compareTo(namespace) == 0){
+                    flag = true;     
+                }
+                
+            }
+            
+            return flag;
+        }
     public void actionPerformed(ActionEvent event) {
         Object source = event.getSource();
+            
+            
+          // if(a_set_exists_with_this_namespace(namespace_field.getText()) == false){
         if(source == ok_button) {
-        String namespace_str = namespace_field.getText();
+                //this code below handles whether we inherit from an existing set or not
+             
+                String namespace_str = namespace_field.getText();
         String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
+        
+                
+                
+                if (existingSetJComboBox.getSelectedItem().toString().trim().compareTo("Do not inherit") == 0){
+
         // Ensure the set doesn't already exist
-        if(msm.getSet(namespace_str) == null) {
+        //if(msm.getSet(namespace_str) == null) {
+                if(a_set_exists_with_this_namespace(namespace_str) == false){
+       
+              
+                    
             MetadataSet set = msm.addSet(namespace_str, name_str);
+                    
+                    //mark as set changed = true
+                    set.setSetChanged(true);
+                    atLeastOneSetChanged = true;
+                    
             // Update tree.
             model.add(null, set, GEMSNode.SET);
@@ -1745 +1956 @@
             set = null;
             setVisible(false);
-                     set_changed = true;
-        }
+                    
+        }
+                else{
+                    
+                       JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+         
+                }
+                //do not inherit == 0 
         // Otherwise show a warning.
-        else {
-            JOptionPane.showMessageDialog(self, Dictionary.get("Gems.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        }
+        //else {
+         //   JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        //}
+                
+                
         name_str = null;
         namespace_str = null;
+                }//end do not inherit
+                else {
+                    //lets grab the metadata we want to inherit from...
+                    String anitem = existingSetJComboBox.getSelectedItem().toString();
+                   
+                   // if(msm.getSet(namespace_str) == null) {
+                    if(a_set_exists_with_this_namespace(namespace_field.getText()) == false){
+       
+                        //setup to read the filename from mds file
+                         String [] items = anitem.split("#%");
+                        try {
+
+                        FileInputStream fstream = new FileInputStream(items[1].trim());
+                        DataInputStream in = new DataInputStream(fstream);
+                        ///////////////
+
+                        FileOutputStream out;
+                        PrintStream p;
+                        //setup to write to filename from existing file
+                        try {
+                        out = new FileOutputStream(Utility.METADATA_DIR + "/"+ namespace_str + ".mds");
+                        p = new PrintStream(out);
+
+                        //cycle through all lines in IN and print to OUT
+                        while(in.available() != 0){
+
+                            //System.out.println(in.readLine()+ "\n"
+                            String nextline = in.readLine();
+
+                            if(nextline.matches(".+namespace=\".+\".*") == true){
+
+                               nextline = nextline.replaceFirst("namespace=\".+\"","namespace=\"" + namespace_str+ "\"");                          
+                            }
+                            else{
+                             nextline = nextline.replaceFirst(">.+</Name>",">" + name_str + "</Name>");
+
+                            }
+
+
+
+
+                            p.print(nextline + "\n");
+                        }
+
+
+                        //
+                        p.close();
+                       
+                        MetadataSet loadedset = msm.loadMetadataSet(new File(Utility.METADATA_DIR + "/" + namespace_str + ".mds"));
+                         model.add(null, loadedset, GEMSNode.SET);
+                        }
+                        catch(Exception e){
+                            System.out.println("Print file error");
+
+                        }
+
+
+
+                        ///////////////
+
+
+                        }
+                        catch(Exception e){
+
+                            System.out.println("File Input error");
+
+                        }
+                   
+                    }//msm.getset(namespacE) == null
+                    else{
+                        
+                      JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+         
+                        
+                    }
+                }
+            //}//if a_set_exists_with_this_namespace
+                 //set = null;
+         setVisible(false);
         }
         else if(source == cancel_button) {
@@ -1800 +2098 @@
         JLabel subject_tree_label = new JLabel();
         subject_tree_label.setOpaque(false);
-        Dictionary.setText(subject_tree_label, "MEM.Subject");
+        Dictionary.setText(subject_tree_label, "GEMS.Subject");
         subject_tree = new SmarterTree();
         subject_tree.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1810 +2108 @@
         JLabel value_label = new JLabel();
         value_label.setOpaque(false);
-        Dictionary.setText(value_label, "MEM.Value"); 
+        Dictionary.setText(value_label, "GEMS.Value"); 
         value = new JTextArea();
         value.setBackground(config.getColor("coloring.collection_tree_background", false));
@@ -1816 +2114 @@
         value.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
         value.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(value, "MEM.Value_Tooltip");
+        Dictionary.setTooltip(value, "GEMS.Value_Tooltip");
 
         JPanel button_pane = new JPanel();
@@ -1926 +2224 @@
         // Hide dialog
         setVisible(false);
-                 set_changed = true;
+                 atLeastOneSetChanged = true;
         }
         else if(source == cancel_button) {
@@ -1948 +2246 @@
             }
             value.setText("");
-            Dictionary.setText(this, "MEM.AddValue");
+            Dictionary.setText(this, "GEMS.AddValue");
         }
         else {
@@ -1959 +2257 @@
             }
             value.setText(Codec.transform(current_value_node.toString(), Codec.DOM_TO_TEXT));
-            Dictionary.setText(this, "MEM.EditValue");
+            Dictionary.setText(this, "GEMS.EditValue");
         }
         model = null;
@@ -2034 +2332 @@
     public void actionPerformed(ActionEvent event) {
         if(current_attribute != -1) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Attribute")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Attribute")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove this attribute
         if(result == 0) {
@@ -2067 +2365 @@
             }
             // Disable buttons
-            edit_attribute.setEnabled(false);
+           // edit_attribute.setEnabled(false);
             remove_attribute.setEnabled(false);
             ignore = false;
-                     set_changed = true;
+                    
+                     atLeastOneSetChanged= true;
         }
         }
@@ -2082 +2381 @@
      */
     public void actionPerformed(ActionEvent event) {
+         
         if(current_element != null) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Element")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove this attribute
         if(result == 0) {
@@ -2096 +2396 @@
             card_layout.show(details_pane, BLANK);
             ignore = false;
-                     set_changed = true;
+                    
+                     atLeastOneSetChanged = true;
         }
         }
@@ -2112 +2413 @@
     public void actionPerformed(ActionEvent event) {
         if(current_collection_file != null) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.File")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.File")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the current collection file profile from the profiler.
         if(result == 0) {
@@ -2138 +2439 @@
         if(current_set != null) {
                 
-                //If the current_set_filename is dls or dc or ex and in the METADATA_DIR, then do
+                //If the current_set_filename is dls or dublin or ex and in the METADATA_DIR, then do
                 //not let anyone remove them --Attila
                // System.out.println(current_set.getName());
@@ -2145 +2446 @@
                 File current_set_filename = current_set.getFile();
               //  System.out.println(current_set_filename.toString());
-                
+               
                 if(current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"dls.mds")) == 0 ||
-                    current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"dc.mds")) == 0 ||
+                    current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"dublin.mds")) == 0 ||
                     current_set_filename.toString().compareTo(new String(Utility.METADATA_DIR+"ex.mds")) == 0){
                   
-                    JOptionPane.showMessageDialog(self, Dictionary.get("Gems.Cannot_Delete_Core_Sets_Error"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Cannot_Delete_Core_Sets_Error"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
                     return;
                 }
                 
                 
-        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Set")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Set")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the currently selected set
         if(result == 0) {
+                    
             ignore = true;
             msm.removeSet(current_set);
@@ -2168 +2470 @@
             card_layout.show(details_pane, BLANK);
             ignore = false;
-                     set_changed = true;
+                    
+                    
+                    //We do not need to set the following var because by this point the set was 
+                    //completetely removed
+                    //atLeastOneSetChanged
+                    
+                    
         }
         }
@@ -2181 +2489 @@
     public void actionPerformed(ActionEvent event) {
         if(current_value_node != null) {                 
-        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Value")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Value")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the current selected value
         if(result == 0) {
@@ -2191 +2499 @@
             remove_value.setEnabled(false);
             ignore = false;
-                     set_changed = true;
+                    
+                    //does this every get called?
+                    System.out.println("\nGEMS.RemovevalueActionListener called");
+                    atLeastOneSetChanged = true;
         }
         }
@@ -2257 +2568 @@
         if(!event.getValueIsAdjusting()) {
         if((current_attribute = table.getSelectedRow()) != -1) {
-            edit_attribute.setEnabled(true);
-            remove_attribute.setEnabled(true);
+          //  edit_attribute.setEnabled(true);
+          //  remove_attribute.setEnabled(true);
+                     // System.out.println("curr_attr != -1");
+         
         }
         else {
+                   // System.out.println("curr_attr = -1");
             current_attribute = -1;
-            edit_attribute.setEnabled(false);
-            remove_attribute.setEnabled(false);
+          //  edit_attribute.setEnabled(false);
+          //  remove_attribute.setEnabled(false);
         }
         }
@@ -2313 +2627 @@
             // !!! String action = msm.profiler.getAction(current_collection_file, source);
             // if (action == null) {
-            // action = Dictionary.get("MEM.Ignore");
+            // action = Dictionary.get("GEMS.Ignore");
             // }
             // attributes.add(new Attribute(source, action));
             // }
-            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Source"), Dictionary.get("MEM.Target"), Dictionary.get("MEM.Ignore"));
+            atm = new AttributeTableModel(attributes, Dictionary.get("GEMS.Source"), Dictionary.get("GEMS.Target"), Dictionary.get("GEMS.Ignore"));
             //current_node.setModel(atm);
             }
@@ -2325 +2639 @@
 
             card_layout.show(details_pane, PROFILE);
-            setControls(true, false, false, true, false, false, true, false, false, false, false, false);
+           // setControls(true, false, false, true, false, false, true, false, false, false, false, false);
             break;
         case GEMSNode.ELEMENT:
@@ -2331 +2645 @@
             atm = current_node.getModel();
             if(atm == null) {
-            atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.get("MEM.Name"), Dictionary.get("MEM.Language_Code"), Dictionary.get("MEM.Value"), "");
+            atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.get("GEMS.Name"), Dictionary.get("GEMS.Language_Code"), Dictionary.get("GEMS.Value"), "");
             //current_node.setModel(atm);
             }
@@ -2346 +2660 @@
             element_values_layout.show(element_values_pane, VALUES);
             // Meanwhile disable/enable controls depending on this Element selection.
-            setControls(true, false, false, false, false, true, true, false, false, true, false, false);
+            //setControls(true, false, false, false, false, true, true, false, false, true, false, false);
             }
             else {
             element_values_layout.show(element_values_pane, BLANK);
             // Meanwhile disable/enable controls depending on this Element selection.
-            setControls(true, false, false, false, false, false, true, false, false, false, false, false);
+            //setControls(true, false, false, false, false, false, true, false, false, false, false, false);
             }
             card_layout.show(details_pane, ELEMENT);
@@ -2369 +2683 @@
                 attribute = null;
             }
-            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Name"), Dictionary.get("MEM.Value"), "");
+            atm = new AttributeTableModel(attributes, Dictionary.get("GEMS.Name"), Dictionary.get("GEMS.Value"), "");
             //current_node.setModel(atm);
             temp = null;
@@ -2380 +2694 @@
             attributes = null;
             // Meanwhile disable/enable controls depending on this Element selection.
-            setControls(true, true, false, false, true, false, true, false, false, false, false, false);
+           // setControls(true, true, false, false, true, false, true, false, false, false, false, false);
             break;
         case GEMSNode.PROFILER:
             // Meanwhile disable/enable controls depending on this Element selection.
-            setControls(true, false, true, false, false, false, false, false, false, false, false, false);
+            //setControls(true, false, true, false, false, false, false, false, false, false, false, false);
         default:
             // Show a blank panel.
@@ -2392 +2706 @@
         path = null;
         atm = null;
+                
+                //System.out.println("Tree eventselection");
         }
     }
     }
 
-    private class MEMTreeCellRenderer
+    private class GEMSTreeCellRenderer
     extends DefaultTreeCellRenderer {
     public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
@@ -2437 +2753 @@
         static final public int ROOT       = 3; 
         static final public int SET        = 4;
-        PopupListener() {
+        
+        GEMS GEMSRef = null;
+        PopupListener(GEMS g) {
         setPopup = new JPopupMenu();
         subfieldPopup = new JPopupMenu();
         elementPopup = new JPopupMenu();
         attributePopup = new JPopupMenu();
-        
+            
+            //reference to our parent(GEMS), because some of the actionlisteners would not
+            //work unless they were declared in GEMS, and I need a way to reference GEMS
+            
+        GEMSRef = g;
         
         //create the MenuItems
@@ -2448 +2770 @@
         //set related popups
         menuAddSet = new JMenuItem();
-            Dictionary.setText(menuAddSet,"Gems.Popup.menuAddSet");
+            //Dictionary.setText(menuAddSet,"GEMS.Popup.menuAddSet");
+            Dictionary.setText(menuAddSet,"GEMS.Add_Set_Tooltip");
             
         menuRenameSet = new JMenuItem();
-        Dictionary.setText(menuRenameSet,"Gems.Popup.menuRenameSet");
+        Dictionary.setText(menuRenameSet,"GEMS.Popup.menuRenameSet");
         
         menuAddElement =new JMenuItem();
-        Dictionary.setText(menuAddElement,"Gems.Popup.menuAddElement");
+       // Dictionary.setText(menuAddElement,"GEMS.Popup.menuAddElement");
+        Dictionary.setText(menuAddElement,"GEMS.Add_Element_Tooltip");
         
         menuAddAttributeSet = new JMenuItem();
-        Dictionary.setText(menuAddAttributeSet, "Gems.Popup.menuAddAttribute");
-        menuRemoveSet = new JMenuItem();
-        Dictionary.setText(menuRemoveSet,"Gems.Popup.menuRemoveSet");
-        //subfield related Gems.Popups
+       // Dictionary.setText(menuAddAttributeSet, "GEMS.Popup.menuAddAttribute");
+        Dictionary.setText(menuAddAttributeSet, "GEMS.Add_Attribute_Tooltip");
+        
+            
+            menuRemoveSet = new JMenuItem();
+        //Dictionary.setText(menuRemoveSet,"GEMS.Popup.menuRemoveSet");
+       Dictionary.setText(menuRemoveSet,"GEMS.Remove_Set_Tooltip");
+        
+            //subfield related GEMS.Popups
             menuRenameSubfield = new JMenuItem();
-            Dictionary.setText(menuRenameSubfield,"Gems.Popup.menuRenameSubfield");
+            Dictionary.setText(menuRenameSubfield,"GEMS.Popup.menuRenameSubfield");
             
             menuDeleteSubfield=new JMenuItem();
-            Dictionary.setText(menuDeleteSubfield,"Gems.Popup.menuRemoveSubfield");
+            Dictionary.setText(menuDeleteSubfield,"GEMS.Popup.menuRemoveSubfield");
             
             menuAddAttributeSubfield=new JMenuItem();
-            Dictionary.setText(menuAddAttributeSubfield,"Gems.Popup.menuAddAttribute");
-            
-            //element related Gems.Popups
+           // Dictionary.setText(menuAddAttributeSubfield,"GEMS.Popup.menuAddAttribute");
+             Dictionary.setText(menuAddAttributeSubfield,"GEMS.Add_Attribute_Tooltip");
+            
+            //element related GEMS.Popups
             menuRenameElement=new JMenuItem();
-            Dictionary.setText(menuRenameElement,"Gems.Popup.menuRenameElement");
+           // Dictionary.setText(menuRenameElement,"GEMS.Popup.menuRenameElement");
+            //Dictionary.setText(menuRenameElement,"GEMS.Rename_Element_Tooltip");
             
             menuDeleteElement=new JMenuItem();
-            Dictionary.setText(menuDeleteElement,"Gems.Popup.menuRemoveElement");
+           // Dictionary.setText(menuDeleteElement,"GEMS.Popup.menuRemoveElement");
+            Dictionary.setText(menuDeleteElement,"GEMS.Remove_Element_Tooltip");
             
             menuAddAttributeElement=new JMenuItem();
-            Dictionary.setText(menuAddAttributeElement,"Gems.Popup.menuAddAttribute");
+            //Dictionary.setText(menuAddAttributeElement,"GEMS.Popup.menuAddAttribute");
+            Dictionary.setText(menuAddAttributeElement,"GEMS.Add_Attribute_Tooltip");
             
             menuAddSubfield=new JMenuItem();
-            Dictionary.setText(menuAddSubfield,"Gems.Popup.menuAddSubfield");
+            Dictionary.setText(menuAddSubfield,"GEMS.Popup.menuAddSubfield");
+             //Dictionary.setText(menuAddSubfield,"GEMS.Add_Subfield");
         
-            //attribute related Gems.Popups
+            //attribute related GEMS.Popups
             menuEditValue=new JMenuItem();
-            Dictionary.setText(menuEditValue,"Gems.Popup.menuEditValue");
+            //Dictionary.setText(menuEditValue,"GEMS.Popup.menuEditValue");
+            Dictionary.setText(menuEditValue,"GEMS.Edit_Value_Tooltip");
             
             menuDeleteAttribute=new JMenuItem();
-            Dictionary.setText(menuDeleteAttribute,"Gems.Popup.menuRemoveAttribute");
+           // Dictionary.setText(menuDeleteAttribute,"GEMS.Popup.menuRemoveAttribute");
+            Dictionary.setText(menuDeleteAttribute,"GEMS.Remove_Attribute_Tooltip");
             
             menuAddAttributeAttribute=new JMenuItem();
-            Dictionary.setText(menuAddAttributeAttribute,"Gems.Popup.menuAddAttribute");
+           // Dictionary.setText(menuAddAttributeAttribute,"GEMS.Popup.menuAddAttribute");
+             Dictionary.setText(menuAddAttributeAttribute,"GEMS.Add_Attribute_Tooltip");
              
              //start Associate the menu items with the appropriate popups:
              //setPopup.add(menuRenameSet);
-            //setPopup.add(menuAddSet);
+            setPopup.add(menuAddSet);
         setPopup.add(menuAddAttributeSet);
         setPopup.add(menuAddElement);
@@ -2528 +2865 @@
              menuAddSubfield.addActionListener(this);
              
+            // menuEditValue.addActionListener(new AddOrEditAttributeActionListener());
+             AddOrEditAttributeActionListener tes = new AddOrEditAttributeActionListener();
+             
              menuEditValue.addActionListener(new AddOrEditAttributeActionListener());
+             
+             //menuEditValue.addActionListener(this);
+             
              menuDeleteAttribute.addActionListener(new RemoveAttributeActionListener());
              menuAddAttributeAttribute.addActionListener(new AddOrEditAttributeActionListener());
@@ -2552 +2895 @@
                // setPopup.show(e.getComponent(),
                  //          e.getX(), e.getY());
-                
+               //System.out.println(e.getSource().toString());
+               
+               //SmarterTable table = (SmarterTable) e.getSource();
+               
+             /*  if(table.getSelectedRow() <= -1) {
+                   
+                   System.out.println("blahasdf");                   
+               }
+               
+               table.getComponent(0)
+              
+               System.out.println(.get);
+               
+              
+              */
+               
              if(e.getSource() == mds_tree) {
                 try {
@@ -2607 +2965 @@
      
         public void actionPerformed(ActionEvent e) {
-            System.out.println("dsf");
+           // GEMSRef.add_or_edit_attribute_action_listener.actionPerformed(e);
+            System.out.println("NO way hose");
         }
         

trunk/gli/src/org/greenstone/gatherer/gems/MSMUtils.java

@@ -297 +297 @@
     static public TreeSet getAttributes(Element element) {
     TreeSet attribute_tree = new TreeSet();
+        
+        
+       // GemsLanguageManager gemsLangManager = new GemsLanguageManager("/home/arosmain/gsdl/gli/classes/xml/languages.xml");
+        GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + "/gli/classes/xml/languages.xml");
+        
+        String[] enabled_langs = gemsLangManager.getEnabledLanguageCodesToArray();
+                       
     for(Node node = element.getFirstChild(); node != null; node = node.getNextSibling()) {
         if(node instanceof Element) {
@@ -303 +310 @@
         if(some_element_name.equals(StaticStrings.ATTRIBUTE_ELEMENT)) {
             attribute_tree.add(new Attribute(some_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), some_element.getAttribute(StaticStrings.LANGUAGE_ATTRIBUTE), MSMUtils.getValue(some_element)));
-        }
+                    // System.out.println(some_element_name +  "<- some_element nodes' value");
+                 
+                
+                }
         else if(some_element_name.equals(StaticStrings.LANGUAGE_ELEMENT)) {
+                    ///Added by Attila on Nov 05 04
+                   // System.out.println(some_element_name +  "<- some_element nodes' value");
+                    
+                    
+                    ////
+                    
             String language_code = some_element.getAttribute(StaticStrings.CODE_ATTRIBUTE);
             NodeList attribute_elements = some_element.getElementsByTagName(StaticStrings.ATTRIBUTE_ELEMENT);
+                    
             for(int i = 0; i < attribute_elements.getLength(); i++) {
             Element attribute_element = (Element) attribute_elements.item(i);
-            attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
+                      
+                     
+                            //System.out.println("code is:" + language_code);
+                        
+                           
+                            for(int k = 0; k < enabled_langs.length; k++){
+                                
+                               if(enabled_langs[k].trim().compareTo(some_element.getAttributes().item(0).getNodeValue().toString()) == 0){
+                                   
+                                
+                               
+                                 attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
+                     attribute_element = null;
+                                 
+                                 break;
+                               }
+                               //else {
+                               //    System.out.println(enabled_langs[k].trim().toString() + some_element.getAttributes().item(0).getNodeValue().toString());
+                              // }
+                           
+                            }
+                        //  enabled_languages_split[k].toLowerCase().trim();
+              
+                            
+                       // if(match_exit_flag == false)
+                            // break;
+                        //add language specific attr's:
+            //attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
             attribute_element = null;
             }
@@ -319 +363 @@
         }
     }
+     //  attribute_tree.
     return attribute_tree;
     }

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

@@ -66 +66 @@
     // the nmae of the collection if this set is collection-specific
     private String collection = null;
-    //I realize I should be using getters and setters, but for a quick fix
-    public boolean set_changed = false;
+    //set_changed is check in msm(metadatasetmanager).save() and if this is true then we save
+    //the collection, otherwise we leave it as is
+    private boolean setChanged = false;
     private String current_language_code;
     /** The description of this metadata set. Cached as it takes more computation time. */
@@ -124 +125 @@
     }
     }
-    /** Conditional copy constructor. 
+  
+    public boolean getSetChanged() {
+        
+        return setChanged;    
+    }
+    public void setSetChanged(boolean val) {
+         
+        setChanged = val;
+    }
+      /** Conditional copy constructor. 
      * @param original The original metadata set to copy from.
      * @param condition An <i>int</i> which matches one of the tree pruning filter types.

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

@@ -102 +102 @@
     return mds;
     }
-
+    public Vector getVectorSets() {   
+        Vector sets = new Vector();
+        
+        File metadata_directory = new File(Utility.METADATA_DIR);
+    if (metadata_directory.exists()) {
+        // Load just those .mds files in this directory, and return them
+        File[] directory_files = metadata_directory.listFiles();
+        for (int i = 0; i < directory_files.length; i++) {
+        File child_file = directory_files[i];
+        if (!child_file.isDirectory() && child_file.getName().endsWith(".mds")) {
+            System.err.println("Found mds file: " + child_file);
+            MetadataSet metadata_set = loadMetadataSet(child_file);
+                  //  metadata_set.getName();
+                    sets.add(new String(child_file.toString() + " ^ " + metadata_set.getName()));
+            //model.add(null, metadata_set, GEMSNode.SET);
+        }
+        }
+    }
+        return sets;
+    }
+    public Object [] getVectorSetsToStringArray() {
+        
+        return getSets().toArray();    
+    }
     /** Add a value tree to a given metadata element represented as a GValueModel
      * @param model The <strong>GValueTree</strong> model
@@ -288 +311 @@
     return result;
     }
-
+  
 
     /** Get the value tree that matches the given element.
@@ -465 +488 @@
                 //set has not changed(or has been recently saved
               
-                //if(set.set_changed == false){
-                //  continue;      
-                //}
+             
+             /*
+                if(set.getSetChanged() == false){
+                  continue;   
+                }*/
                 
          // just use the existing file path
@@ -477 +502 @@
                 
                
-                   // System.out.println("::: " + mds_file.toString());
+            // System.out.println("::: " + mds_file.toString());
          Utility.export(set.getDocument(), mds_file);
+             
+             set.setSetChanged(false);
          //What does setfile do?
          //set.setFile(mds_file);
@@ -512 +539 @@
     public void removeSet(MetadataSet set) {
     mds_hashtable.remove(set.getNamespace());
+        File f =  set.getFile();
+        f.delete();
+        //System.out.println(f.toString() + Utility.METADATA_DIR);
     // fireSetChanged(set);
     }