Changeset 1514 for trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXReducedToTree.java

Timestamp:

20/08/10 09:37:05 (21 months ago)

Author:

Stephen Rankin

Message:

Reverted back to using older version of NXReducedToTree as the new version would not work (Java bug?). Fixed a few bugs. ref#236.

File:

• trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXReducedToTree.java (modified) (9 diffs)

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

@@ -1 @@
- /* NeXus - Neutron & X-ray Common Data Format
-  *
-  * NeXus file validation GUI tool.
-  *
-  * Copyright (C) 2010 Stephen Rankin
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-  * License as published by the Free Software Foundation; either
-  * version 2 of the License, or (at your option) any later version.
-  *
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  *
-  * For further information, see <http://www.neutron.anl.gov/NeXus/>
-  *
-  * NXReducedToTree.java
-  *
-  */
+/* NeXus - Neutron & X-ray Common Data Format
+ *
+ * NeXus file validation GUI tool.
+ *
+ * Copyright (C) 2010 Stephen Rankin
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For further information, see <http://www.neutron.anl.gov/NeXus/>
+ *
+ * NXReducedToTree.java
+ *
+ */
 package org.nexusformat.nxvalidate;
 
-import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Vector;
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
@@ -33 +34 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
+import org.nexusformat.nxvalidate.exceptions.NXvalidateException;
+import org.w3c.dom.Document;
+
 
 /**
@@ -41 +45 @@
 public class NXReducedToTree extends DefaultTreeModel {
 
-    private ArrayList<TreeModelListener> listenerList =
-            new ArrayList<TreeModelListener>();
+    private Vector listenerList = new Vector();
     private NXNodeMapper root = null;
-    
+
     public NXReducedToTree(TreeNode root) {
         super(root);
-        this.root = (NXNodeMapper)root;
+        this.root = (NXNodeMapper) root;
     }
 
@@ -53 +56 @@
 
         TreeModelEvent evt = new TreeModelEvent(this,
-                                              new Object[] {root});
+                new Object[]{root});
         fireTreeStructureChanged(evt);
     }
 
-    @Override
     public Object getRoot() {
 
         return root;
-        
+
     }
 
-    @Override
     public boolean isLeaf(Object aNode) {
 
@@ -78 +79 @@
     }
 
-    @Override
     public int getChildCount(Object parent) {
 
         NXNodeMapper node = (NXNodeMapper) parent;
         return node.getChildCount();
-        
+
     }
 
@@ -91 +91 @@
         NXNodeMapper node = (NXNodeMapper) parent;
         return node.getChildAt(index);
-        
+
     }
 
@@ -104 +104 @@
     @Override
     public void valueForPathChanged(TreePath path, Object newValue) {
-       
-
     }
 
@@ -112 +110 @@
 
         if ((listener != null) && !listenerList.contains(listener)) {
-            listenerList.add(listener);
+            listenerList.addElement(listener);
         }
 
@@ -121 +119 @@
 
         if (listener != null) {
-            listenerList.remove(listener);
+            listenerList.removeElement(listener);
         }
 
     }
 
-    public void fireTreeNodesChanged(TreeModelEvent ev) {
-        events(ev);
-    }
+    public void fireTreeNodesChanged(TreeModelEvent e) {
 
-    public void fireTreeNodesInserted(TreeModelEvent ev) {
-        events(ev);
-    }
+        Enumeration listeners = listenerList.elements();
 
-    public void fireTreeNodesRemoved(TreeModelEvent ev) {
-        events(ev);
-    }
+        while (listeners.hasMoreElements()) {
+            TreeModelListener listener =
+                    (TreeModelListener) listeners.nextElement();
+            listener.treeNodesChanged(e);
+        }
 
-    public void fireTreeStructureChanged(TreeModelEvent ev) {
-        events(ev);
-    }
-
-    private void events(TreeModelEvent ev){
-
-        for(int i = 0; i<listenerList.size(); ++i) {
-            TreeModelListener listener =
-                    (TreeModelListener) listenerList.get(i);
-            listener.treeNodesChanged(ev);
-        }
 
     }
 
+    public void fireTreeNodesInserted(TreeModelEvent e) {
+
+        Enumeration listeners = listenerList.elements();
+
+        while (listeners.hasMoreElements()) {
+            TreeModelListener listener =
+                    (TreeModelListener) listeners.nextElement();
+            listener.treeNodesInserted(e);
+        }
+
+
+    }
+
+    public void fireTreeNodesRemoved(TreeModelEvent e) {
+
+        Enumeration listeners = listenerList.elements();
+
+        while (listeners.hasMoreElements()) {
+            TreeModelListener listener =
+                    (TreeModelListener) listeners.nextElement();
+            listener.treeNodesRemoved(e);
+        }
+
+
+    }
+
+    public void fireTreeStructureChanged(TreeModelEvent e) {
+
+        Enumeration listeners = listenerList.elements();
+
+        while (listeners.hasMoreElements()) {
+            TreeModelListener listener =
+                    (TreeModelListener) listeners.nextElement();
+            listener.treeStructureChanged(e);
+        }
+
+
+    }
 }