Changeset 4467

Timestamp:

2003-06-03T17:19:41+12:00 (21 years ago)

Author:

mdewsnip

Message:

Changed removeAttribute method so it takes the language of the attribute as a parameter.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java

@@ -187 +187 @@
     }
 
-    public void removeAttribute(String name, String value) {
-    Element attributes[] = MSMUtils.getAttributeNodesNamed(element, name);
-    // For each of the attribute nodes which match the requested name...
-    for(int i = 0; attributes != null && i < attributes.length; i++) {
-                // Retrieve the value for this node...
-        String current = MSMUtils.getValue(attributes[i]);
-                // And if it matches our removal value, remove the attribute node.
-        if(current.equals(value)) {
-        element.removeChild(attributes[i]);
-        current = null;
-        attributes = null;
-        return;
+
+    /** Removes an Attribute node from the element. */
+    public boolean removeAttribute(String name, String language, String value)
+    {
+    // Find the attribute to remove
+    for (Node n = element.getFirstChild(); n != null; n = n.getNextSibling()) {
+        if (n.getNodeName().equals("Attribute")) {
+        Element e = (Element) n;
+        if (e.getAttribute("name").equals(name) &&
+            e.getAttribute("language").equalsIgnoreCase(language) &&
+            MSMUtils.getValue(e).equals(value)) {
+            // Match found, so remove the attribute node and return
+            element.removeChild(n);
+            return true;
+        }
         }
-        current = null;
-    }
-    // If we get this far then theres no match. Boo-hoo.
-    attributes = null;
-    }
+    }
+
+    // No match found
+    return false;
+    }
+
+
     /** Set the value of the namespace required flag.
       * @param namespace_required The new value as a <i>boolean</i>.