Skip to content

Commit c85226f

Browse files
author
vromero
committed
8152785: Remove javac -XDnoModules
Reviewed-by: jjg
1 parent a7923b1 commit c85226f

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public class Modules extends JCTree.Visitor {
128128
private final boolean allowModules;
129129

130130
public final boolean multiModuleMode;
131-
public final boolean noModules;
132131

133132
private final String moduleOverride;
134133

@@ -167,10 +166,6 @@ protected Modules(Context context) {
167166

168167
moduleOverride = options.get(Option.XMODULE);
169168

170-
// The following is required, for now, to support building
171-
// Swing beaninfo via javadoc.
172-
noModules = options.isSet("noModules");
173-
174169
multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH);
175170
ClassWriter classWriter = ClassWriter.instance(context);
176171
classWriter.multiModuleMode = multiModuleMode;
@@ -194,7 +189,7 @@ private void dprintln(String msg) {
194189
}
195190

196191
public boolean enter(List<JCCompilationUnit> trees, ClassSymbol c) {
197-
if (!allowModules || noModules) {
192+
if (!allowModules) {
198193
for (JCCompilationUnit tree: trees) {
199194
tree.modle = syms.noModule;
200195
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ public RootDocImpl getRootDocImpl(String doclocale,
188188
syms.unnamedModule.complete(); // TEMP to force reading all named modules
189189

190190
// Build up the complete list of any packages to be documented
191-
Location location =
192-
modules.multiModuleMode && !modules.noModules ? StandardLocation.MODULE_SOURCE_PATH
191+
Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH
193192
: docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) ? StandardLocation.SOURCE_PATH
194193
: StandardLocation.CLASS_PATH;
195194

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public DocletEnvironment getEnvironment(String encoding,
192192
syms.unnamedModule.complete(); // TEMP to force reading all named modules
193193

194194
// Build up the complete list of any packages to be documented
195-
Location location =
196-
modules.multiModuleMode && !modules.noModules ? StandardLocation.MODULE_SOURCE_PATH
195+
Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH
197196
: docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) ? StandardLocation.SOURCE_PATH
198197
: StandardLocation.CLASS_PATH;
199198

0 commit comments

Comments
 (0)