diff -r 8369cde9152a -r 53535e4e1b08 langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java Tue Oct 21 13:08:20 2014 -0700 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java Tue Oct 21 17:50:13 2014 -0700 @@ -31,7 +31,6 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.Writer; -import java.nio.file.NoSuchFileException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -51,6 +50,7 @@ import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; + import javax.lang.model.SourceVersion; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; @@ -62,6 +62,7 @@ import javax.lang.model.util.ElementFilter; import javax.lang.model.util.SimpleTypeVisitor9; import javax.lang.model.util.Types; + import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaCompiler; @@ -71,15 +72,13 @@ import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import javax.tools.ToolProvider; +import static javax.tools.Diagnostic.Kind.*; import com.sun.tools.javac.code.Symbol.CompletionFailure; import com.sun.tools.javac.main.CommandLine; import com.sun.tools.javac.util.DefinedBy; import com.sun.tools.javac.util.DefinedBy.Api; -import static javax.tools.Diagnostic.Kind.*; - - /** * Javah generates support files for native methods. * Parse commandline options and invokes javadoc to execute those commands. @@ -421,7 +420,7 @@ List l = new ArrayList<>(); for (String arg: args) l.add(arg); return Arrays.asList(CommandLine.parse(l.toArray(new String[l.size()]))); - } catch (FileNotFoundException | NoSuchFileException e) { + } catch (FileNotFoundException e) { throw new BadArgs("at.args.file.not.found", e.getLocalizedMessage()); } catch (IOException e) { throw new BadArgs("at.args.io.exception", e.getLocalizedMessage());