[Mc4j-cvs] mc4j/src/org/mc4j/console/connection/install/finder FileSystemModel.java,1.4,1.5

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/install/finder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8927/src/org/mc4j/console/connection/install/finder

Modified Files:
	FileSystemModel.java 
Log Message:
Some images, dashboard component tweaks and dashboard updates

Index: FileSystemModel.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/install/finder/FileSystemModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileSystemModel.java	12 Apr 2006 19:13:58 -0000	1.4
--- FileSystemModel.java	17 Apr 2006 12:01:27 -0000	1.5
***************
*** 21,32 ****
  
  import javax.swing.event.TreeModelListener;
  import javax.swing.tree.TreeModel;
  import javax.swing.tree.TreePath;
  import java.io.File;
  import java.io.FileFilter;
  import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Map;
! import java.util.Vector;
  
  /**
--- 21,37 ----
  
  import javax.swing.event.TreeModelListener;
+ import javax.swing.event.TreeModelEvent;
  import javax.swing.tree.TreeModel;
  import javax.swing.tree.TreePath;
  import java.io.File;
  import java.io.FileFilter;
+ import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.HashMap;
+ import java.util.List;
  import java.util.Map;
! import java.util.concurrent.Callable;
! import java.util.concurrent.ExecutorService;
! import java.util.concurrent.Executors;
  
  /**
***************
*** 34,38 ****
   * @version $Revision$($Author$ / $Date$)
   */
!  public class FileSystemModel implements TreeModel {
  
      Map checked = new HashMap();
--- 39,43 ----
   * @version $Revision$($Author$ / $Date$)
   */
! public class FileSystemModel implements TreeModel {
  
      Map checked = new HashMap();
***************
*** 40,48 ****
      File root = new File("file://");
  
!     Vector treeModelListeners = new Vector();
  
      private static DirectoryFilter filter = new DirectoryFilter();
      private static ServerInstallFinder finder = new ServerInstallFinder();
  
  
  
--- 45,54 ----
      File root = new File("file://");
  
!     List<TreeModelListener> treeModelListeners = new ArrayList<TreeModelListener>();
  
      private static DirectoryFilter filter = new DirectoryFilter();
      private static ServerInstallFinder finder = new ServerInstallFinder();
  
+     private ExecutorService service = Executors.newSingleThreadExecutor();
  
  
***************
*** 53,71 ****
          return root;
      }
      /**
       * Adds a listener for the TreeModelEvent posted after the tree changes.
       */
      public void addTreeModelListener(TreeModelListener l) {
!         treeModelListeners.addElement(l);
      }
  
  
      /**
!     * Removes a listener previously added with addTreeModelListener().
!     */
      public void removeTreeModelListener(TreeModelListener l) {
!         treeModelListeners.removeElement(l);
      }
  
  
      public boolean isLeaf(Object node) {
--- 59,83 ----
          return root;
      }
+ 
      /**
       * Adds a listener for the TreeModelEvent posted after the tree changes.
       */
      public void addTreeModelListener(TreeModelListener l) {
!         treeModelListeners.add(l);
      }
  
  
      /**
!      * Removes a listener previously added with addTreeModelListener().
!      */
      public void removeTreeModelListener(TreeModelListener l) {
!         treeModelListeners.remove(l);
      }
  
+     public void fireTreeChange() {
+         for (TreeModelListener listener : treeModelListeners) {
+             listener.treeNodesChanged(new TreeModelEvent(this, new Object[] { root }));
+         }
+     }
  
      public boolean isLeaf(Object node) {
***************
*** 79,84 ****
      public int getIndexOfChild(Object parent, Object child) {
          int j = getChildCount(parent);
!         for (int i =0; i < j;i++) {
!             if (child.equals(getChild(parent,i)))
                  return i;
          }
--- 91,96 ----
      public int getIndexOfChild(Object parent, Object child) {
          int j = getChildCount(parent);
!         for (int i = 0; i < j; i++) {
!             if (child.equals(getChild(parent, i)))
                  return i;
          }
***************
*** 87,94 ****
  
      public ConnectionTypeDescriptor getServerInfo(File f) {
          return finder.getServerTypePath(f);
      }
  
!     public ServerInstallVersion getFileInfo(File f) {
          ServerInstallVersion info = (ServerInstallVersion) checked.get(f);
  
--- 99,107 ----
  
      public ConnectionTypeDescriptor getServerInfo(File f) {
+ 
          return finder.getServerTypePath(f);
      }
  
!     public ServerInstallVersion getFileInfo(final File f) {
          ServerInstallVersion info = (ServerInstallVersion) checked.get(f);
  
***************
*** 96,115 ****
              return info;
  
!         ConnectionTypeDescriptor type = finder.getServerTypePath(f);
!         if (type != null) {
!             File recognitionFile = finder.getRecognitionFile(f);
!             String version = type.getServerVersion(recognitionFile);
!             if (version == null) {
!                 version = "unknown";
              }
!             info = new ServerInstallVersion(type.getConnectionType() /*getDisplayName()*/,version);
!         }
!         checked.put(f, info);
          return info;
      }
  
  
- 
- 
      public Object getChild(Object node, int index) {
          File parent = (File) node;
--- 109,134 ----
              return info;
  
!         service.submit(new Callable<Object>() {
!             public Object call() throws Exception {
!                 ServerInstallVersion info = null;
!                 ConnectionTypeDescriptor type = finder.getServerTypePath(f);
!                 if (type != null) {
!                     File recognitionFile = finder.getRecognitionFile(f);
!                     String version = type.getServerVersion(recognitionFile);
!                     if (version == null) {
!                         version = "unknown";
!                     }
!                     info = new ServerInstallVersion(type.getConnectionType() /*getDisplayName()*/, version);
!                 }
!                 checked.put(f, info);
!                 fireTreeChange();
!                 return null;
              }
!         });
! 
          return info;
      }
  
  
      public Object getChild(Object node, int index) {
          File parent = (File) node;