Changeset 10515


Ignore:
Timestamp:
2005-08-16T12:26:31+12:00 (19 years ago)
Author:
mdewsnip
Message:

Removed the unnecessary "self" variable.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r10454 r10515  
    212212    String command_element_name = command_element.getNodeName();
    213213    if(command_element_name.equals(CLASSIFY_ELEMENT)) {
    214         return self.classifyToString(command_element, show_extracted_namespace);
     214        return classifyToString(command_element, show_extracted_namespace);
    215215    }
    216216    else if(command_element_name.equals(FORMAT_ELEMENT)) {
    217         return self.formatToString(command_element, show_extracted_namespace);
     217        return formatToString(command_element, show_extracted_namespace);
    218218    }
    219219    else if(command_element_name.equals(INDEXES_ELEMENT)) {
    220         return self.indexesToString(command_element, show_extracted_namespace);
     220        return indexesToString(command_element, show_extracted_namespace);
    221221    }
    222222    else if(command_element_name.equals(INDEX_DEFAULT_ELEMENT)) {
    223         return self.indexDefaultToString(command_element, show_extracted_namespace);
     223        return indexDefaultToString(command_element, show_extracted_namespace);
    224224    }
    225225    else if(command_element_name.equals(LANGUAGES_ELEMENT)) {
    226         return self.languagesToString(command_element);
     226        return languagesToString(command_element);
    227227    }
    228228    else if(command_element_name.equals(LANGUAGE_DEFAULT_ELEMENT)) {
    229         return self.languageDefaultToString(command_element);
     229        return languageDefaultToString(command_element);
    230230    }
    231231    else if(command_element_name.equals(LEVELS_ELEMENT)) {
    232         return self.levelsToString(command_element);
     232        return levelsToString(command_element);
    233233    }
    234234    else if(command_element_name.equals(COLLECTIONMETADATA_ELEMENT)) {
    235         return self.metadataToString(command_element, show_extracted_namespace);
     235        return metadataToString(command_element, show_extracted_namespace);
    236236    }
    237237    else if(command_element_name.equals(COLLECTIONMETADATA_CREATOR_ELEMENT)) {
    238         return self.metadataToString(command_element, show_extracted_namespace);
     238        return metadataToString(command_element, show_extracted_namespace);
    239239    }
    240240    else if(command_element_name.equals(COLLECTIONMETADATA_MAINTAINER_ELEMENT)) {
    241         return self.metadataToString(command_element, show_extracted_namespace);
     241        return metadataToString(command_element, show_extracted_namespace);
    242242    }
    243243    else if(command_element_name.equals(COLLECTIONMETADATA_PUBLIC_ELEMENT)) {
    244         return self.metadataToString(command_element, show_extracted_namespace);
     244        return metadataToString(command_element, show_extracted_namespace);
    245245    }
    246246    else if (command_element_name.equals(BUILDTYPE_ELEMENT)) {
    247         return self.metadataToString(command_element, show_extracted_namespace);
     247        return metadataToString(command_element, show_extracted_namespace);
    248248    }
    249249    else if(command_element_name.equals(PLUGIN_ELEMENT)) {
    250         return self.pluginToString(command_element, show_extracted_namespace);
     250        return pluginToString(command_element, show_extracted_namespace);
    251251    }
    252252    else if(command_element_name.equals(SEARCHTYPE_ELEMENT)) {
    253         return self.searchtypeToString(command_element);
     253        return searchtypeToString(command_element);
    254254    }
    255255    else if(command_element_name.equals(SUBCOLLECTION_ELEMENT)) {
    256         return self.subcollectionToString(command_element, show_extracted_namespace);
     256        return subcollectionToString(command_element, show_extracted_namespace);
    257257    }
    258258    else if(command_element_name.equals(SUBCOLLECTION_DEFAULT_INDEX_ELEMENT)) {
    259         return self.subcollectionDefaultIndexToString(command_element);
     259        return subcollectionDefaultIndexToString(command_element);
    260260    }
    261261    else if(command_element_name.equals(SUBCOLLECTION_INDEXES_ELEMENT)) {
    262         return self.subcollectionIndexesToString(command_element);
     262        return subcollectionIndexesToString(command_element);
    263263    }
    264264    else if(command_element_name.equals(SUPERCOLLECTION_ELEMENT)) {
    265         return self.supercollectionToString(command_element);
     265        return supercollectionToString(command_element);
    266266    }
    267267    else if(command_element_name.equals(UNKNOWN_ELEMENT)) {
    268         return self.unknownToString(command_element);
     268        return unknownToString(command_element);
    269269    }
    270270    return "";
    … …  
    309309    static private ArrayList known_metadata;
    310310
    311     static private CollectionConfiguration self;
    312 
    313311    /** Gives the preferred ordering of commands */
    314312    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT,  StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.BUILDTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
    … …  
    322320    /** ************************** Public Methods ***************************/
    323321
    324     public CollectionConfiguration(File collect_cfg_file) {
    325     this.self = this;
     322    public CollectionConfiguration(File collect_cfg_file)
     323    {
    326324    this.collect_cfg_file = collect_cfg_file;
    327325    // If collect_cfg is xml we can load it straight away
    … …  
    531529    /** ************************** Private Methods ***************************/
    532530
    533     private String classifyToString(Element command_element, boolean show_extracted_namespace)
     531    static private String classifyToString(Element command_element, boolean show_extracted_namespace)
    534532    {
    535533    StringBuffer text = new StringBuffer(CLASSIFY_STR);
    … …  
    589587    }
    590588
    591     private String formatToString(Element command_element, boolean show_extracted_namespace) {
     589    static private String formatToString(Element command_element, boolean show_extracted_namespace) {
    592590    StringBuffer text = new StringBuffer(FORMAT_STR);
    593591    text.append(SPACE_CHARACTER);
    … …  
    616614
    617615    /** Retrieve or create the indexes Element. */
    618     private Element getOrCreateElementByTagName(String name, String conditional_attribute, String required_value) {
     616    static private Element getOrCreateElementByTagName(String name, String conditional_attribute, String required_value) {
    619617    Element document_element = document.getDocumentElement();
    620618    NodeList elements = document_element.getElementsByTagName(name);
    … …  
    653651    }
    654652
    655     private String indexesToString(Element command_element, boolean show_extracted_namespace) {
     653    static private String indexesToString(Element command_element, boolean show_extracted_namespace) {
    656654    boolean comment_only = false;
    657655    StringBuffer text = new StringBuffer("");
    … …  
    707705    }
    708706
    709     private String indexDefaultToString(Element command_element, boolean show_extracted_namespace) {
     707    static private String indexDefaultToString(Element command_element, boolean show_extracted_namespace) {
    710708    StringBuffer text = new StringBuffer("");
    711709    if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
    … …  
    735733    }
    736734
    737     private String languagesToString(Element command_element) {
     735    static private String languagesToString(Element command_element) {
    738736    StringBuffer text = new StringBuffer(LANGUAGES_STR);
    739737    text.append(TAB_CHARACTER);
    … …  
    754752    }
    755753
    756     private String languageDefaultToString(Element command_element) {
     754    static private String languageDefaultToString(Element command_element) {
    757755    StringBuffer text = new StringBuffer(LANGUAGE_DEFAULT_STR);
    758756    text.append(TAB_CHARACTER);
    … …  
    761759    }
    762760
    763     private String levelsToString(Element command_element) {
     761    static private String levelsToString(Element command_element) {
    764762    StringBuffer text = new StringBuffer("");
    765763    if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
    … …  
    783781    }
    784782
    785     static public String metadataToString(Element command_element, boolean text_value) {
     783    static private String metadataToString(Element command_element, boolean text_value) {
    786784    boolean special = false;
    787785    // If there is no value attribute, then we don't write anything
    … …  
    15301528    }
    15311529
    1532     private String pluginToString(Element command_element, boolean show_extracted_namespace) {
     1530    static private String pluginToString(Element command_element, boolean show_extracted_namespace) {
    15331531    StringBuffer text = new StringBuffer();
    15341532    if(!command_element.getAttribute(SEPARATOR_ATTRIBUTE).equals(TRUE_STR)) {
    … …  
    15751573    }
    15761574
    1577     private String searchtypeToString(Element command_element) {
     1575    static private String searchtypeToString(Element command_element) {
    15781576    if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
    15791577        StringBuffer text = new StringBuffer(SEARCHTYPE_STR);
    … …  
    15931591    }
    15941592
    1595     private String subcollectionToString(Element command_element, boolean show_extracted_namespace) {
     1593    static private String subcollectionToString(Element command_element, boolean show_extracted_namespace) {
    15961594    StringBuffer text = new StringBuffer(SUBCOLLECTION_STR);
    15971595    text.append(SPACE_CHARACTER);
    … …  
    16211619    }
    16221620
    1623     private String subcollectionDefaultIndexToString(Element command_element) {
     1621    static private String subcollectionDefaultIndexToString(Element command_element) {
    16241622    StringBuffer text = new StringBuffer(SUBCOLLECTION_DEFAULT_INDEX_STR);
    16251623    text.append(TAB_CHARACTER);
    … …  
    16361634    }
    16371635
    1638     private String subcollectionIndexesToString(Element command_element) {
     1636    static private String subcollectionIndexesToString(Element command_element) {
    16391637    StringBuffer text = new StringBuffer(SUBCOLLECTION_INDEX_STR);
    16401638    text.append(TAB_CHARACTER);
    … …  
    16631661    }
    16641662
    1665     private String supercollectionToString(Element command_element) {
     1663    static private String supercollectionToString(Element command_element) {
    16661664    NodeList content_elements = command_element.getElementsByTagName(COLLECTION_ELEMENT);
    16671665    int content_elements_length = content_elements.getLength();
    … …  
    16811679    }
    16821680
    1683     private String unknownToString(Element command_element) {
     1681    static private String unknownToString(Element command_element) {
    16841682    return XMLTools.getValue(command_element);
    16851683    }
Note: See TracChangeset for help on using the changeset viewer.