src/com/sun/javatest/exec/TestTreeModel.java

*** 72,84 ****
  
      TestTreeModel(Parameters p, FilterSelectionHandler filterHandler, UIFactory uif) {
          this.filterHandler = filterHandler;
          this.uif = uif;
  
!         cache = new Hashtable();
!         cacheQueue = new LinkedList();
!         suspendedQueue = new LinkedList();
  
          cacheWorker = new CacheWorker();
          cacheWorker.setPriority(Thread.MIN_PRIORITY + 1);
          cacheWorker.start();
  
--- 72,84 ----
  
      TestTreeModel(Parameters p, FilterSelectionHandler filterHandler, UIFactory uif) {
          this.filterHandler = filterHandler;
          this.uif = uif;
  
!         cache = new Hashtable<>();
!         cacheQueue = new LinkedList<>();
!         suspendedQueue = new LinkedList<>();
  
          cacheWorker = new CacheWorker();
          cacheWorker.setPriority(Thread.MIN_PRIORITY + 1);
          cacheWorker.start();
  
*** 497,507 ****
  
      TreePath resolveUrl(String path) {
          if (path == null || path.length() == 0 || root == null) {
              return null;
          }
!         ArrayList<TT_TreeNode> al = new ArrayList();
          al.add(root);
          TT_BasicNode spot = root;
  
          StringBuffer sb = new StringBuffer(path);
  
--- 497,507 ----
  
      TreePath resolveUrl(String path) {
          if (path == null || path.length() == 0 || root == null) {
              return null;
          }
!         ArrayList<TT_TreeNode> al = new ArrayList<>();
          al.add(root);
          TT_BasicNode spot = root;
  
          StringBuffer sb = new StringBuffer(path);
  
*** 648,658 ****
  
          return result;
      }
  
      TreePath[] urlsToPaths(String[] urls) {
!         ArrayList<TreePath> result = new ArrayList();
  
          for (int i = 0; i < urls.length; i++) {
              TreePath thisOne = urlToPath(urls[i]);
              if (thisOne == null)
                  continue;   // skipped for some reason
--- 648,658 ----
  
          return result;
      }
  
      TreePath[] urlsToPaths(String[] urls) {
!         ArrayList<TreePath> result = new ArrayList<>();
  
          for (int i = 0; i < urls.length; i++) {
              TreePath thisOne = urlToPath(urls[i]);
              if (thisOne == null)
                  continue;   // skipped for some reason
*** 815,826 ****
  
          root = new TT_BasicNode(null, (TRT_TreeNode) (trt.getRoot()),
                  (trt.getTestFinder() == null ? null : trt.getTestFinder().getComparator()));
  
          // prime relevant nodes with root and first level
!         relevantNodes = Collections.synchronizedSet(new HashSet());
!         relevantTests = Collections.synchronizedSet(new HashSet());
  
          addRelevantNode((TT_TreeNode) getRoot());
          TT_BasicNode tn = ((TT_BasicNode) getRoot());
          for (int i = 0; i < ((TT_BasicNode) getRoot()).getChildCount(); i++) {
              addRelevantNode((TT_TreeNode) (tn.getChildAt(i)));
--- 815,826 ----
  
          root = new TT_BasicNode(null, (TRT_TreeNode) (trt.getRoot()),
                  (trt.getTestFinder() == null ? null : trt.getTestFinder().getComparator()));
  
          // prime relevant nodes with root and first level
!         relevantNodes = Collections.synchronizedSet(new HashSet<TT_TreeNode>());
!         relevantTests = Collections.synchronizedSet(new HashSet<TestResult>());
  
          addRelevantNode((TT_TreeNode) getRoot());
          TT_BasicNode tn = ((TT_BasicNode) getRoot());
          for (int i = 0; i < ((TT_BasicNode) getRoot()).getChildCount(); i++) {
              addRelevantNode((TT_TreeNode) (tn.getChildAt(i)));
*** 1000,1012 ****
              Enumeration e = cache.keys();
              while (e.hasMoreElements()) {
                  (cache.get(e.nextElement())).invalidate();
              }   // while
  
!             cache = new Hashtable();
!             cacheQueue = new LinkedList();
!             suspendedQueue = new LinkedList();
          }
  
          // reprocess any needed nodes
          Iterator it = relevantNodes.iterator();
          while (it.hasNext()) {
--- 1000,1012 ----
              Enumeration e = cache.keys();
              while (e.hasMoreElements()) {
                  (cache.get(e.nextElement())).invalidate();
              }   // while
  
!             cache = new Hashtable<>();
!             cacheQueue = new LinkedList<>();
!             suspendedQueue = new LinkedList<>();
          }
  
          // reprocess any needed nodes
          Iterator it = relevantNodes.iterator();
          while (it.hasNext()) {