Changeset 9103

Timestamp:

2005-02-18T14:21:15+13:00 (19 years ago)

Author:

kjdon

Message:

changed names of lots of Dictionary strings

Location:

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

Files:

• GEMS.java (modified) (10 diffs)
• MetadataSet.java (modified) (2 diffs)

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

@@ -359 +359 @@
         if(atLeastOneSetChanged == true)
         {
-        int result = JOptionPane.showConfirmDialog(self, Dictionary.get("GEMS.Menu.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Menu.Confirm_Exit_Save_Title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+        int result = JOptionPane.showConfirmDialog(self, Dictionary.get("GEMS.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Confirm_Exit_Save_Title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 
         if(result == 0)
@@ -479 +479 @@
         help = new JMenu();
         help.setIcon(Utility.HELP_ICON);
-        Dictionary.setText(help, "GEMS.Menu.Help");
+        Dictionary.setText(help, "Menu.Help");
 
         help_help = new JMenuItem();
         help_help.addActionListener(this);
-        Dictionary.registerText(help_help, "GEMS.Menu.Help");
+        Dictionary.registerText(help_help, "Menu.Help");
 
         // Layout (help menu)
@@ -666 +666 @@
         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]);
+            int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Exit_Save", Dictionary.get("GEMS.Element")), Dictionary.get("GEMS.Confirm_Exit_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
          //   System.out.println("Exit: "+result);
             if(result == 0) {
@@ -942 +942 @@
         else if (source == popupListener.menuAddAttributeAttribute || source == popupListener.menuAddAttributeSet || source == popupListener.menuAddAttributeElement){
 
-        Dictionary.setText(this, "GEMS.AddAttribute");
+        Dictionary.setText(this, "GEMS.Add_Attribute");
         for(int i = 0; i < attributeLists.size(); i++) {
             name.add(attributeLists.get(i).toString());    
@@ -1016 +1016 @@
        //System.err.println("just entered editAttribute"); //debug
        AttributeTableModel model = null;
-       Dictionary.setText(this, "GEMS.EditAttribute");
+       Dictionary.setText(this, "GEMS.Edit_Attribute");
        
        switch(current_attribute_type) {
@@ -1150 +1150 @@
 
     public AddSubelementActionListener() {
-        Dictionary.setText(this, "GEMS.Popup.menuAddSubelement");
+        Dictionary.setText(this, "GEMS.Add_Subelement");
         Dictionary.setTooltip(name_field, "GEMS.Subelement_Name_Tooltip");
     }
@@ -1238 +1238 @@
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
-        Dictionary.setText(this, "GEMS.AddElement");
+        Dictionary.setText(this, "GEMS.Add_Element");
 
         JPanel labels_pane = new JPanel();
@@ -1389 +1389 @@
         setModal(true);
         setSize(ADD_SET_SIZE);
-        Dictionary.setText(this, "GEMS.AddSet");
+        Dictionary.setText(this, "GEMS.Add_Set");
 
         // Creation
@@ -1617 +1617 @@
         setModal(true);
         setSize(OPEN_SETS_SIZE);
-        Dictionary.setText(this, "GEMS.Menu.File_Open");
+        Dictionary.setText(this, "GEMS.Open_Set");
 
         // Creation
@@ -2445 +2445 @@
         //Create the menu items
         menuAddAttributeSet = new JMenuItem();
-        Dictionary.setText(menuAddAttributeSet, "GEMS.Popup.menuAddAttribute");
+        Dictionary.setBoth(menuAddAttributeSet, "GEMS.Add_Attribute", "GEMS.Add_Attribute_Tooltip");
         menuAddElement =new JMenuItem();
-        Dictionary.setText(menuAddElement,"GEMS.Popup.menuAddElement");
+        Dictionary.setBoth(menuAddElement,"GEMS.Add_Element","GEMS.Add_Element_Tooltip");
         menuRenameSet = new JMenuItem();
-        Dictionary.setText(menuRenameSet,"GEMS.Popup.menuRenameSet");
+        Dictionary.setBoth(menuRenameSet,"GEMS.Rename_Set", "GEMS.Rename_Set_Tooltip");
             menuRemoveSet = new JMenuItem();
-        Dictionary.setText(menuRemoveSet, "GEMS.Popup.menuRemoveSet");
+        Dictionary.setBoth(menuRemoveSet, "GEMS.Remove_Set","GEMS.Remove_Set_Tooltip");
             
             menuAddAttributeElement=new JMenuItem();
-            Dictionary.setText(menuAddAttributeElement,"GEMS.Popup.menuAddAttribute");
+            Dictionary.setBoth(menuAddAttributeElement,"GEMS.Add_Attribute", "GEMS.Add_Attribute_Tooltip");
         menuAddSubelement=new JMenuItem();
-            Dictionary.setText(menuAddSubelement,"GEMS.Popup.menuAddSubelement");
+            Dictionary.setBoth(menuAddSubelement,"GEMS.Add_Subelement", "GEMS.Add_Subelement_Tooltip");
             menuRenameElement=new JMenuItem();
-            Dictionary.setText(menuRenameElement,"GEMS.Popup.menuRenameElement");
+            Dictionary.setBoth(menuRenameElement,"GEMS.Rename_Element", "GEMS.Rename_Element_Tooltip");
             menuDeleteElement=new JMenuItem();
-        Dictionary.setText(menuDeleteElement,"GEMS.Popup.menuRemoveElement");
+        Dictionary.setBoth(menuDeleteElement,"GEMS.Remove_Element", "GEMS.Remove_Element_Tooltip" );
 
         menuAddAttributeAttribute=new JMenuItem();
-        Dictionary.setText(menuAddAttributeAttribute,"GEMS.Popup.menuAddAttribute");
+        Dictionary.setBoth(menuAddAttributeAttribute,"GEMS.Add_Attribute", "GEMS.Add_Attribute_Tooltip");
             menuEditValue=new JMenuItem();
-            Dictionary.setText(menuEditValue,"GEMS.Popup.menuEditValue");
+            Dictionary.setBoth(menuEditValue,"GEMS.Edit_Value", "GEMS.Edit_Value_Tooltip");
             menuDeleteAttribute=new JMenuItem();
-        Dictionary.setText(menuDeleteAttribute,"GEMS.Popup.menuRemoveAttribute");
+        Dictionary.setBoth(menuDeleteAttribute,"GEMS.Remove_Attribute", "GEMS.Remove_Attribute_Tooltip");
              
         //Associate the menu items with the appropriate popups:

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

@@ -336 +336 @@
     }
     if(description == null) {
-        description = getAttribute(StaticStrings.DESCRIPTION_ELEMENT, Dictionary.get("MSM.No_Description"));
+        description = getAttribute(StaticStrings.DESCRIPTION_ELEMENT, Dictionary.get("GEMS.No_Description"));
     }
     return description;
@@ -438 +438 @@
             
         //name = getAttribute(StaticStrings.NAME_ELEMENT, Dictionary.get("MSM.No_Name"));
-       return getAttribute(StaticStrings.NAME_ELEMENT, Dictionary.get("MSM.No_Name"));
+       return getAttribute(StaticStrings.NAME_ELEMENT, Dictionary.get("GEMS.No_Name"));
     
         }