Changeset 4502

Timestamp:

2003-06-06T15:41:35+12:00 (21 years ago)

Author:

kjdon

Message:

ElementWrapper now stores the namespace that its element had when it was created. this is passed to MSMUtils getFullName and getFullIdentifier to be used if the element has no parent

File:

• trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java (modified) (6 diffs)

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

@@ -64 +64 @@
     private Element element = null;
     /** A string prefix identifying the metadata set namespace. */
-    private String namespace = null;
+    private String namespace = "";
     /** Constructor for elements with no namespace necessary.
      * @param element The DOM <strong>Element</strong> this is to be based on.
@@ -70 +70 @@
     public ElementWrapper(Element element) {
     this.element = element;
+    Element parent =  (Element)element.getParentNode();
+    if (parent != null) {
+        this.namespace = parent.getAttribute("namespace");
+    }
+    
     }
     /** Constructor.
       * @param element The DOM <strong>Element</strong> this is to be based on.
+
       * @param namespace_required <i>true</i> if this element wrapper should always attempt to show a namespace prefix (retrieving it from the DOM if necessary).
       * @deprecated
       */
-    public ElementWrapper(Element element, boolean namespace_required) {
-    this(element);
-    }
+    //  public ElementWrapper(Element element, boolean namespace_required) {
+    //this(element);
+    //  }
 
     public void addAttribute(String name, String value) {
@@ -113 +119 @@
     public boolean equals(Object object) {
     if(object instanceof ElementWrapper) {
-        String our_full_name = MSMUtils.getFullName(element);
+        String our_full_name = MSMUtils.getFullName(element, namespace);
         String their_full_name = MSMUtils.getFullName(((ElementWrapper)object).getElement());
         return our_full_name.equals(their_full_name);
@@ -144 +150 @@
       */
     public String getName() {
-    return MSMUtils.getFullName(element);
+    return MSMUtils.getFullName(element, namespace);
     }
     /** Retrieve the namespace prefix for this element wrapper.
@@ -151 +157 @@
       */
     public String getNamespace() {
+    if (!namespace.equals("")) {
+        return namespace;
+    }
     String name = getName();
     int pos;
@@ -218 +227 @@
     }
     public String toString() {
-    return MSMUtils.getFullIdentifier(element);
+    return MSMUtils.getFullIdentifier(element, namespace);
     }
 }