src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java

*** 24,46 ****
   */
  
  package com.sun.media.sound;
  
  import java.io.BufferedInputStream;
- import java.io.InputStream;
  import java.io.File;
  import java.io.FileInputStream;
! 
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Properties;
  import java.util.ServiceLoader;
  
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- 
  import javax.sound.sampled.AudioPermission;
  
  /** Managing security in the Java Sound implementation.
   * This class contains all code that uses and is used by
   * SecurityManager.doPrivileged().
--- 24,44 ----
   */
  
  package com.sun.media.sound;
  
  import java.io.BufferedInputStream;
  import java.io.File;
  import java.io.FileInputStream;
! import java.io.InputStream;
! import java.security.AccessController;
! import java.security.PrivilegedAction;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Properties;
  import java.util.ServiceLoader;
  
  import javax.sound.sampled.AudioPermission;
  
  /** Managing security in the Java Sound implementation.
   * This class contains all code that uses and is used by
   * SecurityManager.doPrivileged().
*** 62,72 ****
       */
      private static boolean hasSecurityManager() {
          return (System.getSecurityManager() != null);
      }
  
- 
      static void checkRecordPermission() throws SecurityException {
          if(Printer.trace) Printer.trace("JSSecurityManager.checkRecordPermission()");
          SecurityManager sm = System.getSecurityManager();
          if (sm != null) {
              sm.checkPermission(new AudioPermission("record"));
--- 60,69 ----
*** 88,97 ****
--- 85,95 ----
                                 final String filename) {
          if(hasSecurityManager()) {
              try {
                  // invoke the privileged action using 1.2 security
                  PrivilegedAction<Void> action = new PrivilegedAction<Void>() {
+                         @Override
                          public Void run() {
                              loadPropertiesImpl(properties, filename);
                              return null;
                          }
                      };
*** 106,116 ****
              // not JDK 1.2 security, assume we already have permission
              loadPropertiesImpl(properties, filename);
          }
      }
  
- 
      private static void loadPropertiesImpl(Properties properties,
                                             String filename) {
          if(Printer.trace)Printer.trace(">> JSSecurityManager: loadPropertiesImpl()");
          String fname = System.getProperty("java.home");
          try {
--- 104,113 ----
*** 174,183 ****
--- 171,181 ----
          final Iterator<T> ps = AccessController.doPrivileged(psAction);
  
          // the iterator's hasNext() method looks through classpath for
          // the provider class names, so it requires read permissions
          PrivilegedAction<Boolean> hasNextAction = new PrivilegedAction<Boolean>() {
+             @Override
              public Boolean run() {
                  return ps.hasNext();
              }
          };