Changeset 1519

Timestamp:

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

Author:

Stephen Rankin

Message:

Added show failed nodes feature. ref#236.

Location:

trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate

Files:

• FileLoadingActions.java (modified) (1 diff)
• NXNodeMapper.java (modified) (8 diffs)
• NXReducedToTree.java (modified) (3 diffs)
• NXvalidateFrame.form (modified) (1 diff)
• NXvalidateFrame.java (modified) (1 diff)
• TreeUtils.java (modified) (3 diffs)

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

@@ -211 +211 @@
             //Display reduced file
             Document document = builder.parse(reducedFile);
+            document.setUserData("file", nxsFile, null);
             NXNodeMapper node = new NXNodeMapper(
                     document, true, nxsFile);
             node.setReducedDoc(document);
             this.reducedDoc = document;
+            
             if (nxdlFile != null) {
                 node.setNXDLFile(nxdlFile);

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) {
-
-
-
     }
 

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

@@ -60 +60 @@
     }
 
+    @Override
     public Object getRoot() {
 
@@ -66 +67 @@
     }
 
+    @Override
     public boolean isLeaf(Object aNode) {
-
         // Determines whether the icon shows up to the left.
         // Return true for any node with no children
@@ -79 +80 @@
     }
 
+    @Override
     public int getChildCount(Object parent) {
 

trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXvalidateFrame.form

@@ -86 +86 @@
                   <KeyStroke key="Ctrl+G"/>
                 </Property>
-                <Property name="text" type="java.lang.String" value="Filter Good Values"/>
+                <Property name="text" type="java.lang.String" value="Show Failed Nodes"/>
               </Properties>
               <Events>

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

@@ -263 +263 @@
 
         filterMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_G, java.awt.event.InputEvent.CTRL_MASK));
-        filterMenuItem.setText("Filter Good Values");
+        filterMenuItem.setText("Show Failed Nodes");
         filterMenuItem.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {

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

@@ -21 +21 @@
  * For further information, see <http://www.neutron.anl.gov/NeXus/>
  *
- * TextPaneStyle.java
+ * TreeUtils.java
  *
  */
@@ -27 +27 @@
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Enumeration;
 import javax.swing.JTree;
 import javax.swing.tree.TreePath;
@@ -43 +45 @@
         }
 
+        ArrayList<NXNodeMapper> nodes = new ArrayList<NXNodeMapper>();
+        ArrayList<TreePath> paths = new ArrayList<TreePath>();
         NXNodeMapper baseNode = getBaseNode(tree);
-        NXNodeMapper node = null;
-        
-        int rows = tree.getRowCount();
-
-        for (int i = 0; i < rows; ++i) {
-            node = (NXNodeMapper) tree.getPathForRow(i).getLastPathComponent();
-            System.out.println("Node Name: " + node.toString() + ": " + node.getBadNode());
-        }
+
+        if (baseNode==null) {
+            return;
+        }
+
+        Enumeration children = baseNode.children();
+        NXNodeMapper tmpNode = null;
+
+        NXNodeMapper parent = null;
+        TreePath path = null;
+        ArrayList<NXNodeMapper> tmpPath = null;
+        ArrayList<NXNodeMapper> tmpPath2 = null;
+        nodes.add(baseNode);
+
+        while (children.hasMoreElements()) {
+
+            tmpNode = (NXNodeMapper)children.nextElement();
+            nodes.add(tmpNode);
+            nodes.addAll(getSubNodes(tmpNode));
+
+        }
+
+        for (int i = 0; i < nodes.size(); ++i) {
+           
+           nodes.get(i).checkBadNode();
+           
+           if(nodes.get(i).getBadNode()){
+
+               tmpPath = new ArrayList<NXNodeMapper>();
+               //tmpPath.add(nodes.get(i));
+
+               parent = (NXNodeMapper)nodes.get(i).getParent();
+
+               while(!parent.toString().equals(baseNode.toString()) && parent!=null){
+                   tmpPath.add(parent);
+                   parent = (NXNodeMapper)parent.getParent();
+               }
+               tmpPath.add(baseNode);
+               tmpPath.add((NXNodeMapper)baseNode.getParent());
+               
+               tmpPath2 = new ArrayList<NXNodeMapper>();
+               
+               int number = tmpPath.size() -1;
+               for(int j = 0; j < tmpPath.size();++j){
+                   tmpPath2.add(tmpPath.get(number -j));
+               }
+
+               paths.add(new TreePath(tmpPath2.toArray()));
+               tree.expandPath(new TreePath(tmpPath2.toArray()));
+           }
+        }
+
+    }
+
+    private ArrayList<NXNodeMapper> getSubNodes(NXNodeMapper node){
+
+        ArrayList<NXNodeMapper> nodes = new ArrayList<NXNodeMapper>();
+        NXNodeMapper tmpNode = null;
+
+        Enumeration children = node.children();
+
+        while (children.hasMoreElements()) {
+            
+            tmpNode = (NXNodeMapper)children.nextElement();
+            nodes.add(tmpNode);
+            nodes.addAll(getSubNodes(tmpNode));
+            
+        }
+
+        return nodes;
 
     }