Changeset 8978 for trunk/gli/src/org/greenstone/gatherer/gems/MSMUtils.java

Timestamp:

2005-02-08T14:29:02+13:00 (19 years ago)

Author:

mdewsnip

Message:

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

File:

• trunk/gli/src/org/greenstone/gatherer/gems/MSMUtils.java (modified) (8 diffs)

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

@@ -75 +75 @@
     } 
 
-    /** 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.
+    /** 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.
      * @param element_element the Element to add the attribute element to
      * @param attribute_name_str the name of the new attribute to add as a String
      * @param language_code_str the two letter code String of the language this attribute is to be added as
      * @param value_str the String to be assigned as the attribute elements value
-     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
+     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
      * @see org.greenstone.gatherer.msm.MSMUtils#setValue(Element, String)
      * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
@@ -96 +96 @@
 
     // Start off by determining if we have to add this node in the new multilingual optimized way
-    if(isAttributeLanguageDependant(document, attribute_name_str)) {
+    if(isAttributeLanguageDependent(document, attribute_name_str)) {
         boolean found = false;
         // Try to retrieve a language element for the given language code
@@ -428 +428 @@
      * @param language_code_str the two letter code String indicating the desired language
      * @see org.greenstone.gatherer.msm.MSMUtils#getValue
-     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
+     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
      * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
      * @see org.greenstone.gatherer.util.StaticStrings#CODE_ATTRIBUTE
@@ -441 +441 @@
     Document document = element_element.getOwnerDocument();
     // Determine if the attribute is language specific
-    if(isAttributeLanguageDependant(document, attribute_name_str)) {
+    if(isAttributeLanguageDependent(document, attribute_name_str)) {
         NodeList language_elements = element_element.getElementsByTagName(StaticStrings.LANGUAGE_ELEMENT);
         for(int i = 0; !found && i < language_elements.getLength(); i++) {
@@ -738 +738 @@
      * @param document the Document for which we wish to check the language requirements
      * @param attribute_name_str the name of the attribute we a testing as a String
-     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
+     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDENT_ATTRIBUTE
      * Modified by Matthew Whyte 4/02/05
      */
-    static private boolean isAttributeLanguageDependant(Document document, String attribute_name_str)
+    static private boolean isAttributeLanguageDependent(Document document, String attribute_name_str)
     {
     //gives a list of comma seperated language specific attributes.
-    String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE).toLowerCase();
+    String language_specific_attributes = document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE).toLowerCase();
     //System.err.println("lang_specific: " + language_specific_attributes); //debug
 
@@ -759 +759 @@
     }
 
-    /** 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.
+    /** 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.
      * @param document the Document to test
      * @return true if this is an old mds, false otherwise
-     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDANT_ATTRIBUTE
+     * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGEDEPENDENT_ATTRIBUTE
      * @see org.greenstone.gatherer.util.StaticStrings#EMPTY_STR
      */
     static private boolean isLegacyMDS(Document document) {
-    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE));
-    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDANT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
+    ///ystem.err.println("isLegacyMDS(): l_d = " + document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE));
+    return (document.getDocumentElement().getAttribute(StaticStrings.LANGUAGEDEPENDENT_ATTRIBUTE)).equals(StaticStrings.EMPTY_STR);
     }
 
@@ -809 +809 @@
      * @param value_str the value String which also must match before we remove anything
      * @return true if the desired attribute was successfully found and removed, false otherwise
-     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
+     * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependent
      * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Node)
      * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
@@ -820 +820 @@
     //Determine the if this is one of the language specific attributes.
     //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).
-    if(isAttributeLanguageDependant(element_element.getOwnerDocument(), attribute_name_str))
+    if(isAttributeLanguageDependent(element_element.getOwnerDocument(), attribute_name_str))
         {
         /*