Ignore:
Timestamp:
2004-10-07T16:44:32+13:00 (20 years ago)
Author:
mdewsnip
Message:

Replaced all "Gatherer.config" with "Configuration".

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

    r8212 r8231  
    190190    program_label.setPreferredSize(LABEL_SIZE);
    191191    Dictionary.registerText(program_label, "Preferences.Connection.ProgramCommand");
    192     program_field = new JTextField(Gatherer.config.getPreviewCommand());
     192    program_field = new JTextField(Configuration.getPreviewCommand());
    193193    program_field.setCaretPosition(0);
    194194    Dictionary.registerTooltip(program_field, "Preferences.Connection.ProgramCommand_Tooltip");
    … …  
    198198    library_path_label = new JLabel();
    199199    library_path_label.setPreferredSize(LABEL_SIZE);
    200     library_path_field = new JTextField(Gatherer.config.getString("general.exec_address", true));
     200    library_path_field = new JTextField(Configuration.getString("general.exec_address", true));
    201201    library_path_field.setCaretPosition(0);
    202202    if (Gatherer.GS3) {
    … …  
    228228        servlet_combobox = new JComboBox();
    229229        // try to locate and select the current site
    230         String this_site = Gatherer.config.site_name;
     230        String this_site = Configuration.site_name;
    231231        for(int b = 0; b < site_combobox.getItemCount(); b++) {
    232232        String entry = (String) site_combobox.getItemAt(b);
    … …  
    252252        servlet_combobox.setEnabled(true);
    253253        // try to locate and select the current servlet
    254         String this_servlet = Gatherer.config.getServletPath();
     254        String this_servlet = Configuration.getServletPath();
    255255        for(int b = 0; b < servlet_combobox.getItemCount(); b++) {
    256256            String entry = (String) servlet_combobox.getItemAt(b);
    … …  
    264264    }
    265265   
    266     boolean currently_enabled = Gatherer.config.get("general.use_proxy", true);
     266    boolean currently_enabled = Configuration.get("general.use_proxy", true);
    267267    // Creation
    268268    JPanel connection_pane = new JPanel();
    … …  
    277277    proxy_host_label.setPreferredSize(LABEL_SIZE);
    278278    Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host");
    279     proxy_host_field = new JTextField(Gatherer.config.getString("general.proxy_host", true));
     279    proxy_host_field = new JTextField(Configuration.getString("general.proxy_host", true));
    280280    proxy_host_field.setEnabled(currently_enabled);
    281281    Dictionary.registerTooltip(proxy_host_field, "Preferences.Connection.Proxy_Host_Tooltip");
    … …  
    285285    proxy_port_label.setPreferredSize(LABEL_SIZE);
    286286    Dictionary.registerText(proxy_port_label, "Preferences.Connection.Proxy_Port");
    287     String port_value = Gatherer.config.getString("general.proxy_port", true);
     287    String port_value = Configuration.getString("general.proxy_port", true);
    288288    if(port_value.length() > 0) {
    289289       proxy_port_field = new JSpinner(new SpinnerNumberModel((new Integer(port_value)).intValue(), 0, 65535, 1));
    … …  
    414414    email_label.setPreferredSize(LABEL_SIZE);
    415415    Dictionary.registerText(email_label, "Preferences.General.Email");
    416     email_field = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
    417     email_field.setText(Gatherer.config.getEmail());
     416    email_field = new EmailField(Configuration.getColor("coloring.error_background", false));
     417    email_field.setText(Configuration.getEmail());
    418418    Dictionary.registerTooltip(email_field, "Preferences.General.Email_Tooltip");
    419419
    … …  
    421421    view_extracted_metadata_checkbox = new JCheckBox();
    422422    view_extracted_metadata_checkbox.setSelected(false);
    423     if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
     423    if (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
    424424        view_extracted_metadata_checkbox.setSelected(true);
    425425    }
    … …  
    429429    show_file_size_checkbox = new JCheckBox();
    430430    show_file_size_checkbox.setSelected(false);
    431     if (Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
     431    if (Configuration.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
    432432        show_file_size_checkbox.setSelected(true);
    433433    }
    … …  
    442442    Dictionary.registerTooltip(language_combobox, "Preferences.General.Interface_Language_Tooltip");
    443443    // Try to locate and select the current language
    444     String language_code = Gatherer.config.getLanguage();
     444    String language_code = Configuration.getLanguage();
    445445    for(int b = 0; b < language_combobox.getItemCount(); b++) {
    446446        DictionaryEntry entry = (DictionaryEntry) language_combobox.getItemAt(b);
    … …  
    497497    mode_description_textarea.setWrapStyleWord(true);
    498498    // Determine which value is already selected
    499     switch(Gatherer.config.getMode()) {
     499    switch(Configuration.getMode()) {
    500500    case Configuration.ASSISTANT_MODE:
    501501        assistant_mode_radio_button.setSelected(true);
    … …  
    540540    private JPanel createWarningPreferences() {
    541541    // Retrieve all of the warning preferences settings.
    542     HashMap warning_preferences = Gatherer.config.getAll("warning\\..*", true);
     542    HashMap warning_preferences = Configuration.getAll("warning\\..*", true);
    543543    warning_preferences_check_list = new CheckList(false);
    544544    for(Iterator keys = warning_preferences.keySet().iterator(); keys.hasNext(); ) {
    … …  
    580580
    581581    workflow_mirror = new JCheckBox();
    582     workflow_mirror.setSelected(Gatherer.config.get("workflow.mirror", false));
     582    workflow_mirror.setSelected(Configuration.get("workflow.mirror", false));
    583583    workflow_mirror.setPreferredSize(ROW_SIZE);
    584584    Dictionary.registerText(workflow_mirror, "Preferences.Workflow.Mirror");
    585585
    586586    workflow_gather = new JCheckBox();
    587     workflow_gather.setSelected(Gatherer.config.get("workflow.gather", false));
     587    workflow_gather.setSelected(Configuration.get("workflow.gather", false));
    588588    workflow_gather.setPreferredSize(ROW_SIZE);
    589589    Dictionary.registerText(workflow_gather, "Preferences.Workflow.Gather");
    590590
    591591    workflow_enrich = new JCheckBox();
    592     workflow_enrich.setSelected(Gatherer.config.get("workflow.enrich", false));
     592    workflow_enrich.setSelected(Configuration.get("workflow.enrich", false));
    593593    workflow_enrich.setPreferredSize(ROW_SIZE);
    594594    Dictionary.registerText(workflow_enrich, "Preferences.Workflow.Enrich");
    595595
    596596    workflow_design = new JCheckBox();
    597     workflow_design.setSelected(Gatherer.config.get("workflow.design", false));
     597    workflow_design.setSelected(Configuration.get("workflow.design", false));
    598598    workflow_design.setPreferredSize(ROW_SIZE);
    599599    Dictionary.registerText(workflow_design, "Preferences.Workflow.Design");
    600600
    601601    workflow_export = new JCheckBox();
    602     workflow_export.setSelected(Gatherer.config.get("workflow.export", false));
     602    workflow_export.setSelected(Configuration.get("workflow.export", false));
    603603    workflow_export.setPreferredSize(ROW_SIZE);
    604604    Dictionary.registerText(workflow_export, "Preferences.Workflow.Export");
    605605
    606606    workflow_create = new JCheckBox();
    607     workflow_create.setSelected(Gatherer.config.get("workflow.create", false));
     607    workflow_create.setSelected(Configuration.get("workflow.create", false));
    608608    workflow_create.setPreferredSize(ROW_SIZE);
    609609    Dictionary.registerText(workflow_create, "Preferences.Workflow.Create");
    … …  
    620620    checklist_pane.setLayout(new BoxLayout(checklist_pane, BoxLayout.Y_AXIS));
    621621    checklist_pane.add(title_label);
    622     if (Gatherer.config.get("workflow.mirror", true)) {
     622    if (Configuration.get("workflow.mirror", true)) {
    623623        checklist_pane.add(workflow_mirror);
    624624    }
    625     if (Gatherer.config.get("workflow.gather", true)) {
     625    if (Configuration.get("workflow.gather", true)) {
    626626        checklist_pane.add(workflow_gather);
    627627    }
    628     if (Gatherer.config.get("workflow.enrich", true)) {
     628    if (Configuration.get("workflow.enrich", true)) {
    629629        checklist_pane.add(workflow_enrich);
    630630    }
    631     if (Gatherer.config.get("workflow.design", true)) {
     631    if (Configuration.get("workflow.design", true)) {
    632632        checklist_pane.add(workflow_design);
    633633    }
    634     if (Gatherer.config.get("workflow.export", true)) {
     634    if (Configuration.get("workflow.export", true)) {
    635635        checklist_pane.add(workflow_export);
    636636    }
    637     if (Gatherer.config.get("workflow.create", true)) {
     637    if (Configuration.get("workflow.create", true)) {
    638638        checklist_pane.add(workflow_create);
    639639    }
    … …  
    665665        program_str = program_str + " %1";
    666666        }
    667         Gatherer.config.setPreviewCommand(program_str);
     667        Configuration.setPreviewCommand(program_str);
    668668
    669669        String library_path_string = library_path_field.getText();
    670         Gatherer.config.setString("general.exec_address", true, library_path_string);
     670        Configuration.setString("general.exec_address", true, library_path_string);
    671671        if (!library_path_string.equals("")) {
    672672        try {
    673             Gatherer.config.exec_address = new URL(library_path_string);
     673            Configuration.exec_address = new URL(library_path_string);
    674674        }
    675675        catch (MalformedURLException error) {
    … …  
    679679        boolean site_changed = false;
    680680        if (Gatherer.GS3) {
    681         String current_site = Gatherer.config.site_name;
     681        String current_site = Configuration.site_name;
    682682        String new_site =(String)site_combobox.getSelectedItem() ;
    683683        if (!new_site.equals(current_site)) {
    684684            site_changed = true;
    685685        }
    686         Gatherer.config.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
     686        Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
    687687        }
    688688       
    689         Gatherer.config.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
    690         Gatherer.config.setString("general.proxy_host", true, proxy_host_field.getText());
    691         Gatherer.config.setString("general.proxy_port", true, proxy_port_field.getValue() + "");
     689        Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
     690        Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
     691        Configuration.setString("general.proxy_port", true, proxy_port_field.getValue() + "");
    692692        Gatherer.setProxy();
    693693
    694694        // General preferences
    695         Gatherer.config.setEmail(email_field.getText());
    696 
    697         Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
     695        Configuration.setEmail(email_field.getText());
     696
     697        Configuration.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
    698698        // Force both workspace and collection trees to redraw
    699699        if (Gatherer.g_man != null) {
    … …  
    702702        }
    703703
    704         Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
     704        Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
    705705        Gatherer.g_man.enrich_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
    706706
    707         String current_lang = Gatherer.config.getLanguage();
     707        String current_lang = Configuration.getLanguage();
    708708        String new_lang = ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale().getLanguage();
    709709        if (!current_lang.equals(new_lang)) {
    710         Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
     710        Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
    711711        // delete the plugins and classifiers.dat files
    712712        PlugInManager.clearPlugInCache();
    … …  
    715715
    716716        // Mode preferences
    717         int current_mode = Gatherer.config.getMode();
     717        int current_mode = Configuration.getMode();
    718718        int new_mode;
    719719        if(assistant_mode_radio_button.isSelected()) {
    … …  
    731731        // If there has been a change in modes, update the config, and also inform the persistant gui views that have a need to know
    732732        if(new_mode != current_mode) {
    733         Gatherer.config.setMode(new_mode);
     733        Configuration.setMode(new_mode);
    734734        Collection collection = Gatherer.c_man.getCollection();
    735735        if (collection != null) {
    … …  
    741741        for(int i = 0; i < warning_preferences_check_list.getEntryCount(); i++) {
    742742        Entry entry = warning_preferences_check_list.get(i);
    743         Gatherer.config.set(entry.getProperty(), true, entry.isSelected());
     743        Configuration.set(entry.getProperty(), true, entry.isSelected());
    744744        }
    745745
    … …  
    751751
    752752        // Workflow preferences
    753         // Gatherer.config.set("workflow.mirror", false, workflow_mirror.isSelected());
    754         // Gatherer.config.set("workflow.gather", false, workflow_gather.isSelected());
    755         // Gatherer.config.set("workflow.enrich", false, workflow_enrich.isSelected());
    756         // Gatherer.config.set("workflow.design", false, workflow_design.isSelected());
    757         // Gatherer.config.set("workflow.export", false, workflow_export.isSelected());
    758         // Gatherer.config.set("workflow.create", false, workflow_create.isSelected());
     753        // Configuration.set("workflow.mirror", false, workflow_mirror.isSelected());
     754        // Configuration.set("workflow.gather", false, workflow_gather.isSelected());
     755        // Configuration.set("workflow.enrich", false, workflow_enrich.isSelected());
     756        // Configuration.set("workflow.design", false, workflow_design.isSelected());
     757        // Configuration.set("workflow.export", false, workflow_export.isSelected());
     758        // Configuration.set("workflow.create", false, workflow_create.isSelected());
    759759        // Gatherer.g_man.workflowUpdate("Mirror", workflow_mirror.isSelected());
    760760        // Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
    761761        // Gatherer.g_man.workflowUpdate("Enrich", workflow_enrich.isSelected());
    762         // Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Gatherer.config.getMode() > Configuration.ASSISTANT_MODE));
     762        // Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Configuration.getMode() > Configuration.ASSISTANT_MODE));
    763763        // Gatherer.g_man.workflowUpdate("Export", workflow_export.isSelected());
    764764        // Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
    765765
    766766        // Always save configuration changes immediately (in case the GLI crashes)
    767         Gatherer.config.save();
     767        Configuration.save();
    768768
    769769        // Hide dialog
    … …  
    903903    public void actionPerformed(ActionEvent event) {
    904904        boolean enabled = use_proxy_checkbox.isSelected();
    905         Gatherer.config.set("general.use_proxy", true, enabled);
     905        Configuration.set("general.use_proxy", true, enabled);
    906906        // Fortunately this is already driven by the event thread.
    907907        proxy_host_field.setEnabled(enabled);
Note: See TracChangeset for help on using the changeset viewer.