stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8152785: Remove javac -XDnoModules

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2016-05-27 19:45:57 -04:00
parent 1da9340c23
commit 58de940c2f
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
View File

@ -128,7 +128,6 @@ public class Modules extends JCTree.Visitor {
private final boolean allowModules;
public final boolean multiModuleMode;
public final boolean noModules;
private final String moduleOverride;
@ -167,10 +166,6 @@ public class Modules extends JCTree.Visitor {
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 class Modules extends JCTree.Visitor {
}
public boolean enter(List<JCCompilationUnit> trees, ClassSymbol c) {
if (!allowModules || noModules) {
if (!allowModules) {
for (JCCompilationUnit tree: trees) {
tree.modle = syms.noModule;
}

3
langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java
View File

@ -188,8 +188,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
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;

3
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
View File

@ -192,8 +192,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
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;