src/share/classes/sun/awt/datatransfer/TransferableProxy.java

rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr

*** 109,149 ****
      ClassLoaderObjectOutputStream(OutputStream os) throws IOException {
          super(os);
      }
  
      protected void annotateClass(final Class<?> cl) throws IOException {
!         ClassLoader classLoader =
!             (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() {
!                 public Object run() {
                      return cl.getClassLoader();
                  }
              });
  
          Set<String> s = new HashSet<String>(1);
          s.add(cl.getName());
  
          map.put(s, classLoader);
      }
      protected void annotateProxyClass(final Class<?> cl) throws IOException {
!         ClassLoader classLoader =
!             (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() {
!                 public Object run() {
                      return cl.getClassLoader();
                  }
              });
  
!         Class[] interfaces = cl.getInterfaces();
          Set<String> s = new HashSet<String>(interfaces.length);
          for (int i = 0; i < interfaces.length; i++) {
              s.add(interfaces[i].getName());
          }
  
          map.put(s, classLoader);
      }
  
      Map<Set<String>, ClassLoader> getClassLoaderMap() {
!         return new HashMap(map);
      }
  }
  
  final class ClassLoaderObjectInputStream extends ObjectInputStream {
      private final Map<Set<String>, ClassLoader> map;
--- 109,149 ----
      ClassLoaderObjectOutputStream(OutputStream os) throws IOException {
          super(os);
      }
  
      protected void annotateClass(final Class<?> cl) throws IOException {
!         ClassLoader classLoader = AccessController.doPrivileged(
!             new PrivilegedAction<ClassLoader>() {
!                 public ClassLoader run() {
                      return cl.getClassLoader();
                  }
              });
  
          Set<String> s = new HashSet<String>(1);
          s.add(cl.getName());
  
          map.put(s, classLoader);
      }
      protected void annotateProxyClass(final Class<?> cl) throws IOException {
!         ClassLoader classLoader = AccessController.doPrivileged(
!             new PrivilegedAction<ClassLoader>() {
!                 public ClassLoader run() {
                      return cl.getClassLoader();
                  }
              });
  
!         Class<?>[] interfaces = cl.getInterfaces();
          Set<String> s = new HashSet<String>(interfaces.length);
          for (int i = 0; i < interfaces.length; i++) {
              s.add(interfaces[i].getName());
          }
  
          map.put(s, classLoader);
      }
  
      Map<Set<String>, ClassLoader> getClassLoaderMap() {
!         return new HashMap<>(map);
      }
  }
  
  final class ClassLoaderObjectInputStream extends ObjectInputStream {
      private final Map<Set<String>, ClassLoader> map;
*** 189,201 ****
          // The code below is mostly copied from the superclass.
          ClassLoader nonPublicLoader = null;
          boolean hasNonPublicInterface = false;
  
          // define proxy in class loader of non-public interface(s), if any
!         Class[] classObjs = new Class[interfaces.length];
          for (int i = 0; i < interfaces.length; i++) {
!             Class cl = Class.forName(interfaces[i], false, classLoader);
              if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
                  if (hasNonPublicInterface) {
                      if (nonPublicLoader != cl.getClassLoader()) {
                          throw new IllegalAccessError(
                              "conflicting non-public interface class loaders");
--- 189,201 ----
          // The code below is mostly copied from the superclass.
          ClassLoader nonPublicLoader = null;
          boolean hasNonPublicInterface = false;
  
          // define proxy in class loader of non-public interface(s), if any
!         Class<?>[] classObjs = new Class<?>[interfaces.length];
          for (int i = 0; i < interfaces.length; i++) {
!             Class<?> cl = Class.forName(interfaces[i], false, classLoader);
              if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
                  if (hasNonPublicInterface) {
                      if (nonPublicLoader != cl.getClassLoader()) {
                          throw new IllegalAccessError(
                              "conflicting non-public interface class loaders");