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

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

Location:
trunk/gli/src/org/greenstone/gatherer/cdm
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

    r8020 r8231  
    156156
    157157    // Display on screen.
    158     Dimension screen_size = Gatherer.config.screen_size;
     158    Dimension screen_size = Configuration.screen_size;
    159159    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
    160160    screen_size = null;
    … …  
    215215    inner_pane.setBackground(color);
    216216    JLabel header_label = new JLabel("<html><strong>" + name + "</strong></html>");
    217     header_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
     217    header_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
    218218    header_label.setHorizontalAlignment(JLabel.CENTER);
    219219    header_label.setOpaque(true);
    … …  
    235235    ArrayList arguments = data.getArguments(true, false);
    236236    int total_height = 250;
    237     int mode = Gatherer.config.getMode();
     237    int mode = Configuration.getMode();
    238238    for(int i = 0; i < arguments.size(); i++) {
    239239        Argument argument = (Argument) arguments.get(i);
    … …  
    246246    // now add in the custom args bit
    247247    coloured = !coloured;
    248     Color color = (coloured ? Gatherer.config.getColor("coloring.collection_heading_background", false) : Gatherer.config.getColor("coloring.collection_tree_background", false));
     248    Color color = (coloured ? Configuration.getColor("coloring.collection_heading_background", false) : Configuration.getColor("coloring.collection_tree_background", false));
    249249    addHeader(Dictionary.get("CDM.ArgumentConfiguration.Custom_Header"), color);
    250250    custom_pane.setBackground(color);
    … …  
    264264    private Argument argument = null;
    265265
    266     private Color colour_one = Gatherer.config.getColor("coloring.collection_heading_background", false);
    267     private Color colour_two = Gatherer.config.getColor("coloring.collection_tree_background", false);
     266    private Color colour_one = Configuration.getColor("coloring.collection_heading_background", false);
     267    private Color colour_two = Configuration.getColor("coloring.collection_tree_background", false);
    268268    /** One of a possible two buttons available for adding to this control. */
    269269    private JButton one = null;
    … …  
    449449
    450450        // Editable for advanced modes (allows things like dc.Title,ex.Title)
    451         if (Gatherer.config.getMode() > Configuration.ASSISTANT_MODE) {
     451        if (Configuration.getMode() > Configuration.ASSISTANT_MODE) {
    452452            ((JComboBox) value).setEditable(true);
    453453        }

  • trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

    r8015 r8231  
    3636import javax.swing.event.*;
    3737import org.apache.xerces.parsers.*;
     38import org.greenstone.gatherer.Configuration;
    3839import org.greenstone.gatherer.Dictionary;
    3940import org.greenstone.gatherer.Gatherer;
    … …  
    327328        if(Utility.isWindows()) {
    328329            args = new String[6];
    329             if(Gatherer.config.perl_path != null) {
    330             args[0] = Gatherer.config.perl_path;
     330            if(Configuration.perl_path != null) {
     331            args[0] = Configuration.perl_path;
    331332            }
    332333            else {
    333334            args[0] = "Perl.exe";
    334335            }
    335             args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
     336            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
    336337            args[2] = "-xml";
    337338            args[3] = "-language";
    … …  
    386387        if (Gatherer.isGsdlRemote) {
    387388
    388         String lang = Gatherer.config.getLanguage();
     389        String lang = Configuration.getLanguage();
    389390
    390391        String launch  = Gatherer.cgiBase + "launch";
    … …  
    410411
    411412        // Retrieve the gsdl home directory...
    412         String directory = Gatherer.config.gsdl_path;
     413        String directory = Configuration.gsdl_path;
    413414        directory = directory + "perllib" + File.separator + "classify" + File.separator;
    414415
    415         String current_lang = Gatherer.config.getLanguage();
     416        String current_lang = Configuration.getLanguage();
    416417        File files[] = (new File(directory)).listFiles();
    417418        if(files != null) {
    … …  
    465466    }
    466467
    467     String current_lang = Gatherer.config.getLanguage();
     468    String current_lang = Configuration.getLanguage();
    468469    if (num_classifiers>0) {
    469470        // Create a progress indicator.
    … …  
    659660        ClassifierComboboxListener ccl = new ClassifierComboboxListener();
    660661        classifier = new GComboBox(getAvailable());
    661         classifier.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    662         classifier.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     662        classifier.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
     663        classifier.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
    663664        classifier.setEditable(true);
    664         classifier.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
    665         classifier.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     665        classifier.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     666        classifier.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
    666667        if(classifier.getItemCount() > 0) {
    667668        classifier.setSelectedIndex(0);

  • trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

    r8056 r8231  
    3232import java.util.*;
    3333import javax.swing.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Gatherer;
    3536import org.greenstone.gatherer.cdm.CommandTokenizer;
    … …  
    10911092            String name = (String) acquired_collectionmeta_names.get(y);
    10921093            String value = name.substring(1);
    1093             Gatherer.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Gatherer.config.getLanguage() + "] \"" + value + "\"");
     1094            Gatherer.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Configuration.getLanguage() + "] \"" + value + "\"");
    10941095            Element element = document.createElement(COLLECTIONMETADATA_ELEMENT);
    10951096            element.setAttribute(NAME_ATTRIBUTE, name);
    1096             element.setAttribute(LANGUAGE_ATTRIBUTE, Gatherer.config.getLanguage());
     1097            element.setAttribute(LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
    10971098            element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
    10981099            XMLTools.setValue(element, value);
    … …  
    13671368        String value_str = tokenizer.nextToken();
    13681369        if(name_str != null && value_str != null) {
    1369         String language_str = Gatherer.config.getLanguage();
     1370        String language_str = Configuration.getLanguage();
    13701371        // Check if the value string is actually a language string
    13711372        if(value_str.startsWith(LBRACKET_CHARACTER) && value_str.endsWith(RBRACKET_CHARACTER)) {

  • trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

    r8055 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Gatherer;
    3536import org.greenstone.gatherer.cdm.ClassifierManager;
    … …  
    215216      boolean formats_changed = format_manager.formatsChanged();
    216217
    217       if(formats_changed && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
     218      if(formats_changed && Gatherer.c_man.built() && Configuration.exec_file != null) {
    218219      // Release the collection
    219220      Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);

  • trunk/gli/src/org/greenstone/gatherer/cdm/CollectionMeta.java

    r8015 r8231  
    6565    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
    6666    element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
    67     element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Gatherer.config.getLanguage());
     67    element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
    6868    element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
    6969    }

  • trunk/gli/src/org/greenstone/gatherer/cdm/CollectionMetaManager.java

    r6539 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Gatherer;
    3536import org.greenstone.gatherer.cdm.CollectionDesignManager;
    … …  
    124125    for(int i = 0; i < size; i++) {
    125126        CollectionMeta metadatum = (CollectionMeta) getElementAt(i);
    126         if(metadatum.getName().equals(name) && metadatum.getLanguage().equals(Gatherer.config.getLanguage())) {
     127        if(metadatum.getName().equals(name) && metadatum.getLanguage().equals(Configuration.getLanguage())) {
    127128        Gatherer.println("Found '" + metadatum + "'");
    128129        return metadatum;

  • trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java

    r8002 r8231  
    3737import javax.swing.*;
    3838import javax.swing.event.*;
     39import org.greenstone.gatherer.Configuration;
    3940import org.greenstone.gatherer.Dictionary;
    4041import org.greenstone.gatherer.Gatherer;
    … …  
    274275
    275276        instructions_textarea = new JTextArea();
    276         instructions_textarea.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     277        instructions_textarea.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    277278        instructions_textarea.setEditable(false);
    278279        instructions_textarea.setLineWrap(true);
    … …  
    323324       
    324325        editor_textarea = new JTextArea();
    325         editor_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
     326        editor_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
    326327        editor_textarea.setCaretPosition(0);
    327328        editor_textarea.setLineWrap(true);

  • trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

    r7365 r8231  
    213213        Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
    214214
    215         creator_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
     215        creator_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
    216216        Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
    217217
    … …  
    219219        Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
    220220
    221         maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
     221        maintainer_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
    222222        Dictionary.registerTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
    223223
    … …  
    230230        JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
    231231        short_name_textfield.setEditable(false);
    232         short_name_textfield.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     232        short_name_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    233233        JPanel icon_panel = new JPanel();
    234234        icon_label = new JLabel();
    … …  
    259259        Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
    260260        description_textarea = new JTextArea();
    261         description_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
     261        description_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
    262262        Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
    263263        // Connection
    … …  
    423423        creator_collectionmeta.setValue(creator_email_str);
    424424        // If the email is currently empty, store this email
    425         if(Gatherer.config.getEmail() == null) {
    426             Gatherer.config.setEmail(creator_email_str); // Store the email address in the configuration
     425        if(Configuration.getEmail() == null) {
     426            Configuration.setEmail(creator_email_str); // Store the email address in the configuration
    427427        }
    428428        collection_extra_collectionmeta.setValue(description_textarea.getText());
    … …  
    579579    public DesignTree() {
    580580        super();
    581         resetModel(Gatherer.config.getMode());
     581        resetModel(Configuration.getMode());
    582582        expandRow(0);
    583583        setRootVisible(false);

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

    r8002 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Dictionary;
    3536import org.greenstone.gatherer.Gatherer;
    … …  
    958959        index_combobox = new GComboBox();
    959960        index_combobox.setPreferredSize(FIELD_SIZE);
    960         index_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    961         index_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     961        index_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
     962        index_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
    962963        index_combobox.setEditable(true);
    963         index_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
    964         index_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     964        index_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     965        index_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
    965966        Dictionary.registerTooltip(index_combobox, "CDM.IndexManager.MGPP.Index_Tooltip");
    966967
    … …  
    10901091        level_combobox = new GComboBox(Index.LEVEL);
    10911092        level_combobox.setPreferredSize(FIELD_SIZE);
    1092         level_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    1093         level_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     1093        level_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
     1094        level_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
    10941095        level_combobox.setEditable(true);
    1095         level_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
    1096         level_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     1096        level_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     1097        level_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
    10971098        Dictionary.registerTooltip(level_combobox, "CDM.IndexManager.Level_Tooltip");
    10981099

  • trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java

    r8002 r8231  
    3838import javax.swing.*;
    3939import javax.swing.event.*;
     40import org.greenstone.gatherer.Configuration;
    4041import org.greenstone.gatherer.Dictionary;
    4142import org.greenstone.gatherer.Gatherer;
    … …  
    293294        }
    294295        default_language_field.setPreferredSize(COMPONENT_SIZE);
    295         default_language_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     296        default_language_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    296297        default_language_field.setEditable(false);
    297298        JPanel control_panel = new JPanel();
    … …  
    302303        selector_combobox = new JComboBox(getLanguageCodes().toArray());
    303304        selector_combobox.setPreferredSize(COMPONENT_SIZE);
    304         selector_combobox.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     305        selector_combobox.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    305306        selector_combobox.setRenderer(new LanguageListCellRenderer());
    306307        Dictionary.registerTooltip(selector_combobox, "CDM.LanguageManager.Selector_Tooltip");

  • trunk/gli/src/org/greenstone/gatherer/cdm/MetadataSetView.java

    r8055 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Dictionary;
    3536import org.greenstone.gatherer.Gatherer;
    … …  
    208209        header_pane = new JPanel();
    209210        instructions = new JTextArea();
    210         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     211        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    211212        instructions.setEditable(false);
    212213        instructions.setLineWrap(true);

  • trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java

    r8152 r8231  
    380380        if(Utility.isWindows()) {
    381381            args = new String[6];
    382             if(Gatherer.config.perl_path != null) {
    383             args[0] = Gatherer.config.perl_path;
     382            if(Configuration.perl_path != null) {
     383            args[0] = Configuration.perl_path;
    384384            }
    385385            else {
    386386            args[0] = "Perl.exe";
    387387            }
    388             args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
     388            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
    389389            args[2] = "-xml";
    390390            args[3] = "-language";
    … …  
    436436        if (Gatherer.isGsdlRemote) {
    437437
    438         String lang = Gatherer.config.getLanguage();
     438        String lang = Configuration.getLanguage();
    439439
    440440        String launch  = Gatherer.cgiBase + "launch";
    … …  
    459459        else {
    460460        // Retrieve the gsdl home directory...
    461         String directory = Gatherer.config.gsdl_path;
     461        String directory = Configuration.gsdl_path;
    462462        directory = directory + "perllib" + File.separator + "plugins" + File.separator;
    463463        loadPlugIns(new File(directory));
    … …  
    503503    boolean is_mac = Utility.isMac();
    504504
    505     String current_lang = Gatherer.config.getLanguage();
     505    String current_lang = Configuration.getLanguage();
    506506    if (num_plugins>0) {
    507507        // Create a progress indicator.
    … …  
    532532    boolean is_windows = Utility.isWindows();
    533533    boolean is_mac = Utility.isMac();
    534     String current_lang = Gatherer.config.getLanguage();
     534    String current_lang = Configuration.getLanguage();
    535535    if(files != null) {
    536536        // Create a progress indicator.
    … …  
    729729
    730730        instructions = new JTextArea();
    731         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     731        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    732732        instructions.setEditable(false);
    733733        instructions.setLineWrap(true);
    … …  
    752752        PlugInComboboxListener picl = new PlugInComboboxListener();
    753753        plugin = new GComboBox(getAvailable());
    754         plugin.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    755         plugin.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     754        plugin.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
     755        plugin.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
    756756        plugin.setEditable(true);
    757         plugin.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
    758         plugin.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     757        plugin.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     758        plugin.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
    759759        picl.itemStateChanged(new ItemEvent(plugin, 0, null, ItemEvent.SELECTED));
    760760
    … …  
    818818        plugin_list_pane.add(plugin_list_label, BorderLayout.NORTH);
    819819        plugin_list_pane.add(new JScrollPane(plugin_list), BorderLayout.CENTER);
    820         modeChanged(Gatherer.config.getMode()); // Whether the movement buttons are visible is mode dependant
     820        modeChanged(Configuration.getMode()); // Whether the movement buttons are visible is mode dependant
    821821
    822822        plugin_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));

  • trunk/gli/src/org/greenstone/gatherer/cdm/SearchTypeManager.java

    r8002 r8231  
    3636import javax.swing.*;
    3737import javax.swing.event.*;
     38import org.greenstone.gatherer.Configuration;
    3839import org.greenstone.gatherer.Dictionary;
    3940import org.greenstone.gatherer.Gatherer;
    … …  
    210211        search_type_combobox = new GComboBox(SEARCH_TYPES);
    211212        search_type_combobox.setPreferredSize(Utility.LABEL_SIZE);
    212         search_type_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    213         search_type_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     213        search_type_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
     214        search_type_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
    214215        search_type_combobox.setEditable(true);
    215216        search_type_combobox.setSelectedIndex(0);
    216         search_type_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
    217         search_type_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     217        search_type_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     218        search_type_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
    218219        Dictionary.registerTooltip(search_type_combobox, "CDM.SearchTypeManager.SearchType_Selection_Tooltip");
    219220

  • trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionIndexManager.java

    r8002 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Dictionary;
    3536import org.greenstone.gatherer.Gatherer;
    … …  
    246247        }
    247248        default_value_field.setPreferredSize(Utility.LABEL_SIZE);
    248         default_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     249        default_value_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    249250        default_value_field.setEditable(false);
    250251

  • trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.java

    r8015 r8231  
    218218        JPanel button_pane_1 = new JPanel();
    219219        include_button = new JRadioButton();
    220         include_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     220        include_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    221221        include_button.setMnemonic(KeyEvent.VK_I);
    222222        include_button.setOpaque(false);
    223223        Dictionary.registerText(include_button, "CDM.SubcollectionManager.Include");
    224224        exclude_button = new JRadioButton();
    225         exclude_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     225        exclude_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    226226        exclude_button.setMnemonic(KeyEvent.VK_X);
    227227        exclude_button.setOpaque(false);
    … …  
    268268        JPanel message_pane = new JPanel();
    269269        String args[] = new String[3];
    270         args[0] = Gatherer.config.getModeAsString();
     270        args[0] = Configuration.getModeAsString();
    271271        args[1] = Dictionary.get("Preferences.Mode.Systems");
    272272        args[2] = Dictionary.get("Preferences.Mode.Expert");
    … …  
    347347        border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
    348348        border_pane.setLayout(card_layout);
    349         if(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE) {
     349        if(Configuration.getMode() > Configuration.LIBRARIAN_MODE) {
    350350        border_pane.add(tabbed_pane, ENABLED_CONTROLS);
    351351        border_pane.add(message_pane, DISABLED_CONTROLS);

  • trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

    r8002 r8231  
    3232import javax.swing.*;
    3333import javax.swing.event.*;
     34import org.greenstone.gatherer.Configuration;
    3435import org.greenstone.gatherer.Dictionary;
    3536import org.greenstone.gatherer.Gatherer;
    … …  
    126127
    127128        JTextArea instructions = new JTextArea();
    128         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     129        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    129130        instructions.setCaretPosition(0);
    130131        instructions.setEditable(false);
    … …  
    193194        File gsdl_collection_directory;
    194195        if (Gatherer.GS3) {
    195         gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
     196        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
    196197        } else {
    197         gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
     198        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
    198199        }
    199200        current_coll_name = Gatherer.c_man.getCollection().getName();

  • trunk/gli/src/org/greenstone/gatherer/cdm/TranslationView.java

    r7157 r8231  
    3333import javax.swing.event.*;
    3434import javax.swing.table.*;
     35import org.greenstone.gatherer.Configuration;
    3536import org.greenstone.gatherer.Dictionary;
    3637import org.greenstone.gatherer.Gatherer;
    … …  
    220221        fragment_table = new JTable(fragment_table_model);
    221222        fragment_table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
    222         fragment_table.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     223        fragment_table.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    223224        fragment_table.setColumnSelectionAllowed(false);
    224225        fragment_table.setDefaultRenderer(Object.class, new FragmentTableRenderer());
    … …  
    226227
    227228        JScrollPane table_scroll = new JScrollPane(fragment_table);
    228         table_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     229        table_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    229230        table_scroll.setOpaque(true);
    230231
    … …  
    245246        Dictionary.registerText(default_label, "CDM.TranslationManager.Default_Text");
    246247        default_area = new JTextArea();
    247         default_area.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     248        default_area.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    248249        default_area.setEditable(false);
    249250        default_area.setLineWrap(true);
    … …  
    254255        Dictionary.registerText(translation_label, "CDM.TranslationManager.Translation");
    255256        translation_area = new JTextArea();
    256         translation_area.setBackground(Gatherer.config.getColor("coloring.disabled", false));
     257        translation_area.setBackground(Configuration.getColor("coloring.disabled", false));
    257258        translation_area.setEnabled(false);
    258259        translation_area.setLineWrap(true);
    … …  
    466467            // Update and enable the text area
    467468            translation_area.setEnabled(true);
    468             translation_area.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
     469            translation_area.setBackground(Configuration.getColor("coloring.editable_background", false));
    469470            }
    470471            else {
    … …  
    476477            translation_area.setText("");
    477478            translation_area.setEnabled(false);
    478             translation_area.setBackground(Gatherer.config.getColor("coloring.disabled", false));
     479            translation_area.setBackground(Configuration.getColor("coloring.disabled", false));
    479480            }
    480481        }
    … …  
    654655        JComponent component = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
    655656        if(isSelected) {
    656             component.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", false));
     657            component.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
    657658        }
    658659        else {
    659             component.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     660            component.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    660661        }
    661662        return component;
    … …  
    683684            // Ready the text area
    684685            translation_area.setEnabled(true);
    685             translation_area.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
     686            translation_area.setBackground(Configuration.getColor("coloring.editable_background", false));
    686687            ignore_event = false;
    687688        }
Note: See TracChangeset for help on using the changeset viewer.