OpenJDK / jdk / hs
changeset 38619:27c0007bb28d
8152785: Remove javac -XDnoModules
Reviewed-by: jjg
| author | vromero |
|---|---|
| date | Fri, 27 May 2016 19:45:57 -0400 |
| parents | f14423456446 |
| children | c95c5bc94fad |
| files | langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java |
| diffstat | 3 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Fri May 27 14:45:20 2016 -0700 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Fri May 27 19:45:57 2016 -0400 @@ -128,7 +128,6 @@ private final boolean allowModules; public final boolean multiModuleMode; - public final boolean noModules; private final String moduleOverride; @@ -167,10 +166,6 @@ moduleOverride = options.get(Option.XMODULE); - // The following is required, for now, to support building - // Swing beaninfo via javadoc. - noModules = options.isSet("noModules"); - multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH); ClassWriter classWriter = ClassWriter.instance(context); classWriter.multiModuleMode = multiModuleMode; @@ -194,7 +189,7 @@ } public boolean enter(List<JCCompilationUnit> trees, ClassSymbol c) { - if (!allowModules || noModules) { + if (!allowModules) { for (JCCompilationUnit tree: trees) { tree.modle = syms.noModule; }
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java Fri May 27 14:45:20 2016 -0700 +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java Fri May 27 19:45:57 2016 -0400 @@ -188,8 +188,7 @@ syms.unnamedModule.complete(); // TEMP to force reading all named modules // Build up the complete list of any packages to be documented - Location location = - modules.multiModuleMode && !modules.noModules ? StandardLocation.MODULE_SOURCE_PATH + Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH : docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java Fri May 27 14:45:20 2016 -0700 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java Fri May 27 19:45:57 2016 -0400 @@ -192,8 +192,7 @@ syms.unnamedModule.complete(); // TEMP to force reading all named modules // Build up the complete list of any packages to be documented - Location location = - modules.multiModuleMode && !modules.noModules ? StandardLocation.MODULE_SOURCE_PATH + Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH : docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;