src/com/sun/javatest/util/PathClassLoader.java

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

@@ -90,11 +90,11 @@
      * @param name The fully-qualified name of the class to load.
      * @param resolve True if imports should be resolved, false otherwise.
      * @return the class that was loaded
      * @throws ClassNotFoundException if the class was not found.
      */
-    protected Class loadClass(String name, boolean resolve)
+    protected Class<?> loadClass(String name, boolean resolve)
         throws ClassNotFoundException {
 
             Class<?> cl = classes.get(name);
 
             if (cl == null) {

@@ -111,11 +111,11 @@
 
             return cl;
     }
 
 
-    private synchronized Class locateClass(String name)
+    private synchronized Class<?> locateClass(String name)
         throws ClassNotFoundException {
         //System.err.println("locateClass: " + name);
         Class<?> c = classes.get(name);
         if (c != null)
             return c;

@@ -133,11 +133,11 @@
         }
 
         throw new ClassNotFoundException(name);
     }
 
-    private Class locateClassInDir(String name, File dir)
+    private Class<?> locateClassInDir(String name, File dir)
         throws ClassNotFoundException {
         //System.err.println("locateClassInDir: " + name + " " + dir);
         String cname = name.replace('.', '/') + ".class";
         try {
             File file = new File(dir, cname);

@@ -147,11 +147,11 @@
             //System.err.println("locateClassInDir: " + e);
             return null;
         }
     }
 
-    private Class locateClassInJar(String name, File jarFile)
+    private Class<?> locateClassInJar(String name, File jarFile)
         throws ClassNotFoundException {
         //System.err.println("locateClassInJar: " + name + " " + jarFile);
         String cname = name.replace('.', '/') + ".class";
         try {
             ZipFile z = zips.get(jarFile);

@@ -168,11 +168,11 @@
             //System.err.println("locateClassInJar: " + e);
             return null;
         }
     }
 
-    private Class readClass(String name, InputStream in, int size) throws IOException {
+    private Class<?> readClass(String name, InputStream in, int size) throws IOException {
         byte[] data = new byte[size];
         try {
             for (int total = 0; total < size; ) {
                 total += in.read(data, total, size - total);
             }