Ignore:
Timestamp:
2003-10-07T15:35:23+13:00 (21 years ago)
Author:
mdewsnip
Message:

Changed calls to the Dictionary.

Location:
trunk/gli/src/org/greenstone/gatherer/mem
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/mem/MEMNode.java

    r5564 r5593  
    161161        }
    162162        v = null;
    163                 // Add the profile set.
    164         children.add(new MEMNode(PROFILER, Dictionary.newget("MEM.Profiles"), this));
     163        // Add the profile set.
     164        children.add(new MEMNode(PROFILER, Dictionary.get("MEM.Profiles"), this));
    165165        break;
    166166    case SET: // Add the elements as children

  • trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

    r5590 r5593  
    143143    this.self = this;
    144144
    145     dialog_options[0] = Dictionary.newget("General.OK");
    146     dialog_options[1] = Dictionary.newget("General.Cancel");
     145    dialog_options[0] = Dictionary.get("General.OK");
     146    dialog_options[1] = Dictionary.get("General.Cancel");
    147147
    148148    // Creation
    … …  
    386386    set_attributes_scroll.setViewportView(set_attributes);
    387387
    388     set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     388    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
    389389    set_attributes_pane.setLayout(new BorderLayout());
    390390    set_attributes_pane.add(set_attributes_scroll, BorderLayout.CENTER);
    391391       
    392     set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     392    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    393393    set_details_pane.setLayout(new BorderLayout());
    394394    //set_details_pane.add(set_name_pane, BorderLayout.NORTH);
    … …  
    401401    element_attributes_scroll.setViewportView(element_attributes);
    402402
    403     element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     403    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
    404404    element_attributes_pane.setLayout(new BorderLayout());
    405405    element_attributes_pane.add(element_attributes_scroll, BorderLayout.CENTER);
    406406         
    407     element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
     407    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
    408408    //element_values_pane.setLayout(new BorderLayout());
    409409    //element_values_pane.add(new JScrollPane(element_values), BorderLayout.CENTER);
    … …  
    416416    element_inner_pane.add(element_values_pane);
    417417         
    418     element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     418    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    419419    element_details_pane.setLayout(new BorderLayout());
    420420    //element_details_pane.add(element_name_pane, BorderLayout.NORTH);
    … …  
    427427    profile_attributes_scroll.setViewportView(profile_attributes);
    428428
    429     profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
     429    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
    430430    profile_attributes_pane.setLayout(new BorderLayout());
    431431    profile_attributes_pane.add(profile_attributes_scroll, BorderLayout.CENTER);
    432432
    433     profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     433    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    434434    profile_details_pane.setLayout(new BorderLayout());
    435435    //profile_details_pane.add(profile_name_pane, BorderLayout.NORTH);
    … …  
    601601        JPanel center_pane = new JPanel();
    602602        center_pane.setOpaque(false);
    603         value = new ComboArea(Dictionary.newget("MEM.Values"), LABEL_SIZE);
     603        value = new ComboArea(Dictionary.get("MEM.Values"), LABEL_SIZE);
    604604        value.setOpaque(false);
    605605
    … …  
    885885        else {
    886886        cont = false;
    887         JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Attribute_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     887        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    888888        }
    889889
    … …  
    917917        else {
    918918        cont = false;
    919         JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Attribute_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     919        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    920920        }
    921921
    … …  
    10731073        // Otherwise show an error message and do not proceed.
    10741074        else {
    1075             JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Element_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     1075            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Element_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    10761076        }
    10771077        name_str = null;
    … …  
    10921092            // Warn the user that they can't do that dave.
    10931093            else {
    1094             JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     1094            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    10951095            }
    10961096        }
    … …  
    12011201        // Otherwise warn the user and don't hide the prompt.
    12021202        else {
    1203             JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.File_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     1203            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.File_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    12041204        }
    12051205        name_str = null;
    … …  
    13291329        // Otherwise show a warning.
    13301330        else {
    1331             JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Set_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
     1331            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
    13321332        }
    13331333        name_str = null;
    … …  
    16521652    public void actionPerformed(ActionEvent event) {
    16531653        if(current_attribute != -1) {
    1654         int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Attribute")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1654        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]);
    16551655        // Remove this attribute
    16561656        if(result == 0) {
    … …  
    17001700    public void actionPerformed(ActionEvent event) {
    17011701        if(current_element != null) {
    1702         int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Element")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1702        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]);
    17031703        // Remove this attribute
    17041704        if(result == 0) {
    … …  
    17281728    public void actionPerformed(ActionEvent event) {
    17291729        if(current_collection_file != null) {
    1730         int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.File")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1730        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]);
    17311731        // Remove the current collection file profile from the profiler.
    17321732        if(result == 0) {
    … …  
    17531753    public void actionPerformed(ActionEvent event) {
    17541754        if(current_set != null) {
    1755         int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Set")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1755        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]);
    17561756        // Remove the currently selected set
    17571757        if(result == 0) {
    … …  
    17781778    public void actionPerformed(ActionEvent event) {
    17791779        if(current_value_node != null) {                 
    1780         int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Value")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1780        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]);
    17811781        // Remove the current selected value
    17821782        if(result == 0) {
    … …  
    19091909                String action = Gatherer.c_man.msm.profiler.getAction(current_collection_file, source);
    19101910                if (action == null) {
    1911                 action = Dictionary.newget("MEM.Ignore");
     1911                action = Dictionary.get("MEM.Ignore");
    19121912                }
    19131913                attributes.add(new Attribute(source, action));
    19141914            }
    1915             atm = new AttributeTableModel(attributes, Dictionary.newget("MEM.Source"), Dictionary.newget("MEM.Target"), Dictionary.newget("MEM.Ignore"));
     1915            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Source"), Dictionary.get("MEM.Target"), Dictionary.get("MEM.Ignore"));
    19161916            //current_node.setModel(atm);
    19171917            }
    … …  
    19271927            atm = current_node.getModel();
    19281928            if(atm == null) {
    1929             atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.newget("MEM.Name"), Dictionary.newget("MEM.Language_Code"), Dictionary.newget("MEM.Value"), "");
     1929            atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.get("MEM.Name"), Dictionary.get("MEM.Language_Code"), Dictionary.get("MEM.Value"), "");
    19301930            //current_node.setModel(atm);
    19311931            }
    … …  
    19651965                attribute = null;
    19661966            }
    1967             atm = new AttributeTableModel(attributes, Dictionary.newget("MEM.Name"), Dictionary.newget("MEM.Value"), "");
     1967            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Name"), Dictionary.get("MEM.Value"), "");
    19681968            //current_node.setModel(atm);
    19691969            temp = null;
Note: See TracChangeset for help on using the changeset viewer.