src/com/sun/javatest/tool/ManagerLoader.java

rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg

@@ -45,20 +45,20 @@
 import com.sun.javatest.util.I18NResourceBundle;
 import com.sun.javatest.util.StringArray;
 
 class ManagerLoader
 {
-    ManagerLoader(Class managerClass, PrintStream log) {
+    ManagerLoader(Class<?> managerClass, PrintStream log) {
         setManagerClass(managerClass);
         setLog(log);
     }
 
-    void setManagerClass(Class managerClass) {
+    void setManagerClass(Class<?> managerClass) {
         this.managerClass = managerClass;
     }
 
-    void setManagerConstructorArgs(Class[] argTypes, Object[] args) {
+    void setManagerConstructorArgs(Class<?>[] argTypes, Object[] args) {
         constrArgTypes = argTypes;
         constrArgs = args;
     }
 
     void setLog(PrintStream log) {

@@ -67,16 +67,16 @@
 
     Set<Object> loadManagers(String resourceName)
         throws IOException
     {
 
-        Enumeration e = ResourceLoader.getResources(resourceName, getClass());
+        Enumeration<URL> e = ResourceLoader.getResources(resourceName, getClass());
         Set<Object> mgrs = new HashSet<>();
         URLClassLoader altLoader = null;
 
         while (e.hasMoreElements()) {
-            URL entry = (URL)(e.nextElement());
+            URL entry = e.nextElement();
             try {
                 BufferedReader in = new BufferedReader(new InputStreamReader(entry.openStream()));
                 String line;
                 while ((line = in.readLine()) != null) {
                     line = line.trim();

@@ -154,11 +154,11 @@
         if (cl == null) {
             return null;
         }
 
         try {
-            Class c = Class.forName(className, true, cl);
+            Class<?> c = Class.forName(className, true, cl);
             Object mgr = newInstance(c);
             if (managerClass.isInstance(mgr)) {
                 return mgr;
             } else {
                 if (log != null) {

@@ -178,11 +178,11 @@
         if (constrArgTypes == null || constrArgTypes.length == 0) {
             return c.newInstance();
         }
 
         try {
-            Constructor constr = c.getConstructor(constrArgTypes);
+            Constructor<?> constr = c.getConstructor(constrArgTypes);
             return constr.newInstance(constrArgs);
         }
         catch (InvocationTargetException e) {
             Throwable t = e.getTargetException();
             if (t instanceof RuntimeException) {

@@ -239,12 +239,12 @@
     private void writeI18N(String key, Object[] args) {
         log.println(i18n.getString(key, args));
     }
 
     private Class<?> managerClass;
-    private Constructor constr;
-    private Class[] constrArgTypes;
+    private Constructor<?> constr;
+    private Class<?>[] constrArgTypes;
     private Object[] constrArgs;
     private PrintStream log;
 
     private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(ManagerLoader.class);
 }