replace obsolete Hashtable class

Author: thurka

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileCache.java

@@ -29,8 +29,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
@@ -56,7 +57,7 @@ public class ClassFileCache {
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
     private ClassPath classPath; // Used to quickly obtain an open JAR file for a given name
-    private Hashtable vmSuppliedClassCache;
+    private Map vmSuppliedClassCache;
     private byte[][] classFileBytes;
     private String[] classNameAndLocation;
     private long[] lastTimeUsed;
@@ -78,7 +79,7 @@ public class ClassFileCache {
         classFileBytes = new byte[capacity][];
         lastTimeUsed = new long[capacity];
 
-        vmSuppliedClassCache = new Hashtable();
+        vmSuppliedClassCache = new HashMap();
         preloadNames = new ArrayList();
         preloadLoaderIds = new ArrayList();
     }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCCTClassContainer.java

@@ -26,8 +26,9 @@
 package org.graalvm.visualvm.lib.jfluid.results.cpu;
 
 import org.graalvm.visualvm.lib.jfluid.utils.IntVector;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 
 /**
@@ -127,7 +128,7 @@ protected int generateClassNodeFromMethodNodes(IntVector methodNodes, int dataOf
         // Now add all the children of methodNodes that have the same class, to thisNode, and collect the rest of the
         // children of methodNodes into sourceChildren vector.
         IntVector sourceChildren = new IntVector();
-        Hashtable uniqChildrenCache = new Hashtable();
+        Set uniqChildrenCache = new HashSet();
 
         for (int i = 0; i < nMethodNodes; i++) {
             int methodNodeOfs = methodNodes.get(i);
@@ -174,12 +175,12 @@ protected int generateClassNodeFromMethodNodes(IntVector methodNodes, int dataOf
                                                                                                                          .get(i)));
         }
 
-        Enumeration e = uniqChildrenCache.elements();
+        Iterator e = uniqChildrenCache.iterator();
 
-        for (int i = 0; e.hasMoreElements(); i++) {
+        for (int i = 0; e.hasNext(); i++) {
             sameTypeChildren.clear();
 
-            int sourceChildClassOrPackageId = ((Integer) e.nextElement()).intValue();
+            int sourceChildClassOrPackageId = ((Integer) e.next()).intValue();
 
             for (int j = 0; j < nAllChildren; j++) {
                 if (sourceChildrenClassIds[j] == sourceChildClassOrPackageId) {
@@ -221,7 +222,7 @@ protected int generateClassNodeFromMethodNodes(IntVector methodNodes, int dataOf
      * 3. All other source children are added to allSourceChildren, but not to uniqChildCache.
      */
     protected void processChildren(int dataOfs, int methodNodeOfs, int nChildren, IntVector allSourceChildren,
-                                   Hashtable uniqChildCache) {
+                                   Set uniqChildCache) {
         int thisNodeClassOrPackageId = getMethodIdForNodeOfs(dataOfs);
 
         int nCalls = 0;
@@ -250,10 +251,7 @@ protected void processChildren(int dataOfs, int methodNodeOfs, int nChildren, In
 
                 Integer key = Integer.valueOf(sourceChildClassOrPackageId);
 
-                if (!uniqChildCache.containsKey(key)) {
-                    uniqChildCache.put(key, key);
-                }
-
+                uniqChildCache.add(key);
                 allSourceChildren.add(sourceChildOfs);
             }
         }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/threads/ThreadsDataManager.java

@@ -25,10 +25,11 @@
 
 package org.graalvm.visualvm.lib.jfluid.results.threads;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.graalvm.visualvm.lib.jfluid.client.MonitoredData;
 import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
 import org.graalvm.visualvm.lib.jfluid.results.DataManager;
-import java.util.Hashtable;
 
 
 /**
@@ -45,7 +46,7 @@
 public class ThreadsDataManager extends DataManager {
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
-    private Hashtable idToIndex = new Hashtable(30);
+    private Map idToIndex = new HashMap(30);
     private ThreadData[] threadData; // Per-thread array of points at which thread's state changes
     private boolean supportsSleepingState = true;
     private boolean threadsMonitoringEnabled = true;