[jboss-cvs] JBossAS SVN: r88182 - branches/Branch_5_x/testsuite/src/main/org/jboss/test/classloader/leak/clstore.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-05-05 00:18:12 -0400 (Tue, 05 May 2009)
New Revision: 88182

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/classloader/leak/clstore/LeakAnalyzer.java
Log:
Generics cleanup

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/classloader/leak/clstore/LeakAnalyzer.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/classloader/leak/clstore/LeakAnalyzer.java	2009-05-05 04:16:43 UTC (rev 88181)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/classloader/leak/clstore/LeakAnalyzer.java	2009-05-05 04:18:12 UTC (rev 88182)
@@ -27,10 +27,10 @@
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -80,7 +80,7 @@
     * Show the reference holders tree of an object. This returns a report you
     * can visualize through MBean.
     */
-   public String exploreObjectReferences(HashMap referencesMap, Object thatObject, int maxLevel, boolean useToString,
+   public String exploreObjectReferences(HashMap<Long, List<ReferenceDataPoint>> referencesMap, Object thatObject, int maxLevel, boolean useToString,
          boolean condensed)
    {
       ReferenceReportNode root = new ReferenceReportNode(callToString(thatObject, useToString));
@@ -92,7 +92,7 @@
 
       try
       {
-         exploreObject(root, thatObject, 0, maxLevel, useToString, false, referencesMap, new HashSet(), prunableLeaves);
+         exploreObject(root, thatObject, 0, maxLevel, useToString, false, referencesMap, new HashSet<String>(), prunableLeaves);
 
          for (Iterator<ReferenceReportNode> it = prunableLeaves.iterator(); it.hasNext();)
          {
@@ -123,7 +123,7 @@
 
    /** Explore references recursively */
    private void exploreObject(ReferenceReportNode node, Object source, int currentLevel, final int maxLevel,
-         boolean useToString, boolean weakAndSoft, Map mapDataPoints, Set alreadyExplored, Set prunableLeaves)
+         boolean useToString, boolean weakAndSoft, Map<Long, List<ReferenceDataPoint>> mapDataPoints, Set<String> alreadyExplored, Set<ReferenceReportNode> prunableLeaves)
    {
       if (maxLevel >= 0 && currentLevel >= maxLevel)
       {
@@ -148,7 +148,7 @@
 
       log.info("resolving references of " + callToString(source, useToString) + "...");
       Long sourceTag = new Long(this.getTagOnObject(source));
-      ArrayList listPoints = (ArrayList) mapDataPoints.get(sourceTag);
+      List<ReferenceDataPoint> listPoints = mapDataPoints.get(sourceTag);
       if (listPoints == null)
       {
          log.info("didn't find references");
@@ -157,10 +157,8 @@
 
       log.info("References found");
 
-      for (Iterator iter = listPoints.iterator(); iter.hasNext();)
-      {
-         ReferenceDataPoint point = (ReferenceDataPoint) iter.next();
-         
+      for (ReferenceDataPoint point : listPoints)
+      {         
          ReferenceReportNode child = new ReferenceReportNode();
          
          Object nextReference = treatReference(child, point, useToString);
@@ -185,6 +183,7 @@
                   {
                      // WeakHashMap$Entry is suspicious. 
                      // Put in some more info about the entry
+                     @SuppressWarnings("unchecked")
                      Map.Entry entry = (Entry) nextReference;
                      Object key = entry.getKey();
                      msg += " KEY=" + (key == null ? " null" : key.getClass().getName() + "@" + System.identityHashCode(key));
@@ -199,7 +198,7 @@
                else if (msg.indexOf("java.lang.ThreadLocal$ThreadLocalMap$Entry") >= 0)
                {
                   // Get the key and follow that to see why it isn't released
-                  nextReference = ((Reference) nextReference).get();
+                  nextReference = ((Reference<?>) nextReference).get();
                }
                // else just keep going
                
@@ -326,7 +325,7 @@
             }
             else
             {
-               Class clazz = referenceHolder.getClass();
+               Class<?> clazz = referenceHolder.getClass();
                Field field = this.getObjectField(clazz, (int) point.getIndex());
                if (field == null)
                {
@@ -401,7 +400,8 @@
                                                             // at zero. See
                                                             // GetClassFields.
          {
-            Class clazz = (Class) referenceHolder;
+            @SuppressWarnings("unchecked")
+            Class<?> clazz = (Class) referenceHolder;
             Field field = this.getObjectField(clazz, (int) point.getIndex());
             String fieldName = null;
             if (field == null)
@@ -432,7 +432,7 @@
             break;
          case JVMTICallBack.THREAD_REFERENCE :
 
-            Class methodClass = this.getMethodClass(point.getMethod());
+            Class<?> methodClass = this.getMethodClass(point.getMethod());
             if (methodClass != null)
             {
                String className = null;