equal
deleted
inserted
replaced
25 * @test |
25 * @test |
26 * @bug 6729471 |
26 * @bug 6729471 |
27 * @summary javap does not output inner interfaces of an interface |
27 * @summary javap does not output inner interfaces of an interface |
28 * @library /tools/lib |
28 * @library /tools/lib |
29 * @modules jdk.compiler/com.sun.tools.javac.api |
29 * @modules jdk.compiler/com.sun.tools.javac.api |
30 * jdk.compiler/com.sun.tools.javac.file |
|
31 * jdk.compiler/com.sun.tools.javac.main |
30 * jdk.compiler/com.sun.tools.javac.main |
32 * jdk.jdeps/com.sun.tools.javap |
31 * jdk.jdeps/com.sun.tools.javap |
33 * @build ToolBox |
32 * @build toolbox.ToolBox toolbox.JarTask |
34 * @run main T6729471 |
33 * @run main T6729471 |
35 */ |
34 */ |
36 |
35 |
37 import java.io.*; |
36 import java.io.*; |
38 import java.net.*; |
37 import java.net.*; |
39 import java.util.*; |
38 import java.util.*; |
40 import javax.tools.*; |
39 import javax.tools.*; |
|
40 |
|
41 import toolbox.JarTask; |
|
42 import toolbox.ToolBox; |
41 |
43 |
42 public class T6729471 |
44 public class T6729471 |
43 { |
45 { |
44 public static void main(String... args) throws IOException { |
46 public static void main(String... args) throws IOException { |
45 new T6729471().run(); |
47 new T6729471().run(); |
80 File createJar(String name, String... paths) throws IOException { |
82 File createJar(String name, String... paths) throws IOException { |
81 JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); |
83 JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); |
82 try (JavaFileManager fm = comp.getStandardFileManager(null, null, null)) { |
84 try (JavaFileManager fm = comp.getStandardFileManager(null, null, null)) { |
83 File f = new File(name); |
85 File f = new File(name); |
84 ToolBox tb = new ToolBox(); |
86 ToolBox tb = new ToolBox(); |
85 tb.new JarTask(f.getPath()) |
87 new JarTask(tb, f.getPath()) |
86 .files(fm, StandardLocation.PLATFORM_CLASS_PATH, paths) |
88 .files(fm, StandardLocation.PLATFORM_CLASS_PATH, paths) |
87 .run(); |
89 .run(); |
88 return f; |
90 return f; |
89 } |
91 } |
90 } |
92 } |