Changeset 8978


Ignore:
Timestamp:
2005-02-08T14:29:02+13:00 (19 years ago)
Author:
mdewsnip
Message:

Replaced all "dependant" with "dependent" (mgw5).

Location:
trunk/gli
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/classes/feedback.properties

    r7316 r8978  
    221221Separator=Separator
    222222NoComponent=No Component (it's a null object)
    223 TitlePane=Metal Title Pane (Platform dependant)
     223TitlePane=Metal Title Pane (Platform dependent)
    224224ToolTipText=ToolTipText
    225225Feedback=Feedback

  • trunk/gli/makegli.bat

    r8884 r8978  
    141141if "%1" == "" goto makeAll
    142142    :: If a file has been specified as a command-line argument, just compile that file
    143     if "%GLILANG%" == "en" echo Compiling %1 and dependant classes...
     143    if "%GLILANG%" == "en" echo Compiling %1 and dependent classes...
    144144    if "%GLILANG%" == "es" echo Compilando %1 y clases dependientes...
    145145    if "%GLILANG%" == "fr" echo Compilation de %1 et des classes d‚pendantes,,,

  • trunk/gli/makegli.sh

    r8884 r8978  
    126126    echo "ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ $* É ÚÁ×ÉÓÉÍÙÅ ËÌÁÓÓÙ..."
    127127    else
    128     echo "Compiling $* and dependant classes..."
     128    echo "Compiling $* and dependent classes..."
    129129    fi
    130130

  • trunk/gli/metadata/dublin.mds

    r7237 r8978  
    1919            name               CDATA #REQUIRED
    2020        namespace          CDATA #REQUIRED
    21         language_dependant CDATA "">
     21        language_dependent CDATA "">
    2222
    2323  <!-- The name of a metadata set. Is language specific. -->

  • trunk/gli/metadata/nzgls.mds

    r8932 r8978  
    1919            name               CDATA #REQUIRED
    2020        namespace          CDATA #REQUIRED
    21         language_dependant CDATA "">
     21        language_dependent CDATA "">
    2222
    2323  <!-- The name of a metadata set. Is language specific. -->

  • trunk/gli/metadata/qdublin.mds

    r8972 r8978  
    1919            name               CDATA #REQUIRED
    2020        namespace          CDATA #REQUIRED
    21         language_dependant CDATA "">
     21        language_dependent CDATA "">
    2222
    2323  <!-- The name of a metadata set. Is language specific. -->
    … …  
    5959            restricted (true|false) "false">
    6060]>
    61 <MetadataSet contact="[email protected]" creator="Dublin Core Metadata Initiative" family="Dublin Core" language_dependant="identifier, definition, comment" lastchanged="Tue Jun 04 10:35:30 2002 - jmt12 on blackbird" namespace="dc">
     61<MetadataSet contact="[email protected]" creator="Dublin Core Metadata Initiative" family="Dublin Core" language_dependent="identifier, definition, comment" lastchanged="Tue Jun 04 10:35:30 2002 - jmt12 on blackbird" namespace="dc">
    6262    <!-- English Version sourced from http://www.dublincore.org/documents/dces/ -->
    6363    <SetLanguage code="en">

  • trunk/gli/metadata/rfc1807.mds

    r8865 r8978  
    1919            name               CDATA #REQUIRED
    2020        namespace          CDATA #REQUIRED
    21         language_dependant CDATA "">
     21        language_dependent CDATA "">
    2222
    2323  <!-- The name of a metadata set. Is language specific. -->

  • trunk/gli/src/org/greenstone/gatherer/gems/ComboArea.java

    r8593 r8978  
    188188        temp = (JLabel) super.getListCellRendererComponent(list, "", index, isSelected, cellHasFocus);
    189189        }
    190                 // Colouring should be the same as the dependant we are based on.
     190                // Colouring should be the same as the dependent we are based on.
    191191        if(isSelected) {
    192192        temp.setBackground(text_area.getSelectionColor());

  • trunk/gli/src/org/greenstone/gatherer/gems/ElementWrapper.java

    r8971 r8978  
    205205    return element;
    206206    }
    207     /** Retrieve the identity of this element (not necessary the same as this elements name). Identity is language and locale dependant.
     207    /** Retrieve the identity of this element (not necessary the same as this elements name). Identity is language and locale dependent.
    208208     * @return The identity as a <strong>String</strong>.
    209209     * @see org.greenstone.gatherer.msm.MSMUtils

  • trunk/gli/src/org/greenstone/gatherer/gems/MSMUtils.java

    r8971 r8978  
    7575    }
    7676
    77     /** Method to add an attribute element to the given element. This method makes use of the language_dependant attribute of the document to not only determine if the attribute is language dependant, but also to see whether a Language element should be created if doesn't already exist.
     77    /** Method to add an attribute element to the given element. This method makes use of the language_dependent attribute of the document to not only determine if the attribute is language dependent, but also to see whether a Language element should be created if doesn't already exist.
    7878     * @param element_element the Element to add the attribute element to
    7979     * @param attribute_name_str the name of the new attribute to add as a String
    8080     * @param language_code_str the two letter code String of the language this attribute is to be added as
    8181     * @param value_str the String to be assigned as the attribute elements value
    82      * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
     82     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
    8383     * @see org.greenstone.gatherer.msm.MSMUtils#setValue(Element, String)
    8484     * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
    … …  
    9696
    9797    // Start off by determining if we have to add this node in the new multilingual optimized way
    98     if(isAttributeLanguageDependant(document, attribute_name_str)) {
     98    if(isAttributeLanguageDependent(document, attribute_name_str)) {
    9999        boolean found = false;
    100100        // Try to retrieve a language element for the given language code
    … …  
    428428     * @param language_code_str the two letter code String indicating the desired language
    429429     * @see org.greenstone.gatherer.msm.MSMUtils#getValue
    430      * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
     430     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
    431431     * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
    432432     * @see org.greenstone.gatherer.util.StaticStrings#CODE_ATTRIBUTE
    … …  
    441441    Document document = element_element.getOwnerDocument();
    442442    // Determine if the attribute is language specific
    443     if(isAttributeLanguageDependant(document, attribute_name_str)) {
     443    if(isAttributeLanguageDependent(document, attribute_name_str)) {
    444444        NodeList language_elements = element_element.getElementsByTagName(StaticStrings.LANGUAGE_ELEMENT);
    445445        for(int i = 0; !found && i < language_elements.getLength(); i++) {
    … …  
    738738     * @param document the Document for which we wish to check the language requirements
    739739     * @param attribute_name_str the name of the attribute we a testing as a String
    740      * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
     740     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDENT_ATTRIBUTE
    741741     * Modified by Matthew Whyte 4/02/05
    742742     */
    743     static private boolean isAttributeLanguageDependant(Document document, String attribute_name_str)
     743    static private boolean isAttributeLanguageDependent(Document document, String attribute_name_str)
    744744    {
    745745    //gives a list of comma seperated language specific attributes.
    746     String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE).toLowerCase();
     746    String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE).toLowerCase();
    747747    //System.err.println("lang_specific: " + language_specific_attributes); //debug
    748748
    … …  
    759759    }
    760760
    761     /** Determine if the given document is a legacy MDS or a new multilingual one. The easiest way to tell is whether there is a language_dependant attribute in the document element.
     761    /** Determine if the given document is a legacy MDS or a new multilingual one. The easiest way to tell is whether there is a language_dependent attribute in the document element.
    762762     * @param document the Document to test
    763763     * @return true if this is an old mds, false otherwise
    764      * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
     764     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDENT_ATTRIBUTE
    765765     * @see org.greenstone.gatherer.util.StaticStrings#EMPTY_STR
    766766     */
    767767    static private boolean isLegacyMDS(Document document) {
    768     ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE));
    769     return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
     768    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE));
     769    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
    770770    }
    771771
    … …  
    809809     * @param value_str the value String which also must match before we remove anything
    810810     * @return true if the desired attribute was successfully found and removed, false otherwise
    811      * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
     811     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
    812812     * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Node)
    813813     * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
    … …  
    820820    //Determine the if this is one of the language specific attributes.
    821821    //This can sometimes give a false result, if an attribute is made language specific half way through creation of a metadata set (or vice versa).
    822     if(isAttributeLanguageDependant(element_element.getOwnerDocument(), attribute_name_str))
     822    if(isAttributeLanguageDependent(element_element.getOwnerDocument(), attribute_name_str))
    823823        {
    824824        /*

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

    r8971 r8978  
    617617    }
    618618
    619     /** This method retrieves the required attribute from the Metadata Set, typically it's name or it's description. Note that this method is language dependant, and moreover supports both legacy metadata sets and the new sets optimized for multiple languages.
     619    /** This method retrieves the required attribute from the Metadata Set, typically it's name or it's description. Note that this method is language dependent, and moreover supports both legacy metadata sets and the new sets optimized for multiple languages.
    620620     * @param element_name the name of the type of element the required information is in as a String
    621621     * @param default_string the value to return if no such element is found also as a String

  • trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

    r8766 r8978  
    142142    static final public String LANGUAGE_DEFAULT_STR                       = "defaultlanguage";
    143143    static final public String LANGUAGE_STR                               = "language";
    144     static final public String LANGUAGEDEPENDANT_ATTRIBUTE                = "language_dependent";
     144    static final public String LANGUAGEDEPENDENT_ATTRIBUTE                = "language_dependent";
    145145    static final public String LANGUAGES_ELEMENT                          = "Languages";
    146146    static final public String LANGUAGES_STR                              = "languages";
Note: See TracChangeset for help on using the changeset viewer.