langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Thu Apr 06 17:01:05 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Fri Apr 07 08:08:26 2017 +0000
@@ -183,7 +183,7 @@
}
/**
- * Wrapper class for java.lang.reflect.Module. To materialize a handle use the static factory
+ * Wrapper class for java.lang.Module. To materialize a handle use the static factory
* methods Module#getModule(Class<?>) or Module#getUnnamedModule(ClassLoader).
*/
public static class Module {
@@ -236,9 +236,9 @@
}
// -----------------------------------------------------------------------------------------
- // on java.lang.reflect.Module
+ // on java.lang.Module
private static Method addExportsMethod = null;
- // on java.lang.reflect.Module
+ // on java.lang.Module
private static Method addUsesMethod = null;
// on java.lang.Class
private static Method getModuleMethod;
@@ -248,7 +248,7 @@
private static void init() {
if (addExportsMethod == null) {
try {
- Class<?> moduleClass = Class.forName("java.lang.reflect.Module", false, null);
+ Class<?> moduleClass = Class.forName("java.lang.Module", false, null);
addUsesMethod = moduleClass.getDeclaredMethod("addUses", new Class<?>[] { Class.class });
addExportsMethod = moduleClass.getDeclaredMethod("addExports",
new Class<?>[] { String.class, moduleClass });
@@ -318,7 +318,7 @@
}
/**
- * Wrapper class for java.lang.module.Layer.
+ * Wrapper class for java.lang.ModuleLayer.
*/
public static final class Layer {
private final Object theRealLayer;
@@ -372,7 +372,7 @@
private static void init() {
if (layerClass == null) {
try {
- layerClass = Class.forName("java.lang.reflect.Layer", false, null);
+ layerClass = Class.forName("java.lang.ModuleLayer", false, null);
bootMethod = layerClass.getDeclaredMethod("boot");
defineModulesWithOneLoaderMethod = layerClass.getDeclaredMethod("defineModulesWithOneLoader",
Configuration.getConfigurationClass(),