Changeset 1519 for trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXNodeMapper.java

Timestamp:

24/08/10 12:02:11 (21 months ago)

Author:

Stephen Rankin

Message:

Added show failed nodes feature. ref#236.

File:

• trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXNodeMapper.java (modified) (8 diffs)

trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXNodeMapper.java

@@ -378 +378 @@
             return root;
 
-        } else {
-            return new NXNodeMapper(domNode.getParentNode(), false,
-                    domNode.getNodeName());
-        }
+        } else if(domNode.getParentNode()!=null ){
+
+            if(domNode.getParentNode().getNodeType() == domNode.DOCUMENT_NODE){
+
+                Document doc = (Document)domNode.getParentNode();
+
+                return new NXNodeMapper(domNode.getParentNode(), true,
+                    ((File)doc.getUserData("file")).getAbsolutePath());
+
+            } else{
+
+                return new NXNodeMapper(domNode.getParentNode(), false,
+                    domNode.getParentNode().getNodeName());
+            }
+        }else{
+                return null;
+        }
+        
     }
 
@@ -455 +469 @@
     }
 
-    public ArrayList<NXNodeMapper> getOpenNodes(){
+    public ArrayList<NXNodeMapper> getOpenNodes() {
         return documents;
     }
 
-    public void removeAllNodes(){
+    public void removeAllNodes() {
         documents.clear();
     }
@@ -470 +484 @@
 
         public boolean hasMoreElements() {
+            
             if (count < children.size()) {
                 more = true;
@@ -477 +492 @@
 
             return more;
-
         }
 
         public Object nextElement() {
-            count++;
-
-            if (children.size() < count) {
+            
+            if (count < children.size()) {
                 node = children.get(count);
-                return node;
+                count++;
+                return new NXNodeMapper(node, false, node.getNodeName());
             } else {
                 throw new NoSuchElementException();
@@ -499 +513 @@
         if (isRoot) {
             documents.add(index, childNode);
-        } else{
+        } else {
             NodeList list = domNode.getChildNodes();
 
             for (int i = 0; i < list.getLength(); ++i) {
-                if(i == index){
+                if (i == index) {
                     domNode.insertBefore(childNode.domNode, list.item(i));
                 }
@@ -515 +529 @@
             documents.remove(index);
 
-        } else{
+        } else {
 
             NodeList list = domNode.getChildNodes();
 
             for (int i = 0; i < list.getLength(); ++i) {
-                if(i == index){
+                if (i == index) {
                     domNode.removeChild(list.item(index));
                 }
@@ -534 +548 @@
         if (isRoot) {
             documents.remove((NXNodeMapper) node);
-        }else{
+        } else {
             NodeList list = domNode.getChildNodes();
 
             for (int i = 0; i < list.getLength(); ++i) {
-                if(list.item(i).isSameNode(childNode.domNode)){
+                if (list.item(i).isSameNode(childNode.domNode)) {
                     domNode.removeChild(childNode.domNode);
                 }
@@ -547 +561 @@
     public void removeFromParent() {
         if (isRoot) {
-           return;
-        } else{
-           NXNodeMapper parentNode = (NXNodeMapper)getParent();
-           parentNode.remove(this);
+            return;
+        } else {
+            NXNodeMapper parentNode = (NXNodeMapper) getParent();
+            parentNode.remove(this);
         }
     }
 
     public void setParent(MutableTreeNode newParent) {
-
-
-
     }