--- a/langtools/make/tools/crules/MutableFieldsAnalyzer.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/make/tools/crules/MutableFieldsAnalyzer.java Thu Aug 11 17:02:00 2016 +0000
@@ -107,6 +107,8 @@
"layerClass", "bootMethod", "defineModulesWithOneLoaderMethod", "configurationMethod");
ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$ServiceLoaderHelper",
"loadMethod");
+ ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$VMHelper",
+ "vmClass", "getRuntimeArgumentsMethod");
ignoreFields("com.sun.tools.javac.util.ModuleHelper",
"addExportsMethod", "getUnnamedModuleMethod", "getModuleMethod");
}
--- a/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@
* use the tool's default method for reporting diagnostics
*
* @param docletClass a class providing the necessary methods required
- * of a doclet
+ * of a doclet; a value of {@code null} means to use the standard doclet.
*
* @param options documentation tool options and doclet options,
* {@code null} means no options
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java Thu Aug 11 17:02:00 2016 +0000
@@ -179,10 +179,10 @@
args.init("javac", options, classes, compilationUnits);
// init multi-release jar handling
- if (fileManager.isSupportedOption(Option.MULTIRELEASE.text) == 1) {
+ if (fileManager.isSupportedOption(Option.MULTIRELEASE.primaryName) == 1) {
Target target = Target.instance(context);
List<String> list = List.of(target.multiReleaseValue());
- fileManager.handleOption(Option.MULTIRELEASE.text, list.iterator());
+ fileManager.handleOption(Option.MULTIRELEASE.primaryName, list.iterator());
}
return new JavacTaskImpl(context);
@@ -212,8 +212,9 @@
public int isSupportedOption(String option) {
Set<Option> recognizedOptions = Option.getJavacToolOptions();
for (Option o : recognizedOptions) {
- if (o.matches(option))
+ if (o.matches(option)) {
return o.hasArg() ? 1 : 0;
+ }
}
return -1;
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Thu Aug 11 17:02:00 2016 +0000
@@ -51,6 +51,7 @@
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javac.jvm.Profile;
+import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.platform.PlatformDescription;
import com.sun.tools.javac.util.*;
@@ -59,8 +60,6 @@
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.Kind.*;
-import static com.sun.tools.javac.main.Option.*;
-
import com.sun.tools.javac.util.Dependencies.CompletionCause;
/**
@@ -200,10 +199,10 @@
annotate = Annotate.instance(context);
Options options = Options.instance(context);
- verbose = options.isSet(VERBOSE);
+ verbose = options.isSet(Option.VERBOSE);
cacheCompletionFailure = options.isUnset("dev");
preferSource = "source".equals(options.get("-Xprefer"));
- userPathsFirst = options.isSet(XXUSERPATHSFIRST);
+ userPathsFirst = options.isSet(Option.XXUSERPATHSFIRST);
allowSigFiles = context.get(PlatformDescription.class) != null;
completionFailureName =
@@ -211,7 +210,7 @@
? names.fromString(options.get("failcomplete"))
: null;
- moduleOverride = options.isSet(XMODULE) ? names.fromString(options.get(XMODULE))
+ moduleOverride = options.isSet(Option.XMODULE) ? names.fromString(options.get(Option.XMODULE))
: null;
// Temporary, until more info is available from the module system.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Thu Aug 11 17:02:00 2016 +0000
@@ -3184,11 +3184,13 @@
}
public void visitAssignop(final JCAssignOp tree) {
- JCTree lhsAccess = access(TreeInfo.skipParens(tree.lhs));
final boolean boxingReq = !tree.lhs.type.isPrimitive() &&
tree.operator.type.getReturnType().isPrimitive();
- if (boxingReq || lhsAccess.hasTag(APPLY)) {
+ AssignopDependencyScanner depScanner = new AssignopDependencyScanner(tree);
+ depScanner.scan(tree.rhs);
+
+ if (boxingReq || depScanner.dependencyFound) {
// boxing required; need to rewrite as x = (unbox typeof x)(x op y);
// or if x == (typeof x)z then z = (unbox typeof x)((typeof x)z op y)
// (but without recomputing x)
@@ -3238,6 +3240,41 @@
}
}
+ class AssignopDependencyScanner extends TreeScanner {
+
+ Symbol sym;
+ boolean dependencyFound = false;
+
+ AssignopDependencyScanner(JCAssignOp tree) {
+ this.sym = TreeInfo.symbol(tree.lhs);
+ }
+
+ @Override
+ public void scan(JCTree tree) {
+ if (tree != null && sym != null) {
+ tree.accept(this);
+ }
+ }
+
+ @Override
+ public void visitAssignop(JCAssignOp tree) {
+ if (TreeInfo.symbol(tree.lhs) == sym) {
+ dependencyFound = true;
+ return;
+ }
+ super.visitAssignop(tree);
+ }
+
+ @Override
+ public void visitUnary(JCUnary tree) {
+ if (TreeInfo.symbol(tree.arg) == sym) {
+ dependencyFound = true;
+ return;
+ }
+ super.visitUnary(tree);
+ }
+ }
+
/** Lower a tree of the form e++ or e-- where e is an object type */
JCExpression lowerBoxedPostop(final JCUnary tree) {
// translate to tmp1=lval(e); tmp2=tmp1; tmp1 OP 1; tmp2
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Thu Aug 11 17:02:00 2016 +0000
@@ -147,7 +147,9 @@
private final String addReadsOpt;
private Map<ModuleSymbol, Set<RequiresDirective>> addReads;
private final String addModsOpt;
+ private final Set<String> extraAddMods = new HashSet<>();
private final String limitModsOpt;
+ private final Set<String> extraLimitMods = new HashSet<>();
private Set<ModuleSymbol> rootModules = null;
@@ -182,10 +184,10 @@
java_se = names.fromString("java.se");
java_ = names.fromString("java.");
- addExportsOpt = options.get(Option.XADDEXPORTS);
- addReadsOpt = options.get(Option.XADDREADS);
- addModsOpt = options.get(Option.ADDMODS);
- limitModsOpt = options.get(Option.LIMITMODS);
+ addExportsOpt = options.get(Option.ADD_EXPORTS);
+ addReadsOpt = options.get(Option.ADD_READS);
+ addModsOpt = options.get(Option.ADD_MODULES);
+ limitModsOpt = options.get(Option.LIMIT_MODULES);
}
int depth = -1;
@@ -195,8 +197,16 @@
System.err.println(msg);
}
+ public void addExtraAddModules(String... extras) {
+ extraAddMods.addAll(Arrays.asList(extras));
+ }
+
+ public void addExtraLimitModules(String... extras) {
+ extraLimitMods.addAll(Arrays.asList(extras));
+ }
+
boolean inInitModules;
- public void initModules(List<JCCompilationUnit> trees, Collection<String> extraAddMods, Collection<String> extraLimitMods) {
+ public void initModules(List<JCCompilationUnit> trees) {
Assert.check(!inInitModules);
try {
inInitModules = true;
@@ -205,7 +215,7 @@
Assert.checkNull(rootModules);
Assert.checkNull(allModules);
this.rootModules = modules;
- setupAllModules(extraAddMods, extraLimitMods); //initialize the module graph
+ setupAllModules(); //initialize the module graph
Assert.checkNonNull(allModules);
inInitModules = false;
}, null);
@@ -862,7 +872,7 @@
return allModules;
}
- private void setupAllModules(Collection<String> extraAddMods, Collection<String> extraLimitMods) {
+ private void setupAllModules() {
Assert.checkNonNull(rootModules);
Assert.checkNull(allModules);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java Thu Aug 11 17:02:00 2016 +0000
@@ -232,7 +232,7 @@
OptionHelper helper = new GrumpyHelper(log) {
@Override
public String get(Option option) {
- return options.get(option.getText());
+ return options.get(option);
}
@Override
@@ -251,23 +251,15 @@
}
};
- for (Option o: javacFileManagerOptions) {
- if (o.matches(current)) {
- if (o.hasArg()) {
- if (remaining.hasNext()) {
- if (!o.process(helper, current, remaining.next()))
- return true;
- }
- } else {
- if (!o.process(helper, current))
- return true;
- }
- // operand missing, or process returned true
- throw new IllegalArgumentException(current);
- }
+ Option o = Option.lookup(current, javacFileManagerOptions);
+ if (o == null) {
+ return false;
}
- return false;
+ if (!o.handleOption(helper, current, remaining))
+ throw new IllegalArgumentException(current);
+
+ return true;
}
// where
private static final Set<Option> javacFileManagerOptions =
@@ -275,11 +267,8 @@
@Override @DefinedBy(Api.COMPILER)
public int isSupportedOption(String option) {
- for (Option o : javacFileManagerOptions) {
- if (o.matches(option))
- return o.hasArg() ? 1 : 0;
- }
- return -1;
+ Option o = Option.lookup(option, javacFileManagerOptions);
+ return (o == null) ? -1 : o.hasArg() ? 1 : 0;
}
protected String multiReleaseValue;
@@ -316,7 +305,7 @@
try {
ok = ok & handleOption(e.getKey(), e.getValue());
} catch (IllegalArgumentException ex) {
- log.error(Errors.IllegalArgumentForOption(e.getKey().getText(), ex.getMessage()));
+ log.error(Errors.IllegalArgumentForOption(e.getKey().getPrimaryName(), ex.getMessage()));
ok = false;
}
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Thu Aug 11 17:02:00 2016 +0000
@@ -84,7 +84,7 @@
import static javax.tools.StandardLocation.PLATFORM_CLASS_PATH;
-import static com.sun.tools.javac.main.Option.BOOTCLASSPATH;
+import static com.sun.tools.javac.main.Option.BOOT_CLASS_PATH;
import static com.sun.tools.javac.main.Option.DJAVA_ENDORSED_DIRS;
import static com.sun.tools.javac.main.Option.DJAVA_EXT_DIRS;
import static com.sun.tools.javac.main.Option.ENDORSEDDIRS;
@@ -580,8 +580,7 @@
private class ClassPathLocationHandler extends SimpleLocationHandler {
ClassPathLocationHandler() {
- super(StandardLocation.CLASS_PATH,
- Option.CLASSPATH, Option.CP);
+ super(StandardLocation.CLASS_PATH, Option.CLASS_PATH);
}
@Override
@@ -649,7 +648,7 @@
BootClassPathLocationHandler() {
super(StandardLocation.PLATFORM_CLASS_PATH,
- Option.BOOTCLASSPATH, Option.XBOOTCLASSPATH,
+ Option.BOOT_CLASS_PATH, Option.XBOOTCLASSPATH,
Option.XBOOTCLASSPATH_PREPEND,
Option.XBOOTCLASSPATH_APPEND,
Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
@@ -669,7 +668,7 @@
option = canonicalize(option);
optionValues.put(option, value);
- if (option == BOOTCLASSPATH) {
+ if (option == BOOT_CLASS_PATH) {
optionValues.remove(XBOOTCLASSPATH_PREPEND);
optionValues.remove(XBOOTCLASSPATH_APPEND);
}
@@ -682,7 +681,7 @@
private Option canonicalize(Option option) {
switch (option) {
case XBOOTCLASSPATH:
- return Option.BOOTCLASSPATH;
+ return Option.BOOT_CLASS_PATH;
case DJAVA_ENDORSED_DIRS:
return Option.ENDORSEDDIRS;
case DJAVA_EXT_DIRS:
@@ -713,7 +712,7 @@
SearchPath computePath() throws IOException {
SearchPath path = new SearchPath();
- String bootclasspathOpt = optionValues.get(BOOTCLASSPATH);
+ String bootclasspathOpt = optionValues.get(BOOT_CLASS_PATH);
String endorseddirsOpt = optionValues.get(ENDORSEDDIRS);
String extdirsOpt = optionValues.get(EXTDIRS);
String xbootclasspathPrependOpt = optionValues.get(XBOOTCLASSPATH_PREPEND);
@@ -773,14 +772,14 @@
private Collection<Path> systemClasses() throws IOException {
// Return "modules" jimage file if available
if (Files.isRegularFile(thisSystemModules)) {
- return addAdditionalBootEntries(Collections.singleton(thisSystemModules));
+ return Collections.singleton(thisSystemModules);
}
// Exploded module image
Path modules = javaHome.resolve("modules");
if (Files.isDirectory(modules.resolve("java.base"))) {
try (Stream<Path> listedModules = Files.list(modules)) {
- return addAdditionalBootEntries(listedModules.collect(Collectors.toList()));
+ return listedModules.collect(Collectors.toList());
}
}
@@ -788,26 +787,6 @@
return null;
}
- //ensure bootclasspath prepends/appends are reflected in the systemClasses
- private Collection<Path> addAdditionalBootEntries(Collection<Path> modules) throws IOException {
- String files = System.getProperty("sun.boot.class.path");
- if (files == null)
- return modules;
-
- Set<Path> paths = new LinkedHashSet<>();
-
- // The JVM no longer supports -Xbootclasspath/p:, so any interesting
- // entries should be appended to the set of modules.
-
- paths.addAll(modules);
-
- for (String s : files.split(Pattern.quote(File.pathSeparator))) {
- paths.add(getPath(s));
- }
-
- return paths;
- }
-
private void lazy() {
if (searchPath == null) {
try {
@@ -1161,7 +1140,7 @@
ModuleSourcePathLocationHandler() {
super(StandardLocation.MODULE_SOURCE_PATH,
- Option.MODULESOURCEPATH);
+ Option.MODULE_SOURCE_PATH);
}
@Override
@@ -1493,16 +1472,16 @@
BasicLocationHandler[] handlers = {
new BootClassPathLocationHandler(),
new ClassPathLocationHandler(),
- new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCEPATH),
- new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSORPATH),
- new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, Option.PROCESSORMODULEPATH),
+ new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCE_PATH),
+ new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSOR_PATH),
+ new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, Option.PROCESSOR_MODULE_PATH),
new OutputLocationHandler(StandardLocation.CLASS_OUTPUT, Option.D),
new OutputLocationHandler(StandardLocation.SOURCE_OUTPUT, Option.S),
new OutputLocationHandler(StandardLocation.NATIVE_HEADER_OUTPUT, Option.H),
new ModuleSourcePathLocationHandler(),
// TODO: should UPGRADE_MODULE_PATH be merged with SYSTEM_MODULES?
- new ModulePathLocationHandler(StandardLocation.UPGRADE_MODULE_PATH, Option.UPGRADEMODULEPATH),
- new ModulePathLocationHandler(StandardLocation.MODULE_PATH, Option.MODULEPATH, Option.MP),
+ new ModulePathLocationHandler(StandardLocation.UPGRADE_MODULE_PATH, Option.UPGRADE_MODULE_PATH),
+ new ModulePathLocationHandler(StandardLocation.MODULE_PATH, Option.MODULE_PATH),
new SystemModulesLocationHandler(),
};
@@ -1518,29 +1497,42 @@
boolean handleOption(Option option, String value) {
switch (option) {
- case XPATCH:
- Map<String, SearchPath> map = new LinkedHashMap<>();
- int eq = value.indexOf('=');
- if (eq > 0) {
- String mName = value.substring(0, eq);
- SearchPath mPatchPath = new SearchPath()
- .addFiles(value.substring(eq + 1));
- boolean ok = true;
- for (Path p: mPatchPath) {
- Path mi = p.resolve("module-info.class");
- if (Files.exists(mi)) {
- log.error(Errors.LocnModuleInfoNotAllowedOnPatchPath(mi));
- ok = false;
+ case PATCH_MODULE:
+ if (value == null) {
+ patchMap = null;
+ } else {
+ // Allow an extended syntax for --patch-module consisting of a series
+ // of values separated by NULL characters. This is to facilitate
+ // supporting deferred file manager options on the command line.
+ // See Option.PATCH_MODULE for the code that composes these multiple
+ // values.
+ for (String v : value.split("\0")) {
+ int eq = v.indexOf('=');
+ if (eq > 0) {
+ String mName = v.substring(0, eq);
+ SearchPath mPatchPath = new SearchPath()
+ .addFiles(v.substring(eq + 1));
+ boolean ok = true;
+ for (Path p : mPatchPath) {
+ Path mi = p.resolve("module-info.class");
+ if (Files.exists(mi)) {
+ log.error(Errors.LocnModuleInfoNotAllowedOnPatchPath(mi));
+ ok = false;
+ }
+ }
+ if (ok) {
+ if (patchMap == null) {
+ patchMap = new LinkedHashMap<>();
+ }
+ patchMap.put(mName, mPatchPath);
+ }
+ } else {
+ // Should not be able to get here;
+ // this should be caught and handled in Option.PATCH_MODULE
+ log.error(Errors.LocnInvalidArgForXpatch(value));
}
}
- if (ok && !mPatchPath.isEmpty()) {
- map.computeIfAbsent(mName, (_x) -> new SearchPath())
- .addAll(mPatchPath);
- }
- } else {
- log.error(Errors.LocnInvalidArgForXpatch(value));
}
- patchMap = map;
return true;
default:
LocationHandler h = handlersForOption.get(option);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Aug 11 17:02:00 2016 +0000
@@ -55,6 +55,7 @@
import com.sun.tools.javac.file.PathFileObject;
import com.sun.tools.javac.jvm.ClassFile.NameAndType;
import com.sun.tools.javac.jvm.ClassFile.Version;
+import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -67,7 +68,7 @@
import static com.sun.tools.javac.jvm.ClassFile.*;
import static com.sun.tools.javac.jvm.ClassFile.Version.*;
-import static com.sun.tools.javac.main.Option.*;
+import static com.sun.tools.javac.main.Option.PARAMETERS;
/** This class provides operations to read a classfile into an internal
* representation. The internal representation is anchored in a
@@ -236,7 +237,7 @@
log = Log.instance(context);
Options options = Options.instance(context);
- verbose = options.isSet(VERBOSE);
+ verbose = options.isSet(Option.VERBOSE);
Source source = Source.instance(context);
allowSimplifiedVarargs = source.allowSimplifiedVarargs();
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java Thu Aug 11 17:02:00 2016 +0000
@@ -63,6 +63,7 @@
import com.sun.tools.javac.resources.CompilerProperties.Errors;
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
@@ -143,7 +144,7 @@
@Override
public boolean handleFileManagerOption(Option option, String value) {
- options.put(option.getText(), value);
+ options.put(option, value);
deferredFileManagerOptions.put(option, value);
return true;
}
@@ -164,6 +165,11 @@
}
@Override
+ public void error(JCDiagnostic.Error error) {
+ Arguments.this.error(error);
+ }
+
+ @Override
public void addFile(Path p) {
files.add(p);
}
@@ -193,12 +199,15 @@
fileObjects = null;
classNames = new LinkedHashSet<>();
processArgs(List.from(args), Option.getJavaCompilerOptions(), cmdLineHelper, true, false);
+ if (errors) {
+ log.printLines(PrefixKind.JAVAC, "msg.usage", ownName);
+ }
}
private final OptionHelper apiHelper = new GrumpyHelper(null) {
@Override
public String get(Option option) {
- return options.get(option.getText());
+ return options.get(option);
}
@Override
@@ -297,8 +306,8 @@
String platformString = options.get(Option.RELEASE);
checkOptionAllowed(platformString == null,
- option -> error("err.release.bootclasspath.conflict", option.getText()),
- Option.BOOTCLASSPATH, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
+ option -> error("err.release.bootclasspath.conflict", option.getPrimaryName()),
+ Option.BOOT_CLASS_PATH, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
Option.XBOOTCLASSPATH_PREPEND,
Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
Option.EXTDIRS, Option.DJAVA_EXT_DIRS,
@@ -360,39 +369,29 @@
}
Option option = null;
+
+ // first, check the provided set of javac options
if (arg.startsWith("-")) {
- for (Option o : allowableOpts) {
- if (o.matches(arg)) {
- option = o;
- break;
- }
- }
+ option = Option.lookup(arg, allowableOpts);
} else if (allowOperands && Option.SOURCEFILE.matches(arg)) {
option = Option.SOURCEFILE;
}
- if (option == null) {
- if (fm != null && fm.handleOption(arg, argIter)) {
- continue;
+ if (option != null) {
+ if (!option.handleOption(helper, arg, argIter)) {
+ return false;
}
- error("err.invalid.flag", arg);
- return false;
+ continue;
}
- if (option.hasArg()) {
- if (!argIter.hasNext()) {
- error("err.req.arg", arg);
- return false;
- }
- String operand = argIter.next();
- if (option.process(helper, arg, operand)) {
- return false;
- }
- } else {
- if (option.process(helper, arg)) {
- return false;
- }
+ // check file manager option
+ if (fm != null && fm.handleOption(arg, argIter)) {
+ continue;
}
+
+ // none of the above
+ error("err.invalid.flag", arg);
+ return false;
}
return true;
@@ -407,13 +406,13 @@
*/
public boolean validate() {
JavaFileManager fm = getFileManager();
- if (options.isSet(Option.M)) {
+ if (options.isSet(Option.MODULE)) {
if (!fm.hasLocation(StandardLocation.CLASS_OUTPUT)) {
log.error(Errors.OutputDirMustBeSpecifiedWithDashMOption);
} else if (!fm.hasLocation(StandardLocation.MODULE_SOURCE_PATH)) {
log.error(Errors.ModulesourcepathMustBeSpecifiedWithDashMOption);
} else {
- java.util.List<String> modules = Arrays.asList(options.get(Option.M).split(","));
+ java.util.List<String> modules = Arrays.asList(options.get(Option.MODULE).split(","));
try {
for (String module : modules) {
Location sourceLoc = fm.getModuleLocation(StandardLocation.MODULE_SOURCE_PATH, module);
@@ -449,17 +448,20 @@
|| options.isSet(Option.X)
|| options.isSet(Option.VERSION)
|| options.isSet(Option.FULLVERSION)
- || options.isSet(Option.M))
+ || options.isSet(Option.MODULE))
return true;
if (emptyAllowed)
return true;
- if (JavaCompiler.explicitAnnotationProcessingRequested(options)) {
- error("err.no.source.files.classes");
- } else {
- error("err.no.source.files");
+ if (!errors) {
+ if (JavaCompiler.explicitAnnotationProcessingRequested(options)) {
+ error("err.no.source.files.classes");
+ } else {
+ error("err.no.source.files");
+ }
}
+
return false;
}
@@ -542,12 +544,12 @@
// This check is only effective in command line mode,
// where the file manager options are added to options
- if (options.get(Option.BOOTCLASSPATH) != null) {
+ if (options.get(Option.BOOT_CLASS_PATH) != null) {
error("err.profile.bootclasspath.conflict");
}
}
- if (options.isSet(Option.SOURCEPATH) && options.isSet(Option.MODULESOURCEPATH)) {
+ if (options.isSet(Option.SOURCE_PATH) && options.isSet(Option.MODULE_SOURCE_PATH)) {
error("err.sourcepath.modulesourcepath.conflict");
}
@@ -578,17 +580,17 @@
final Target t = target;
checkOptionAllowed(t.compareTo(Target.JDK1_8) <= 0,
- option -> error("err.option.not.allowed.with.target", option.getText(), t.name),
- Option.BOOTCLASSPATH,
+ option -> error("err.option.not.allowed.with.target", option.getPrimaryName(), t.name),
+ Option.BOOT_CLASS_PATH,
Option.XBOOTCLASSPATH_PREPEND, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
Option.EXTDIRS, Option.DJAVA_EXT_DIRS);
checkOptionAllowed(t.compareTo(Target.JDK1_9) >= 0,
- option -> error("err.option.not.allowed.with.target", option.getText(), t.name),
- Option.MODULESOURCEPATH, Option.UPGRADEMODULEPATH,
- Option.SYSTEM, Option.MODULEPATH, Option.ADDMODS, Option.LIMITMODS,
- Option.XPATCH);
+ option -> error("err.option.not.allowed.with.target", option.getPrimaryName(), t.name),
+ Option.MODULE_SOURCE_PATH, Option.UPGRADE_MODULE_PATH,
+ Option.SYSTEM, Option.MODULE_PATH, Option.ADD_MODULES, Option.LIMIT_MODULES,
+ Option.PATCH_MODULE);
if (fm.hasLocation(StandardLocation.MODULE_SOURCE_PATH)) {
if (!options.isSet(Option.PROC, "only")
@@ -608,7 +610,7 @@
if (obsoleteOptionFound)
log.warning(LintCategory.OPTIONS, "option.obsolete.suppression");
- String addExports = options.get(Option.XADDEXPORTS);
+ String addExports = options.get(Option.ADD_EXPORTS);
if (addExports != null) {
// Each entry must be of the form module/package=target-list where target-list is a
// comma-separated list of module or ALL-UNNAMED.
@@ -636,7 +638,7 @@
});
}
- String addReads = options.get(Option.XADDREADS);
+ String addReads = options.get(Option.ADD_READS);
if (addReads != null) {
// Each entry must be of the form module=source-list where source-list is a
// comma separated list of module or ALL-UNNAMED.
@@ -724,7 +726,7 @@
for (String s: xdoclintCustom.split("\\s+")) {
if (s.isEmpty())
continue;
- doclintOpts.add(s.replace(Option.XDOCLINT_CUSTOM.text, DocLint.XMSGS_CUSTOM_PREFIX));
+ doclintOpts.add(DocLint.XMSGS_CUSTOM_PREFIX + s);
}
}
@@ -735,14 +737,13 @@
if (checkPackages != null) {
for (String s : checkPackages.split("\\s+")) {
- doclintOpts.add(s.replace(Option.XDOCLINT_PACKAGE.text, DocLint.XCHECK_PACKAGE));
+ doclintOpts.add(DocLint.XCHECK_PACKAGE + s);
}
}
// standard doclet normally generates H1, H2,
// so for now, allow user comments to assume that
doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2");
-
return List.from(doclintOpts.toArray(new String[doclintOpts.size()]));
}
@@ -771,6 +772,22 @@
}
}
+ void error(JCDiagnostic.Error error) {
+ errors = true;
+ switch (errorMode) {
+ case ILLEGAL_ARGUMENT: {
+ String msg = log.localize(error);
+ throw new PropagatedException(new IllegalArgumentException(msg));
+ }
+ case ILLEGAL_STATE: {
+ String msg = log.localize(error);
+ throw new PropagatedException(new IllegalStateException(msg));
+ }
+ case LOG:
+ report(error);
+ }
+ }
+
void error(String key, Object... args) {
errors = true;
switch (errorMode) {
@@ -784,7 +801,6 @@
}
case LOG:
report(key, args);
- log.printLines(PrefixKind.JAVAC, "msg.usage", ownName);
}
}
@@ -797,6 +813,11 @@
log.printRawLines(ownName + ": " + log.localize(PrefixKind.JAVAC, key, args));
}
+ private void report(JCDiagnostic.Error error) {
+ // Would be good to have support for -XDrawDiagnostics here
+ log.printRawLines(ownName + ": " + log.localize(error));
+ }
+
private JavaFileManager getFileManager() {
if (fileManager == null)
fileManager = context.get(JavaFileManager.class);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Aug 11 17:02:00 2016 +0000
@@ -892,14 +892,21 @@
// forcibly set the equivalent of -Xlint:-options, so that no further
// warnings about command line options are generated from this point on
- options.put(XLINT_CUSTOM.text + "-" + LintCategory.OPTIONS.option, "true");
- options.remove(XLINT_CUSTOM.text + LintCategory.OPTIONS.option);
+ options.put(XLINT_CUSTOM.primaryName + "-" + LintCategory.OPTIONS.option, "true");
+ options.remove(XLINT_CUSTOM.primaryName + LintCategory.OPTIONS.option);
start_msec = now();
try {
initProcessAnnotations(processors);
+ for (String className : classnames) {
+ int sep = className.indexOf('/');
+ if (sep != -1) {
+ modules.addExtraAddModules(className.substring(0, sep));
+ }
+ }
+
// These method calls must be chained to avoid memory leaks
processAnnotations(
enterTrees(
@@ -1010,7 +1017,7 @@
}
public List<JCCompilationUnit> initModules(List<JCCompilationUnit> roots) {
- modules.initModules(roots, Collections.emptySet(), Collections.emptySet());
+ modules.initModules(roots);
if (roots.isEmpty()) {
enterDone = true;
}
@@ -1258,8 +1265,8 @@
static boolean explicitAnnotationProcessingRequested(Options options) {
return
options.isSet(PROCESSOR) ||
- options.isSet(PROCESSORPATH) ||
- options.isSet(PROCESSORMODULEPATH) ||
+ options.isSet(PROCESSOR_PATH) ||
+ options.isSet(PROCESSOR_MODULE_PATH) ||
options.isSet(PROC, "only") ||
options.isSet(XPRINT);
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java Thu Aug 11 17:02:00 2016 +0000
@@ -176,12 +176,13 @@
log = Log.instance(context);
if (argv.length == 0) {
- Option.HELP.process(new OptionHelper.GrumpyHelper(log) {
+ OptionHelper h = new OptionHelper.GrumpyHelper(log) {
@Override
public String getOwnName() { return ownName; }
@Override
public void put(String name, String value) { }
- }, "-help");
+ };
+ Option.HELP.process(h, "-help");
return Result.CMDERR;
}
@@ -266,10 +267,10 @@
}
// init multi-release jar handling
- if (fileManager.isSupportedOption(Option.MULTIRELEASE.text) == 1) {
+ if (fileManager.isSupportedOption(Option.MULTIRELEASE.primaryName) == 1) {
Target target = Target.instance(context);
List<String> list = List.of(target.multiReleaseValue());
- fileManager.handleOption(Option.MULTIRELEASE.text, list.iterator());
+ fileManager.handleOption(Option.MULTIRELEASE.primaryName, list.iterator());
}
// init JavaCompiler
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Thu Aug 11 17:02:00 2016 +0000
@@ -30,9 +30,14 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.text.Collator;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.Comparator;
import java.util.EnumSet;
+import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
@@ -51,6 +56,9 @@
import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.platform.PlatformProvider;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.util.JDK9Wrappers;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.util.Log.WriterKind;
@@ -62,10 +70,13 @@
import static com.sun.tools.javac.main.Option.OptionKind.*;
/**
- * Options for javac. The specific Option to handle a command-line option
- * is identified by searching the members of this enum in order, looking for
- * the first {@link #matches match}. The action for an Option is performed
- * by calling {@link #process process}, and by providing a suitable
+ * Options for javac.
+ * The specific Option to handle a command-line option can be found by calling
+ * {@link #lookup}, which search some or all of the members of this enum in order,
+ * looking for the first {@link #matches match}.
+ * The action for an Option is performed {@link #handleOption}, which determines
+ * whether an argument is needed and where to find it;
+ * {@code handleOption} then calls {@link #process process} providing a suitable
* {@link OptionHelper} to provide access the compiler state.
*
* <p><b>This is NOT part of any supported API.
@@ -89,17 +100,12 @@
XLINT("-Xlint", "opt.Xlint", EXTENDED, BASIC),
- XLINT_CUSTOM("-Xlint:", EXTENDED, BASIC, ANYOF, getXLintChoices()) {
- private static final String LINT_KEY_FORMAT = " %-19s %s";
+ XLINT_CUSTOM("-Xlint:", "opt.arg.Xlint", "opt.Xlint.custom", EXTENDED, BASIC, ANYOF, getXLintChoices()) {
+ private final String LINT_KEY_FORMAT = LARGE_INDENT + " %-" +
+ (DEFAULT_SYNOPSIS_WIDTH + SMALL_INDENT.length() - LARGE_INDENT.length() - 2) + "s %s";
@Override
- void help(Log log, OptionKind kind) {
- if (this.kind != kind)
- return;
-
- log.printRawLines(WriterKind.STDOUT,
- String.format(HELP_LINE_FORMAT,
- log.localize(PrefixKind.JAVAC, "opt.Xlint.subopts"),
- log.localize(PrefixKind.JAVAC, "opt.Xlint.suboptlist")));
+ protected void help(Log log) {
+ super.help(log);
log.printRawLines(WriterKind.STDOUT,
String.format(LINT_KEY_FORMAT,
"all",
@@ -125,14 +131,14 @@
@Override
public boolean matches(String option) {
return DocLint.isValidOption(
- option.replace(XDOCLINT_CUSTOM.text, DocLint.XMSGS_CUSTOM_PREFIX));
+ option.replace(XDOCLINT_CUSTOM.primaryName, DocLint.XMSGS_CUSTOM_PREFIX));
}
@Override
public boolean process(OptionHelper helper, String option) {
String prev = helper.get(XDOCLINT_CUSTOM);
String next = (prev == null) ? option : (prev + " " + option);
- helper.put(XDOCLINT_CUSTOM.text, next);
+ helper.put(XDOCLINT_CUSTOM.primaryName, next);
return false;
}
},
@@ -141,14 +147,14 @@
@Override
public boolean matches(String option) {
return DocLint.isValidOption(
- option.replace(XDOCLINT_PACKAGE.text, DocLint.XCHECK_PACKAGE));
+ option.replace(XDOCLINT_PACKAGE.primaryName, DocLint.XCHECK_PACKAGE));
}
@Override
public boolean process(OptionHelper helper, String option) {
String prev = helper.get(XDOCLINT_PACKAGE);
String next = (prev == null) ? option : (prev + " " + option);
- helper.put(XDOCLINT_PACKAGE.text, next);
+ helper.put(XDOCLINT_PACKAGE.primaryName, next);
return false;
}
},
@@ -173,35 +179,55 @@
}
},
- CLASSPATH("-classpath", "opt.arg.path", "opt.classpath", STANDARD, FILEMANAGER),
+ CLASS_PATH("--class-path -classpath -cp", "opt.arg.path", "opt.classpath", STANDARD, FILEMANAGER),
+
+ SOURCE_PATH("--source-path -sourcepath", "opt.arg.path", "opt.sourcepath", STANDARD, FILEMANAGER),
+
+ MODULE_SOURCE_PATH("--module-source-path -modulesourcepath", "opt.arg.mspath", "opt.modulesourcepath", STANDARD, FILEMANAGER),
+
+ MODULE_PATH("--module-path -p -modulepath -mp", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER),
- CP("-cp", "opt.arg.path", "opt.classpath", STANDARD, FILEMANAGER) {
+ UPGRADE_MODULE_PATH("--upgrade-module-path -upgrademodulepath", "opt.arg.path", "opt.upgrademodulepath", STANDARD, FILEMANAGER),
+
+ SYSTEM("--system -system", "opt.arg.jdk", "opt.system", STANDARD, FILEMANAGER),
+
+ PATCH_MODULE("--patch-module -Xpatch:", "opt.arg.patch", "opt.patch", EXTENDED, FILEMANAGER) {
+ // The deferred filemanager diagnostics mechanism assumes a single value per option,
+ // but --patch-module can be used multiple times, once per module. Therefore we compose
+ // a value for the option containing the last value specified for each module, and separate
+ // the the module=path pairs by an invalid path character, NULL.
+ // The standard file manager code knows to split apart the NULL-separated components.
@Override
public boolean process(OptionHelper helper, String option, String arg) {
- return super.process(helper, "-classpath", arg);
+ if (!arg.contains("=")) { // could be more strict regeex, e.g. "(?i)[a-z0-9_.]+=.*"
+ helper.error(Errors.LocnInvalidArgForXpatch(arg));
+ }
+
+ String previous = helper.get(this);
+ if (previous == null) {
+ return super.process(helper, option, arg);
+ }
+
+ Map<String,String> map = new LinkedHashMap<>();
+ for (String s : previous.split("\0")) {
+ int sep = s.indexOf('=');
+ map.put(s.substring(0, sep), s.substring(sep + 1));
+ }
+
+ int sep = arg.indexOf('=');
+ map.put(arg.substring(0, sep), arg.substring(sep + 1));
+
+ StringBuilder sb = new StringBuilder();
+ map.forEach((m, p) -> {
+ if (sb.length() > 0)
+ sb.append('\0');
+ sb.append(m).append('=').append(p);
+ });
+ return super.process(helper, option, sb.toString());
}
},
- SOURCEPATH("-sourcepath", "opt.arg.path", "opt.sourcepath", STANDARD, FILEMANAGER),
-
- MODULESOURCEPATH("-modulesourcepath", "opt.arg.mspath", "opt.modulesourcepath", STANDARD, FILEMANAGER),
-
- MODULEPATH("-modulepath", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER),
-
- MP("-mp", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER) {
- @Override
- public boolean process(OptionHelper helper, String option, String arg) {
- return super.process(helper, "-modulepath", arg);
- }
- },
-
- UPGRADEMODULEPATH("-upgrademodulepath", "opt.arg.path", "opt.upgrademodulepath", STANDARD, FILEMANAGER),
-
- SYSTEM("-system", "opt.arg.jdk", "opt.system", STANDARD, FILEMANAGER),
-
- XPATCH("-Xpatch:", "opt.arg.patch", "opt.patch", EXTENDED, FILEMANAGER),
-
- BOOTCLASSPATH("-bootclasspath", "opt.arg.path", "opt.bootclasspath", STANDARD, FILEMANAGER) {
+ BOOT_CLASS_PATH("--boot-class-path -bootclasspath", "opt.arg.path", "opt.bootclasspath", STANDARD, FILEMANAGER) {
@Override
public boolean process(OptionHelper helper, String option, String arg) {
helper.remove("-Xbootclasspath/p:");
@@ -228,7 +254,7 @@
DJAVA_EXT_DIRS("-Djava.ext.dirs=", "opt.arg.dirs", "opt.extdirs", EXTENDED, FILEMANAGER) {
@Override
public boolean process(OptionHelper helper, String option, String arg) {
- return super.process(helper, "-extdirs", arg);
+ return EXTDIRS.process(helper, "-extdirs", arg);
}
},
@@ -237,7 +263,7 @@
DJAVA_ENDORSED_DIRS("-Djava.endorsed.dirs=", "opt.arg.dirs", "opt.endorseddirs", EXTENDED, FILEMANAGER) {
@Override
public boolean process(OptionHelper helper, String option, String arg) {
- return super.process(helper, "-endorseddirs", arg);
+ return ENDORSEDDIRS.process(helper, "-endorseddirs", arg);
}
},
@@ -245,9 +271,9 @@
PROCESSOR("-processor", "opt.arg.class.list", "opt.processor", STANDARD, BASIC),
- PROCESSORPATH("-processorpath", "opt.arg.path", "opt.processorpath", STANDARD, FILEMANAGER),
+ PROCESSOR_PATH("--processor-path -processorpath", "opt.arg.path", "opt.processorpath", STANDARD, FILEMANAGER),
- PROCESSORMODULEPATH("-processormodulepath", "opt.arg.path", "opt.processormodulepath", STANDARD, FILEMANAGER),
+ PROCESSOR_MODULE_PATH("--processor-module-path -processormodulepath", "opt.arg.path", "opt.processormodulepath", STANDARD, FILEMANAGER),
PARAMETERS("-parameters","opt.parameters", STANDARD, BASIC),
@@ -285,12 +311,9 @@
}
},
- RELEASE("-release", "opt.arg.release", "opt.release", STANDARD, BASIC) {
+ RELEASE("--release -release", "opt.arg.release", "opt.release", STANDARD, BASIC) {
@Override
- void help(Log log, OptionKind kind) {
- if (this.kind != kind)
- return;
-
+ protected void help(Log log) {
Iterable<PlatformProvider> providers =
ServiceLoader.load(PlatformProvider.class, Arguments.class.getClassLoader());
Set<String> platforms = StreamSupport.stream(providers.spliterator(), false)
@@ -307,10 +330,7 @@
delim = ", ";
}
- log.printRawLines(WriterKind.STDOUT,
- String.format(HELP_LINE_FORMAT,
- super.helpSynopsis(log),
- log.localize(PrefixKind.JAVAC, descrKey, targets.toString())));
+ super.help(log, log.localize(PrefixKind.JAVAC, descrKey, targets.toString()));
}
},
@@ -346,21 +366,20 @@
}
},
- HELP("-help", "opt.help", STANDARD, INFO) {
+ // Note: -h is already taken for "native header output directory".
+ HELP("--help -help", "opt.help", STANDARD, INFO) {
@Override
public boolean process(OptionHelper helper, String option) {
Log log = helper.getLog();
String ownName = helper.getOwnName();
log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "msg.usage.header", ownName);
- for (Option o: getJavaCompilerOptions()) {
- o.help(log, OptionKind.STANDARD);
- }
+ showHelp(log, OptionKind.STANDARD);
log.printNewline(WriterKind.STDOUT);
return super.process(helper, option);
}
},
- A("-A", "opt.arg.key.equals.value", "opt.A", STANDARD, BASIC, true) {
+ A("-A", "opt.arg.key.equals.value", "opt.A", STANDARD, BASIC, ArgKind.ADJACENT) {
@Override
public boolean matches(String arg) {
return arg.startsWith("-A");
@@ -385,7 +404,8 @@
helper.error("err.invalid.A.key", option);
return true;
}
- return process(helper, option, option);
+ helper.put(option, option);
+ return false;
}
},
@@ -393,9 +413,7 @@
@Override
public boolean process(OptionHelper helper, String option) {
Log log = helper.getLog();
- for (Option o: getJavaCompilerOptions()) {
- o.help(log, OptionKind.EXTENDED);
- }
+ showHelp(log, OptionKind.EXTENDED);
log.printNewline(WriterKind.STDOUT);
log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "msg.usage.nonstandard.footer");
return super.process(helper, option);
@@ -404,7 +422,7 @@
// This option exists only for the purpose of documenting itself.
// It's actually implemented by the launcher.
- J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO, true) {
+ J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO, ArgKind.ADJACENT) {
@Override
public boolean process(OptionHelper helper, String option) {
throw new AssertionError
@@ -484,7 +502,7 @@
public boolean process(OptionHelper helper, String option) {
String p = option.substring(option.indexOf(':') + 1).trim();
String prev = helper.get(PLUGIN);
- helper.put(PLUGIN.text, (prev == null) ? p : prev + '\0' + p);
+ helper.put(PLUGIN.primaryName, (prev == null) ? p : prev + '\0' + p);
return false;
}
},
@@ -517,7 +535,7 @@
}
},
- DIAGS("-diags:", null, HIDDEN, BASIC, true) {
+ DIAGS("-diags:", null, HIDDEN, BASIC) {
@Override
public boolean process(OptionHelper helper, String option) {
return HiddenGroup.DIAGS.process(helper, option);
@@ -531,11 +549,11 @@
XD("-XD", null, HIDDEN, BASIC) {
@Override
public boolean matches(String s) {
- return s.startsWith(text);
+ return s.startsWith(primaryName);
}
@Override
public boolean process(OptionHelper helper, String option) {
- return process(helper, option, option.substring(text.length()));
+ return process(helper, option, option.substring(primaryName.length()));
}
@Override
@@ -548,47 +566,45 @@
}
},
- XADDEXPORTS("-XaddExports:", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
+ ADD_EXPORTS("--add-exports -XaddExports:", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
@Override
- public boolean process(OptionHelper helper, String option) {
- String p = option.substring(option.indexOf(':') + 1).trim();
- String prev = helper.get(XADDEXPORTS);
- helper.put(XADDEXPORTS.text, (prev == null) ? p : prev + '\0' + p);
+ public boolean process(OptionHelper helper, String option, String arg) {
+ String prev = helper.get(ADD_EXPORTS);
+ helper.put(ADD_EXPORTS.primaryName, (prev == null) ? arg : prev + '\0' + arg);
return false;
}
},
- XADDREADS("-XaddReads:", "opt.arg.addReads", "opt.addReads", EXTENDED, BASIC) {
+ ADD_READS("--add-reads -XaddReads:", "opt.arg.addReads", "opt.addReads", EXTENDED, BASIC) {
@Override
- public boolean process(OptionHelper helper, String option) {
- String p = option.substring(option.indexOf(':') + 1).trim();
- String prev = helper.get(XADDREADS);
- helper.put(XADDREADS.text, (prev == null) ? p : prev + '\0' + p);
+ public boolean process(OptionHelper helper, String option, String arg) {
+ String prev = helper.get(ADD_READS);
+ helper.put(ADD_READS.primaryName, (prev == null) ? arg : prev + '\0' + arg);
return false;
}
},
XMODULE("-Xmodule:", "opt.arg.module", "opt.module", EXTENDED, BASIC) {
@Override
- public boolean process(OptionHelper helper, String option) {
+ public boolean process(OptionHelper helper, String option, String arg) {
String prev = helper.get(XMODULE);
if (prev != null) {
- helper.error("err.option.too.many", XMODULE.text);
+ helper.error("err.option.too.many", XMODULE.primaryName);
}
- String p = option.substring(option.indexOf(':') + 1);
- helper.put(XMODULE.text, p);
+ helper.put(XMODULE.primaryName, arg);
return false;
}
},
- M("-m", "opt.arg.m", "opt.m", STANDARD, BASIC),
+ MODULE("--module -m", "opt.arg.m", "opt.m", STANDARD, BASIC),
- ADDMODS("-addmods", "opt.arg.addmods", "opt.addmods", STANDARD, BASIC),
- LIMITMODS("-limitmods", "opt.arg.limitmods", "opt.limitmods", STANDARD, BASIC),
+ ADD_MODULES("--add-modules -addmods", "opt.arg.addmods", "opt.addmods", STANDARD, BASIC),
+
+ LIMIT_MODULES("--limit-modules -limitmods", "opt.arg.limitmods", "opt.limitmods", STANDARD, BASIC),
// This option exists only for the purpose of documenting itself.
// It's actually implemented by the CommandLine class.
- AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO, true) {
+ AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO, ArgKind.ADJACENT) {
@Override
public boolean process(OptionHelper helper, String option) {
throw new AssertionError("the @ flag should be caught by CommandLine.");
@@ -629,9 +645,78 @@
}
},
- MULTIRELEASE("-multi-release", "opt.arg.multi-release", "opt.multi-release", HIDDEN, FILEMANAGER);
+ MULTIRELEASE("--multi-release -multi-release", "opt.arg.multi-release", "opt.multi-release", HIDDEN, FILEMANAGER),
+
+ INHERIT_RUNTIME_ENVIRONMENT("--inherit-runtime-environment", "opt.inherit_runtime_environment",
+ EXTENDED, BASIC) {
+ @Override
+ public boolean process(OptionHelper helper, String option) {
+ try {
+ Class.forName(JDK9Wrappers.VMHelper.VM_CLASSNAME);
+ String[] runtimeArgs = JDK9Wrappers.VMHelper.getRuntimeArguments();
+ for (String arg : runtimeArgs) {
+ // Handle any supported runtime options; ignore all others.
+ // The runtime arguments always use the single token form, e.g. "--name=value".
+ for (Option o : getSupportedRuntimeOptions()) {
+ if (o.matches(arg)) {
+ o.handleOption(helper, arg, Collections.emptyIterator());
+ break;
+ }
+ }
+ }
+ } catch (ClassNotFoundException | SecurityException e) {
+ helper.error("err.cannot.access.runtime.env");
+ }
+ return false;
+ }
- /** The kind of an Option. This is used by the -help and -X options. */
+ private Option[] getSupportedRuntimeOptions() {
+ Option[] supportedRuntimeOptions = {
+ ADD_EXPORTS,
+ ADD_MODULES,
+ LIMIT_MODULES,
+ MODULE_PATH,
+ UPGRADE_MODULE_PATH,
+ PATCH_MODULE
+ };
+ return supportedRuntimeOptions;
+ }
+ };
+
+ /**
+ * The kind of argument, if any, accepted by this option. The kind is augmented
+ * by characters in the name of the option.
+ */
+ public enum ArgKind {
+ /** This option does not take any argument. */
+ NONE,
+
+// Not currently supported
+// /**
+// * This option takes an optional argument, which may be provided directly after an '='
+// * separator, or in the following argument position if that word does not itself appear
+// * to be the name of an option.
+// */
+// OPTIONAL,
+
+ /**
+ * This option takes an argument.
+ * If the name of option ends with ':' or '=', the argument must be provided directly
+ * after that separator.
+ * Otherwise, if may appear after an '=' or in the following argument position.
+ */
+ REQUIRED,
+
+ /**
+ * This option takes an argument immediately after the option name, with no separator
+ * character.
+ */
+ ADJACENT
+ }
+
+ /**
+ * The kind of an Option. This is used by the -help and -X options.
+ */
public enum OptionKind {
/** A standard option, documented by -help. */
STANDARD,
@@ -641,8 +726,10 @@
HIDDEN,
}
- /** The group for an Option. This determines the situations in which the
- * option is applicable. */
+ /**
+ * The group for an Option. This determines the situations in which the
+ * option is applicable.
+ */
enum OptionGroup {
/** A basic option, available for use on the command line or via the
* Compiler API. */
@@ -656,7 +743,9 @@
OPERAND
}
- /** The kind of choice for "choice" options. */
+ /**
+ * The kind of choice for "choice" options.
+ */
enum ChoiceKind {
/** The expected value is exactly one of the set of choices. */
ONEOF,
@@ -684,65 +773,113 @@
}
}
- public final String text;
-
- final OptionKind kind;
+ /**
+ * The "primary name" for this option.
+ * This is the name that is used to put values in the {@link Options} table.
+ */
+ public final String primaryName;
- final OptionGroup group;
+ /**
+ * The set of names (primary name and aliases) for this option.
+ * Note that some names may end in a separator, to indicate that an argument must immediately
+ * follow the separator (and cannot appear in the following argument position.
+ */
+ public final String[] names;
- /** Documentation key for arguments.
- */
- final String argsNameKey;
+ /** Documentation key for arguments. */
+ protected final String argsNameKey;
/** Documentation key for description.
*/
- final String descrKey;
+ protected final String descrKey;
+
+ /** The kind of this option. */
+ private final OptionKind kind;
+
+ /** The group for this option. */
+ private final OptionGroup group;
+
+ /** The kind of argument for this option. */
+ private final ArgKind argKind;
- /** Suffix option (-foo=bar or -foo:bar)
+ /** The kind of choices for this option, if any. */
+ private final ChoiceKind choiceKind;
+
+ /** The choices for this option, if any, and whether or not the choices are hidden. */
+ private final Map<String,Boolean> choices;
+
+ /**
+ * Looks up the first option matching the given argument in the full set of options.
+ * @param arg the argument to be matches
+ * @return the first option that matches, or null if none.
*/
- final boolean hasSuffix;
+ public static Option lookup(String arg) {
+ return lookup(arg, EnumSet.allOf(Option.class));
+ }
- /** The kind of choices for this option, if any.
+ /**
+ * Looks up the first option matching the given argument within a set of options.
+ * @param arg the argument to be matches
+ * @return the first option that matches, or null if none.
*/
- final ChoiceKind choiceKind;
+ public static Option lookup(String arg, Set<Option> options) {
+ for (Option option: options) {
+ if (option.matches(arg))
+ return option;
+ }
+ return null;
+ }
- /** The choices for this option, if any, and whether or not the choices
- * are hidden
+ /**
+ * Writes the "command line help" for given kind of option to the log.
+ * @param log the log
+ * @param kind the kind of options to select
*/
- final Map<String,Boolean> choices;
+ private static void showHelp(Log log, OptionKind kind) {
+ Comparator<Option> comp = new Comparator<Option>() {
+ final Collator collator = Collator.getInstance(Locale.US);
+ { collator.setStrength(Collator.PRIMARY); }
+ @Override
+ public int compare(Option o1, Option o2) {
+ return collator.compare(o1.primaryName, o2.primaryName);
+ }
+ };
+
+ getJavaCompilerOptions()
+ .stream()
+ .filter(o -> o.kind == kind)
+ .sorted(comp)
+ .forEach(o -> {
+ o.help(log);
+ });
+ }
Option(String text, String descrKey,
OptionKind kind, OptionGroup group) {
- this(text, null, descrKey, kind, group, null, null, false);
- }
-
- Option(String text, String descrKey,
- OptionKind kind, OptionGroup group,
- boolean doHasSuffix) {
- this(text, null, descrKey, kind, group, null, null, doHasSuffix);
+ this(text, null, descrKey, kind, group, null, null, ArgKind.NONE);
}
Option(String text, String argsNameKey, String descrKey,
OptionKind kind, OptionGroup group) {
- this(text, argsNameKey, descrKey, kind, group, null, null, false);
+ this(text, argsNameKey, descrKey, kind, group, null, null, ArgKind.REQUIRED);
}
Option(String text, String argsNameKey, String descrKey,
- OptionKind kind, OptionGroup group, boolean doHasSuffix) {
- this(text, argsNameKey, descrKey, kind, group, null, null, doHasSuffix);
+ OptionKind kind, OptionGroup group, ArgKind ak) {
+ this(text, argsNameKey, descrKey, kind, group, null, null, ak);
}
- Option(String text, OptionKind kind, OptionGroup group,
+ Option(String text, String argsNameKey, String descrKey, OptionKind kind, OptionGroup group,
ChoiceKind choiceKind, Map<String,Boolean> choices) {
- this(text, null, null, kind, group, choiceKind, choices, false);
+ this(text, argsNameKey, descrKey, kind, group, choiceKind, choices, ArgKind.REQUIRED);
}
Option(String text, String descrKey,
OptionKind kind, OptionGroup group,
ChoiceKind choiceKind, String... choices) {
this(text, null, descrKey, kind, group, choiceKind,
- createChoices(choices), false);
+ createChoices(choices), ArgKind.REQUIRED);
}
// where
private static Map<String,Boolean> createChoices(String... choices) {
@@ -755,39 +892,60 @@
private Option(String text, String argsNameKey, String descrKey,
OptionKind kind, OptionGroup group,
ChoiceKind choiceKind, Map<String,Boolean> choices,
- boolean doHasSuffix) {
- this.text = text;
+ ArgKind argKind) {
+ this.names = text.trim().split("\\s+");
+ Assert.check(names.length >= 1);
+ this.primaryName = names[0];
this.argsNameKey = argsNameKey;
this.descrKey = descrKey;
this.kind = kind;
this.group = group;
this.choiceKind = choiceKind;
this.choices = choices;
- char lastChar = text.charAt(text.length()-1);
- this.hasSuffix = doHasSuffix || lastChar == ':' || lastChar == '=';
+ this.argKind = argKind;
}
- public String getText() {
- return text;
+ public String getPrimaryName() {
+ return primaryName;
}
public OptionKind getKind() {
return kind;
}
+ public ArgKind getArgKind() {
+ return argKind;
+ }
+
public boolean hasArg() {
- return argsNameKey != null && !hasSuffix;
+ return (argKind != ArgKind.NONE);
}
public boolean matches(String option) {
+ for (String name: names) {
+ if (matches(option, name))
+ return true;
+ }
+ return false;
+ }
+
+ private boolean matches(String option, String name) {
+ if (name.startsWith("--")) {
+ return option.equals(name)
+ || hasArg() && option.startsWith(name + "=");
+ }
+
+ boolean hasSuffix = (argKind == ArgKind.ADJACENT)
+ || name.endsWith(":") || name.endsWith("=");
+
if (!hasSuffix)
- return option.equals(text);
+ return option.equals(name);
- if (!option.startsWith(text))
+ if (!option.startsWith(name))
return false;
if (choices != null) {
- String arg = option.substring(text.length());
+ String arg = option.substring(name.length());
if (choiceKind == ChoiceKind.ONEOF)
return choices.keySet().contains(arg);
else {
@@ -801,55 +959,161 @@
return true;
}
+ /**
+ * Handles an option.
+ * If an argument for the option is required, depending on spec of the option, it will be found
+ * as part of the current arg (following ':' or '=') or in the following argument.
+ * This is the recommended way to handle an option directly, instead of calling the underlying
+ * {@link #process process} methods.
+ * @param helper a helper to provide access to the environment
+ * @param arg the arg string that identified this option
+ * @param rest the remaining strings to be analysed
+ * @return true if the operation was successful, and false otherwise
+ * @implNote The return value is the opposite of that used by {@link #process}.
+ */
+ public boolean handleOption(OptionHelper helper, String arg, Iterator<String> rest) {
+ if (hasArg()) {
+ String operand;
+ int sep = findSeparator(arg);
+ if (getArgKind() == Option.ArgKind.ADJACENT) {
+ operand = arg.substring(primaryName.length());
+ } else if (sep > 0) {
+ operand = arg.substring(sep + 1);
+ } else {
+ if (!rest.hasNext()) {
+ helper.error("err.req.arg", arg);
+ return false;
+ }
+ operand = rest.next();
+ }
+ return !process(helper, arg, operand);
+ } else {
+ return !process(helper, arg);
+ }
+ }
+
+ /**
+ * Processes an option that either does not need an argument,
+ * or which contains an argument within it, following a separator.
+ * @param helper a helper to provide access to the environment
+ * @param option the option to be processed
+ * @return true if an error occurred
+ */
+ public boolean process(OptionHelper helper, String option) {
+ if (argKind == ArgKind.NONE) {
+ return process(helper, primaryName, option);
+ } else {
+ int sep = findSeparator(option);
+ return process(helper, primaryName, option.substring(sep + 1));
+ }
+ }
+
+ /**
+ * Processes an option by updating the environment via a helper object.
+ * @param helper a helper to provide access to the environment
+ * @param option the option to be processed
+ * @param arg the value to associate with the option, or a default value
+ * to be used if the option does not otherwise take an argument.
+ * @return true if an error occurred
+ */
public boolean process(OptionHelper helper, String option, String arg) {
if (choices != null) {
if (choiceKind == ChoiceKind.ONEOF) {
// some clients like to see just one of option+choice set
for (String s: choices.keySet())
- helper.remove(option + s);
- String opt = option + arg;
+ helper.remove(primaryName + s);
+ String opt = primaryName + arg;
helper.put(opt, opt);
// some clients like to see option (without trailing ":")
// set to arg
- String nm = option.substring(0, option.length() - 1);
+ String nm = primaryName.substring(0, primaryName.length() - 1);
helper.put(nm, arg);
} else {
// set option+word for each word in arg
for (String a: arg.split(",+")) {
- String opt = option + a;
+ String opt = primaryName + a;
helper.put(opt, opt);
}
}
}
- helper.put(option, arg);
+ helper.put(primaryName, arg);
if (group == OptionGroup.FILEMANAGER)
helper.handleFileManagerOption(this, arg);
return false;
}
- public boolean process(OptionHelper helper, String option) {
- if (hasSuffix)
- return process(helper, text, option.substring(text.length()));
- else
- return process(helper, option, option);
+ /**
+ * Scans a word to find the first separator character, either colon or equals.
+ * @param word the word to be scanned
+ * @return the position of the first':' or '=' character in the word,
+ * or -1 if none found
+ */
+ private static int findSeparator(String word) {
+ for (int i = 0; i < word.length(); i++) {
+ switch (word.charAt(i)) {
+ case ':': case '=':
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ /** The indent for the option synopsis. */
+ private static final String SMALL_INDENT = " ";
+ /** The automatic indent for the description. */
+ private static final String LARGE_INDENT = " ";
+ /** The space allowed for the synopsis, if the description is to be shown on the same line. */
+ private static final int DEFAULT_SYNOPSIS_WIDTH = 28;
+ /** The nominal maximum line length, when seeing if text will fit on a line. */
+ private static final int DEFAULT_MAX_LINE_LENGTH = 80;
+ /** The format for a single-line help entry. */
+ private static final String COMPACT_FORMAT = SMALL_INDENT + "%-" + DEFAULT_SYNOPSIS_WIDTH + "s %s";
+
+ /**
+ * Writes help text for this option to the log.
+ * @param log the log
+ */
+ protected void help(Log log) {
+ help(log, log.localize(PrefixKind.JAVAC, descrKey));
}
- private static final String HELP_LINE_FORMAT = " %-26s %s";
-
- void help(Log log, OptionKind kind) {
- if (this.kind != kind)
- return;
+ protected void help(Log log, String descr) {
+ String synopses = Arrays.stream(names)
+ .map(s -> helpSynopsis(s, log))
+ .collect(Collectors.joining(", "));
- log.printRawLines(WriterKind.STDOUT,
- String.format(HELP_LINE_FORMAT,
- helpSynopsis(log),
- log.localize(PrefixKind.JAVAC, descrKey)));
+ // If option synopses and description fit on a single line of reasonable length,
+ // display using COMPACT_FORMAT
+ if (synopses.length() < DEFAULT_SYNOPSIS_WIDTH
+ && !descr.contains("\n")
+ && (SMALL_INDENT.length() + DEFAULT_SYNOPSIS_WIDTH + 1 + descr.length() <= DEFAULT_MAX_LINE_LENGTH)) {
+ log.printRawLines(WriterKind.STDOUT, String.format(COMPACT_FORMAT, synopses, descr));
+ return;
+ }
+ // If option synopses fit on a single line of reasonable length, show that;
+ // otherwise, show 1 per line
+ if (synopses.length() <= DEFAULT_MAX_LINE_LENGTH) {
+ log.printRawLines(WriterKind.STDOUT, SMALL_INDENT + synopses);
+ } else {
+ for (String name: names) {
+ log.printRawLines(WriterKind.STDOUT, SMALL_INDENT + helpSynopsis(name, log));
+ }
+ }
+
+ // Finally, show the description
+ log.printRawLines(WriterKind.STDOUT, LARGE_INDENT + descr.replace("\n", "\n" + LARGE_INDENT));
}
- private String helpSynopsis(Log log) {
+ /**
+ * Composes the initial synopsis of one of the forms for this option.
+ * @param name the name of this form of the option
+ * @param log the log used to localize the description of the arguments
+ * @return the synopsis
+ */
+ private String helpSynopsis(String name, Log log) {
StringBuilder sb = new StringBuilder();
- sb.append(text);
+ sb.append(name);
if (argsNameKey == null) {
if (choices != null) {
String sep = "{";
@@ -863,10 +1127,9 @@
sb.append("}");
}
} else {
- if (!hasSuffix)
+ if (!name.matches(".*[=:]$") && argKind != ArgKind.ADJACENT)
sb.append(" ");
sb.append(log.localize(PrefixKind.JAVAC, argsNameKey));
-
}
return sb.toString();
@@ -915,24 +1178,35 @@
return choices;
}
+ /**
+ * Returns the set of options supported by the command line tool.
+ * @return the set of options.
+ */
static Set<Option> getJavaCompilerOptions() {
return EnumSet.allOf(Option.class);
}
+ /**
+ * Returns the set of options supported by the built-in file manager.
+ * @return the set of options.
+ */
public static Set<Option> getJavacFileManagerOptions() {
- return getOptions(EnumSet.of(FILEMANAGER));
+ return getOptions(FILEMANAGER);
}
+ /**
+ * Returns the set of options supported by this implementation of
+ * the JavaCompiler API, via {@link JavaCompiler#getTask}.
+ * @return the set of options.
+ */
public static Set<Option> getJavacToolOptions() {
- return getOptions(EnumSet.of(BASIC));
+ return getOptions(BASIC);
}
- static Set<Option> getOptions(Set<OptionGroup> desired) {
- Set<Option> options = EnumSet.noneOf(Option.class);
- for (Option option : Option.values())
- if (desired.contains(option.group))
- options.add(option);
- return Collections.unmodifiableSet(options);
+ private static Set<Option> getOptions(OptionGroup group) {
+ return Arrays.stream(Option.values())
+ .filter(o -> o.group == group)
+ .collect(Collectors.toCollection(() -> EnumSet.noneOf(Option.class)));
}
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java Thu Aug 11 17:02:00 2016 +0000
@@ -27,6 +27,7 @@
import java.nio.file.Path;
+import com.sun.tools.javac.util.JCDiagnostic;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Log.PrefixKind;
@@ -63,6 +64,9 @@
/** Report an error. */
abstract void error(String key, Object... args);
+ /** Report an error. */
+ abstract void error(JCDiagnostic.Error error);
+
/** Record a file to be compiled. */
abstract void addFile(Path p);
@@ -113,6 +117,11 @@
}
@Override
+ void error(JCDiagnostic.Error error) {
+ throw new IllegalArgumentException(log.localize(error));
+ }
+
+ @Override
public void addFile(Path p) {
throw new IllegalArgumentException(p.toString());
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Aug 11 17:02:00 2016 +0000
@@ -62,6 +62,7 @@
import com.sun.tools.javac.comp.Modules;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.model.JavacElements;
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.platform.PlatformDescription;
@@ -89,7 +90,6 @@
import static com.sun.tools.javac.code.Lint.LintCategory.PROCESSING;
import static com.sun.tools.javac.code.Kinds.Kind.*;
-import static com.sun.tools.javac.main.Option.*;
import static com.sun.tools.javac.comp.CompileStates.CompileState;
import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
@@ -196,17 +196,17 @@
source = Source.instance(context);
diags = JCDiagnostic.Factory.instance(context);
options = Options.instance(context);
- printProcessorInfo = options.isSet(XPRINTPROCESSORINFO);
- printRounds = options.isSet(XPRINTROUNDS);
- verbose = options.isSet(VERBOSE);
+ printProcessorInfo = options.isSet(Option.XPRINTPROCESSORINFO);
+ printRounds = options.isSet(Option.XPRINTROUNDS);
+ verbose = options.isSet(Option.VERBOSE);
lint = Lint.instance(context).isEnabled(PROCESSING);
compiler = JavaCompiler.instance(context);
- if (options.isSet(PROC, "only") || options.isSet(XPRINT)) {
+ if (options.isSet(Option.PROC, "only") || options.isSet(Option.XPRINT)) {
compiler.shouldStopPolicyIfNoError = CompileState.PROCESS;
}
fatalErrors = options.isSet("fatalEnterError");
showResolveErrors = options.isSet("showResolveErrors");
- werror = options.isSet(WERROR);
+ werror = options.isSet(Option.WERROR);
fileManager = context.get(JavaFileManager.class);
platformAnnotations = initPlatformAnnotations();
@@ -279,7 +279,7 @@
private void initProcessorIterator(Iterable<? extends Processor> processors) {
Iterator<? extends Processor> processorIterator;
- if (options.isSet(XPRINT)) {
+ if (options.isSet(Option.XPRINT)) {
try {
processorIterator = List.of(new PrintingProcessor()).iterator();
} catch (Throwable t) {
@@ -297,7 +297,7 @@
* path for the named class. Otherwise, use a service
* provider mechanism to create the processor iterator.
*/
- String processorNames = options.get(PROCESSOR);
+ String processorNames = options.get(Option.PROCESSOR);
if (fileManager.hasLocation(ANNOTATION_PROCESSOR_MODULE_PATH)) {
processorIterator = (processorNames == null) ?
new ServiceIterator(serviceLoader, log) :
@@ -363,7 +363,7 @@
? standardFileManager.getLocationAsPaths(ANNOTATION_PROCESSOR_PATH)
: standardFileManager.getLocationAsPaths(CLASS_PATH);
- if (needClassLoader(options.get(PROCESSOR), workingPath) )
+ if (needClassLoader(options.get(Option.PROCESSOR), workingPath) )
handleException(key, e);
} else {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Aug 11 17:02:00 2016 +0000
@@ -1222,7 +1222,7 @@
# 0: string
compiler.err.locn.invalid.arg.for.xpatch=\
- invalid argument for -Xpatch option: {0}
+ invalid argument for --patch-module option: {0}
#####
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Thu Aug 11 17:02:00 2016 +0000
@@ -165,12 +165,12 @@
javac.opt.Xlint.none=\
Disable all warnings
#L10N: do not localize: -Xlint
-javac.opt.Xlint.subopts=\
- -Xlint:key,...
-javac.opt.Xlint.suboptlist=\n\
-\ Warnings to enable or disable, separated by comma.\n\
-\ Precede a key by '-' to disable the specified warning.\n\
-\ Supported keys are:
+javac.opt.arg.Xlint=\
+ <key>(,<key>)*
+javac.opt.Xlint.custom=\
+ Warnings to enable or disable, separated by comma.\n\
+ Precede a key by '-' to disable the specified warning.\n\
+ Supported keys are:
javac.opt.Xlint.desc.auxiliaryclass=\
Warn about an auxiliary class that is hidden in a source file, and is used from other files.
@@ -239,20 +239,19 @@
# L10N: do not localize: accessibility html missing reference syntax
# L10N: do not localize: public protected package private
-javac.opt.Xdoclint.custom=\n\
-\ Enable or disable specific checks for problems in javadoc comments,\n\
-\ where <group> is one of accessibility, html, missing, reference, or syntax,\n\
-\ and <access> is one of public, protected, package, or private.
+javac.opt.Xdoclint.custom=\
+ Enable or disable specific checks for problems in javadoc comments,\n\
+ where <group> is one of accessibility, html, missing, reference, or syntax,\n\
+ and <access> is one of public, protected, package, or private.
javac.opt.Xdoclint.package.args = \
- ([-]<packages>)
+ [-]<packages>(,[-]<package>)*
-javac.opt.Xdoclint.package.desc=\n\
-\ Enable or disable checks in specific packages. <packages> is a comma separated\n\
-\ list of package specifiers. Package specifier is either a qualified name of a package\n\
-\ or a package name prefix followed by '.*', which expands to all sub-packages of\n\
-\ the given package. Prefix the package specifier with '-' to disable checks for\n\
-\ the specified packages.
+javac.opt.Xdoclint.package.desc=\
+ Enable or disable checks in specific packages. Each <package> is either the\n\
+ qualified name of a package or a package name prefix followed by '.*', which\n\
+ expands to all sub-packages of the given package. Each <package> can be prefixed\n\
+ with '-' to disable checks for the specified package or packages.
javac.opt.Xstdout=\
Redirect standard output
@@ -274,34 +273,36 @@
Read options and filenames from file
javac.opt.diags=\
Select a diagnostic mode
-javac.opt.addExports=\n\
-\ Specify a package to be considered as exported from its defining module\n\
-\ to additional modules, or to all unnamed modules if <other-module> is ALL-UNNAMED.
+javac.opt.addExports=\
+ Specify a package to be considered as exported from its defining module\n\
+ to additional modules, or to all unnamed modules if <other-module> is ALL-UNNAMED.
javac.opt.arg.addExports=\
<module>/<package>=<other-module>(,<other-module>)*
-javac.opt.addReads=\n\
-\ Specify additional modules to be considered as required by a given module.\n\
-\ <other-module> may be ALL-UNNAMED to require the unnamed module.
+javac.opt.addReads=\
+ Specify additional modules to be considered as required by a given module.\n\
+ <other-module> may be ALL-UNNAMED to require the unnamed module.
javac.opt.arg.addReads=\
<module>=<other-module>(,<other-module>)*
-javac.opt.patch=\n\
-\ Override or augment a module with classes and resources\n\
-\ in JAR files or directories
+javac.opt.patch=\
+ Override or augment a module with classes and resources\n\
+ in JAR files or directories
javac.opt.arg.patch=\
<module>=<file>(:<file>)*
javac.opt.module=\
Specify a module to which the classes being compiled belong.
javac.opt.arg.module=\
- <module-name>
-javac.opt.addmods=\n\
-\ Root modules to resolve in addition to the initial modules, or all modules\n\
-\ on the module path if <module> is ALL-MODULE-PATH.
+ <module>
+javac.opt.addmods=\
+ Root modules to resolve in addition to the initial modules, or all modules\n\
+ on the module path if <module> is ALL-MODULE-PATH.
javac.opt.arg.addmods=\
<module>(,<module>)*
javac.opt.limitmods=\
Limit the universe of observable modules
javac.opt.arg.limitmods=\
<module>(,<module>)*
+javac.opt.inherit_runtime_environment=\
+ Inherit module system configuration options from the runtime environment.
## errors
@@ -334,7 +335,7 @@
javac.err.error.writing.file=\
error writing {0}; {1}
javac.err.sourcepath.modulesourcepath.conflict=\
- cannot specify both -sourcepath and -modulesourcepath
+ cannot specify both --source-path and --module-source-path
javac.warn.source.target.conflict=\
source release {0} requires target release {1}
javac.warn.target.default.source.conflict=\
@@ -347,6 +348,8 @@
not a directory: {0}
javac.err.file.not.file=\
not a file: {0}
+javac.err.cannot.access.runtime.env=\
+ cannot access runtime environment
## messages
@@ -356,7 +359,7 @@
javac.msg.usage=\
Usage: {0} <options> <source files>\n\
- use -help for a list of possible options
+ use --help for a list of possible options
javac.msg.usage.nonstandard.footer=\
These options are non-standard and subject to change without notice.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Thu Aug 11 17:02:00 2016 +0000
@@ -252,4 +252,40 @@
}
}
}
+
+
+ /**
+ * Helper class for new method in jdk.internal.misc.VM.
+ */
+ public static final class VMHelper {
+ public static final String VM_CLASSNAME = "jdk.internal.misc.VM";
+
+ @SuppressWarnings("unchecked")
+ public static String[] getRuntimeArguments() {
+ try {
+ init();
+ Object result = getRuntimeArgumentsMethod.invoke(null);
+ return (String[])result;
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
+ | SecurityException ex) {
+ throw new Abort(ex);
+ }
+ }
+
+ // -----------------------------------------------------------------------------------------
+
+ private static Class<?> vmClass = null;
+ private static Method getRuntimeArgumentsMethod = null;
+
+ private static void init() {
+ if (vmClass == null) {
+ try {
+ vmClass = Class.forName(VM_CLASSNAME, false, null);
+ getRuntimeArgumentsMethod = vmClass.getDeclaredMethod("getRuntimeArguments");
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
+ throw new Abort(ex);
+ }
+ }
+ }
+ }
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java Thu Aug 11 17:02:00 2016 +0000
@@ -748,6 +748,14 @@
return localize(PrefixKind.COMPILER_MISC, key, args);
}
+ public String localize(JCDiagnostic.DiagnosticInfo diagInfo) {
+ if (useRawMessages) {
+ return diagInfo.key();
+ } else {
+ return messages.getLocalizedString(diagInfo.key(), diagInfo.args);
+ }
+ }
+
/** Find a localized string in the resource bundle.
* @param key The key for the localized string.
* @param args Fields to substitute into the string.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@
* Get the value for an option.
*/
public String get(Option option) {
- return values.get(option.text);
+ return values.get(option.primaryName);
}
/**
@@ -101,14 +101,14 @@
* Check if the value for an option has been set.
*/
public boolean isSet(Option option) {
- return (values.get(option.text) != null);
+ return (values.get(option.primaryName) != null);
}
/**
* Check if the value for a choice option has been set to a specific value.
*/
public boolean isSet(Option option, String value) {
- return (values.get(option.text + value) != null);
+ return (values.get(option.primaryName + value) != null);
}
/**
@@ -122,14 +122,14 @@
* Check if the value for an option has not been set.
*/
public boolean isUnset(Option option) {
- return (values.get(option.text) == null);
+ return (values.get(option.primaryName) == null);
}
/**
* Check if the value for a choice option has not been set to a specific value.
*/
public boolean isUnset(Option option, String value) {
- return (values.get(option.text + value) == null);
+ return (values.get(option.primaryName + value) == null);
}
public void put(String name, String value) {
@@ -137,7 +137,7 @@
}
public void put(Option option, String value) {
- values.put(option.text, value);
+ values.put(option.primaryName, value);
}
public void putAll(Options options) {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java Thu Aug 11 17:02:00 2016 +0000
@@ -526,19 +526,27 @@
private void showHelp() {
log.println(getMessage("main.usage", progname));
+
for (Option o: recognizedOptions) {
if (o.isHidden())
continue;
String name = o.aliases[0].substring(1); // there must always be at least one name
log.println(getMessage("main.opt." + name));
}
- String[] fmOptions = { "-classpath", "-cp", "-bootclasspath" };
+
+ String[] fmOptions = {
+ "--module-path", "--system",
+ "--class-path", "-classpath", "-cp",
+ "-bootclasspath"
+ };
+
for (String o: fmOptions) {
if (fileManager.isSupportedOption(o) == -1)
continue;
- String name = o.substring(1);
+ String name = o.replaceAll("^-+", "").replaceAll("-+", "_");
log.println(getMessage("main.opt." + name));
}
+
log.println(getMessage("main.usage.foot"));
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,6 @@
log.println(s);
}
-
/*
* Help for loading localized messages.
*/
@@ -117,18 +116,6 @@
}
/*
- * Usage message.
- */
- public void usage() throws Exit {
- log.println(getText("usage"));
- }
-
- public void version() throws Exit {
- log.println(getText("javah.version",
- System.getProperty("java.version"), null));
- }
-
- /*
* Failure modes.
*/
public void bug(String key) throws Exit {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties Thu Aug 11 17:02:00 2016 +0000
@@ -69,58 +69,61 @@
Warning: Tracing is no longer supported. Instead, use\
-verbose:jni option of the virtual machine.
-#
-# Usage message.
-#
-usage=\
-Usage: javah [options] <classes>\n\
-\n\
-where [options] include:\n\
-\n\t\
--help Print this help message and exit\n\t\
--classpath <path> Path from which to load classes\n\t\
--cp <path> Path from which to load classes\n\t\
--modulepath <path> Path from which to load application modules\n\t\
--system <path> JDK directory from which to load system modules\n\t\
--d <dir> Output directory\n\t\
--o <file> Output file (only one of -d or -o may be used)\n\t\
--jni Generate JNI-style header file (default)\n\t\
--version Print version information\n\t\
--verbose Enable verbose output\n\t\
--force Always write output files\n\
-\n\
-<classes> are specified with their fully qualified names, optionally\n\
-prefixed by a module name followed by '/'. Examples:\n\
- java.lang.Object\n\
- java.base/java.io.File\n\
-
main.usage=\
Usage: \n\
\ javah [options] <classes>\n\
where [options] include:
+
main.opt.o=\
-\ -o <file> Output file (only one of -d or -o may be used)
+\ -o <file> Output file (only one of -d or -o may be used)
+
main.opt.d=\
-\ -d <dir> Output directory
+\ -d <dir> Output directory
+
main.opt.v=\
-\ -v -verbose Enable verbose output
+\ -v -verbose Enable verbose output
+
main.opt.h=\
-\ -h --help -? Print this message
+\ -h --help -? Print this message
+
main.opt.version=\
-\ -version Print version information
+\ -version Print version information
+
main.opt.jni=\
-\ -jni Generate JNI-style header file (default)
+\ -jni Generate JNI-style header file (default)
+
main.opt.force=\
-\ -force Always write output files
+\ -force Always write output files
+
+main.opt.module_path=\
+\ --module-path <path> Path from which to load application modules
+
+main.opt.upgrade_module_path=\
+\ --upgrade_module-path <path> Path from which to load application modules
+
main.opt.classpath=\
-\ -classpath <path> Path from which to load classes
+\ -classpath <path> Path from which to load classes
+
+main.opt.class_path=\
+\ --class-path <path> Path from which to load classes
+
main.opt.cp=\
-\ -cp <path> Path from which to load classes
+\ -cp <path> Path from which to load classes
+
main.opt.bootclasspath=\
-\ -bootclasspath <path> Path from which to load bootstrap classes
-main.usage.foot=\
-<classes> are specified with their fully qualified names\n\
-(for example, java.lang.Object).
+\ -bootclasspath <path> Path from which to load bootstrap classes
+
+main.opt.system=\
+\ --system <jdk> Specify where to find system modules
+
+main.usage.foot=\n\
+GNU-style options may use '=' instead whitespace to separate the name of an option\n\
+from its value.\n\
+\n\
+Each class must be specified by its fully qualified names, optionally\n\
+prefixed by a module name followed by '/'. Examples:\n\
+\ java.lang.Object\n\
+\ java.base/java.io.File\n\
#
# Version string.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java Thu Aug 11 17:02:00 2016 +0000
@@ -63,7 +63,7 @@
helper.sourceRoots(paths);
}
},
- SOURCEPATH("-sourcepath", "Specify search path for sources.") {
+ SOURCE_PATH("--source-path", "Specify search path for sources.") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
List<Path> paths = getFileListArg(iter, helper);
@@ -71,7 +71,13 @@
helper.sourcepath(paths);
}
},
- MODULEPATH("-modulepath", "Specify search path for modules.") {
+ SOURCEPATH("-sourcepath", "An alias for -sourcepath") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ SOURCE_PATH.processMatching(iter, helper);
+ }
+ },
+ MODULE_PATH("--module-path", "Specify search path for modules.") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
List<Path> paths = getFileListArg(iter, helper);
@@ -79,7 +85,19 @@
helper.modulepath(paths);
}
},
- CLASSPATH("-classpath", "Specify search path for classes.") {
+ MODULEPATH("-modulepath", "An alias for -modulepath") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ MODULE_PATH.processMatching(iter, helper);
+ }
+ },
+ P("-p", "An alias for -modulepath") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ MODULE_PATH.processMatching(iter, helper);
+ }
+ },
+ CLASS_PATH("--class-path", "Specify search path for classes.") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
List<Path> paths = getFileListArg(iter, helper);
@@ -87,10 +105,16 @@
helper.classpath(paths);
}
},
+ CLASSPATH("-classpath", "An alias for -classpath.") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ CLASS_PATH.processMatching(iter, helper);
+ }
+ },
CP("-cp", "An alias for -classpath") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
- CLASSPATH.processMatching(iter, helper);
+ CLASS_PATH.processMatching(iter, helper);
}
},
X("-x", "Exclude files matching the given pattern") {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java Thu Aug 11 17:02:00 2016 +0000
@@ -251,9 +251,9 @@
// Source roots
args.addSourceLocations(Option.SRC, sources);
- args.addSourceLocations(Option.SOURCEPATH, sourceSearchPaths);
- args.addSourceLocations(Option.CLASSPATH, classSearchPaths);
- args.addSourceLocations(Option.MODULEPATH, moduleSearchPaths);
+ args.addSourceLocations(Option.SOURCE_PATH, sourceSearchPaths);
+ args.addSourceLocations(Option.CLASS_PATH, classSearchPaths);
+ args.addSourceLocations(Option.MODULE_PATH, moduleSearchPaths);
// Boolean options
if (permitSourcesInDefaultPackage)
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java Thu Aug 11 17:02:00 2016 +0000
@@ -187,7 +187,7 @@
// Parse file objects provide via the DocumentationTool API
parse(fileObjects, classTrees, true);
- modules.initModules(classTrees.toList(), Collections.emptySet(), Collections.emptySet());
+ modules.initModules(classTrees.toList());
// Build up the complete list of any packages to be documented
Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java Thu Aug 11 17:02:00 2016 +0000
@@ -45,6 +45,8 @@
import com.sun.tools.javac.main.CommandLine;
import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.file.BaseFileManager;
+import com.sun.tools.javac.main.OptionHelper;
+import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
import com.sun.tools.javac.platform.PlatformDescription;
import com.sun.tools.javac.platform.PlatformUtils;
import com.sun.tools.javac.util.ClientCodeException;
@@ -173,7 +175,7 @@
}
void usage(boolean exit) {
- usage("main.usage", "-help", null, exit);
+ usage("main.usage", "-help", "main.usage.foot", exit);
}
@Override
@@ -365,14 +367,14 @@
((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
}
- String platformString = compOpts.get("-release");
+ String platformString = compOpts.get("--release");
if (platformString != null) {
if (compOpts.isSet("-source")) {
usageError("main.release.bootclasspath.conflict", "-source");
}
- if (fileManagerOpts.containsKey(Option.BOOTCLASSPATH)) {
- usageError("main.release.bootclasspath.conflict", Option.BOOTCLASSPATH.getText());
+ if (fileManagerOpts.containsKey(Option.BOOT_CLASS_PATH)) {
+ usageError("main.release.bootclasspath.conflict", Option.BOOT_CLASS_PATH.getPrimaryName());
}
PlatformDescription platformDescription =
@@ -555,4 +557,19 @@
}
options.append(args);
}
+
+ @Override
+ OptionHelper getOptionHelper() {
+ return new GrumpyHelper(null) {
+ @Override
+ public String get(com.sun.tools.javac.main.Option option) {
+ return compOpts.get(option);
+ }
+
+ @Override
+ public void put(String name, String value) {
+ compOpts.put(name, value);
+ }
+ };
+ }
}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,6 +31,7 @@
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.main.OptionHelper;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Options;
@@ -50,21 +51,28 @@
BOOTCLASSPATH("-bootclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
CLASSPATH("-classpath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CLASSPATH, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
CP("-cp", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CP, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
+ }
+ },
+
+ CLASS_PATH("--class-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
@@ -78,28 +86,49 @@
SOURCEPATH("-sourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.SOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
+ }
+ },
+
+ SOURCE_PATH("--source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
}
},
SYSCLASSPATH("-sysclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
MODULESOURCEPATH("-modulesourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULESOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
+ }
+ },
+
+ MODULE_SOURCE_PATH("--module-source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
}
},
UPGRADEMODULEPATH("-upgrademodulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.UPGRADEMODULEPATH, arg);
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
+ }
+ },
+
+ UPGRADE_MODULE_PATH("--upgrade-module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
}
},
@@ -110,10 +139,31 @@
}
},
+ SYSTEM_("--system", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SYSTEM, arg);
+ }
+ },
+
MODULEPATH("-modulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ MODULE_PATH("--module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ P("-p", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
}
},
@@ -124,6 +174,13 @@
}
},
+ ADD_MODULES("--add-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
LIMITMODS("-limitmods", true) {
@Override
public void process(Helper helper, String arg) {
@@ -131,6 +188,13 @@
}
},
+ LIMIT_MODULES("--limit-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.LIMIT_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
ENCODING("-encoding", true) {
@Override
public void process(Helper helper, String arg) {
@@ -139,13 +203,20 @@
}
},
- RELEASE("-release", true) {
+ RELEASE("--release", true) {
@Override
public void process(Helper helper, String arg) {
helper.setCompilerOpt(opt, arg);
}
},
+ RELEASE_OLD("-release", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setCompilerOpt("--release", arg);
+ }
+ },
+
SOURCE("-source", true) {
@Override
public void process(Helper helper, String arg) {
@@ -167,6 +238,55 @@
}
},
+ XADDREADS("-XaddReads:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_READS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_READS("--add-reads", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_READS.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ ADDEXPORTS("-XaddExports:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_EXPORTS("--add-exports", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ XMODULE("-Xmodule:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.XMODULE.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ XPATCH("-Xpatch:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.XMODULE.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ PATCH_MODULE("--patch-module", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.PATCH_MODULE.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
// ----- doclet options -----
DOCLET("-doclet", true), // handled in setDocletInvoker
@@ -362,6 +482,7 @@
abstract void Xusage();
abstract void usageError(String msg, Object... args);
+ abstract OptionHelper getOptionHelper();
void addToList(ListBuffer<String> list, String str){
StringTokenizer st = new StringTokenizer(str, ":");
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -37,15 +37,28 @@
\ -help Display command line options and exit\n\
\ -doclet <class> Generate output via alternate doclet\n\
\ -docletpath <path> Specify where to find doclet class files\n\
-\ -sourcepath <pathlist> Specify where to find source files\n\
-\ -classpath <pathlist> Specify where to find user class files\n\
-\ -cp <pathlist> Specify where to find user class files\n\
+\ --module-source-path <path> Specify where to find input source files for multiple modules\n\
+\ --upgrade-module-path <path> Override location of upgradeable modules\n\
+\ --module-path <path>, -p <path> Specify where to find application modules\n\
+\ --add-modules <module>(,<module>)*\n\
+\ Root modules to resolve in addition to the initial modules,\n\
+\ or all modules on the module path if <module> is ALL-MODULE-PATH.\n\
+\ --limit-modules <module>(,<module>)*\n\
+\ Limit the universe of observable modules\n\
+\ --source-path <path> Specify where to find source files\n\
+\ -sourcepath <path> Specify where to find source files\n\
+\ --class-path <path> Specify where to find user class files\n\
+\ -classpath <path> Specify where to find user class files\n\
+\ -cp <path> Specify where to find user class files\n\
\ -exclude <pkglist> Specify a list of packages to exclude\n\
\ -subpackages <subpkglist> Specify subpackages to recursively load\n\
\ -breakiterator Compute first sentence with BreakIterator\n\
-\ -bootclasspath <pathlist> Override location of class files loaded\n\
-\ by the bootstrap class loader\n\
+\ -bootclasspath <path> Override location of platform class files\n\
+\ used for non-modular releases\n\
+\ --system <jdk> Override location of system modules used\n\
+\ for modular releases.\n\
\ -source <release> Provide source compatibility with specified release\n\
+\ --release <release> Provide source compatibility with specified release\n\
\ -extdirs <dirlist> Override location of installed extensions\n\
\ -verbose Output messages about what Javadoc is doing\n\
\ -locale <name> Locale to be used, e.g. en_US or en_US_WIN\n\
@@ -54,9 +67,25 @@
\ -J<flag> Pass <flag> directly to the runtime system\n\
\ -X Print a synopsis of nonstandard options and exit\n
+main.usage.foot=\n\
+GNU-style options may use '=' instead whitespace to separate the name of an option\n\
+from its value.\n
+
main.Xusage=\
\ -Xmaxerrs <number> Set the maximum number of errors to print\n\
-\ -Xmaxwarns <number> Set the maximum number of warnings to print\n
+\ -Xmaxwarns <number> Set the maximum number of warnings to print\n\
+\ --add-exports <module>/<package>=<other-module>(,<other-module>)*\n\
+\ Specify a package to be considered as exported from its \n\
+\ defining module to additional modules, or to all unnamed \n\
+\ modules if <other-module> is ALL-UNNAMED.\n\
+\ --add-reads <module>=<other-module>(,<other-module>)*\n\
+\ Specify additional modules to be considered as required by a\n\
+\ given module. <other-module> may be ALL-UNNAMED to require\n\
+\ the unnamed module.\n\
+\ -Xmodule:<module-name> Specify a module to which the classes being compiled belong.\n\
+\ --patch-module <module>=<file>(:<file>)*\n\
+\ Override or augment a module with classes and resources\n\
+\ in JAR files or directories\n
main.Xusage.foot=\
These options are non-standard and subject to change without notice.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -80,7 +80,7 @@
Content typeParameters = getTypeParameters(member);
if (!typeParameters.isEmpty()) {
htmltree.addContent(typeParameters);
- htmltree.addContent(writer.getSpace());
+ htmltree.addContent(Contents.SPACE);
}
}
@@ -157,7 +157,7 @@
param.asType()).varargs(isVarArg));
tree.addContent(link);
if(name(param).length() > 0) {
- tree.addContent(writer.getSpace());
+ tree.addContent(Contents.SPACE);
tree.addContent(name(param));
}
}
@@ -173,11 +173,11 @@
protected void addReceiverAnnotations(ExecutableElement member, TypeMirror rcvrType,
List<? extends AnnotationMirror> annotationMirrors, Content tree) {
writer.addReceiverAnnotationInfo(member, rcvrType, annotationMirrors, tree);
- tree.addContent(writer.getSpace());
+ tree.addContent(Contents.SPACE);
tree.addContent(utils.getTypeName(rcvrType, false));
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, RECEIVER_TYPE, rcvrType);
tree.addContent(writer.getTypeParameterLinks(linkInfo));
- tree.addContent(writer.getSpace());
+ tree.addContent(Contents.SPACE);
tree.addContent("this");
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -82,8 +82,7 @@
*/
protected AbstractIndexWriter(ConfigurationImpl configuration,
DocPath path,
- IndexBuilder indexbuilder)
- throws IOException {
+ IndexBuilder indexbuilder) {
super(configuration, path);
this.indexbuilder = indexbuilder;
}
@@ -94,7 +93,7 @@
* @return a content tree for the tree label
*/
protected Content getNavLinkIndex() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, indexLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.indexLabel);
return li;
}
@@ -216,10 +215,10 @@
protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) {
Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
si.setLabel(utils.getPackageName(pkg));
- si.setCategory(getResource("doclet.Packages").toString());
+ si.setCategory(resources.getText("doclet.Packages"));
Content dt = HtmlTree.DT(link);
dt.addContent(" - ");
- dt.addContent(getResource("doclet.package"));
+ dt.addContent(contents.package_);
dt.addContent(" " + utils.getPackageName(pkg));
dlTree.addContent(dt);
Content dd = new HtmlTree(HtmlTag.DD);
@@ -238,7 +237,7 @@
LinkInfoImpl.Kind.INDEX, typeElement).strong(true));
si.setContainingPackage(utils.getPackageName(utils.containingPackage(typeElement)));
si.setLabel(utils.getSimpleName(typeElement));
- si.setCategory(getResource("doclet.Types").toString());
+ si.setCategory(resources.getText("doclet.Types"));
Content dt = HtmlTree.DT(link);
dt.addContent(" - ");
addClassInfo(typeElement, dt);
@@ -256,7 +255,7 @@
* @param contentTree the content tree to which the class info will be added
*/
protected void addClassInfo(TypeElement te, Content contentTree) {
- contentTree.addContent(getResource("doclet.in",
+ contentTree.addContent(contents.getContent("doclet.in",
utils.getTypeElementName(te, false),
getPackageLink(utils.containingPackage(te),
utils.getPackageName(utils.containingPackage(te)))
@@ -286,7 +285,7 @@
} else {
si.setLabel(name);
}
- si.setCategory(getResource("doclet.Members").toString());
+ si.setCategory(resources.getText("doclet.Members"));
Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink,
getDocLink(LinkInfoImpl.Kind.INDEX, member, name));
Content dt = HtmlTree.DT(span);
@@ -304,11 +303,11 @@
HtmlTree labelLink = HtmlTree.A(path, new StringContent(sii.getLabel()));
Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
dt.addContent(" - ");
- dt.addContent(getResource("doclet.Search_tag_in", sii.getHolder()));
+ dt.addContent(contents.getContent("doclet.Search_tag_in", sii.getHolder()));
dlTree.addContent(dt);
Content dd = new HtmlTree(HtmlTag.DD);
if (sii.getDescription().isEmpty()) {
- dd.addContent(getSpace());
+ dd.addContent(Contents.SPACE);
} else {
dd.addContent(sii.getDescription());
}
@@ -326,7 +325,7 @@
*/
protected void addComment(Element element, Content contentTree) {
List<? extends DocTree> tags;
- Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.addStyle(HtmlStyle.block);
if (utils.isDeprecated(element)) {
@@ -360,15 +359,15 @@
TypeElement containing = utils.getEnclosingTypeElement(member);
String classdesc = utils.getTypeElementName(containing, true) + " ";
if (utils.isField(member)) {
- Content resource = getResource(utils.isStatic(member)
+ Content resource = contents.getContent(utils.isStatic(member)
? "doclet.Static_variable_in"
: "doclet.Variable_in", classdesc);
contentTree.addContent(resource);
} else if (utils.isConstructor(member)) {
contentTree.addContent(
- getResource("doclet.Constructor_for", classdesc));
+ contents.getContent("doclet.Constructor_for", classdesc));
} else if (utils.isMethod(member)) {
- Content resource = getResource(utils.isStatic(member)
+ Content resource = contents.getContent(utils.isStatic(member)
? "doclet.Static_method_in"
: "doclet.Method_in", classdesc);
contentTree.addContent(resource);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -33,13 +33,9 @@
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.SimpleElementVisitor9;
import com.sun.source.doctree.DocTree;
-import com.sun.tools.javac.util.DefinedBy;
-import com.sun.tools.javac.util.DefinedBy.Api;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
@@ -48,6 +44,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -73,6 +70,9 @@
protected final ConfigurationImpl configuration;
protected final Utils utils;
protected final SubWriterHolderWriter writer;
+ protected final Contents contents;
+ protected final Resources resources;
+
protected final TypeElement typeElement;
protected Map<String, Integer> typeMap = new LinkedHashMap<>();
protected Set<MethodTypes> methodTypes = EnumSet.noneOf(MethodTypes.class);
@@ -86,7 +86,9 @@
this.writer = writer;
this.nodepr = configuration.nodeprecated;
this.typeElement = typeElement;
- this.utils = writer.configuration.utils;
+ this.utils = configuration.utils;
+ this.contents = configuration.contents;
+ this.resources = configuration.resources;
}
public AbstractMemberWriter(SubWriterHolderWriter writer) {
@@ -258,7 +260,7 @@
if (!set.isEmpty()) {
String mods = set.stream().map(m -> m.toString()).collect(Collectors.joining(" "));
htmltree.addContent(mods);
- htmltree.addContent(writer.getSpace());
+ htmltree.addContent(Contents.SPACE);
}
}
@@ -286,7 +288,7 @@
addModifier(member, code);
if (type == null) {
code.addContent(utils.isClass(member) ? "class" : "interface");
- code.addContent(writer.getSpace());
+ code.addContent(Contents.SPACE);
} else {
List<? extends TypeParameterElement> list = utils.isExecutableElement(member)
? ((ExecutableElement)member).getTypeParameters()
@@ -299,7 +301,7 @@
if (typeParameters.charCount() > 10) {
code.addContent(new HtmlTree(HtmlTag.BR));
} else {
- code.addContent(writer.getSpace());
+ code.addContent(Contents.SPACE);
}
code.addContent(
writer.getLink(new LinkInfoImpl(configuration,
@@ -394,6 +396,7 @@
* @param ped The <code>ProgramElement</code> being checked.
* return true if the <code>ProgramElement</code> is being inherited and
* false otherwise.
+ *@return true if inherited
*/
protected boolean isInherited(Element ped){
return (!utils.isPrivate(ped) &&
@@ -413,7 +416,7 @@
protected void addDeprecatedAPI(Collection<Element> deprmembers, String headingKey,
String tableSummary, List<String> tableHeader, Content contentTree) {
if (deprmembers.size() > 0) {
- Content caption = writer.getTableCaption(configuration.getResource(headingKey));
+ Content caption = writer.getTableCaption(configuration.getContent(headingKey));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
: HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
@@ -536,7 +539,7 @@
protected void serialWarning(Element e, String key, String a1, String a2) {
if (configuration.serialwarn) {
- configuration.getDocletSpecificMsg().warning(e, key, a1, a2);
+ configuration.messages.warning(e, key, a1, a2);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -66,7 +66,7 @@
* @param filename Name of the module index file to be generated.
*/
public AbstractModuleIndexWriter(ConfigurationImpl configuration,
- DocPath filename) throws IOException {
+ DocPath filename) {
super(configuration, filename);
modules = configuration.modulePackages;
}
@@ -259,7 +259,7 @@
* @return a Content object to be added to the documentation tree
*/
protected Content getNavLinkContents() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, overviewLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.overviewLabel);
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@
* @param filename Name of the package index file to be generated.
*/
public AbstractPackageIndexWriter(ConfigurationImpl configuration,
- DocPath filename) throws IOException {
+ DocPath filename) {
super(configuration, filename);
packages = configuration.packages;
}
@@ -191,7 +191,7 @@
* @return a Content object to be added to the documentation tree
*/
protected Content getNavLinkContents() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, overviewLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.overviewLabel);
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -71,8 +71,7 @@
* @throws DocletAbortException
*/
protected AbstractTreeWriter(ConfigurationImpl configuration,
- DocPath filename, ClassTree classtree)
- throws IOException {
+ DocPath filename, ClassTree classtree) {
super(configuration, filename);
this.classtree = classtree;
}
@@ -121,7 +120,7 @@
HtmlTree div, boolean isEnums) {
if (!sset.isEmpty()) {
TypeElement firstTypeElement = sset.first();
- Content headingContent = getResource(heading);
+ Content headingContent = contents.getContent(heading);
Content sectionHeading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
headingContent);
HtmlTree htmlTree;
@@ -162,7 +161,7 @@
isFirst = false;
if (utils.isInterface(typeElement)) {
contentTree.addContent(" (");
- contentTree.addContent(getResource("doclet.also"));
+ contentTree.addContent(contents.also);
contentTree.addContent(" extends ");
} else {
contentTree.addContent(" (implements ");
@@ -196,7 +195,7 @@
* @return a content tree for the tree label
*/
protected Content getNavLinkTree() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, treeLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.treeLabel);
return li;
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -35,6 +35,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -78,8 +79,7 @@
* @throws DocletAbortException
*/
public AllClassesFrameWriter(ConfigurationImpl configuration,
- DocPath filename, IndexBuilder indexbuilder)
- throws IOException {
+ DocPath filename, IndexBuilder indexbuilder) {
super(configuration, filename);
this.indexbuilder = indexbuilder;
}
@@ -100,15 +100,13 @@
allclassgen = new AllClassesFrameWriter(configuration,
filename, indexbuilder);
allclassgen.buildAllClassesFile(true);
- allclassgen.close();
filename = DocPaths.ALLCLASSES_NOFRAME;
allclassgen = new AllClassesFrameWriter(configuration,
filename, indexbuilder);
allclassgen.buildAllClassesFile(false);
- allclassgen.close();
} catch (IOException exc) {
- configuration.standardmessage.
- error("doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -122,7 +120,7 @@
String label = configuration.getText("doclet.All_Classes");
Content body = getBody(false, getWindowTitle(label));
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING,
- HtmlStyle.bar, allclassesLabel);
+ HtmlStyle.bar, contents.allClassesLabel);
body.addContent(heading);
Content ul = new HtmlTree(HtmlTag.UL);
// Generate the class links and add it to the tdFont tree.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -111,7 +111,7 @@
memberDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.fieldDetailsLabel);
+ contents.fieldDetailsLabel);
memberDetailsTree.addContent(heading);
writer.printedAnnotationFieldHeading = true;
}
@@ -142,7 +142,7 @@
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.MEMBER, getType(member)));
pre.addContent(link);
- pre.addContent(writer.getSpace());
+ pre.addContent(Contents.SPACE);
if (configuration.linksource) {
Content memberName = new StringContent(name(member));
writer.addSrcLink(member, memberName, pre);
@@ -193,18 +193,11 @@
}
/**
- * Close the writer.
- */
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Field_Summary"));
+ contents.fieldSummaryLabel);
memberTree.addContent(label);
}
@@ -221,7 +214,7 @@
* {@inheritDoc}
*/
public Content getCaption() {
- return configuration.getResource("doclet.Fields");
+ return configuration.getContent("doclet.Fields");
}
/**
@@ -296,9 +289,9 @@
if (link) {
return writer.getHyperLink(
SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
- writer.getResource("doclet.navField"));
+ contents.navField);
} else {
- return writer.getResource("doclet.navField");
+ return contents.navField;
}
}
@@ -309,9 +302,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
- writer.getResource("doclet.navField")));
+ contents.navField));
} else {
- liNav.addContent(writer.getResource("doclet.navField"));
+ liNav.addContent(contents.navField);
}
}
private TypeMirror getType(Element member) {
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.io.*;
-
import java.util.Arrays;
import java.util.List;
@@ -96,7 +94,7 @@
ExecutableElement ee = (ExecutableElement)member;
AnnotationValue value = ee.getDefaultValue();
if (value != null) {
- Content dt = HtmlTree.DT(writer.getResource("doclet.Default"));
+ Content dt = HtmlTree.DT(contents.default_);
Content dl = HtmlTree.DL(dt);
Content dd = HtmlTree.DD(new StringContent(value.toString()));
dl.addContent(dd);
@@ -108,16 +106,9 @@
/**
* {@inheritDoc}
*/
- public void close() throws IOException {
- writer.close();
- }
-
- /**
- * {@inheritDoc}
- */
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Annotation_Type_Optional_Member_Summary"));
+ contents.annotateTypeOptionalMemberSummaryLabel);
memberTree.addContent(label);
}
@@ -125,16 +116,16 @@
* {@inheritDoc}
*/
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Annotation_Type_Optional_Member_Summary"),
- configuration.getText("doclet.annotation_type_optional_members"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Annotation_Type_Optional_Member_Summary"),
+ resources.getText("doclet.annotation_type_optional_members"));
}
/**
* {@inheritDoc}
*/
public Content getCaption() {
- return configuration.getResource("doclet.Annotation_Type_Optional_Members");
+ return configuration.getContent("doclet.Annotation_Type_Optional_Members");
}
/**
@@ -163,9 +154,9 @@
if (link) {
return writer.getHyperLink(
SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY,
- writer.getResource("doclet.navAnnotationTypeOptionalMember"));
+ contents.navAnnotationTypeOptionalMember);
} else {
- return writer.getResource("doclet.navAnnotationTypeOptionalMember");
+ return contents.navAnnotationTypeOptionalMember;
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -111,7 +111,7 @@
memberDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.annotationTypeDetailsLabel);
+ contents.annotationTypeDetailsLabel);
memberDetailsTree.addContent(heading);
writer.printedAnnotationHeading = true;
}
@@ -143,7 +143,7 @@
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.MEMBER, getType(member)));
pre.addContent(link);
- pre.addContent(writer.getSpace());
+ pre.addContent(Contents.SPACE);
if (configuration.linksource) {
Content memberName = new StringContent(name(member));
writer.addSrcLink(member, memberName, pre);
@@ -194,18 +194,11 @@
}
/**
- * Close the writer.
- */
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Annotation_Type_Required_Member_Summary"));
+ contents.annotateTypeRequiredMemberSummaryLabel);
memberTree.addContent(label);
}
@@ -222,7 +215,7 @@
* {@inheritDoc}
*/
public Content getCaption() {
- return configuration.getResource("doclet.Annotation_Type_Required_Members");
+ return configuration.getContent("doclet.Annotation_Type_Required_Members");
}
/**
@@ -297,9 +290,9 @@
if (link) {
return writer.getHyperLink(
SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
- writer.getResource("doclet.navAnnotationTypeRequiredMember"));
+ contents.navAnnotationTypeRequiredMember);
} else {
- return writer.getResource("doclet.navAnnotationTypeRequiredMember");
+ return contents.navAnnotationTypeRequiredMember;
}
}
@@ -310,9 +303,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
- writer.getResource("doclet.navAnnotationTypeMember")));
+ contents.navAnnotationTypeMember));
} else {
- liNav.addContent(writer.getResource("doclet.navAnnotationTypeMember"));
+ liNav.addContent(contents.navAnnotationTypeMember);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -98,7 +98,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(annotationType),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -111,7 +111,7 @@
@Override
protected Content getNavLinkPackage() {
Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
- packageLabel);
+ contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -123,7 +123,7 @@
*/
@Override
protected Content getNavLinkClass() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.classLabel);
return li;
}
@@ -134,7 +134,7 @@
*/
@Override
protected Content getNavLinkClassUse() {
- Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
+ Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), contents.useLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -150,11 +150,11 @@
if (prev != null) {
Content prevLink = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, utils.asTypeElement(prev))
- .label(prevclassLabel).strong(true));
+ .label(contents.prevClassLabel).strong(true));
li = HtmlTree.LI(prevLink);
}
else
- li = HtmlTree.LI(prevclassLabel);
+ li = HtmlTree.LI(contents.prevClassLabel);
return li;
}
@@ -169,11 +169,11 @@
if (next != null) {
Content nextLink = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, utils.asTypeElement(next))
- .label(nextclassLabel).strong(true));
+ .label(contents.nextClassLabel).strong(true));
li = HtmlTree.LI(nextLink);
}
else
- li = HtmlTree.LI(nextclassLabel);
+ li = HtmlTree.LI(contents.nextClassLabel);
return li;
}
@@ -320,13 +320,13 @@
List<? extends DocTree> deprs = utils.getBlockTags(annotationType, DocTree.Kind.DEPRECATED);
if (utils.isDeprecated(annotationType)) {
CommentHelper ch = utils.getCommentHelper(annotationType);
- Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
if (!commentTags.isEmpty()) {
- div.addContent(getSpace());
+ div.addContent(Contents.SPACE);
addInlineDeprecatedComment(annotationType, deprs.get(0), div);
}
}
@@ -340,7 +340,7 @@
@Override
protected Content getNavLinkTree() {
Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
- treeLabel, "", "");
+ contents.treeLabel, "", "");
Content li = HtmlTree.LI(treeLinkContent);
return li;
}
@@ -368,8 +368,8 @@
* @throws java.lang.Exception
*/
protected Content getNavSummaryLinks() throws Exception {
- Content li = HtmlTree.LI(summaryLabel);
- li.addContent(getSpace());
+ Content li = HtmlTree.LI(contents.summaryLabel);
+ li.addContent(Contents.SPACE);
Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
configuration.getBuilderFactory().getMemberSummaryBuilder(this);
@@ -406,7 +406,7 @@
AbstractMemberWriter writer = ((AbstractMemberWriter) builder.
getMemberSummaryWriter(type));
if (writer == null) {
- liNav.addContent(getResource(label));
+ liNav.addContent(contents.getContent(label));
} else {
liNav.addContent(writer.getNavSummaryLink(null,
! builder.getVisibleMemberMap(type).noVisibleMembers()));
@@ -420,8 +420,8 @@
* @throws java.lang.Exception
*/
protected Content getNavDetailLinks() throws Exception {
- Content li = HtmlTree.LI(detailLabel);
- li.addContent(getSpace());
+ Content li = HtmlTree.LI(contents.detailLabel);
+ li.addContent(Contents.SPACE);
Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
configuration.getBuilderFactory().getMemberSummaryBuilder(this);
@@ -438,7 +438,7 @@
if (writerField != null) {
writerField.addNavDetailLink(!utils.getAnnotationFields(annotationType).isEmpty(), liNavField);
} else {
- liNavField.addContent(getResource("doclet.navField"));
+ liNavField.addContent(contents.navField);
}
addNavGap(liNavField);
ulNav.addContent(liNavField);
@@ -451,7 +451,7 @@
writerRequired.addNavDetailLink(!annotationType.getAnnotationMirrors().isEmpty(), liNavReq);
ulNav.addContent(liNavReq);
} else {
- Content liNav = HtmlTree.LI(getResource("doclet.navAnnotationTypeMember"));
+ Content liNav = HtmlTree.LI(contents.navAnnotationTypeMember);
ulNav.addContent(liNav);
}
return ulNav;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -47,6 +47,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
@@ -226,11 +227,10 @@
try {
clsgen = new ClassUseWriter(configuration, mapper, path, typeElement);
clsgen.generateClassUseFile();
- clsgen.close();
} catch (IOException exc) {
- configuration.standardmessage.
- error("doclet.exception_encountered",
- exc.toString(), path.getPath());
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
+ exc.toString(), path.getPath());
throw new DocletAbortException(exc);
}
}
@@ -245,7 +245,7 @@
if (pkgSet.size() > 0) {
addClassUse(div);
} else {
- div.addContent(getResource("doclet.ClassUse_No.usage.of.0",
+ div.addContent(contents.getContent("doclet.ClassUse_No.usage.of.0",
utils.getFullyQualifiedName(typeElement)));
}
if (configuration.allowTag(HtmlTag.MAIN)) {
@@ -287,7 +287,7 @@
* @param contentTree the content tree to which the packages elements will be added
*/
protected void addPackageList(Content contentTree) throws IOException {
- Content caption = getTableCaption(configuration.getResource(
+ Content caption = getTableCaption(configuration.getContent(
"doclet.ClassUse_Packages.that.use.0",
getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
@@ -320,7 +320,7 @@
pkgToPackageAnnotations.isEmpty()) {
return;
}
- Content caption = getTableCaption(configuration.getResource(
+ Content caption = getTableCaption(configuration.getContent(
"doclet.ClassUse_PackageAnnotation",
getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
@@ -360,10 +360,10 @@
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(markerAnchor)
: HtmlTree.LI(HtmlStyle.blockList, markerAnchor);
- Content link = getResource("doclet.ClassUse_Uses.of.0.in.1",
- getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
- typeElement)),
- getPackageLink(pkg, utils.getPackageName(pkg)));
+ Content link = contents.getContent("doclet.ClassUse_Uses.of.0.in.1",
+ getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
+ typeElement)),
+ getPackageLink(pkg, utils.getPackageName(pkg)));
Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
htmlTree.addContent(heading);
addClassUse(pkg, htmlTree);
@@ -404,67 +404,67 @@
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement));
Content pkgLink = getPackageLink(pkg, utils.getPackageName(pkg));
classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_Annotation", classLink,
+ configuration.getContent("doclet.ClassUse_Annotation", classLink,
pkgLink), classUseTableSummary, contentTree);
classSubWriter.addUseInfo(pkgToClassTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_TypeParameter", classLink,
+ configuration.getContent("doclet.ClassUse_TypeParameter", classLink,
pkgLink), classUseTableSummary, contentTree);
classSubWriter.addUseInfo(pkgToSubclass.get(pkg),
- configuration.getResource("doclet.ClassUse_Subclass", classLink,
+ configuration.getContent("doclet.ClassUse_Subclass", classLink,
pkgLink), subclassUseTableSummary, contentTree);
classSubWriter.addUseInfo(pkgToSubinterface.get(pkg),
- configuration.getResource("doclet.ClassUse_Subinterface", classLink,
+ configuration.getContent("doclet.ClassUse_Subinterface", classLink,
pkgLink), subinterfaceUseTableSummary, contentTree);
classSubWriter.addUseInfo(pkgToImplementingClass.get(pkg),
- configuration.getResource("doclet.ClassUse_ImplementingClass", classLink,
+ configuration.getContent("doclet.ClassUse_ImplementingClass", classLink,
pkgLink), classUseTableSummary, contentTree);
fieldSubWriter.addUseInfo(pkgToField.get(pkg),
- configuration.getResource("doclet.ClassUse_Field", classLink,
+ configuration.getContent("doclet.ClassUse_Field", classLink,
pkgLink), fieldUseTableSummary, contentTree);
fieldSubWriter.addUseInfo(pkgToFieldAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_FieldAnnotations", classLink,
+ configuration.getContent("doclet.ClassUse_FieldAnnotations", classLink,
pkgLink), fieldUseTableSummary, contentTree);
fieldSubWriter.addUseInfo(pkgToFieldTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_FieldTypeParameter", classLink,
+ configuration.getContent("doclet.ClassUse_FieldTypeParameter", classLink,
pkgLink), fieldUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodAnnotations", classLink,
+ configuration.getContent("doclet.ClassUse_MethodAnnotations", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodParameterAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodParameterAnnotations", classLink,
+ configuration.getContent("doclet.ClassUse_MethodParameterAnnotations", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodTypeParameter", classLink,
+ configuration.getContent("doclet.ClassUse_MethodTypeParameter", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodReturn.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodReturn", classLink,
+ configuration.getContent("doclet.ClassUse_MethodReturn", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodReturnTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodReturnTypeParameter", classLink,
+ configuration.getContent("doclet.ClassUse_MethodReturnTypeParameter", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodArgs.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodArgs", classLink,
+ configuration.getContent("doclet.ClassUse_MethodArgs", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodArgTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodArgsTypeParameters", classLink,
+ configuration.getContent("doclet.ClassUse_MethodArgsTypeParameters", classLink,
pkgLink), methodUseTableSummary, contentTree);
methodSubWriter.addUseInfo(pkgToMethodThrows.get(pkg),
- configuration.getResource("doclet.ClassUse_MethodThrows", classLink,
+ configuration.getContent("doclet.ClassUse_MethodThrows", classLink,
pkgLink), methodUseTableSummary, contentTree);
constrSubWriter.addUseInfo(pkgToConstructorAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_ConstructorAnnotations", classLink,
+ configuration.getContent("doclet.ClassUse_ConstructorAnnotations", classLink,
pkgLink), constructorUseTableSummary, contentTree);
constrSubWriter.addUseInfo(pkgToConstructorParameterAnnotations.get(pkg),
- configuration.getResource("doclet.ClassUse_ConstructorParameterAnnotations", classLink,
+ configuration.getContent("doclet.ClassUse_ConstructorParameterAnnotations", classLink,
pkgLink), constructorUseTableSummary, contentTree);
constrSubWriter.addUseInfo(pkgToConstructorArgs.get(pkg),
- configuration.getResource("doclet.ClassUse_ConstructorArgs", classLink,
+ configuration.getContent("doclet.ClassUse_ConstructorArgs", classLink,
pkgLink), constructorUseTableSummary, contentTree);
constrSubWriter.addUseInfo(pkgToConstructorArgTypeParameter.get(pkg),
- configuration.getResource("doclet.ClassUse_ConstructorArgsTypeParameters", classLink,
+ configuration.getContent("doclet.ClassUse_ConstructorArgsTypeParameters", classLink,
pkgLink), constructorUseTableSummary, contentTree);
constrSubWriter.addUseInfo(pkgToConstructorThrows.get(pkg),
- configuration.getResource("doclet.ClassUse_ConstructorThrows", classLink,
+ configuration.getContent("doclet.ClassUse_ConstructorThrows", classLink,
pkgLink), constructorUseTableSummary, contentTree);
}
@@ -490,7 +490,7 @@
bodyTree.addContent(htmlTree);
}
ContentBuilder headContent = new ContentBuilder();
- headContent.addContent(getResource("doclet.ClassUse_Title", cltype));
+ headContent.addContent(contents.getContent("doclet.ClassUse_Title", cltype));
headContent.addContent(new HtmlTree(HtmlTag.BR));
headContent.addContent(clname);
Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING,
@@ -512,7 +512,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -524,7 +524,7 @@
*/
protected Content getNavLinkPackage() {
Content linkContent =
- getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), packageLabel);
+ getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -548,7 +548,7 @@
* @return a content tree for the use link
*/
protected Content getNavLinkClassUse() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, useLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.useLabel);
return li;
}
@@ -559,8 +559,8 @@
*/
protected Content getNavLinkTree() {
Content linkContent = utils.isEnclosingPackageIncluded(typeElement)
- ? getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), treeLabel)
- : getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), treeLabel);
+ ? getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), contents.treeLabel)
+ : getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), contents.treeLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -112,7 +112,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -125,7 +125,7 @@
@Override
protected Content getNavLinkPackage() {
Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
- packageLabel);
+ contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -137,7 +137,7 @@
*/
@Override
protected Content getNavLinkClass() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.classLabel);
return li;
}
@@ -148,7 +148,7 @@
*/
@Override
protected Content getNavLinkClassUse() {
- Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
+ Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), contents.useLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -164,11 +164,11 @@
if (prev != null) {
Content prevLink = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, prev)
- .label(prevclassLabel).strong(true));
+ .label(contents.prevClassLabel).strong(true));
li = HtmlTree.LI(prevLink);
}
else
- li = HtmlTree.LI(prevclassLabel);
+ li = HtmlTree.LI(contents.prevClassLabel);
return li;
}
@@ -183,11 +183,11 @@
if (next != null) {
Content nextLink = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, next)
- .label(nextclassLabel).strong(true));
+ .label(contents.nextClassLabel).strong(true));
li = HtmlTree.LI(nextLink);
}
else
- li = HtmlTree.LI(nextclassLabel);
+ li = HtmlTree.LI(contents.nextClassLabel);
return li;
}
@@ -210,18 +210,18 @@
div.addStyle(HtmlStyle.header);
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
if (mdle != null && !mdle.isUnnamed()) {
- Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, moduleLabel);
+ Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
- moduleNameDiv.addContent(getSpace());
+ moduleNameDiv.addContent(Contents.SPACE);
moduleNameDiv.addContent(getModuleLink(mdle,
new StringContent(mdle.getQualifiedName().toString())));
div.addContent(moduleNameDiv);
}
PackageElement pkg = utils.containingPackage(typeElement);
if (!pkg.isUnnamed()) {
- Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, packageLabel);
+ Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, contents.packageLabel);
Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
- pkgNameDiv.addContent(getSpace());
+ pkgNameDiv.addContent(Contents.SPACE);
Content pkgNameContent = getPackageLink(pkg,
new StringContent(utils.getPackageName(pkg)));
pkgNameDiv.addContent(pkgNameContent);
@@ -469,8 +469,7 @@
}
Set<TypeElement> subclasses = classtree.directSubClasses(typeElement, false);
if (!subclasses.isEmpty()) {
- Content label = getResource(
- "doclet.Subclasses");
+ Content label = contents.subclassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
@@ -488,8 +487,7 @@
if (utils.isInterface(typeElement)) {
Set<TypeElement> subInterfaces = classtree.allSubClasses(typeElement, false);
if (!subInterfaces.isEmpty()) {
- Content label = getResource(
- "doclet.Subinterfaces");
+ Content label = contents.subinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
@@ -513,8 +511,7 @@
}
Set<TypeElement> implcl = classtree.implementingClasses(typeElement);
if (!implcl.isEmpty()) {
- Content label = getResource(
- "doclet.Implementing_Classes");
+ Content label = contents.implementingClassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
@@ -531,8 +528,7 @@
SortedSet<TypeMirror> interfaces = new TreeSet<>(utils.makeTypeMirrorClassUseComparator());
interfaces.addAll(utils.getAllInterfaces(typeElement));
if (utils.isClass(typeElement) && !interfaces.isEmpty()) {
- Content label = getResource(
- "doclet.All_Implemented_Interfaces");
+ Content label = contents.allImplementedInterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
@@ -550,7 +546,7 @@
interfaces.addAll(utils.getAllInterfaces(typeElement));
if (utils.isInterface(typeElement) && !interfaces.isEmpty()) {
- Content label = getResource("doclet.All_Superinterfaces");
+ Content label = contents.allSuperinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
@@ -569,10 +565,10 @@
new SimpleElementVisitor8<Void, Void>() {
@Override @DefinedBy(Api.LANGUAGE_MODEL)
public Void visitType(TypeElement e, Void p) {
- String label = utils.isInterface(e)
- ? "doclet.Enclosing_Interface"
- : "doclet.Enclosing_Class";
- Content dt = HtmlTree.DT(getResource(label));
+ Content label = utils.isInterface(e)
+ ? contents.enclosingInterfaceLabel
+ : contents.enclosingClassLabel;
+ Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
dd.addContent(getLink(new LinkInfoImpl(configuration,
@@ -590,10 +586,10 @@
@Override
public void addFunctionalInterfaceInfo (Content classInfoTree) {
if (isFunctionalInterface()) {
- Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface"));
+ Content dt = HtmlTree.DT(contents.functionalInterface);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
- dd.addContent(getResource("doclet.Functional_Interface_Message"));
+ dd.addContent(contents.functionalInterfaceMessage);
dl.addContent(dd);
classInfoTree.addContent(dl);
}
@@ -619,14 +615,14 @@
classInfoTree.addContent(hr);
List<? extends DocTree> deprs = utils.getBlockTags(typeElement, DocTree.Kind.DEPRECATED);
if (utils.isDeprecated(typeElement)) {
- Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
if (!deprs.isEmpty()) {
CommentHelper ch = utils.getCommentHelper(typeElement);
DocTree dt = deprs.get(0);
List<? extends DocTree> commentTags = ch.getBody(configuration, dt);
if (!commentTags.isEmpty()) {
- div.addContent(getSpace());
+ div.addContent(Contents.SPACE);
addInlineDeprecatedComment(typeElement, deprs.get(0), div);
}
}
@@ -671,7 +667,7 @@
@Override
protected Content getNavLinkTree() {
Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
- treeLabel, "", "");
+ contents.treeLabel, "", "");
Content li = HtmlTree.LI(treeLinkContent);
return li;
}
@@ -697,8 +693,8 @@
* @return the content tree for the navigation summary links
*/
protected Content getNavSummaryLinks() throws Exception {
- Content li = HtmlTree.LI(summaryLabel);
- li.addContent(getSpace());
+ Content li = HtmlTree.LI(contents.summaryLabel);
+ li.addContent(Contents.SPACE);
Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
configuration.getBuilderFactory().getMemberSummaryBuilder(this);
@@ -713,7 +709,7 @@
AbstractMemberWriter writer =
((AbstractMemberWriter) memberSummaryBuilder.getMemberSummaryWriter(kind));
if (writer == null) {
- liNav.addContent(getResource(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+ liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
} else {
writer.addNavSummaryLink(
memberSummaryBuilder.members(kind),
@@ -734,8 +730,8 @@
* @throws java.lang.Exception
*/
protected Content getNavDetailLinks() throws Exception {
- Content li = HtmlTree.LI(detailLabel);
- li.addContent(getSpace());
+ Content li = HtmlTree.LI(contents.detailLabel);
+ li.addContent(Contents.SPACE);
Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
configuration.getBuilderFactory().getMemberSummaryBuilder(this);
@@ -751,7 +747,7 @@
continue;
}
if (writer == null) {
- liNav.addContent(getResource(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+ liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
} else {
writer.addNavDetailLink(memberSummaryBuilder.members(kind), liNav);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConfigurationImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConfigurationImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -40,23 +40,22 @@
import com.sun.source.util.DocTreePath;
import com.sun.tools.doclint.DocLint;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
import com.sun.tools.javac.code.Symbol.PackageSymbol;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
-import jdk.javadoc.internal.doclets.toolkit.util.MessageRetriever;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static javax.tools.Diagnostic.Kind.*;
@@ -208,10 +207,7 @@
*/
public Map<Doclet.Option, String> doclintOpts = new LinkedHashMap<>();
- /**
- * Unique Resource Handler for this package.
- */
- public final MessageRetriever standardmessage;
+ public final Resources resources;
/**
* First file to appear in the right-hand frame in the generated
@@ -236,13 +232,21 @@
protected Set<Character> tagSearchIndexKeys;
+ protected Contents contents;
+
+ protected Messages messages;
+
/**
* Constructor. Initializes resource for the
* {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
*/
public ConfigurationImpl() {
- standardmessage = new MessageRetriever(this,
- "jdk.javadoc.internal.doclets.formats.html.resources.standard");
+ resources = new Resources(this,
+ Configuration.sharedResourceBundleName,
+ "jdk.javadoc.internal.doclets.formats.html.resources.standard");
+
+ messages = new Messages(this);
+ contents = new Contents(this);
}
private final String versionRBName = "jdk.javadoc.internal.tool.resources.version";
@@ -269,6 +273,16 @@
}
}
+ @Override
+ public Resources getResources() {
+ return resources;
+ }
+
+ @Override
+ public Messages getMessages() {
+ return messages;
+ }
+
protected boolean validateOptions() {
// check shared options
if (!generalValidOptions()) {
@@ -393,14 +407,6 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public MessageRetriever getDocletSpecificMsg() {
- return standardmessage;
- }
-
- /**
* Decide the page which will appear first in the right-hand frame. It will
* be "overview-summary.html" if "-overview" option is used or no
* "-overview" but the number of packages is more than one. It will be
@@ -479,10 +485,11 @@
}
/**
- * Return the path of the overview file and null if it does not exist.
+ * Return the path of the overview file or null if it does not exist.
*
- * @return the path of the overview file and null if it does not exist.
+ * @return the path of the overview file or null if it does not exist.
*/
+ @Override
public JavaFileObject getOverviewPath() {
if (overviewpath != null && getFileManager() instanceof StandardJavaFileManager) {
StandardJavaFileManager fm = (StandardJavaFileManager) getFileManager();
@@ -510,10 +517,63 @@
}
@Override
- public Content newContent() {
- return new ContentBuilder();
+ public String getText(String key) {
+ return resources.getText(key);
+ }
+
+ @Override
+ public String getText(String key, String... args) {
+ return resources.getText(key, (Object[]) args);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ @Override
+ public Content getContent(String key) {
+ return contents.getContent(key);
+ }
+
+ /**
+ * Get the configuration string as a content.
+ *
+ * @param key the key to look for in the configuration file
+ * @param o string or content argument added to configuration text
+ * @return a content tree for the text
+ */
+ @Override
+ public Content getContent(String key, Object o) {
+ return contents.getContent(key, o);
}
+ /**
+ * Get the configuration string as a content.
+ *
+ * @param key the key to look for in the configuration file
+ * @param o1 resource argument
+ * @param o2 resource argument
+ * @return a content tree for the text
+ */
+ @Override
+ public Content getContent(String key, Object o1, Object o2) {
+ return contents.getContent(key, o1, o2);
+ }
+
+ /**
+ * Get the configuration string as a content.
+ *
+ * @param key the key to look for in the configuration file
+ * @param o0 string or content argument added to configuration text
+ * @param o1 string or content argument added to configuration text
+ * @param o2 string or content argument added to configuration text
+ * @return a content tree for the text
+ */
+ @Override
+ public Content getContent(String key, Object o0, Object o1, Object o2) {
+ return contents.getContent(key, o0, o1, o2);
+ }
+
+
@Override
public Location getLocationForPackage(PackageElement pd) {
JavaFileManager fm = getFileManager();
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -87,8 +87,7 @@
* @param configuration the configuration used in this run
* of the standard doclet.
*/
- public ConstantsSummaryWriterImpl(ConfigurationImpl configuration)
- throws IOException {
+ public ConstantsSummaryWriterImpl(ConfigurationImpl configuration) {
super(configuration, DocPaths.CONSTANT_VALUES);
this.configuration = configuration;
constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",
@@ -133,7 +132,7 @@
if (pkg.isUnnamed()) {
link = getHyperLink(getDocLink(
SectionName.UNNAMED_PACKAGE_ANCHOR),
- defaultPackageLabel, "", "");
+ contents.defaultPackageLabel, "", "");
} else {
String parsedPackageName = utils.parsePackageName(pkg);
Content packageNameContent = getPackageLabel(parsedPackageName);
@@ -150,13 +149,11 @@
* {@inheritDoc}
*/
public void addContentsList(Content contentTree, Content contentListTree) {
- Content titleContent = getResource(
- "doclet.Constants_Summary");
+ Content titleContent = contents.constantsSummaryTitle;
Content pHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
HtmlStyle.title, titleContent);
Content div = HtmlTree.DIV(HtmlStyle.header, pHeading);
- Content headingContent = getResource(
- "doclet.Contents");
+ Content headingContent = contents.contentsHeading;
Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
headingContent);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -191,7 +188,7 @@
if (pkg.isUnnamed()) {
summariesTree.addContent(getMarkerAnchor(
SectionName.UNNAMED_PACKAGE_ANCHOR));
- pkgNameContent = defaultPackageLabel;
+ pkgNameContent = contents.defaultPackageLabel;
} else {
String parsedPackageName = utils.parsePackageName(pkg);
summariesTree.addContent(getMarkerAnchor(parsedPackageName));
@@ -315,7 +312,7 @@
for (Modifier mod : member.getModifiers()) {
Content modifier = new StringContent(mod.toString());
code.addContent(modifier);
- code.addContent(getSpace());
+ code.addContent(Contents.SPACE);
}
Content type = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CONSTANT_SUMMARY, member.asType()));
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -119,7 +119,7 @@
constructorDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.CONSTRUCTOR_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.constructorDetailsLabel);
+ contents.constructorDetailsLabel);
constructorDetailsTree.addContent(heading);
return constructorDetailsTree;
}
@@ -221,14 +221,6 @@
}
/**
- * Close the writer.
- */
- @Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* Let the writer know whether a non public constructor was found.
*
* @param foundNonPubConstructor true if we found a non public constructor.
@@ -244,7 +236,7 @@
@Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Constructor_Summary"));
+ contents.constructorSummaryLabel);
memberTree.addContent(label);
}
@@ -253,9 +245,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Constructor_Summary"),
- configuration.getText("doclet.constructors"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Constructor_Summary"),
+ resources.getText("doclet.constructors"));
}
/**
@@ -263,7 +255,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Constructors");
+ return contents.constructors;
}
/**
@@ -273,11 +265,11 @@
public List<String> getSummaryTableHeader(Element member) {
List<String> header = new ArrayList<>();
if (foundNonPubConstructor) {
- header.add(configuration.getText("doclet.Modifier"));
+ header.add(resources.getText("doclet.Modifier"));
}
- header.add(configuration.getText("doclet.0_and_1",
- configuration.getText("doclet.Constructor"),
- configuration.getText("doclet.Description")));
+ header.add(resources.getText("doclet.0_and_1",
+ resources.getText("doclet.Constructor"),
+ resources.getText("doclet.Description")));
return header;
}
@@ -311,9 +303,9 @@
protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
if (link) {
return writer.getHyperLink(SectionName.CONSTRUCTOR_SUMMARY,
- writer.getResource("doclet.navConstructor"));
+ contents.navConstructor);
} else {
- return writer.getResource("doclet.navConstructor");
+ return contents.navConstructor;
}
}
@@ -325,9 +317,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.CONSTRUCTOR_DETAIL,
- writer.getResource("doclet.navConstructor")));
+ contents.navConstructor));
} else {
- liNav.addContent(writer.getResource("doclet.navConstructor"));
+ liNav.addContent(contents.navConstructor);
}
}
@@ -343,7 +335,7 @@
} else if (utils.isPrivate(member)) {
code.addContent("private ");
} else if (utils.isPublic(member)) {
- code.addContent(writer.getSpace());
+ code.addContent(Contents.SPACE);
} else {
code.addContent(
configuration.getText("doclet.Package_private"));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
+import jdk.javadoc.internal.doclets.formats.html.markup.FixedStringContent;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
+
+/**
+ * Constants and factory methods for common fragments of content
+ * used by HtmlDoclet. The string content of these fragments is
+ * generally obtained from the {@link Resources resources} found
+ * in the doclet's configuration.
+ *
+ * @implNote
+ * Many constants are made available in this class, so that they are
+ * only created once per doclet-instance, instead of once per generated page.
+ */
+public class Contents {
+ public static final Content SPACE = RawHtml.nbsp;
+
+ public final Content allClassesLabel;
+ public final Content allImplementedInterfacesLabel;
+ public final Content allModulesLabel;
+ public final Content allPackagesLabel;
+ public final Content allSuperinterfacesLabel;
+ public final Content also;
+ public final Content annotateTypeOptionalMemberSummaryLabel;
+ public final Content annotateTypeRequiredMemberSummaryLabel;
+ public final Content annotationType;
+ public final Content annotationTypeDetailsLabel;
+ public final Content annotationTypeMemberDetail;
+ public final Content annotationTypes;
+ public final Content classLabel;
+ public final Content classes;
+ public final Content constantsSummaryTitle;
+ public final Content constructorDetailsLabel;
+ public final Content constructorSummaryLabel;
+ public final Content constructors;
+ public final Content contentsHeading;
+ public final Content defaultPackageLabel;
+ public final Content default_;
+ public final Content deprecatedAPI;
+ public final Content deprecatedLabel;
+ public final Content deprecatedPhrase;
+ public final Content descfrmClassLabel;
+ public final Content descfrmInterfaceLabel;
+ public final Content descriptionLabel;
+ public final Content detailLabel;
+ public final Content enclosingClassLabel;
+ public final Content enclosingInterfaceLabel;
+ public final Content enumConstantDetailLabel;
+ public final Content enumConstantSummary;
+ public final Content enum_;
+ public final Content enums;
+ public final Content errors;
+ public final Content exceptions;
+ public final Content fieldDetailsLabel;
+ public final Content fieldSummaryLabel;
+ public final Content fields;
+ public final Content framesLabel;
+ public final Content functionalInterface;
+ public final Content functionalInterfaceMessage;
+ public final Content helpLabel;
+ public final Content hierarchyForAllPackages;
+ public final Content implementation;
+ public final Content implementingClassesLabel;
+ public final Content inClass;
+ public final Content inInterface;
+ public final Content indexLabel;
+ public final Content interfaces;
+ public final Content interfacesItalic;
+ public final Content methodDetailLabel;
+ public final Content methodSummary;
+ public final Content methods;
+ public final Content moduleLabel;
+ public final Content moduleSubNavLabel;
+ public final Content modulesLabel;
+ public final Content navAnnotationTypeMember;
+ public final Content navAnnotationTypeOptionalMember;
+ public final Content navAnnotationTypeRequiredMember;
+ public final Content navConstructor;
+ public final Content navEnum;
+ public final Content navField;
+ public final Content navMethod;
+ public final Content navModuleDescription;
+ public final Content navModules;
+ public final Content navNested;
+ public final Content navPackages;
+ public final Content navProperty;
+ public final Content navServices;
+ public final Content nestedClassSummary;
+ public final Content nextClassLabel;
+ public final Content nextLabel;
+ public final Content nextLetter;
+ public final Content nextModuleLabel;
+ public final Content nextPackageLabel;
+ public final Content noFramesLabel;
+ public final Content noScriptMessage;
+ public final Content overridesLabel;
+ public final Content overviewLabel;
+ public final Content packageHierarchies;
+ public final Content packageLabel;
+ public final Content package_;
+ public final Content packagesLabel;
+ public final Content prevClassLabel;
+ public final Content prevLabel;
+ public final Content prevLetter;
+ public final Content prevModuleLabel;
+ public final Content prevPackageLabel;
+ public final Content properties;
+ public final Content propertyDetailsLabel;
+ public final Content propertySummary;
+ public final Content seeLabel;
+ public final Content serializedForm;
+ public final Content specifiedByLabel;
+ public final Content subclassesLabel;
+ public final Content subinterfacesLabel;
+ public final Content summaryLabel;
+ public final Content treeLabel;
+ public final Content useLabel;
+
+ private final Resources resources;
+
+ /**
+ * Creates a {@code Contents} object.
+ *
+ * @param configuration the configuration in which to find the
+ * resources used to look up resource keys, and other details.
+ */
+ Contents(ConfigurationImpl configuration) {
+ this.resources = configuration.getResources();
+
+ allClassesLabel = getNonBreakContent("doclet.All_Classes");
+ allImplementedInterfacesLabel = getContent("doclet.All_Implemented_Interfaces");
+ allModulesLabel = getNonBreakContent("doclet.All_Modules");
+ allPackagesLabel = getNonBreakContent("doclet.All_Packages");
+ allSuperinterfacesLabel = getContent("doclet.All_Superinterfaces");
+ also = getContent("doclet.also");
+ annotateTypeOptionalMemberSummaryLabel = getContent("doclet.Annotation_Type_Optional_Member_Summary");
+ annotateTypeRequiredMemberSummaryLabel = getContent("doclet.Annotation_Type_Required_Member_Summary");
+ annotationType = getContent("doclet.AnnotationType");
+ annotationTypeDetailsLabel = getContent("doclet.Annotation_Type_Member_Detail");
+ annotationTypeMemberDetail = getContent("doclet.Annotation_Type_Member_Detail");
+ annotationTypes = getContent("doclet.AnnotationTypes");
+ classLabel = getContent("doclet.Class");
+ classes = getContent("doclet.Classes");
+ constantsSummaryTitle = getContent("doclet.Constants_Summary");
+ constructorDetailsLabel = getContent("doclet.Constructor_Detail");
+ constructorSummaryLabel = getContent("doclet.Constructor_Summary");
+ constructors = getContent("doclet.Constructors");
+ contentsHeading = getContent("doclet.Contents");
+ defaultPackageLabel = new StringContent(DocletConstants.DEFAULT_PACKAGE_NAME);
+ default_ = getContent("doclet.Default");
+ deprecatedAPI = getContent("doclet.Deprecated_API");
+ deprecatedLabel = getContent("doclet.navDeprecated");
+ deprecatedPhrase = getContent("doclet.Deprecated");
+ descfrmClassLabel = getContent("doclet.Description_From_Class");
+ descfrmInterfaceLabel = getContent("doclet.Description_From_Interface");
+ descriptionLabel = getContent("doclet.Description");
+ detailLabel = getContent("doclet.Detail");
+ enclosingClassLabel = getContent("doclet.Enclosing_Class");
+ enclosingInterfaceLabel = getContent("doclet.Enclosing_Interface");
+ enumConstantDetailLabel = getContent("doclet.Enum_Constant_Detail");
+ enumConstantSummary = getContent("doclet.Enum_Constant_Summary");
+ enum_ = getContent("doclet.Enum");
+ enums = getContent("doclet.Enums");
+ errors = getContent("doclet.Errors");
+ exceptions = getContent("doclet.Exceptions");
+ fieldDetailsLabel = getContent("doclet.Field_Detail");
+ fieldSummaryLabel = getContent("doclet.Field_Summary");
+ fields = getContent("doclet.Fields");
+ framesLabel = getContent("doclet.Frames");
+ functionalInterface = getContent("doclet.Functional_Interface");
+ functionalInterfaceMessage = getContent("doclet.Functional_Interface_Message");
+ helpLabel = getContent("doclet.Help");
+ hierarchyForAllPackages = getContent("doclet.Hierarchy_For_All_Packages");
+ implementation = getContent("doclet.Implementation");
+ implementingClassesLabel = getContent("doclet.Implementing_Classes");
+ inClass = getContent("doclet.in_class");
+ inInterface = getContent("doclet.in_interface");
+ indexLabel = getContent("doclet.Index");
+ interfaces = getContent("doclet.Interfaces");
+ interfacesItalic = getContent("doclet.Interfaces_Italic");
+ methodDetailLabel = getContent("doclet.Method_Detail");
+ methodSummary = getContent("doclet.Method_Summary");
+ methods = getContent("doclet.Methods");
+ moduleLabel = getContent("doclet.Module");
+ moduleSubNavLabel = getContent("doclet.Module_Sub_Nav");
+ modulesLabel = getContent("doclet.Modules");
+ navAnnotationTypeMember = getContent("doclet.navAnnotationTypeMember");
+ navAnnotationTypeOptionalMember = getContent("doclet.navAnnotationTypeOptionalMember");
+ navAnnotationTypeRequiredMember = getContent("doclet.navAnnotationTypeRequiredMember");
+ navConstructor = getContent("doclet.navConstructor");
+ navEnum = getContent("doclet.navEnum");
+ navField = getContent("doclet.navField");
+ navMethod = getContent("doclet.navMethod");
+ navModuleDescription = getContent("doclet.navModuleDescription");
+ navModules = getContent("doclet.navModules");
+ navNested = getContent("doclet.navNested");
+ navPackages = getContent("doclet.navPackages");
+ navProperty = getContent("doclet.navProperty");
+ navServices = getContent("doclet.navServices");
+ nestedClassSummary = getContent("doclet.Nested_Class_Summary");
+ nextClassLabel = getNonBreakContent("doclet.Next_Class");
+ nextLabel = getNonBreakContent("doclet.Next");
+ nextLetter = getContent("doclet.Next_Letter");
+ nextModuleLabel = getNonBreakContent("doclet.Next_Module");
+ nextPackageLabel = getNonBreakContent("doclet.Next_Package");
+ noFramesLabel = getNonBreakContent("doclet.No_Frames");
+ noScriptMessage = getContent("doclet.No_Script_Message");
+ overridesLabel = getContent("doclet.Overrides");
+ overviewLabel = getContent("doclet.Overview");
+ packageHierarchies = getContent("doclet.Package_Hierarchies");
+ packageLabel = getContent("doclet.Package");
+ package_ = getContent("doclet.package");
+ packagesLabel = getContent("doclet.Packages");
+ prevClassLabel = getNonBreakContent("doclet.Prev_Class");
+ prevLabel = getContent("doclet.Prev");
+ prevLetter = getContent("doclet.Prev_Letter");
+ prevModuleLabel = getNonBreakContent("doclet.Prev_Module");
+ prevPackageLabel = getNonBreakContent("doclet.Prev_Package");
+ properties = getContent("doclet.Properties");
+ propertyDetailsLabel = getContent("doclet.Property_Detail");
+ propertySummary = getContent("doclet.Property_Summary");
+ seeLabel = getContent("doclet.See");
+ serializedForm = getContent("doclet.Serialized_Form");
+ specifiedByLabel = getContent("doclet.Specified_By");
+ subclassesLabel = getContent("doclet.Subclasses");
+ subinterfacesLabel = getContent("doclet.Subinterfaces");
+ summaryLabel = getContent("doclet.Summary");
+ treeLabel = getContent("doclet.Tree");
+ useLabel = getContent("doclet.navClassUse");
+ }
+
+ /**
+ * Gets a {@code Content} object, containing the string for
+ * a given key in the doclet's resources.
+ *
+ * @param key the key for the desired string
+ * @return a content tree for the string
+ */
+ public Content getContent(String key) {
+ return new FixedStringContent(resources.getText(key));
+ }
+
+ /**
+ * Gets a {@code Content} object, containing the string for
+ * a given key in the doclet's resources, formatted with
+ * given arguments.
+ *
+ * @param key the key to look for in the configuration fil
+ * @param key the key for the desired string
+ * @param o0 string or content argument to be formatted into the result
+ * @return a content tree for the text
+ */
+ public Content getContent(String key, Object o0) {
+ return getContent(key, o0, null, null);
+ }
+
+ /**
+ * Gets a {@code Content} object, containing the string for
+ * a given key in the doclet's resources, formatted with
+ * given arguments.
+
+ * @param key the key for the desired string
+ * @param o0 string or content argument to be formatted into the result
+ * @param o1 string or content argument to be formatted into the result
+ * @return a content tree for the text
+ */
+ public Content getContent(String key, Object o0, Object o1) {
+ return getContent(key, o0, o1, null);
+ }
+
+ /**
+ * Gets a {@code Content} object, containing the string for
+ * a given key in the doclet's resources, formatted with
+ * given arguments.
+ *
+ * @param key the key for the desired string
+ * @param o0 string or content argument to be formatted into the result
+ * @param o1 string or content argument to be formatted into the result
+ * @param o2 string or content argument to be formatted into the result
+ * @return a content tree for the text
+ */
+ public Content getContent(String key, Object o0, Object o1, Object o2) {
+ Content c = new ContentBuilder();
+ Pattern p = Pattern.compile("\\{([012])\\}");
+ String text = resources.getText(key); // TODO: cache
+ Matcher m = p.matcher(text);
+ int start = 0;
+ while (m.find(start)) {
+ c.addContent(text.substring(start, m.start()));
+
+ Object o = null;
+ switch (m.group(1).charAt(0)) {
+ case '0': o = o0; break;
+ case '1': o = o1; break;
+ case '2': o = o2; break;
+ }
+
+ if (o == null) {
+ c.addContent("{" + m.group(1) + "}");
+ } else if (o instanceof String) {
+ c.addContent((String) o);
+ } else if (o instanceof Content) {
+ c.addContent((Content) o);
+ }
+
+ start = m.end();
+ }
+
+ c.addContent(text.substring(start));
+ return c;
+ }
+
+ /**
+ * Gets a {@code Content} object, containing the string for
+ * a given key in the doclet's resources, substituting
+ * <code> </code> for any space characters found in
+ * the named resource string.
+ *
+ * @param key the key for the desired string
+ * @return a content tree for the string
+ */
+ private Content getNonBreakContent(String key) {
+ String text = resources.getText(key); // TODO: cache
+ Content c = new ContentBuilder();
+ int start = 0;
+ int p;
+ while ((p = text.indexOf(" ", start)) != -1) {
+ c.addContent(text.substring(start, p));
+ c.addContent(RawHtml.nbsp);
+ start = p + 1;
+ }
+ c.addContent(text.substring(start));
+ return c; // TODO: should be made immutable
+ }
+}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -35,6 +35,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -243,10 +244,9 @@
new DeprecatedListWriter(configuration, filename);
depr.generateDeprecatedListFile(
new DeprecatedAPIListBuilder(configuration));
- depr.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -314,7 +314,7 @@
DeprElementKind kind, Content contentTree) {
if (builder.hasDocumentation(kind)) {
Content li = HtmlTree.LI(getHyperLink(getAnchorName(kind),
- getResource(getHeadingKey(kind))));
+ contents.getContent(getHeadingKey(kind))));
contentTree.addContent(li);
}
}
@@ -326,11 +326,11 @@
* @return a content tree for the contents list
*/
public Content getContentsList(DeprecatedAPIListBuilder deprapi) {
- Content headContent = getResource("doclet.Deprecated_API");
+ Content headContent = contents.deprecatedAPI;
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
HtmlStyle.title, headContent);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- Content headingContent = getResource("doclet.Contents");
+ Content headingContent = contents.contentsHeading;
div.addContent(HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
headingContent));
Content ul = new HtmlTree(HtmlTag.UL);
@@ -379,7 +379,7 @@
* @return a content tree for the deprecated label
*/
protected Content getNavLinkDeprecated() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, deprecatedLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.deprecatedLabel);
return li;
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -95,7 +95,7 @@
enumConstantsDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.ENUM_CONSTANT_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.enumConstantsDetailsLabel);
+ contents.enumConstantDetailLabel);
enumConstantsDetailsTree.addContent(heading);
return enumConstantsDetailsTree;
}
@@ -185,17 +185,9 @@
* {@inheritDoc}
*/
@Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Enum_Constant_Summary"));
+ contents.enumConstantSummary);
memberTree.addContent(label);
}
@@ -204,9 +196,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Enum_Constant_Summary"),
- configuration.getText("doclet.enum_constants"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Enum_Constant_Summary"),
+ resources.getText("doclet.enum_constants"));
}
/**
@@ -214,7 +206,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Enum_Constants");
+ return configuration.getContent("doclet.Enum_Constants");
}
/**
@@ -303,14 +295,14 @@
if (link) {
if (typeElement == null) {
return writer.getHyperLink(SectionName.ENUM_CONSTANT_SUMMARY,
- writer.getResource("doclet.navEnum"));
+ contents.navEnum);
} else {
return writer.getHyperLink(
SectionName.ENUM_CONSTANTS_INHERITANCE,
- configuration.getClassName(typeElement), writer.getResource("doclet.navEnum"));
+ configuration.getClassName(typeElement), contents.navEnum);
}
} else {
- return writer.getResource("doclet.navEnum");
+ return contents.navEnum;
}
}
@@ -322,9 +314,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.ENUM_CONSTANT_DETAIL,
- writer.getResource("doclet.navEnum")));
+ contents.navEnum));
} else {
- liNav.addContent(writer.getResource("doclet.navEnum"));
+ liNav.addContent(contents.navEnum);
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -95,7 +95,7 @@
fieldDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.FIELD_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.fieldDetailsLabel);
+ contents.fieldDetailsLabel);
fieldDetailsTree.addContent(heading);
return fieldDetailsTree;
}
@@ -182,20 +182,12 @@
}
/**
- * Close the writer.
- */
- @Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
@Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Field_Summary"));
+ contents.fieldSummaryLabel);
memberTree.addContent(label);
}
@@ -204,9 +196,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Field_Summary"),
- configuration.getText("doclet.fields"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Field_Summary"),
+ resources.getText("doclet.fields"));
}
/**
@@ -214,7 +206,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Fields");
+ return contents.fields;
}
/**
@@ -223,9 +215,9 @@
@Override
public List<String> getSummaryTableHeader(Element member) {
List<String> header = Arrays.asList(writer.getModifierTypeHeader(),
- configuration.getText("doclet.0_and_1",
- configuration.getText("doclet.Field"),
- configuration.getText("doclet.Description")));
+ resources.getText("doclet.0_and_1",
+ resources.getText("doclet.Field"),
+ resources.getText("doclet.Description")));
return header;
}
@@ -259,7 +251,7 @@
: configuration.getText("doclet.Fields_Inherited_From_Interface"));
Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(writer.getSpace());
+ labelHeading.addContent(Contents.SPACE);
labelHeading.addContent(classLink);
inheritedTree.addContent(labelHeading);
}
@@ -312,14 +304,14 @@
if (typeElement == null) {
return writer.getHyperLink(
SectionName.FIELD_SUMMARY,
- writer.getResource("doclet.navField"));
+ contents.navField);
} else {
return writer.getHyperLink(
SectionName.FIELDS_INHERITANCE,
- configuration.getClassName(typeElement), writer.getResource("doclet.navField"));
+ configuration.getClassName(typeElement), contents.navField);
}
} else {
- return writer.getResource("doclet.navField");
+ return contents.navField;
}
}
@@ -331,9 +323,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.FIELD_DETAIL,
- writer.getResource("doclet.navField")));
+ contents.navField));
} else {
- liNav.addContent(writer.getResource("doclet.navField"));
+ liNav.addContent(contents.navField);
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -32,6 +32,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -68,7 +69,7 @@
* @param filename File to be generated.
* @throws java.io.IOException
*/
- public FrameOutputWriter(ConfigurationImpl configuration, DocPath filename) throws IOException {
+ public FrameOutputWriter(ConfigurationImpl configuration, DocPath filename) {
super(configuration, filename);
noOfPackages = configuration.packages.size();
}
@@ -87,10 +88,9 @@
filename = DocPaths.INDEX;
framegen = new FrameOutputWriter(configuration, filename);
framegen.generateFrameFile();
- framegen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -58,7 +59,7 @@
* @param filename File to be generated.
*/
public HelpWriter(ConfigurationImpl configuration,
- DocPath filename) throws IOException {
+ DocPath filename) {
super(configuration, filename);
}
@@ -76,10 +77,9 @@
filename = DocPaths.HELP_DOC;
helpgen = new HelpWriter(configuration, filename);
helpgen.generateHelpFile();
- helpgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -121,10 +121,10 @@
*/
protected void addHelpFileContents(Content contentTree) {
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false, HtmlStyle.title,
- getResource("doclet.Help_line_1"));
+ contents.getContent("doclet.Help_line_1"));
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
Content line2 = HtmlTree.DIV(HtmlStyle.subTitle,
- getResource("doclet.Help_line_2"));
+ contents.getContent("doclet.Help_line_2"));
div.addContent(line2);
if (configuration.allowTag(HtmlTag.MAIN)) {
mainTree.addContent(div);
@@ -136,11 +136,11 @@
ul.addStyle(HtmlStyle.blockList);
if (configuration.createoverview) {
Content overviewHeading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Overview"));
+ contents.overviewLabel);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(overviewHeading)
: HtmlTree.LI(HtmlStyle.blockList, overviewHeading);
- Content line3 = getResource("doclet.Help_line_3",
+ Content line3 = contents.getContent("doclet.Help_line_3",
getHyperLink(DocPaths.OVERVIEW_SUMMARY,
configuration.getText("doclet.Overview")));
Content overviewPara = HtmlTree.P(line3);
@@ -152,26 +152,26 @@
}
}
Content packageHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Package"));
+ contents.packageLabel);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(packageHead)
: HtmlTree.LI(HtmlStyle.blockList, packageHead);
- Content line4 = getResource("doclet.Help_line_4");
+ Content line4 = contents.getContent("doclet.Help_line_4");
Content packagePara = HtmlTree.P(line4);
htmlTree.addContent(packagePara);
HtmlTree ulPackage = new HtmlTree(HtmlTag.UL);
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.Interfaces_Italic")));
+ contents.interfacesItalic));
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.Classes")));
+ contents.classes));
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.Enums")));
+ contents.enums));
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.Exceptions")));
+ contents.exceptions));
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.Errors")));
+ contents.errors));
ulPackage.addContent(HtmlTree.LI(
- getResource("doclet.AnnotationTypes")));
+ contents.annotationTypes));
htmlTree.addContent(ulPackage);
if (configuration.allowTag(HtmlTag.SECTION)) {
ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
@@ -179,46 +179,39 @@
ul.addContent(htmlTree);
}
Content classHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_5"));
+ contents.getContent("doclet.Help_line_5"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(classHead)
: HtmlTree.LI(HtmlStyle.blockList, classHead);
- Content line6 = getResource("doclet.Help_line_6");
+ Content line6 = contents.getContent("doclet.Help_line_6");
Content classPara = HtmlTree.P(line6);
htmlTree.addContent(classPara);
HtmlTree ul1 = new HtmlTree(HtmlTag.UL);
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_7")));
+ contents.getContent("doclet.Help_line_7")));
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_8")));
+ contents.getContent("doclet.Help_line_8")));
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_9")));
+ contents.getContent("doclet.Help_line_9")));
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_10")));
+ contents.getContent("doclet.Help_line_10")));
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_11")));
+ contents.getContent("doclet.Help_line_11")));
ul1.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_12")));
+ contents.getContent("doclet.Help_line_12")));
htmlTree.addContent(ul1);
HtmlTree ul2 = new HtmlTree(HtmlTag.UL);
- ul2.addContent(HtmlTree.LI(
- getResource("doclet.Nested_Class_Summary")));
- ul2.addContent(HtmlTree.LI(
- getResource("doclet.Field_Summary")));
- ul2.addContent(HtmlTree.LI(
- getResource("doclet.Constructor_Summary")));
- ul2.addContent(HtmlTree.LI(
- getResource("doclet.Method_Summary")));
+ ul2.addContent(HtmlTree.LI(contents.nestedClassSummary));
+ ul2.addContent(HtmlTree.LI(contents.fieldSummaryLabel));
+ ul2.addContent(HtmlTree.LI(contents.constructorSummaryLabel));
+ ul2.addContent(HtmlTree.LI(contents.methodSummary));
htmlTree.addContent(ul2);
HtmlTree ul3 = new HtmlTree(HtmlTag.UL);
- ul3.addContent(HtmlTree.LI(
- getResource("doclet.Field_Detail")));
- ul3.addContent(HtmlTree.LI(
- getResource("doclet.Constructor_Detail")));
- ul3.addContent(HtmlTree.LI(
- getResource("doclet.Method_Detail")));
+ ul3.addContent(HtmlTree.LI(contents.fieldDetailsLabel));
+ ul3.addContent(HtmlTree.LI(contents.constructorDetailsLabel));
+ ul3.addContent(HtmlTree.LI(contents.methodDetailLabel));
htmlTree.addContent(ul3);
- Content line13 = getResource("doclet.Help_line_13");
+ Content line13 = contents.getContent("doclet.Help_line_13");
Content para = HtmlTree.P(line13);
htmlTree.addContent(para);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -228,24 +221,24 @@
}
//Annotation Types
Content aHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.AnnotationType"));
+ contents.annotationType);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(aHead)
: HtmlTree.LI(HtmlStyle.blockList, aHead);
- Content aline1 = getResource("doclet.Help_annotation_type_line_1");
+ Content aline1 = contents.getContent("doclet.Help_annotation_type_line_1");
Content aPara = HtmlTree.P(aline1);
htmlTree.addContent(aPara);
HtmlTree aul = new HtmlTree(HtmlTag.UL);
aul.addContent(HtmlTree.LI(
- getResource("doclet.Help_annotation_type_line_2")));
+ contents.getContent("doclet.Help_annotation_type_line_2")));
aul.addContent(HtmlTree.LI(
- getResource("doclet.Help_annotation_type_line_3")));
+ contents.getContent("doclet.Help_annotation_type_line_3")));
aul.addContent(HtmlTree.LI(
- getResource("doclet.Annotation_Type_Required_Member_Summary")));
+ contents.annotateTypeRequiredMemberSummaryLabel));
aul.addContent(HtmlTree.LI(
- getResource("doclet.Annotation_Type_Optional_Member_Summary")));
+ contents.annotateTypeOptionalMemberSummaryLabel));
aul.addContent(HtmlTree.LI(
- getResource("doclet.Annotation_Type_Member_Detail")));
+ contents.annotationTypeMemberDetail));
htmlTree.addContent(aul);
if (configuration.allowTag(HtmlTag.SECTION)) {
ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
@@ -254,22 +247,22 @@
}
//Enums
Content enumHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Enum"));
+ contents.enum_);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(enumHead)
: HtmlTree.LI(HtmlStyle.blockList, enumHead);
- Content eline1 = getResource("doclet.Help_enum_line_1");
+ Content eline1 = contents.getContent("doclet.Help_enum_line_1");
Content enumPara = HtmlTree.P(eline1);
htmlTree.addContent(enumPara);
HtmlTree eul = new HtmlTree(HtmlTag.UL);
eul.addContent(HtmlTree.LI(
- getResource("doclet.Help_enum_line_2")));
+ contents.getContent("doclet.Help_enum_line_2")));
eul.addContent(HtmlTree.LI(
- getResource("doclet.Help_enum_line_3")));
+ contents.getContent("doclet.Help_enum_line_3")));
eul.addContent(HtmlTree.LI(
- getResource("doclet.Enum_Constant_Summary")));
+ contents.enumConstantSummary));
eul.addContent(HtmlTree.LI(
- getResource("doclet.Enum_Constant_Detail")));
+ contents.enumConstantDetailLabel));
htmlTree.addContent(eul);
if (configuration.allowTag(HtmlTag.SECTION)) {
ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
@@ -278,11 +271,11 @@
}
if (configuration.classuse) {
Content useHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_14"));
+ contents.getContent("doclet.Help_line_14"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(useHead)
: HtmlTree.LI(HtmlStyle.blockList, useHead);
- Content line15 = getResource("doclet.Help_line_15");
+ Content line15 = contents.getContent("doclet.Help_line_15");
Content usePara = HtmlTree.P(line15);
htmlTree.addContent(usePara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -293,11 +286,11 @@
}
if (configuration.createtree) {
Content treeHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_16"));
+ contents.getContent("doclet.Help_line_16"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(treeHead)
: HtmlTree.LI(HtmlStyle.blockList, treeHead);
- Content line17 = getResource("doclet.Help_line_17_with_tree_link",
+ Content line17 = contents.getContent("doclet.Help_line_17_with_tree_link",
getHyperLink(DocPaths.OVERVIEW_TREE,
configuration.getText("doclet.Class_Hierarchy")),
HtmlTree.CODE(new StringContent("java.lang.Object")));
@@ -305,9 +298,9 @@
htmlTree.addContent(treePara);
HtmlTree tul = new HtmlTree(HtmlTag.UL);
tul.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_18")));
+ contents.getContent("doclet.Help_line_18")));
tul.addContent(HtmlTree.LI(
- getResource("doclet.Help_line_19")));
+ contents.getContent("doclet.Help_line_19")));
htmlTree.addContent(tul);
if (configuration.allowTag(HtmlTag.SECTION)) {
ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
@@ -318,11 +311,11 @@
if (!(configuration.nodeprecatedlist ||
configuration.nodeprecated)) {
Content dHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Deprecated_API"));
+ contents.deprecatedAPI);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(dHead)
: HtmlTree.LI(HtmlStyle.blockList, dHead);
- Content line20 = getResource("doclet.Help_line_20_with_deprecated_api_link",
+ Content line20 = contents.getContent("doclet.Help_line_20_with_deprecated_api_link",
getHyperLink(DocPaths.DEPRECATED_LIST,
configuration.getText("doclet.Deprecated_API")));
Content dPara = HtmlTree.P(line20);
@@ -343,11 +336,11 @@
configuration.getText("doclet.Index"));
}
Content indexHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_21"));
+ contents.getContent("doclet.Help_line_21"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(indexHead)
: HtmlTree.LI(HtmlStyle.blockList, indexHead);
- Content line22 = getResource("doclet.Help_line_22", indexlink);
+ Content line22 = contents.getContent("doclet.Help_line_22", indexlink);
Content indexPara = HtmlTree.P(line22);
htmlTree.addContent(indexPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -357,11 +350,11 @@
}
}
Content prevHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_23"));
+ contents.getContent("doclet.Help_line_23"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(prevHead)
: HtmlTree.LI(HtmlStyle.blockList, prevHead);
- Content line24 = getResource("doclet.Help_line_24");
+ Content line24 = contents.getContent("doclet.Help_line_24");
Content prevPara = HtmlTree.P(line24);
htmlTree.addContent(prevPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -370,11 +363,11 @@
ul.addContent(htmlTree);
}
Content frameHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Help_line_25"));
+ contents.getContent("doclet.Help_line_25"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(frameHead)
: HtmlTree.LI(HtmlStyle.blockList, frameHead);
- Content line26 = getResource("doclet.Help_line_26");
+ Content line26 = contents.getContent("doclet.Help_line_26");
Content framePara = HtmlTree.P(line26);
htmlTree.addContent(framePara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -383,13 +376,13 @@
ul.addContent(htmlTree);
}
Content allclassesHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.All_Classes"));
+ contents.allClassesLabel);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(allclassesHead)
: HtmlTree.LI(HtmlStyle.blockList, allclassesHead);
- Content line27 = getResource("doclet.Help_line_27",
+ Content line27 = contents.getContent("doclet.Help_line_27",
getHyperLink(DocPaths.ALLCLASSES_NOFRAME,
- configuration.getText("doclet.All_Classes")));
+ resources.getText("doclet.All_Classes")));
Content allclassesPara = HtmlTree.P(line27);
htmlTree.addContent(allclassesPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -398,11 +391,11 @@
ul.addContent(htmlTree);
}
Content sHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Serialized_Form"));
+ contents.serializedForm);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(sHead)
: HtmlTree.LI(HtmlStyle.blockList, sHead);
- Content line28 = getResource("doclet.Help_line_28");
+ Content line28 = contents.getContent("doclet.Help_line_28");
Content serialPara = HtmlTree.P(line28);
htmlTree.addContent(serialPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -411,13 +404,13 @@
ul.addContent(htmlTree);
}
Content constHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
- getResource("doclet.Constants_Summary"));
+ contents.constantsSummaryTitle);
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(constHead)
: HtmlTree.LI(HtmlStyle.blockList, constHead);
- Content line29 = getResource("doclet.Help_line_29",
+ Content line29 = contents.getContent("doclet.Help_line_29",
getHyperLink(DocPaths.CONSTANT_VALUES,
- configuration.getText("doclet.Constants_Summary")));
+ resources.getText("doclet.Constants_Summary")));
Content constPara = HtmlTree.P(line29);
htmlTree.addContent(constPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
@@ -426,7 +419,7 @@
ul.addContent(htmlTree);
}
Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
- Content line30 = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, getResource("doclet.Help_line_30"));
+ Content line30 = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, contents.getContent("doclet.Help_line_30"));
divContent.addContent(line30);
if (configuration.allowTag(HtmlTag.MAIN)) {
mainTree.addContent(divContent);
@@ -443,7 +436,7 @@
*/
@Override
protected Content getNavLinkHelp() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, helpLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.helpLabel);
return li;
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -38,6 +38,7 @@
import jdk.javadoc.doclet.Reporter;
import jdk.javadoc.internal.doclets.toolkit.AbstractDoclet;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.builders.AbstractBuilder;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -68,7 +69,9 @@
/**
* The global configuration information for this run.
*/
- public final ConfigurationImpl configuration;
+ private final ConfigurationImpl configuration;
+
+ private Messages messages;
private static final DocPath DOCLET_RESOURCES = DocPath
@@ -77,6 +80,7 @@
public void init(Locale locale, Reporter reporter) {
configuration.reporter = reporter;
configuration.locale = locale;
+ messages = configuration.getMessages();
}
/**
@@ -118,8 +122,7 @@
}
if (configuration.topFile.isEmpty()) {
- configuration.standardmessage.
- error("doclet.No_Non_Deprecated_Classes_To_Document");
+ messages.error("doclet.No_Non_Deprecated_Classes_To_Document");
return;
}
boolean nodeprecated = configuration.nodeprecated;
@@ -351,11 +354,11 @@
if (toFile.isSameFile(fromfile))
return;
- configuration.message.notice("doclet.Copying_File_0_To_File_1",
+ messages.notice("doclet.Copying_File_0_To_File_1",
fromfile.toString(), path.getPath());
toFile.copyFile(fromfile);
} catch (IOException exc) {
- configuration.message.error("doclet.perform_copy_exception_encountered",
+ messages.error("doclet.perform_copy_exception_encountered",
exc.toString());
throw new DocletAbortException(exc);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -82,7 +82,9 @@
import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.PackageSummaryWriter;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.taglets.DocRootTaglet;
import jdk.javadoc.internal.doclets.toolkit.taglets.TagletWriter;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -145,6 +147,12 @@
protected final Utils utils;
+ protected final Contents contents;
+
+ protected final Messages messages;
+
+ protected final Resources resources;
+
/**
* To check whether annotation heading is printed or not.
*/
@@ -174,10 +182,12 @@
*
* @param path File to be generated.
*/
- public HtmlDocletWriter(ConfigurationImpl configuration, DocPath path)
- throws IOException {
+ public HtmlDocletWriter(ConfigurationImpl configuration, DocPath path) {
super(configuration, path);
this.configuration = configuration;
+ this.contents = configuration.contents;
+ this.messages = configuration.messages;
+ this.resources = configuration.resources;
this.utils = configuration.utils;
this.path = path;
this.pathToRoot = path.parent().invert();
@@ -249,19 +259,19 @@
*/
public Content getAllClassesLinkScript(String id) {
HtmlTree script = HtmlTree.SCRIPT();
- String scriptCode = "<!--" + DocletConstants.NL +
- " allClassesLink = document.getElementById(\"" + id + "\");" + DocletConstants.NL +
- " if(window==top) {" + DocletConstants.NL +
- " allClassesLink.style.display = \"block\";" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " else {" + DocletConstants.NL +
- " allClassesLink.style.display = \"none\";" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " //-->" + DocletConstants.NL;
- Content scriptContent = new RawHtml(scriptCode);
+ String scriptCode = "<!--\n" +
+ " allClassesLink = document.getElementById(\"" + id + "\");\n" +
+ " if(window==top) {\n" +
+ " allClassesLink.style.display = \"block\";\n" +
+ " }\n" +
+ " else {\n" +
+ " allClassesLink.style.display = \"none\";\n" +
+ " }\n" +
+ " //-->\n";
+ Content scriptContent = new RawHtml(scriptCode.replace("\n", DocletConstants.NL));
script.addContent(scriptContent);
Content div = HtmlTree.DIV(script);
- Content div_noscript = HtmlTree.DIV(getResource("doclet.No_Script_Message"));
+ Content div_noscript = HtmlTree.DIV(contents.noScriptMessage);
Content noScript = HtmlTree.NOSCRIPT(div_noscript);
div.addContent(noScript);
return div;
@@ -404,7 +414,7 @@
HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
tdClassDescription.addStyle(HtmlStyle.colLast);
if (utils.isDeprecated(te)) {
- tdClassDescription.addContent(deprecatedLabel);
+ tdClassDescription.addContent(contents.deprecatedLabel);
List<? extends DocTree> tags = utils.getDeprecatedTrees(te);
if (!tags.isEmpty()) {
addSummaryDeprecatedComment(te, tags.get(0), tdClassDescription);
@@ -535,7 +545,7 @@
String allClassesId = "allclasses_";
HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
fixedNavDiv.addStyle(HtmlStyle.fixedNav);
- Content skipNavLinks = configuration.getResource("doclet.Skip_navigation_links");
+ Content skipNavLinks = configuration.getContent("doclet.Skip_navigation_links");
if (header) {
fixedNavDiv.addContent(HtmlConstants.START_OF_TOP_NAVBAR);
navDiv.addStyle(HtmlStyle.topNav);
@@ -617,8 +627,9 @@
if (header && configuration.createindex) {
HtmlTree inputText = HtmlTree.INPUT("text", "search");
HtmlTree inputReset = HtmlTree.INPUT("reset", "reset");
- Content searchTxt = configuration.getResource("doclet.search");
- searchTxt.addContent(getSpace());
+ Content searchTxt = new ContentBuilder();
+ searchTxt.addContent(configuration.getContent("doclet.search"));
+ searchTxt.addContent(Contents.SPACE);
HtmlTree liInput = HtmlTree.LI(HtmlTree.SPAN(searchTxt));
liInput.addContent(inputText);
liInput.addContent(inputReset);
@@ -632,7 +643,7 @@
fixedNavDiv.addContent(subDiv);
fixedNavDiv.addContent(HtmlConstants.END_OF_TOP_NAVBAR);
tree.addContent(fixedNavDiv);
- HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, getSpace());
+ HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, Contents.SPACE);
tree.addContent(paddingDiv);
} else {
subDiv.addContent(getMarkerAnchor(SectionName.SKIP_NAVBAR_BOTTOM));
@@ -678,7 +689,7 @@
*/
protected Content getNavLinkContents() {
Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_SUMMARY),
- overviewLabel, "", "");
+ contents.overviewLabel, "", "");
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -690,7 +701,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkModule(ModuleElement mdle) {
- Content linkContent = getModuleLink(mdle, moduleLabel);
+ Content linkContent = getModuleLink(mdle, contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -701,7 +712,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkModule() {
- Content li = HtmlTree.LI(moduleLabel);
+ Content li = HtmlTree.LI(contents.moduleLabel);
return li;
}
@@ -712,7 +723,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkPackage(PackageElement pkg) {
- Content linkContent = getPackageLink(pkg, packageLabel);
+ Content linkContent = getPackageLink(pkg, contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -723,7 +734,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkPackage() {
- Content li = HtmlTree.LI(packageLabel);
+ Content li = HtmlTree.LI(contents.packageLabel);
return li;
}
@@ -733,7 +744,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkClassUse() {
- Content li = HtmlTree.LI(useLabel);
+ Content li = HtmlTree.LI(contents.useLabel);
return li;
}
@@ -746,10 +757,10 @@
public Content getNavLinkPrevious(DocPath prev) {
Content li;
if (prev != null) {
- li = HtmlTree.LI(getHyperLink(prev, prevLabel, "", ""));
+ li = HtmlTree.LI(getHyperLink(prev, contents.prevLabel, "", ""));
}
else
- li = HtmlTree.LI(prevLabel);
+ li = HtmlTree.LI(contents.prevLabel);
return li;
}
@@ -763,10 +774,10 @@
public Content getNavLinkNext(DocPath next) {
Content li;
if (next != null) {
- li = HtmlTree.LI(getHyperLink(next, nextLabel, "", ""));
+ li = HtmlTree.LI(getHyperLink(next, contents.nextLabel, "", ""));
}
else
- li = HtmlTree.LI(nextLabel);
+ li = HtmlTree.LI(contents.nextLabel);
return li;
}
@@ -778,7 +789,7 @@
*/
protected Content getNavShowLists(DocPath link) {
DocLink dl = new DocLink(link, path.getPath(), null);
- Content framesContent = getHyperLink(dl, framesLabel, "", "_top");
+ Content framesContent = getHyperLink(dl, contents.framesLabel, "", "_top");
Content li = HtmlTree.LI(framesContent);
return li;
}
@@ -799,7 +810,7 @@
* @return a content tree for the link
*/
protected Content getNavHideLists(DocPath link) {
- Content noFramesContent = getHyperLink(link, noframesLabel, "", "_top");
+ Content noFramesContent = getHyperLink(link, contents.noFramesLabel, "", "_top");
Content li = HtmlTree.LI(noFramesContent);
return li;
}
@@ -817,7 +828,7 @@
DocPath docPath = packages.size() == 1 && utils.getSpecifiedClasses().isEmpty()
? pathString(packages.get(0), DocPaths.PACKAGE_TREE)
: pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
- return HtmlTree.LI(getHyperLink(docPath, treeLabel, "", ""));
+ return HtmlTree.LI(getHyperLink(docPath, contents.treeLabel, "", ""));
}
/**
@@ -839,7 +850,7 @@
* @return a content tree for the link
*/
protected Content getNavLinkClass() {
- Content li = HtmlTree.LI(classLabel);
+ Content li = HtmlTree.LI(contents.classLabel);
return li;
}
@@ -850,7 +861,7 @@
*/
protected Content getNavLinkDeprecated() {
Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
- deprecatedLabel, "", "");
+ contents.deprecatedLabel, "", "");
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -865,7 +876,7 @@
protected Content getNavLinkClassIndex() {
Content allClassesContent = getHyperLink(pathToRoot.resolve(
DocPaths.ALLCLASSES_NOFRAME),
- allclassesLabel, "", "");
+ contents.allClassesLabel, "", "");
Content li = HtmlTree.LI(allClassesContent);
return li;
}
@@ -880,7 +891,7 @@
(configuration.splitindex
? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
: DocPaths.INDEX_ALL)),
- indexLabel, "", "");
+ contents.indexLabel, "", "");
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -902,7 +913,7 @@
helpfilenm = DocPath.create(file.getName());
}
Content linkContent = getHyperLink(pathToRoot.resolve(helpfilenm),
- helpLabel, "", "");
+ contents.helpLabel, "", "");
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -913,9 +924,9 @@
* @param liNav the content tree to which the gap will be added
*/
protected void addNavGap(Content liNav) {
- liNav.addContent(getSpace());
+ liNav.addContent(Contents.SPACE);
liNav.addContent("|");
- liNav.addContent(getSpace());
+ liNav.addContent(Contents.SPACE);
}
/**
@@ -954,7 +965,7 @@
*/
public Content getTableCaption(Content title) {
Content captionSpan = HtmlTree.SPAN(title);
- Content space = getSpace();
+ Content space = Contents.SPACE;
Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, space);
Content caption = HtmlTree.CAPTION(captionSpan);
caption.addContent(tabSpan);
@@ -1014,7 +1025,7 @@
*/
public Content getPackageName(PackageElement packageElement) {
return packageElement == null || packageElement.isUnnamed()
- ? defaultPackageLabel
+ ? contents.defaultPackageLabel
: getPackageLabel(packageElement.getQualifiedName());
}
@@ -1040,7 +1051,7 @@
protected void addPackageDeprecatedAPI(SortedSet<Element> deprPkgs, String headingKey,
String tableSummary, List<String> tableHeader, Content contentTree) {
if (deprPkgs.size() > 0) {
- Content caption = getTableCaption(configuration.getResource(headingKey));
+ Content caption = getTableCaption(configuration.getContent(headingKey));
Content table = (configuration.isOutputHtml5())
? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
: HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
@@ -1551,7 +1562,7 @@
return classCrossLink;
} else {
// No cross link found so print warning
- configuration.getDocletSpecificMsg().warning(ch.getDocTreePath(see),
+ messages.warning(ch.getDocTreePath(see),
"doclet.see.class_or_package_not_found",
"@" + tagName,
seetext);
@@ -1594,11 +1605,11 @@
if (this instanceof ClassWriterImpl) {
containing = ((ClassWriterImpl) this).getTypeElement();
} else if (!utils.isPublic(containing)) {
- configuration.getDocletSpecificMsg().warning(
+ messages.warning(
ch.getDocTreePath(see), "doclet.see.class_or_package_not_accessible",
tagName, utils.getFullyQualifiedName(containing));
} else {
- configuration.getDocletSpecificMsg().warning(
+ messages.warning(
ch.getDocTreePath(see), "doclet.see.class_or_package_not_found",
tagName, seetext);
}
@@ -1728,7 +1739,7 @@
htmltree.addContent(div);
}
if (tags.isEmpty()) {
- htmltree.addContent(getSpace());
+ htmltree.addContent(Contents.SPACE);
}
}
@@ -1917,7 +1928,7 @@
@Override @DefinedBy(Api.COMPILER_TREE)
public Boolean visitErroneous(ErroneousTree node, Content c) {
- configuration.getDocletSpecificMsg().warning(ch.getDocTreePath(node),
+ messages.warning(ch.getDocTreePath(node),
"doclet.tag.invalid_usage", node);
result.addContent(new RawHtml(node.toString()));
return false;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.formats.html;
-import java.io.*;
-
import java.util.Arrays;
import java.util.List;
import java.util.SortedSet;
@@ -111,7 +109,7 @@
methodDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.METHOD_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.methodDetailsLabel);
+ contents.methodDetailLabel);
methodDetailsTree.addContent(heading);
return methodDetailsTree;
}
@@ -190,9 +188,9 @@
Content codelLink = HtmlTree.CODE(link);
Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel,
utils.isClass(holder)
- ? writer.descfrmClassLabel
- : writer.descfrmInterfaceLabel);
- descfrmLabel.addContent(writer.getSpace());
+ ? contents.descfrmClassLabel
+ : contents.descfrmInterfaceLabel);
+ descfrmLabel.addContent(Contents.SPACE);
descfrmLabel.addContent(codelLink);
methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
writer.addInlineComment(method, methodDocTree);
@@ -230,20 +228,12 @@
}
/**
- * Close the writer.
- */
- @Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
@Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Method_Summary"));
+ contents.methodSummary);
memberTree.addContent(label);
}
@@ -252,9 +242,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Method_Summary"),
- configuration.getText("doclet.methods"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Method_Summary"),
+ resources.getText("doclet.methods"));
}
/**
@@ -262,7 +252,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Methods");
+ return contents.methods;
}
/**
@@ -271,9 +261,9 @@
@Override
public List<String> getSummaryTableHeader(Element member) {
List<String> header = Arrays.asList(writer.getModifierTypeHeader(),
- configuration.getText("doclet.0_and_1",
- configuration.getText("doclet.Method"),
- configuration.getText("doclet.Description")));
+ resources.getText("doclet.0_and_1",
+ resources.getText("doclet.Method"),
+ resources.getText("doclet.Description")));
return header;
}
@@ -307,7 +297,7 @@
: configuration.getText("doclet.Methods_Inherited_From_Interface"));
Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(writer.getSpace());
+ labelHeading.addContent(Contents.SPACE);
labelHeading.addContent(classLink);
inheritedTree.addContent(labelHeading);
}
@@ -329,7 +319,8 @@
if (writer.configuration.nocomment) {
return;
}
- Utils utils = writer.configuration().utils;
+ Utils utils = writer.utils;
+ Contents contents = writer.contents;
TypeElement holder = utils.getEnclosingTypeElement(method);
if (!(utils.isPublic(holder) ||
utils.isLinkable(holder))) {
@@ -341,14 +332,14 @@
//is not visible so don't document this.
return;
}
- Content label = writer.overridesLabel;
+ Content label = contents.overridesLabel;
LinkInfoImpl.Kind context = LinkInfoImpl.Kind.METHOD_OVERRIDES;
if (method != null) {
if (utils.isAbstract(holder) && utils.isAbstract(method)){
//Abstract method is implemented from abstract class,
//not overridden
- label = writer.specifiedByLabel;
+ label = contents.specifiedByLabel;
context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY;
}
Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, label));
@@ -362,9 +353,9 @@
.where(writer.getName(writer.getAnchor(method))).label(method.getSimpleName()));
Content codeMethLink = HtmlTree.CODE(methlink);
Content dd = HtmlTree.DD(codeMethLink);
- dd.addContent(writer.getSpace());
- dd.addContent(writer.getResource("doclet.in_class"));
- dd.addContent(writer.getSpace());
+ dd.addContent(Contents.SPACE);
+ dd.addContent(writer.contents.inClass);
+ dd.addContent(Contents.SPACE);
dd.addContent(codeOverridenTypeLink);
dl.addContent(dd);
}
@@ -379,6 +370,7 @@
return;
}
Utils utils = writer.utils;
+ Contents contents = writer.contents;
ImplementedMethods implementedMethodsFinder =
new ImplementedMethods(method, writer.configuration);
SortedSet<ExecutableElement> implementedMethods =
@@ -390,16 +382,16 @@
Content intfaclink = writer.getLink(new LinkInfoImpl(
writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
Content codeIntfacLink = HtmlTree.CODE(intfaclink);
- Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, writer.specifiedByLabel));
+ Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, contents.specifiedByLabel));
dl.addContent(dt);
Content methlink = writer.getDocLink(
LinkInfoImpl.Kind.MEMBER, implementedMeth,
implementedMeth.getSimpleName(), false);
Content codeMethLink = HtmlTree.CODE(methlink);
Content dd = HtmlTree.DD(codeMethLink);
- dd.addContent(writer.getSpace());
- dd.addContent(writer.getResource("doclet.in_interface"));
- dd.addContent(writer.getSpace());
+ dd.addContent(Contents.SPACE);
+ dd.addContent(contents.inInterface);
+ dd.addContent(Contents.SPACE);
dd.addContent(codeIntfacLink);
dl.addContent(dd);
}
@@ -417,7 +409,7 @@
Content linkContent = writer.getLink(
new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
htmltree.addContent(linkContent);
- htmltree.addContent(writer.getSpace());
+ htmltree.addContent(Contents.SPACE);
}
}
@@ -430,14 +422,14 @@
if (typeElement == null) {
return writer.getHyperLink(
SectionName.METHOD_SUMMARY,
- writer.getResource("doclet.navMethod"));
+ contents.navMethod);
} else {
return writer.getHyperLink(
SectionName.METHODS_INHERITANCE,
- configuration.getClassName(typeElement), writer.getResource("doclet.navMethod"));
+ configuration.getClassName(typeElement), contents.navMethod);
}
} else {
- return writer.getResource("doclet.navMethod");
+ return contents.navMethod;
}
}
@@ -448,9 +440,9 @@
protected void addNavDetailLink(boolean link, Content liNav) {
if (link) {
liNav.addContent(writer.getHyperLink(
- SectionName.METHOD_DETAIL, writer.getResource("doclet.navMethod")));
+ SectionName.METHOD_DETAIL, contents.navMethod));
} else {
- liNav.addContent(writer.getResource("doclet.navMethod"));
+ liNav.addContent(contents.navMethod);
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -60,7 +60,7 @@
/**
* The module being documented.
*/
- private ModuleElement mdle;
+ private final ModuleElement mdle;
/**
* The classes to be documented. Use this to filter out classes
@@ -114,9 +114,8 @@
}
mdlgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywordsForModule(moduleElement), false, body);
- mdlgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
+ configuration.messages.error(
"doclet.exception_encountered",
exc.toString(), DocPaths.moduleTypeFrame(moduleElement).getPath());
throw new DocletAbortException(exc);
@@ -148,12 +147,12 @@
annotationTypes.addAll(utils.getAnnotationTypes(pkg));
}
}
- addClassKindListing(interfaces, getResource("doclet.Interfaces"), contentTree);
- addClassKindListing(classes, getResource("doclet.Classes"), contentTree);
- addClassKindListing(enums, getResource("doclet.Enums"), contentTree);
- addClassKindListing(exceptions, getResource("doclet.Exceptions"), contentTree);
- addClassKindListing(errors, getResource("doclet.Errors"), contentTree);
- addClassKindListing(annotationTypes, getResource("doclet.AnnotationTypes"), contentTree);
+ addClassKindListing(interfaces, contents.interfaces, contentTree);
+ addClassKindListing(classes, contents.classes, contentTree);
+ addClassKindListing(enums, contents.enums, contentTree);
+ addClassKindListing(exceptions, contents.exceptions, contentTree);
+ addClassKindListing(errors, contents.errors, contentTree);
+ addClassKindListing(annotationTypes, contents.annotationTypes, contentTree);
}
/**
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -39,6 +39,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -79,10 +80,9 @@
try {
modulegen = new ModuleIndexFrameWriter(configuration, filename);
modulegen.buildModuleIndexFile("doclet.Window_Overview", false);
- modulegen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -94,12 +94,12 @@
protected void addModulesList(Map<ModuleElement, Set<PackageElement>> modules, String text,
String tableSummary, Content body) {
Content heading = HtmlTree.HEADING(HtmlConstants.MODULE_HEADING, true,
- modulesLabel);
+ contents.modulesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
? HtmlTree.MAIN(HtmlStyle.indexContainer, heading)
: HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(modulesLabel);
+ ul.setTitle(contents.modulesLabel);
for (ModuleElement mdle: modules.keySet()) {
ul.addContent(getModuleLink(mdle));
}
@@ -150,7 +150,7 @@
*/
protected void addAllClassesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME,
- allclassesLabel, "", "packageFrame");
+ contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -163,7 +163,7 @@
*/
protected void addAllPackagesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME,
- allpackagesLabel, "", "packageListFrame");
+ contents.allPackagesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -172,7 +172,7 @@
* {@inheritDoc}
*/
protected void addNavigationBarFooter(Content body) {
- Content p = HtmlTree.P(getSpace());
+ Content p = HtmlTree.P(Contents.SPACE);
body.addContent(p);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -32,12 +32,14 @@
import javax.lang.model.element.PackageElement;
import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -90,9 +92,9 @@
try {
mdlgen = new ModuleIndexWriter(configuration, filename);
mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", true);
- mdlgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
+ Messages messages = configuration.getMessages();
+ messages.error(
"doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
@@ -195,12 +197,13 @@
subTitleDiv.addStyle(HtmlStyle.subTitle);
addSummaryComment(configuration.overviewElement, subTitleDiv);
Content div = HtmlTree.DIV(HtmlStyle.header, subTitleDiv);
- Content see = seeLabel;
+ Content see = new ContentBuilder();
+ see.addContent(contents.seeLabel);
see.addContent(" ");
Content descPara = HtmlTree.P(see);
Content descLink = getHyperLink(getDocLink(
SectionName.OVERVIEW_DESCRIPTION),
- descriptionLabel, "", "");
+ contents.descriptionLabel, "", "");
descPara.addContent(descLink);
div.addContent(descPara);
if (configuration.allowTag(HtmlTag.MAIN)) {
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -41,6 +41,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -82,10 +83,9 @@
try {
modpackgen = new ModulePackageIndexFrameWriter(configuration, filename);
modpackgen.buildModulePackagesIndexFile("doclet.Window_Overview", false, mdle);
- modpackgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -99,13 +99,13 @@
Content profNameContent = new StringContent(mdle.getQualifiedName().toString());
Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
getTargetModuleLink("classFrame", profNameContent, mdle));
- heading.addContent(getSpace());
- heading.addContent(packagesLabel);
+ heading.addContent(Contents.SPACE);
+ heading.addContent(contents.packagesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
? HtmlTree.MAIN(HtmlStyle.indexContainer, heading)
: HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(packagesLabel);
+ ul.setTitle(contents.packagesLabel);
List<PackageElement> packages = new ArrayList<>(modules.get(mdle));
for (PackageElement pkg : packages) {
if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
@@ -124,13 +124,13 @@
Content moduleNameContent = new StringContent(mdle.getQualifiedName().toString());
Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
getTargetModuleLink("classFrame", moduleNameContent, mdle));
- heading.addContent(getSpace());
- heading.addContent(packagesLabel);
+ heading.addContent(Contents.SPACE);
+ heading.addContent(contents.packagesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
? HtmlTree.MAIN(HtmlStyle.indexContainer, heading)
: HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(packagesLabel);
+ ul.setTitle(contents.packagesLabel);
Set<PackageElement> modulePackages = configuration.modulePackages.get(mdle);
for (PackageElement pkg: modulePackages) {
if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
@@ -198,7 +198,7 @@
*/
protected void addAllClassesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME,
- allclassesLabel, "", "packageFrame");
+ contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -211,7 +211,7 @@
*/
protected void addAllPackagesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME,
- allpackagesLabel, "", "packageListFrame");
+ contents.allPackagesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -224,7 +224,7 @@
*/
protected void addAllModulesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.MODULE_OVERVIEW_FRAME,
- allmodulesLabel, "", "packageListFrame");
+ contents.allModulesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -233,7 +233,7 @@
* {@inheritDoc}
*/
protected void addNavigationBarFooter(Content body) {
- Content p = HtmlTree.P(getSpace());
+ Content p = HtmlTree.P(Contents.SPACE);
body.addContent(p);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -102,8 +102,7 @@
* @param nextModule Next module in the sorted array.
*/
public ModuleWriterImpl(ConfigurationImpl configuration,
- ModuleElement mdle, ModuleElement prevModule, ModuleElement nextModule)
- throws IOException {
+ ModuleElement mdle, ModuleElement prevModule, ModuleElement nextModule) {
super(configuration, DocPaths.moduleSummary(mdle));
this.prevModule = prevModule;
this.nextModule = nextModule;
@@ -129,8 +128,8 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.addStyle(HtmlStyle.header);
Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
- HtmlStyle.title, moduleLabel);
- tHeading.addContent(getSpace());
+ HtmlStyle.title, contents.moduleLabel);
+ tHeading.addContent(Contents.SPACE);
Content moduleHead = new RawHtml(heading);
tHeading.addContent(moduleHead);
div.addContent(tHeading);
@@ -262,7 +261,7 @@
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.addStyle(HtmlStyle.blockList);
addSummaryHeader(HtmlConstants.START_OF_MODULES_SUMMARY, SectionName.MODULES,
- getResource("doclet.navModules"), li);
+ contents.navModules, li);
String text = configuration.getText("doclet.Requires_Summary");
String tableSummary = configuration.getText("doclet.Member_Table_Summary",
configuration.getText("doclet.Requires_Summary"),
@@ -315,7 +314,7 @@
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.addStyle(HtmlStyle.blockList);
addSummaryHeader(HtmlConstants.START_OF_PACKAGES_SUMMARY, SectionName.PACKAGES,
- getResource("doclet.navPackages"), li);
+ contents.navPackages, li);
String text = configuration.getText("doclet.Exported_Packages_Summary");
String tableSummary = configuration.getText("doclet.Member_Table_Summary",
configuration.getText("doclet.Exported_Packages_Summary"),
@@ -385,7 +384,7 @@
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.addStyle(HtmlStyle.blockList);
addSummaryHeader(HtmlConstants.START_OF_SERVICES_SUMMARY, SectionName.SERVICES,
- getResource("doclet.navServices"), li);
+ contents.navServices, li);
String text;
String tableSummary;
if (usesDirs != null && !usesDirs.isEmpty()) {
@@ -468,9 +467,9 @@
HtmlTree tdType = HtmlTree.TD(HtmlStyle.colFirst, srvLinkContent);
tdType.addContent(new HtmlTree(HtmlTag.BR));
tdType.addContent("(");
- HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, getResource("doclet.Implementation"));
+ HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
tdType.addContent(implSpan);
- tdType.addContent(getSpace());
+ tdType.addContent(Contents.SPACE);
tdType.addContent(implLinkContent);
tdType.addContent(")");
HtmlTree tdDesc = new HtmlTree(HtmlTag.TD);
@@ -530,25 +529,25 @@
* @return the content tree for the navigation summary links
*/
protected Content getNavSummaryLinks() throws Exception {
- Content li = HtmlTree.LI(moduleSubNavLabel);
- li.addContent(getSpace());
+ Content li = HtmlTree.LI(contents.moduleSubNavLabel);
+ li.addContent(Contents.SPACE);
Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
Content liNav = new HtmlTree(HtmlTag.LI);
liNav.addContent(!utils.getBody(mdle).isEmpty() && !configuration.nocomment
- ? getHyperLink(SectionName.MODULE_DESCRIPTION, getResource("doclet.navModuleDescription"))
- : getResource("doclet.navModuleDescription"));
+ ? getHyperLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription)
+ : contents.navModuleDescription);
addNavGap(liNav);
liNav.addContent(showDirectives(DirectiveKind.REQUIRES)
- ? getHyperLink(SectionName.MODULES, getResource("doclet.navModules"))
- : getResource("doclet.navModules"));
+ ? getHyperLink(SectionName.MODULES, contents.navModules)
+ : contents.navModules);
addNavGap(liNav);
liNav.addContent(showDirectives(DirectiveKind.EXPORTS)
- ? getHyperLink(SectionName.PACKAGES, getResource("doclet.navPackages"))
- : getResource("doclet.navPackages"));
+ ? getHyperLink(SectionName.PACKAGES, contents.navPackages)
+ : contents.navPackages);
addNavGap(liNav);
liNav.addContent((showDirectives(DirectiveKind.USES) || showDirectives(DirectiveKind.PROVIDES))
- ? getHyperLink(SectionName.SERVICES, getResource("doclet.navServices"))
- : getResource("doclet.navServices"));
+ ? getHyperLink(SectionName.SERVICES, contents.navServices)
+ : contents.navServices);
ulNav.addContent(liNav);
return ulNav;
}
@@ -609,7 +608,7 @@
deprs = utils.getDeprecatedTrees(pkg);
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.addStyle(HtmlStyle.deprecatedContent);
- Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
deprDiv.addContent(deprPhrase);
if (!deprs.isEmpty()) {
CommentHelper ch = utils.getCommentHelper(pkg);
@@ -629,7 +628,7 @@
*/
@Override
protected Content getNavLinkModule() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, moduleLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.moduleLabel);
return li;
}
@@ -641,10 +640,10 @@
public Content getNavLinkPrevious() {
Content li;
if (prevModule == null) {
- li = HtmlTree.LI(prevmoduleLabel);
+ li = HtmlTree.LI(contents.prevModuleLabel);
} else {
li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
- prevModule)), prevmoduleLabel, "", ""));
+ prevModule)), contents.prevModuleLabel, "", ""));
}
return li;
}
@@ -657,10 +656,10 @@
public Content getNavLinkNext() {
Content li;
if (nextModule == null) {
- li = HtmlTree.LI(nextmoduleLabel);
+ li = HtmlTree.LI(contents.nextModuleLabel);
} else {
li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
- nextModule)), nextmoduleLabel, "", ""));
+ nextModule)), contents.nextModuleLabel, "", ""));
}
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -84,20 +84,12 @@
}
/**
- * Close the writer.
- */
- @Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
@Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Nested_Class_Summary"));
+ contents.nestedClassSummary);
memberTree.addContent(label);
}
@@ -106,9 +98,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Nested_Class_Summary"),
- configuration.getText("doclet.nested_classes"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Nested_Class_Summary"),
+ resources.getText("doclet.nested_classes"));
}
/**
@@ -116,7 +108,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Nested_Classes");
+ return configuration.getContent("doclet.Nested_Classes");
}
/**
@@ -169,7 +161,7 @@
: configuration.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(writer.getSpace());
+ labelHeading.addContent(Contents.SPACE);
labelHeading.addContent(classLink);
inheritedTree.addContent(labelHeading);
}
@@ -221,14 +213,14 @@
if (typeElement == null) {
return writer.getHyperLink(
SectionName.NESTED_CLASS_SUMMARY,
- writer.getResource("doclet.navNested"));
+ contents.navNested);
} else {
return writer.getHyperLink(
SectionName.NESTED_CLASSES_INHERITANCE,
- utils.getFullyQualifiedName(typeElement), writer.getResource("doclet.navNested"));
+ utils.getFullyQualifiedName(typeElement), contents.navNested);
}
} else {
- return writer.getResource("doclet.navNested");
+ return contents.navNested;
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -38,6 +38,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -80,8 +81,7 @@
* @param configuration the configuration of the doclet.
* @param packageElement PackageElement under consideration.
*/
- public PackageFrameWriter(ConfigurationImpl configuration, PackageElement packageElement)
- throws IOException {
+ public PackageFrameWriter(ConfigurationImpl configuration, PackageElement packageElement) {
super(configuration, DocPath.forPackage(packageElement).resolve(DocPaths.PACKAGE_FRAME));
this.packageElement = packageElement;
if (utils.getSpecifiedPackages().isEmpty()) {
@@ -119,10 +119,9 @@
}
packgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywords(packageElement), false, body);
- packgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
throw new DocletAbortException(exc);
}
@@ -139,30 +138,30 @@
Configuration config = configuration;
if (utils.isIncluded(packageElement)) {
addClassKindListing(utils.getInterfaces(packageElement),
- getResource("doclet.Interfaces"), contentTree);
+ contents.interfaces, contentTree);
addClassKindListing(utils.getOrdinaryClasses(packageElement),
- getResource("doclet.Classes"), contentTree);
+ contents.classes, contentTree);
addClassKindListing(utils.getEnums(packageElement),
- getResource("doclet.Enums"), contentTree);
+ contents.enums, contentTree);
addClassKindListing(utils.getExceptions(packageElement),
- getResource("doclet.Exceptions"), contentTree);
+ contents.exceptions, contentTree);
addClassKindListing(utils.getErrors(packageElement),
- getResource("doclet.Errors"), contentTree);
+ contents.errors, contentTree);
addClassKindListing(utils.getAnnotationTypes(packageElement),
- getResource("doclet.AnnotationTypes"), contentTree);
+ contents.annotationTypes, contentTree);
} else {
addClassKindListing(config.typeElementCatalog.interfaces(packageElement),
- getResource("doclet.Interfaces"), contentTree);
+ contents.interfaces, contentTree);
addClassKindListing(config.typeElementCatalog.ordinaryClasses(packageElement),
- getResource("doclet.Classes"), contentTree);
+ contents.classes, contentTree);
addClassKindListing(config.typeElementCatalog.enums(packageElement),
- getResource("doclet.Enums"), contentTree);
+ contents.enums, contentTree);
addClassKindListing(config.typeElementCatalog.exceptions(packageElement),
- getResource("doclet.Exceptions"), contentTree);
+ contents.exceptions, contentTree);
addClassKindListing(config.typeElementCatalog.errors(packageElement),
- getResource("doclet.Errors"), contentTree);
+ contents.errors, contentTree);
addClassKindListing(config.typeElementCatalog.annotationTypes(packageElement),
- getResource("doclet.AnnotationTypes"), contentTree);
+ contents.annotationTypes, contentTree);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -37,6 +37,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -76,10 +77,9 @@
try {
packgen = new PackageIndexFrameWriter(configuration, filename);
packgen.buildPackageIndexFile("doclet.Window_Overview", false);
- packgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -91,12 +91,12 @@
protected void addPackagesList(Collection<PackageElement> packages, String text,
String tableSummary, Content body) {
Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
- packagesLabel);
+ contents.packagesLabel);
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
? HtmlTree.MAIN(HtmlStyle.indexContainer, heading)
: HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(packagesLabel);
+ ul.setTitle(contents.packagesLabel);
for (PackageElement aPackage : packages) {
// Do not list the package if -nodeprecated option is set and the
// package is marked as deprecated.
@@ -161,7 +161,7 @@
*/
protected void addAllClassesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME,
- allclassesLabel, "", "packageFrame");
+ contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -174,7 +174,7 @@
*/
protected void addAllModulesLink(Content ul) {
Content linkContent = getHyperLink(DocPaths.MODULE_OVERVIEW_FRAME,
- allmodulesLabel, "", "packageListFrame");
+ contents.allModulesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
ul.addContent(li);
}
@@ -183,7 +183,7 @@
* {@inheritDoc}
*/
protected void addNavigationBarFooter(Content body) {
- Content p = HtmlTree.P(getSpace());
+ Content p = HtmlTree.P(Contents.SPACE);
body.addContent(p);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,11 +31,13 @@
import javax.lang.model.element.PackageElement;
import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -103,10 +105,9 @@
try {
packgen = new PackageIndexWriter(configuration, filename);
packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", true);
- packgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -189,12 +190,13 @@
subTitleDiv.addStyle(HtmlStyle.subTitle);
addSummaryComment(configuration.overviewElement, subTitleDiv);
Content div = HtmlTree.DIV(HtmlStyle.header, subTitleDiv);
- Content see = seeLabel;
- see.addContent(" ");
- Content descPara = HtmlTree.P(see);
+ Content descBody = new ContentBuilder();
+ descBody.addContent(contents.seeLabel);
+ descBody.addContent(" ");
+ Content descPara = HtmlTree.P(descBody);
Content descLink = getHyperLink(getDocLink(
SectionName.OVERVIEW_DESCRIPTION),
- descriptionLabel, "", "");
+ contents.descriptionLabel, "", "");
descPara.addContent(descLink);
div.addContent(descPara);
if (configuration.allowTag(HtmlTag.MAIN)) {
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -34,6 +34,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -112,10 +113,9 @@
packgen = new PackageTreeWriter(configuration, path, pkg,
prev, next);
packgen.generatePackageTreeFile();
- packgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), path.getPath());
throw new DocletAbortException(exc);
}
@@ -130,7 +130,7 @@
HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
? HtmlTree.MAIN()
: body;
- Content headContent = getResource("doclet.Hierarchy_For_Package",
+ Content headContent = contents.getContent("doclet.Hierarchy_For_Package",
utils.getPackageName(packageElement));
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false,
HtmlStyle.title, headContent);
@@ -187,7 +187,7 @@
*/
protected void addLinkToMainTree(Content div) {
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
- getResource("doclet.Package_Hierarchies"));
+ contents.packageHierarchies);
div.addContent(span);
HtmlTree ul = new HtmlTree (HtmlTag.UL);
ul.addStyle(HtmlStyle.horizontal);
@@ -231,7 +231,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -243,7 +243,7 @@
*/
protected Content getNavLinkPackage() {
Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
- packageLabel);
+ contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -38,6 +38,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -108,11 +109,9 @@
try {
pkgusegen = new PackageUseWriter(configuration, mapper, filename, pkgElement);
pkgusegen.generatePackageUseFile();
- pkgusegen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
- exc.toString(), filename);
+ Messages messages = configuration.getMessages();
+ messages.error(exc.toString(), filename);
throw new DocletAbortException(exc);
}
}
@@ -125,7 +124,7 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.addStyle(HtmlStyle.contentContainer);
if (usingPackageToUsedClasses.isEmpty()) {
- div.addContent(getResource("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
+ div.addContent(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
} else {
addPackageUse(div);
}
@@ -167,7 +166,7 @@
* @param contentTree the content tree to which the package list will be added
*/
protected void addPackageList(Content contentTree) throws IOException {
- Content caption = getTableCaption(configuration.getResource(
+ Content caption = getTableCaption(configuration.getContent(
"doclet.ClassUse_Packages.that.use.0",
getPackageLink(packageElement, utils.getPackageName(packageElement))));
Content table = (configuration.isOutputHtml5())
@@ -208,7 +207,7 @@
}
String tableSummary = configuration.getText("doclet.Use_Table_Summary",
configuration.getText("doclet.classes"));
- Content caption = getTableCaption(configuration.getResource(
+ Content caption = getTableCaption(configuration.getContent(
"doclet.ClassUse_Classes.in.0.used.by.1",
getPackageLink(packageElement, utils.getPackageName(packageElement)),
getPackageLink(usingPackage, utils.getPackageName(usingPackage))));
@@ -265,7 +264,7 @@
if (pkg != null && !pkg.isUnnamed()) {
addSummaryComment(pkg, tdLast);
} else {
- tdLast.addContent(getSpace());
+ tdLast.addContent(Contents.SPACE);
}
contentTree.addContent(tdLast);
}
@@ -289,7 +288,7 @@
bodyTree.addContent(htmlTree);
}
ContentBuilder headContent = new ContentBuilder();
- headContent.addContent(getResource("doclet.ClassUse_Title", packageText));
+ headContent.addContent(contents.getContent("doclet.ClassUse_Title", packageText));
headContent.addContent(new HtmlTree(HtmlTag.BR));
headContent.addContent(name);
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
@@ -311,7 +310,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -323,7 +322,7 @@
*/
protected Content getNavLinkPackage() {
Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
- packageLabel);
+ contents.packageLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -334,7 +333,7 @@
* @return a content tree for the use link
*/
protected Content getNavLinkClassUse() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, useLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.useLabel);
return li;
}
@@ -345,7 +344,7 @@
*/
protected Content getNavLinkTree() {
Content linkContent = getHyperLink(DocPaths.PACKAGE_TREE,
- treeLabel);
+ contents.treeLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -100,8 +100,7 @@
* @param next Next package in the sorted array.
*/
public PackageWriterImpl(ConfigurationImpl configuration,
- PackageElement packageElement, PackageElement prev, PackageElement next)
- throws IOException {
+ PackageElement packageElement, PackageElement prev, PackageElement next) {
super(configuration, DocPath
.forPackage(packageElement)
.resolve(DocPaths.PACKAGE_SUMMARY));
@@ -127,9 +126,9 @@
div.addStyle(HtmlStyle.header);
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement);
if (mdle != null && !mdle.isUnnamed()) {
- Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, moduleLabel);
+ Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
- moduleNameDiv.addContent(getSpace());
+ moduleNameDiv.addContent(Contents.SPACE);
moduleNameDiv.addContent(getModuleLink(mdle,
new StringContent(mdle.getQualifiedName().toString())));
div.addContent(moduleNameDiv);
@@ -138,8 +137,8 @@
addAnnotationInfo(packageElement, annotationContent);
div.addContent(annotationContent);
Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
- HtmlStyle.title, packageLabel);
- tHeading.addContent(getSpace());
+ HtmlStyle.title, contents.packageLabel);
+ tHeading.addContent(Contents.SPACE);
Content packageHead = new StringContent(heading);
tHeading.addContent(packageHead);
div.addContent(tHeading);
@@ -149,11 +148,11 @@
docSummaryDiv.addStyle(HtmlStyle.docSummary);
addSummaryComment(packageElement, docSummaryDiv);
div.addContent(docSummaryDiv);
- Content space = getSpace();
+ Content space = Contents.SPACE;
Content descLink = getHyperLink(getDocLink(
SectionName.PACKAGE_DESCRIPTION),
- descriptionLabel, "", "");
- Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink);
+ contents.descriptionLabel, "", "");
+ Content descPara = new HtmlTree(HtmlTag.P, contents.seeLabel, space, descLink);
div.addContent(descPara);
}
if (configuration.allowTag(HtmlTag.MAIN)) {
@@ -184,7 +183,7 @@
CommentHelper ch = utils.getCommentHelper(packageElement);
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.addStyle(HtmlStyle.deprecatedContent);
- Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
deprDiv.addContent(deprPhrase);
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
@@ -233,7 +232,7 @@
HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
tdClassDescription.addStyle(HtmlStyle.colLast);
if (utils.isDeprecated(klass)) {
- tdClassDescription.addContent(deprecatedLabel);
+ tdClassDescription.addContent(contents.deprecatedLabel);
List<? extends DocTree> tags = utils.getDeprecatedTrees(klass);
if (!tags.isEmpty()) {
addSummaryDeprecatedComment(klass, tags.get(0), tdClassDescription);
@@ -323,7 +322,7 @@
*/
protected Content getNavLinkClassUse() {
Content useLink = getHyperLink(DocPaths.PACKAGE_USE,
- useLabel, "", "");
+ contents.useLabel, "", "");
Content li = HtmlTree.LI(useLink);
return li;
}
@@ -336,11 +335,11 @@
public Content getNavLinkPrevious() {
Content li;
if (prev == null) {
- li = HtmlTree.LI(prevpackageLabel);
+ li = HtmlTree.LI(contents.prevPackageLabel);
} else {
DocPath path = DocPath.relativePath(packageElement, prev);
li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY),
- prevpackageLabel, "", ""));
+ contents.prevPackageLabel, "", ""));
}
return li;
}
@@ -353,11 +352,11 @@
public Content getNavLinkNext() {
Content li;
if (next == null) {
- li = HtmlTree.LI(nextpackageLabel);
+ li = HtmlTree.LI(contents.nextPackageLabel);
} else {
DocPath path = DocPath.relativePath(packageElement, next);
li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY),
- nextpackageLabel, "", ""));
+ contents.nextPackageLabel, "", ""));
}
return li;
}
@@ -370,7 +369,7 @@
*/
protected Content getNavLinkTree() {
Content useLink = getHyperLink(DocPaths.PACKAGE_TREE,
- treeLabel, "", "");
+ contents.treeLabel, "", "");
Content li = HtmlTree.LI(useLink);
return li;
}
@@ -383,7 +382,7 @@
@Override
protected Content getNavLinkModule() {
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
- moduleLabel);
+ contents.moduleLabel);
Content li = HtmlTree.LI(linkContent);
return li;
}
@@ -394,7 +393,7 @@
* @return a content tree for the package link
*/
protected Content getNavLinkPackage() {
- Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, packageLabel);
+ Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.packageLabel);
return li;
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -94,7 +94,7 @@
propertyDetailsTree.addContent(writer.getMarkerAnchor(
SectionName.PROPERTY_DETAIL));
Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
- writer.propertyDetailsLabel);
+ contents.propertyDetailsLabel);
propertyDetailsTree.addContent(heading);
return propertyDetailsTree;
}
@@ -163,9 +163,9 @@
Content codeLink = HtmlTree.CODE(link);
Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel,
utils.isClass(holder)
- ? writer.descfrmClassLabel
- : writer.descfrmInterfaceLabel);
- descfrmLabel.addContent(writer.getSpace());
+ ? contents.descfrmClassLabel
+ : contents.descfrmInterfaceLabel);
+ descfrmLabel.addContent(Contents.SPACE);
descfrmLabel.addContent(codeLink);
propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
writer.addInlineComment(property, propertyDocTree);
@@ -203,20 +203,12 @@
}
/**
- * Close the writer.
- */
- @Override
- public void close() throws IOException {
- writer.close();
- }
-
- /**
* {@inheritDoc}
*/
@Override
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
- writer.getResource("doclet.Property_Summary"));
+ contents.propertySummary);
memberTree.addContent(label);
}
@@ -225,9 +217,9 @@
*/
@Override
public String getTableSummary() {
- return configuration.getText("doclet.Member_Table_Summary",
- configuration.getText("doclet.Property_Summary"),
- configuration.getText("doclet.properties"));
+ return resources.getText("doclet.Member_Table_Summary",
+ resources.getText("doclet.Property_Summary"),
+ resources.getText("doclet.properties"));
}
/**
@@ -235,7 +227,7 @@
*/
@Override
public Content getCaption() {
- return configuration.getResource("doclet.Properties");
+ return contents.properties;
}
/**
@@ -282,7 +274,7 @@
: configuration.getText("doclet.Properties_Inherited_From_Interface"));
Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(writer.getSpace());
+ labelHeading.addContent(Contents.SPACE);
labelHeading.addContent(classLink);
inheritedTree.addContent(labelHeading);
}
@@ -342,14 +334,14 @@
if (typeElement == null) {
return writer.getHyperLink(
SectionName.PROPERTY_SUMMARY,
- writer.getResource("doclet.navProperty"));
+ contents.navProperty);
} else {
return writer.getHyperLink(
SectionName.PROPERTIES_INHERITANCE,
- configuration.getClassName(typeElement), writer.getResource("doclet.navProperty"));
+ configuration.getClassName(typeElement), contents.navProperty);
}
} else {
- return writer.getResource("doclet.navProperty");
+ return contents.navProperty;
}
}
@@ -361,9 +353,9 @@
if (link) {
liNav.addContent(writer.getHyperLink(
SectionName.PROPERTY_DETAIL,
- writer.getResource("doclet.navProperty")));
+ contents.navProperty));
} else {
- liNav.addContent(writer.getResource("doclet.navProperty"));
+ liNav.addContent(contents.navProperty);
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -136,8 +136,8 @@
*/
public Content getPackageHeader(String packageName) {
Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
- packageLabel);
- heading.addContent(getSpace());
+ contents.packageLabel);
+ heading.addContent(Contents.SPACE);
heading.addContent(packageName);
return heading;
}
@@ -183,9 +183,9 @@
//Print the heading.
Content className = superClassLink == null ?
- configuration.getResource(
+ configuration.getContent(
"doclet.Class_0_implements_serializable", classLink) :
- configuration.getResource(
+ configuration.getContent(
"doclet.Class_0_extends_implements_serializable", classLink,
superClassLink);
li.addContent(HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -84,10 +85,9 @@
indexgen = new SingleIndexWriter(configuration,
filename, indexbuilder);
indexgen.generateIndexFile();
- indexgen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -150,7 +150,7 @@
contentTree.addContent(
getHyperLink(getNameForIndex(unicode),
new StringContent(unicode)));
- contentTree.addContent(getSpace());
+ contentTree.addContent(Contents.SPACE);
}
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java Thu Aug 11 17:02:00 2016 +0000
@@ -40,6 +40,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -73,6 +74,7 @@
private static final String NEW_LINE = DocletConstants.NL;
private final ConfigurationImpl configuration;
+ private final Messages messages;
private final Utils utils;
private final DocletEnvironment docEnv;
@@ -88,6 +90,7 @@
private SourceToHTMLConverter(ConfigurationImpl configuration, DocletEnvironment rd,
DocPath outputdir) {
this.configuration = configuration;
+ this.messages = configuration.getMessages();
this.utils = configuration.utils;
this.docEnv = rd;
this.outputdir = outputdir;
@@ -200,7 +203,7 @@
Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(),
head, body);
Content htmlDocument = new HtmlDocument(htmlDocType, htmlTree);
- configuration.message.notice("doclet.Generating_0", path.getPath());
+ messages.notice("doclet.Generating_0", path.getPath());
DocFile df = DocFile.createFileForOutput(configuration, path);
try (Writer w = df.openWriter()) {
htmlDocument.write(w, true);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,11 +32,13 @@
import java.util.ListIterator;
import java.util.Set;
import java.util.TreeSet;
+
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
@@ -115,11 +117,10 @@
if (!li.hasNext()) {
indexgen.createSearchIndexFiles();
}
- indexgen.close();
}
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename.getPath());
throw new DocletAbortException(exc);
}
@@ -178,7 +179,7 @@
int j = i + 1;
contentTree.addContent(getHyperLink(DocPaths.indexN(j),
new StringContent(indexElements.get(i).toString())));
- contentTree.addContent(getSpace());
+ contentTree.addContent(Contents.SPACE);
}
}
@@ -188,7 +189,7 @@
* @return a content tree for the link
*/
public Content getNavLinkPrevious() {
- Content prevletterLabel = getResource("doclet.Prev_Letter");
+ Content prevletterLabel = contents.prevLetter;
if (prev == -1) {
return HtmlTree.LI(prevletterLabel);
}
@@ -205,7 +206,7 @@
* @return a content tree for the link
*/
public Content getNavLinkNext() {
- Content nextletterLabel = getResource("doclet.Next_Letter");
+ Content nextletterLabel = contents.nextLetter;
if (next == -1) {
return HtmlTree.LI(nextletterLabel);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -35,7 +35,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes;
@@ -67,8 +66,7 @@
*/
protected HtmlTree mainTree = HtmlTree.MAIN();
- public SubWriterHolderWriter(ConfigurationImpl configuration, DocPath filename)
- throws IOException {
+ public SubWriterHolderWriter(ConfigurationImpl configuration, DocPath filename) {
super(configuration, filename);
}
@@ -126,7 +124,7 @@
Content captionSpan;
Content span;
if (type.isDefaultTab()) {
- captionSpan = HtmlTree.SPAN(configuration.getResource(type.resourceKey()));
+ captionSpan = HtmlTree.SPAN(configuration.getContent(type.resourceKey()));
span = HtmlTree.SPAN(type.tabId(),
HtmlStyle.activeTableTab, captionSpan);
} else {
@@ -134,7 +132,7 @@
span = HtmlTree.SPAN(type.tabId(),
HtmlStyle.tableTab, captionSpan);
}
- Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, getSpace());
+ Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, Contents.SPACE);
span.addContent(tabSpan);
tabbedCaption.addContent(span);
}
@@ -149,7 +147,7 @@
*/
public Content getMethodTypeLinks(MethodTypes methodType) {
String jsShow = "javascript:show(" + methodType.value() +");";
- HtmlTree link = HtmlTree.A(jsShow, configuration.getResource(methodType.resourceKey()));
+ HtmlTree link = HtmlTree.A(jsShow, configuration.getContent(methodType.resourceKey()));
return link;
}
@@ -189,9 +187,9 @@
List<? extends DocTree> deprs = utils.getBlockTags(member, DocTree.Kind.DEPRECATED);
Content div;
if (utils.isDeprecated(member)) {
- Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
- div.addContent(getSpace());
+ div.addContent(Contents.SPACE);
if (!deprs.isEmpty()) {
addInlineDeprecatedComment(member, deprs.get(0), div);
}
@@ -200,9 +198,9 @@
} else {
Element te = member.getEnclosingElement();
if (te != null && utils.isTypeElement(te) && utils.isDeprecated(te)) {
- Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+ Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
- div.addContent(getSpace());
+ div.addContent(Contents.SPACE);
tdSummary.addContent(div);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Thu Aug 11 17:02:00 2016 +0000
@@ -26,6 +26,7 @@
package jdk.javadoc.internal.doclets.formats.html;
import java.util.List;
+
import javax.lang.model.element.Element;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
@@ -51,7 +52,6 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
-import jdk.javadoc.internal.doclets.toolkit.util.MessageRetriever;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
/**
@@ -144,7 +144,7 @@
return null;
}
}.visit(element);
- si.setCategory(configuration.getResource("doclet.SearchTags").toString());
+ si.setCategory(configuration.getContent("doclet.SearchTags").toString());
configuration.tagSearchIndex.add(si);
}
return result;
@@ -215,13 +215,6 @@
/**
* {@inheritDoc}
*/
- public MessageRetriever getMsgRetriever() {
- return configuration.message;
- }
-
- /**
- * {@inheritDoc}
- */
public Content getParamHeader(String header) {
HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel,
new StringContent(header)));
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -96,10 +97,9 @@
try {
treegen = new TreeWriter(configuration, filename, classtree);
treegen.generateTreeFile();
- treegen.close();
} catch (IOException exc) {
- configuration.standardmessage.error(
- "doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), filename);
throw new DocletAbortException(exc);
}
@@ -110,7 +110,7 @@
*/
public void generateTreeFile() throws IOException {
HtmlTree body = getTreeHeader();
- Content headContent = getResource("doclet.Hierarchy_For_All_Packages");
+ Content headContent = contents.hierarchyForAllPackages;
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false,
HtmlStyle.title, headContent);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
@@ -154,7 +154,7 @@
}
if (!classesonly) {
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
- getResource("doclet.Package_Hierarchies"));
+ contents.packageHierarchies);
contentTree.addContent(span);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addStyle(HtmlStyle.horizontal);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.javadoc.internal.doclets.formats.html.markup;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
+
+/**
+ * Class for containing fixed string content for HTML tags of javadoc output.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class FixedStringContent extends Content {
+ private final String string;
+
+ /**
+ * Constructor to construct FixedStringContent object.
+ *
+ * @param content content for the object
+ */
+ public FixedStringContent(CharSequence content) {
+ string = needEscape(content)
+ ? escape(content)
+ : content.toString();
+ }
+
+ /**
+ * This method is not supported by the class.
+ *
+ * @param content content that needs to be added
+ * @throws DocletAbortException this method will always throw a
+ * DocletAbortException because it
+ * is not supported.
+ */
+ @Override
+ public void addContent(Content content) {
+ throw new DocletAbortException("not supported");
+ }
+
+ /**
+ * Adds content for the StringContent object. The method escapes
+ * HTML characters for the string content that is added.
+ *
+ * @param strContent string content to be added
+ * @throws DocletAbortException this method will always throw a
+ * DocletAbortException because it
+ * is not supported.
+ */
+ @Override
+ public void addContent(CharSequence strContent) {
+ throw new DocletAbortException("not supported");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isEmpty() {
+ return string.isEmpty();
+ }
+
+ @Override
+ public int charCount() {
+ return RawHtml.charCount(string);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return string;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ out.write(string);
+ return string.endsWith(DocletConstants.NL);
+ }
+
+ private boolean needEscape(CharSequence cs) {
+ for (int i = 0; i < cs.length(); i++) {
+ switch (cs.charAt(i)) {
+ case '<':
+ case '>':
+ case '&':
+ return true;
+ }
+ }
+ return false;
+ }
+ private String escape(CharSequence s) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < s.length(); i++) {
+ char ch = s.charAt(i);
+ switch (ch) {
+ case '<': sb.append("<"); break;
+ case '>': sb.append(">"); break;
+ case '&': sb.append("&"); break;
+ default: sb.append(ch); break;
+ }
+ }
+ return sb.toString();
+ }
+
+}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -36,6 +36,7 @@
import jdk.javadoc.internal.doclets.formats.html.SectionName;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
@@ -67,11 +68,11 @@
*
* @param filename String file name.
*/
- public HtmlDocWriter(Configuration configuration, DocPath filename)
- throws IOException {
+ public HtmlDocWriter(Configuration configuration, DocPath filename) {
super(configuration, filename);
this.pathToRoot = filename.parent().invert();
- configuration.message.notice("doclet.Generating_0",
+ Messages messages = configuration.getMessages();
+ messages.notice("doclet.Generating_0",
DocFile.createFileForOutput(configuration, filename).getPath());
}
@@ -310,10 +311,6 @@
return (encl.isUnnamed()) ? "" : (encl.getQualifiedName() + ".");
}
- public boolean getMemberDetailsListPrinted() {
- return memberDetailsListPrinted;
- }
-
/**
* Print the frames version of the Html file header.
* Called only when generating an HTML frames file.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -30,6 +30,7 @@
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
@@ -62,11 +63,6 @@
protected Configuration configuration;
/**
- * The flag to indicate whether a member details list is printed or not.
- */
- protected boolean memberDetailsListPrinted;
-
- /**
* Header for table displaying modules and description..
*/
protected final List<String> moduleTableHeader;
@@ -106,89 +102,7 @@
*/
protected final String modifierTypeHeader;
- public final Content overviewLabel;
-
- public final Content defaultPackageLabel;
-
- public final Content packageLabel;
-
- public final Content moduleLabel;
-
- public final Content useLabel;
-
- public final Content prevLabel;
-
- public final Content nextLabel;
-
- public final Content prevclassLabel;
-
- public final Content nextclassLabel;
-
- public final Content summaryLabel;
-
- public final Content detailLabel;
-
- public final Content moduleSubNavLabel;
-
- public final Content framesLabel;
-
- public final Content noframesLabel;
-
- public final Content treeLabel;
-
- public final Content classLabel;
-
- public final Content deprecatedLabel;
-
- public final Content deprecatedPhrase;
-
- public final Content allclassesLabel;
-
- public final Content allpackagesLabel;
-
- public final Content allmodulesLabel;
-
- public final Content indexLabel;
-
- public final Content helpLabel;
-
- public final Content seeLabel;
-
- public final Content descriptionLabel;
-
- public final Content prevpackageLabel;
-
- public final Content nextpackageLabel;
-
- public final Content prevmoduleLabel;
-
- public final Content nextmoduleLabel;
-
- public final Content packagesLabel;
-
- public final Content modulesLabel;
-
- public final Content methodDetailsLabel;
-
- public final Content annotationTypeDetailsLabel;
-
- public final Content fieldDetailsLabel;
-
- public final Content propertyDetailsLabel;
-
- public final Content constructorDetailsLabel;
-
- public final Content enumConstantsDetailsLabel;
-
- public final Content specifiedByLabel;
-
- public final Content overridesLabel;
-
- public final Content descfrmClassLabel;
-
- public final Content descfrmInterfaceLabel;
-
- private final Writer writer;
+ private final DocFile docFile;
protected Content script;
@@ -198,143 +112,45 @@
*
* @param path The directory path to be created for this file
* or null if none to be created.
- * @exception IOException Exception raised by the FileWriter is passed on
- * to next level.
- * @exception UnsupportedEncodingException Exception raised by the
- * OutputStreamWriter is passed on to next level.
*/
- public HtmlWriter(Configuration configuration, DocPath path)
- throws IOException, UnsupportedEncodingException {
- writer = DocFile.createFileForOutput(configuration, path).openWriter();
+ public HtmlWriter(Configuration configuration, DocPath path) {
+ docFile = DocFile.createFileForOutput(configuration, path);
this.configuration = configuration;
- this.memberDetailsListPrinted = false;
+
+ // The following should be converted to shared Content objects
+ // and moved to Contents, but that will require additional
+ // changes at the use sites.
+ Resources resources = configuration.getResources();
moduleTableHeader = Arrays.asList(
- configuration.getText("doclet.Module"),
- configuration.getText("doclet.Description"));
+ resources.getText("doclet.Module"),
+ resources.getText("doclet.Description"));
packageTableHeader = new ArrayList<>();
- packageTableHeader.add(configuration.getText("doclet.Package"));
- packageTableHeader.add(configuration.getText("doclet.Description"));
+ packageTableHeader.add(resources.getText("doclet.Package"));
+ packageTableHeader.add(resources.getText("doclet.Description"));
requiresTableHeader = new ArrayList<>();
- requiresTableHeader.add(configuration.getText("doclet.Module"));
- requiresTableHeader.add(configuration.getText("doclet.Description"));
+ requiresTableHeader.add(resources.getText("doclet.Module"));
+ requiresTableHeader.add(resources.getText("doclet.Description"));
exportedPackagesTableHeader = new ArrayList<>();
- exportedPackagesTableHeader.add(configuration.getText("doclet.Package"));
- exportedPackagesTableHeader.add(configuration.getText("doclet.Module"));
- exportedPackagesTableHeader.add(configuration.getText("doclet.Description"));
+ exportedPackagesTableHeader.add(resources.getText("doclet.Package"));
+ exportedPackagesTableHeader.add(resources.getText("doclet.Module"));
+ exportedPackagesTableHeader.add(resources.getText("doclet.Description"));
usesTableHeader = new ArrayList<>();
- usesTableHeader.add(configuration.getText("doclet.Type"));
- usesTableHeader.add(configuration.getText("doclet.Description"));
+ usesTableHeader.add(resources.getText("doclet.Type"));
+ usesTableHeader.add(resources.getText("doclet.Description"));
providesTableHeader = new ArrayList<>();
- providesTableHeader.add(configuration.getText("doclet.Type"));
- providesTableHeader.add(configuration.getText("doclet.Description"));
- useTableSummary = configuration.getText("doclet.Use_Table_Summary",
- configuration.getText("doclet.packages"));
- modifierTypeHeader = configuration.getText("doclet.0_and_1",
- configuration.getText("doclet.Modifier"),
- configuration.getText("doclet.Type"));
- overviewLabel = getResource("doclet.Overview");
- defaultPackageLabel = new StringContent(DocletConstants.DEFAULT_PACKAGE_NAME);
- packageLabel = getResource("doclet.Package");
- moduleLabel = getResource("doclet.Module");
- useLabel = getResource("doclet.navClassUse");
- prevLabel = getResource("doclet.Prev");
- nextLabel = getResource("doclet.Next");
- prevclassLabel = getNonBreakResource("doclet.Prev_Class");
- nextclassLabel = getNonBreakResource("doclet.Next_Class");
- summaryLabel = getResource("doclet.Summary");
- detailLabel = getResource("doclet.Detail");
- moduleSubNavLabel = getResource("doclet.Module_Sub_Nav");
- framesLabel = getResource("doclet.Frames");
- noframesLabel = getNonBreakResource("doclet.No_Frames");
- treeLabel = getResource("doclet.Tree");
- classLabel = getResource("doclet.Class");
- deprecatedLabel = getResource("doclet.navDeprecated");
- deprecatedPhrase = getResource("doclet.Deprecated");
- allclassesLabel = getNonBreakResource("doclet.All_Classes");
- allpackagesLabel = getNonBreakResource("doclet.All_Packages");
- allmodulesLabel = getNonBreakResource("doclet.All_Modules");
- indexLabel = getResource("doclet.Index");
- helpLabel = getResource("doclet.Help");
- seeLabel = getResource("doclet.See");
- descriptionLabel = getResource("doclet.Description");
- prevpackageLabel = getNonBreakResource("doclet.Prev_Package");
- nextpackageLabel = getNonBreakResource("doclet.Next_Package");
- prevmoduleLabel = getNonBreakResource("doclet.Prev_Module");
- nextmoduleLabel = getNonBreakResource("doclet.Next_Module");
- packagesLabel = getResource("doclet.Packages");
- modulesLabel = getResource("doclet.Modules");
- methodDetailsLabel = getResource("doclet.Method_Detail");
- annotationTypeDetailsLabel = getResource("doclet.Annotation_Type_Member_Detail");
- fieldDetailsLabel = getResource("doclet.Field_Detail");
- propertyDetailsLabel = getResource("doclet.Property_Detail");
- constructorDetailsLabel = getResource("doclet.Constructor_Detail");
- enumConstantsDetailsLabel = getResource("doclet.Enum_Constant_Detail");
- specifiedByLabel = getResource("doclet.Specified_By");
- overridesLabel = getResource("doclet.Overrides");
- descfrmClassLabel = getResource("doclet.Description_From_Class");
- descfrmInterfaceLabel = getResource("doclet.Description_From_Interface");
+ providesTableHeader.add(resources.getText("doclet.Type"));
+ providesTableHeader.add(resources.getText("doclet.Description"));
+ useTableSummary = resources.getText("doclet.Use_Table_Summary",
+ resources.getText("doclet.packages"));
+ modifierTypeHeader = resources.getText("doclet.0_and_1",
+ resources.getText("doclet.Modifier"),
+ resources.getText("doclet.Type"));
}
public void write(Content c) throws IOException {
- c.write(writer, true);
- }
-
- public void close() throws IOException {
- writer.close();
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
- * @return a content tree for the text
- */
- public Content getResource(String key) {
- return configuration.getResource(key);
- }
-
- /**
- * Get the configuration string as a content, replacing spaces
- * with non-breaking spaces.
- *
- * @param key the key to look for in the configuration file
- * @return a content tree for the text
- */
- public Content getNonBreakResource(String key) {
- String text = configuration.getText(key);
- Content c = configuration.newContent();
- int start = 0;
- int p;
- while ((p = text.indexOf(" ", start)) != -1) {
- c.addContent(text.substring(start, p));
- c.addContent(RawHtml.nbsp);
- start = p + 1;
+ try (Writer writer = docFile.openWriter()) {
+ c.write(writer, true);
}
- c.addContent(text.substring(start));
- return c;
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
- * @param o string or content argument added to configuration text
- * @return a content tree for the text
- */
- public Content getResource(String key, Object o) {
- return configuration.getResource(key, o);
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
- * @param o1 string or content argument added to configuration text
- * @param o2 string or content argument added to configuration text
- * @return a content tree for the text
- */
- public Content getResource(String key, Object o0, Object o1) {
- return configuration.getResource(key, o0, o1);
}
/**
@@ -343,21 +159,21 @@
* @return an HtmlTree for the SCRIPT tag
*/
protected HtmlTree getWinTitleScript(){
- HtmlTree script = HtmlTree.SCRIPT();
+ HtmlTree scriptTree = HtmlTree.SCRIPT();
if(winTitle != null && winTitle.length() > 0) {
- String scriptCode = "<!--" + DocletConstants.NL +
- " try {" + DocletConstants.NL +
- " if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
- " parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " catch(err) {" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- "//-->" + DocletConstants.NL;
- RawHtml scriptContent = new RawHtml(scriptCode);
- script.addContent(scriptContent);
+ String scriptCode = "<!--\n" +
+ " try {\n" +
+ " if (location.href.indexOf('is-external=true') == -1) {\n" +
+ " parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";\n" +
+ " }\n" +
+ " }\n" +
+ " catch(err) {\n" +
+ " }\n" +
+ "//-->\n";
+ RawHtml scriptContent = new RawHtml(scriptCode.replace("\n", DocletConstants.NL));
+ scriptTree.addContent(scriptContent);
}
- return script;
+ return scriptTree;
}
/**
@@ -413,61 +229,61 @@
* @return a content for the SCRIPT tag
*/
protected Content getFramesJavaScript() {
- HtmlTree script = HtmlTree.SCRIPT();
- String scriptCode = DocletConstants.NL +
- " targetPage = \"\" + window.location.search;" + DocletConstants.NL +
- " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
- " targetPage = targetPage.substring(1);" + DocletConstants.NL +
- " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
- " targetPage = \"undefined\";" + DocletConstants.NL +
- " function validURL(url) {" + DocletConstants.NL +
- " try {" + DocletConstants.NL +
- " url = decodeURIComponent(url);" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " catch (error) {" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " var pos = url.indexOf(\".html\");" + DocletConstants.NL +
- " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
- " var allowNumber = false;" + DocletConstants.NL +
- " var allowSep = false;" + DocletConstants.NL +
- " var seenDot = false;" + DocletConstants.NL +
- " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL +
- " var ch = url.charAt(i);" + DocletConstants.NL +
- " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
- " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
- " ch == '$' ||" + DocletConstants.NL +
- " ch == '_' ||" + DocletConstants.NL +
- " ch.charCodeAt(0) > 127) {" + DocletConstants.NL +
- " allowNumber = true;" + DocletConstants.NL +
- " allowSep = true;" + DocletConstants.NL +
- " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
- " || ch == '-') {" + DocletConstants.NL +
- " if (!allowNumber)" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
- " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL +
- " if (!allowSep)" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
- " allowNumber = false;" + DocletConstants.NL +
- " allowSep = false;" + DocletConstants.NL +
- " if (ch == '.')" + DocletConstants.NL +
- " seenDot = true;" + DocletConstants.NL +
- " if (ch == '/' && seenDot)" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
- " } else {" + DocletConstants.NL +
- " return false;"+ DocletConstants.NL +
- " }" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " return true;" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- " function loadFrames() {" + DocletConstants.NL +
- " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
- " top.classFrame.location = top.targetPage;" + DocletConstants.NL +
- " }" + DocletConstants.NL;
- RawHtml scriptContent = new RawHtml(scriptCode);
- script.addContent(scriptContent);
- return script;
+ HtmlTree scriptTree = HtmlTree.SCRIPT();
+ String scriptCode = "\n" +
+ " targetPage = \"\" + window.location.search;\n" +
+ " if (targetPage != \"\" && targetPage != \"undefined\")\n" +
+ " targetPage = targetPage.substring(1);\n" +
+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))\n" +
+ " targetPage = \"undefined\";\n" +
+ " function validURL(url) {\n" +
+ " try {\n" +
+ " url = decodeURIComponent(url);\n" +
+ " }\n" +
+ " catch (error) {\n" +
+ " return false;\n" +
+ " }\n" +
+ " var pos = url.indexOf(\".html\");\n" +
+ " if (pos == -1 || pos != url.length - 5)\n" +
+ " return false;\n" +
+ " var allowNumber = false;\n" +
+ " var allowSep = false;\n" +
+ " var seenDot = false;\n" +
+ " for (var i = 0; i < url.length - 5; i++) {\n" +
+ " var ch = url.charAt(i);\n" +
+ " if ('a' <= ch && ch <= 'z' ||\n" +
+ " 'A' <= ch && ch <= 'Z' ||\n" +
+ " ch == '$' ||\n" +
+ " ch == '_' ||\n" +
+ " ch.charCodeAt(0) > 127) {\n" +
+ " allowNumber = true;\n" +
+ " allowSep = true;\n" +
+ " } else if ('0' <= ch && ch <= '9'\n" +
+ " || ch == '-') {\n" +
+ " if (!allowNumber)\n" +
+ " return false;\n" +
+ " } else if (ch == '/' || ch == '.') {\n" +
+ " if (!allowSep)\n" +
+ " return false;\n" +
+ " allowNumber = false;\n" +
+ " allowSep = false;\n" +
+ " if (ch == '.')\n" +
+ " seenDot = true;\n" +
+ " if (ch == '/' && seenDot)\n" +
+ " return false;\n" +
+ " } else {\n" +
+ " return false;\n" +
+ " }\n" +
+ " }\n" +
+ " return true;\n" +
+ " }\n" +
+ " function loadFrames() {\n" +
+ " if (targetPage != \"\" && targetPage != \"undefined\")\n" +
+ " top.classFrame.location = top.targetPage;\n" +
+ " }\n";
+ RawHtml scriptContent = new RawHtml(scriptCode.replace("\n", DocletConstants.NL));
+ scriptTree.addContent(scriptContent);
+ return scriptTree;
}
/**
@@ -487,7 +303,7 @@
this.script = getWinTitleScript();
body.addContent(script);
Content noScript = HtmlTree.NOSCRIPT(
- HtmlTree.DIV(getResource("doclet.No_Script_Message")));
+ HtmlTree.DIV(configuration.getContent("doclet.No_Script_Message")));
body.addContent(noScript);
}
return body;
@@ -558,17 +374,6 @@
return title;
}
- public String codeText(String text) {
- return "<code>" + text + "</code>";
- }
-
- /**
- * Return "&nbsp;", non-breaking space.
- */
- public Content getSpace() {
- return RawHtml.nbsp;
- }
-
/*
* Returns a header for Modifier and Type column of a table.
*/
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Thu Aug 11 17:02:00 2016 +0000
@@ -44,7 +44,7 @@
*/
public class RawHtml extends Content {
- private String rawHtmlContent;
+ private final String rawHtmlContent;
public static final Content nbsp = new RawHtml(" ");
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -58,7 +58,10 @@
/**
* The global configuration information for this run.
*/
- public Configuration configuration;
+ private Configuration configuration;
+
+ protected Messages messages;
+
/*
* a handle to our utility methods
*/
@@ -76,7 +79,7 @@
*/
private boolean isValidDoclet() {
if (!getClass().getName().equals(TOOLKIT_DOCLET_NAME)) {
- configuration.message.error("doclet.Toolkit_Usage_Violation",
+ messages.error("doclet.Toolkit_Usage_Violation",
TOOLKIT_DOCLET_NAME);
return false;
}
@@ -96,6 +99,8 @@
configuration.utils = new Utils(configuration);
utils = configuration.utils;
configuration.workArounds = new WorkArounds(configuration);
+ messages = configuration.getMessages();
+
if (!isValidDoclet()) {
return false;
}
@@ -116,6 +121,7 @@
}
return false;
} catch (Exception exc) {
+ exc.printStackTrace(System.err);
return false;
}
return true;
@@ -146,14 +152,13 @@
*/
private void startGeneration(DocletEnvironment root) throws Configuration.Fault, Exception {
if (root.getIncludedClasses().isEmpty()) {
- configuration.message.
- error("doclet.No_Public_Classes_To_Document");
+ messages.error("doclet.No_Public_Classes_To_Document");
return;
}
if (!configuration.setOptions()) {
return;
}
- configuration.getDocletSpecificMsg().notice("doclet.build_version",
+ messages.notice("doclet.build_version",
configuration.getDocletSpecificBuildDate());
ClassTree classtree = new ClassTree(configuration, configuration.nodeprecated);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -124,9 +124,4 @@
* @param annotationDocTree the content tree to which the tags will be added
*/
public void addTags(Element member, Content annotationDocTree);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -125,9 +125,4 @@
* @param annotationDocTree the content tree to which the tags will be added
*/
public void addTags(Element member, Content annotationDocTree);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -156,11 +156,6 @@
public void printDocument(Content contentTree) throws IOException;
/**
- * Close the writer.
- */
- public void close() throws IOException;
-
- /**
* Return the {@link TypeElement} being documented.
*
* @return the TypeElement representing the annotation being documented.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -197,11 +197,6 @@
public void printDocument(Content contentTree) throws IOException;
/**
- * Close the writer.
- */
- public void close() throws IOException;
-
- /**
* Return the TypeElement being documented.
*
* @return the TypeElement being documented.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java Thu Aug 11 17:02:00 2016 +0000
@@ -27,8 +27,6 @@
import java.io.*;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import javax.lang.model.element.Element;
import javax.lang.model.element.ModuleElement;
@@ -50,7 +48,6 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.Extern;
import jdk.javadoc.internal.doclets.toolkit.util.Group;
-import jdk.javadoc.internal.doclets.toolkit.util.MessageRetriever;
import jdk.javadoc.internal.doclets.toolkit.util.MetaKeywords;
import jdk.javadoc.internal.doclets.toolkit.util.TypeElementCatalog;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -266,15 +263,6 @@
public TypeElementCatalog typeElementCatalog;
/**
- * Message Retriever for the doclet, to retrieve message from the resource
- * file for this Configuration, which is common for 1.1 and standard
- * doclets.
- *
- * TODO: Make this private!!!
- */
- public MessageRetriever message = null;
-
- /**
* True if user wants to suppress time stamp in output.
* Default is false.
*/
@@ -309,6 +297,9 @@
private List<GroupContainer> groups;
+ public abstract Messages getMessages();
+ public abstract Resources getResources();
+
/**
* Return the build date for the doclet.
*/
@@ -322,12 +313,6 @@
public abstract boolean finishOptionSettings();
- /**
- * Return the doclet specific {@link MessageRetriever}
- * @return the doclet specific MessageRetriever.
- */
- public abstract MessageRetriever getDocletSpecificMsg();
-
public CommentUtils cmtUtils;
public SortedSet<ModuleElement> modules;
@@ -354,11 +339,12 @@
*/
public Map<ModuleElement, Set<PackageElement>> modulePackages;
+ protected static final String sharedResourceBundleName =
+ "jdk.javadoc.internal.doclets.toolkit.resources.doclets";
/**
* Constructor. Constructs the message retriever with resource file.
*/
public Configuration() {
- message = new MessageRetriever(this, "jdk.javadoc.internal.doclets.toolkit.resources.doclets");
excludedDocFileDirs = new HashSet<>();
excludedQualifiers = new HashSet<>();
setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH);
@@ -578,7 +564,7 @@
sourcetab = -1;
}
if (sourcetab <= 0) {
- message.warning("doclet.sourcetab_warning");
+ getMessages().warning("doclet.sourcetab_warning");
setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH);
}
return true;
@@ -696,7 +682,7 @@
*/
private void initTagletManager(Set<List<String>> customTagStrs) {
tagletManager = tagletManager == null ?
- new TagletManager(nosince, showversion, showauthor, javafx, message) :
+ new TagletManager(nosince, showversion, showauthor, javafx, this) :
tagletManager;
for (List<String> args : customTagStrs) {
if (args.get(0).equals("-taglet")) {
@@ -721,7 +707,8 @@
} else if (tokens.size() >= 3) {
tagletManager.addNewSimpleCustomTag(tokens.get(0), tokens.get(2), tokens.get(1));
} else {
- message.error("doclet.Error_invalid_custom_tag_argument", args.get(1));
+ Messages messages = getMessages();
+ messages.error("doclet.Error_invalid_custom_tag_argument", args.get(1));
}
}
}
@@ -893,123 +880,69 @@
: utils.getFullyQualifiedName(te);
}
- public String getText(String key) {
- // Check the doclet specific properties file.
- MessageRetriever docletMessage = getDocletSpecificMsg();
- if (docletMessage.containsKey(key)) {
- return docletMessage.getText(key);
- }
- // Check the shared properties file.
- return message.getText(key);
- }
+ /**
+ * Convenience method to obtain a resource from the doclet's
+ * {@link Resources resources}.
+ * Equivalent to <code>getResources.getText(key);</code>.
+ * @param key the key for the desired string
+ * @return the string for the given key
+ * @throws MissingResourceException if the key is not found in either
+ * bundle.
+ */
+ public abstract String getText(String key);
- public String getText(String key, String a1) {
- // Check the doclet specific properties file.
- MessageRetriever docletMessage = getDocletSpecificMsg();
- if (docletMessage.containsKey(key)) {
- return docletMessage.getText(key, a1);
- }
- // Check the shared properties file.
- return message.getText(key, a1);
- }
+ /**
+ * Convenience method to obtain a resource from the doclet's
+ * {@link Resources resources}.
+ * Equivalent to <code>getResources.getText(key, args);</code>.
+ * @param key the key for the desired string
+ * @param args values to be substituted into the resulting string
+ * @return the string for the given key
+ * @throws MissingResourceException if the key is not found in either
+ * bundle.
+ */
+ public abstract String getText(String key, String... args);
- public String getText(String key, String a1, String a2) {
- // Check the doclet specific properties file.
- MessageRetriever docletMessage = getDocletSpecificMsg();
- if (docletMessage.containsKey(key)) {
- return docletMessage.getText(key, a1, a2);
- }
- // Check the shared properties file.
- return message.getText(key, a1, a2);
- }
+ /**
+ * Convenience method to obtain a resource from the doclet's
+ * {@link Resources resources} as a {@code Content} object.
+ *
+ * @param key the key for the desired string
+ * @return a content tree for the text
+ */
+ public abstract Content getContent(String key);
- public String getText(String key, String a1, String a2, String a3) {
- // Check the doclet specific properties file.
- MessageRetriever docletMessage = getDocletSpecificMsg();
- if (docletMessage.containsKey(key)) {
- return docletMessage.getText(key, a1, a2, a3);
- }
- // Check the shared properties file.
- return message.getText(key, a1, a2, a3);
- }
+ /**
+ * Convenience method to obtain a resource from the doclet's
+ * {@link Resources resources} as a {@code Content} object.
+ *
+ * @param key the key for the desired string
+ * @param o string or content argument added to configuration text
+ * @return a content tree for the text
+ */
+ public abstract Content getContent(String key, Object o);
- public abstract Content newContent();
+ /**
+ * Convenience method to obtain a resource from the doclet's
+ * {@link Resources resources} as a {@code Content} object.
+ *
+ * @param key the key for the desired string
+ * @param o1 resource argument
+ * @param o2 resource argument
+ * @return a content tree for the text
+ */
+ public abstract Content getContent(String key, Object o1, Object o2);
/**
* Get the configuration string as a content.
*
- * @param key the key to look for in the configuration file
- * @return a content tree for the text
- */
- public Content getResource(String key) {
- Content c = newContent();
- c.addContent(getText(key));
- return c;
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
- * @param o string or content argument added to configuration text
- * @return a content tree for the text
- */
- public Content getResource(String key, Object o) {
- return getResource(key, o, null, null);
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
- * @param o1 resource argument
- * @param o2 resource argument
- * @return a content tree for the text
- */
- public Content getResource(String key, Object o1, Object o2) {
- return getResource(key, o1, o2, null);
- }
-
- /**
- * Get the configuration string as a content.
- *
- * @param key the key to look for in the configuration file
+ * @param key the key for the desired string
* @param o0 string or content argument added to configuration text
* @param o1 string or content argument added to configuration text
* @param o2 string or content argument added to configuration text
* @return a content tree for the text
*/
- public Content getResource(String key, Object o0, Object o1, Object o2) {
- Content c = newContent();
- Pattern p = Pattern.compile("\\{([012])\\}");
- String text = getText(key);
- Matcher m = p.matcher(text);
- int start = 0;
- while (m.find(start)) {
- c.addContent(text.substring(start, m.start()));
-
- Object o = null;
- switch (m.group(1).charAt(0)) {
- case '0': o = o0; break;
- case '1': o = o1; break;
- case '2': o = o2; break;
- }
-
- if (o == null) {
- c.addContent("{" + m.group(1) + "}");
- } else if (o instanceof String) {
- c.addContent((String) o);
- } else if (o instanceof Content) {
- c.addContent((Content) o);
- }
-
- start = m.end();
- }
-
- c.addContent(text.substring(start));
- return c;
- }
-
+ public abstract Content getContent(String key, Object o0, Object o1, Object o2);
/**
* Return true if the TypeElement element is getting documented, depending upon
@@ -1110,7 +1043,7 @@
private String getOptionsMessage(String key) {
try {
- return c.getDocletSpecificMsg().getText(key, (Object[]) null);
+ return c.getResources().getText(key);
} catch (MissingResourceException ignore) {
return "";
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -47,11 +47,6 @@
public interface ConstantsSummaryWriter {
/**
- * Close the writer.
- */
- public abstract void close() throws IOException;
-
- /**
* Get the header for the constant summary documentation.
*
* @return header that needs to be added to the documentation
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -119,9 +119,4 @@
* @param foundNonPubConstructor true if we found a non public constructor.
*/
public void setFoundNonPubConstructor(boolean foundNonPubConstructor);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -112,9 +112,4 @@
* @return content tree for the enum constants documentation
*/
public Content getEnumConstants(Content enumConstantsTree, boolean isLastContent);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -113,9 +113,4 @@
* @return content tree for the field documentation
*/
public Content getFieldDoc(Content fieldDocTree, boolean isLastContent);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -122,9 +122,4 @@
* @return a content tree for the member
*/
public Content getMemberTree(Content memberTree);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.javadoc.internal.doclets.toolkit;
+
+import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
+
+import com.sun.source.util.DocTreePath;
+import jdk.javadoc.doclet.Reporter;
+
+import static javax.tools.Diagnostic.Kind.*;
+
+/**
+ * Provides standardized access to the diagnostic reporting facilities
+ * for a doclet.
+ *
+ * Messages are specified by resource keys to be found in the doclet's
+ * {@link Resources resources}. Values can be substituted into the
+ * strings obtained from the resource files.
+ *
+ * Messages are reported to the doclet's {@link Reporter reporter}.
+ */
+public class Messages {
+ private final Configuration configuration;
+ private final Resources resources;
+ private Reporter reporter;
+
+ /**
+ * Creates a {@code Messages} object to provide standardized access to
+ * the doclet's diagnostic reporting mechanisms.
+ *
+ * @param configuration the doclet's configuration, used to access
+ * the doclet's resources, reporter, and additional methods and state
+ * used to filter out messages, if any, which should be suppressed.
+ */
+ public Messages(Configuration configuration) {
+ this.configuration = configuration;
+ resources = configuration.getResources();
+ }
+
+ // ***** Errors *****
+
+ /**
+ * Reports an error message to the doclet's reporter.
+ *
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void error(String key, Object... args) {
+ report(ERROR, resources.getText(key, args));
+ }
+
+ /**
+ * Reports an error message to the doclet's reporter.
+ *
+ * @param path a path identifying the position to be included with
+ * the message
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void error(DocTreePath path, String key, Object... args) {
+ report(ERROR, path, resources.getText(key, args));
+ }
+
+ // ***** Warnings *****
+
+ /**
+ * Reports a warning message to the doclet's reporter.
+ *
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void warning(String key, Object... args) {
+ report(WARNING, resources.getText(key, args));
+ }
+
+ /**
+ * Reports a warning message to the doclet's reporter.
+ *
+ * @param path a path identifying the position to be included with
+ * the message
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void warning(DocTreePath path, String key, Object... args) {
+ if (configuration.showMessage(path, key))
+ report(WARNING, path, resources.getText(key, args));
+ }
+
+ /**
+ * Reports a warning message to the doclet's reporter.
+ *
+ * @param e an element identifying the declaration whose position should
+ * to be included with the message
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void warning(Element e, String key, Object... args) {
+ if (configuration.showMessage(e, key)) {
+ report(WARNING, e, resources.getText(key, args));
+ }
+ }
+
+ // ***** Notices *****
+
+ /**
+ * Reports an informational notice to the doclet's reporter.
+ *
+ * @param key the name of a resource containing the message to be printed
+ * @param args optional arguments to be replaced in the message.
+ */
+ public void notice(String key, Object... args) {
+ if (!configuration.quiet) {
+ report(NOTE, resources.getText(key, args));
+ }
+ }
+
+ // ***** Internal support *****
+
+ private void report(Diagnostic.Kind k, String msg) {
+ initReporter();
+ reporter.print(k, msg);
+ }
+
+ private void report(Diagnostic.Kind k, DocTreePath p, String msg) {
+ initReporter();
+ reporter.print(k, p, msg);
+ }
+
+ private void report(Diagnostic.Kind k, Element e, String msg) {
+ initReporter();
+ reporter.print(k, e, msg);
+ }
+
+ // Lazy init the reporter for now, until we can fix/improve
+ // the init of ConfigurationImpl in HtmlDoclet (and similar.)
+ private void initReporter() {
+ if (reporter == null) {
+ reporter = configuration.reporter;
+ }
+ }
+}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -114,9 +114,4 @@
* @return content tree for the method documentation
*/
public Content getMethodDoc(Content methodDocTree, boolean isLastContent);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -132,10 +132,4 @@
* @param contentTree the content tree that will be printed
*/
public abstract void printDocument(Content contentTree) throws IOException;
-
- /**
- * Close the writer.
- */
- public abstract void close() throws IOException;
-
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/NestedClassWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -40,9 +40,4 @@
*/
public interface NestedClassWriter {
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -121,9 +121,4 @@
*/
public abstract void printDocument(Content contentTree) throws IOException;
- /**
- * Close the writer.
- */
- public abstract void close() throws IOException;
-
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -112,9 +112,4 @@
* @return content tree for the property documentation
*/
public Content getPropertyDoc(Content propertyDocTree, boolean isLastContent);
-
- /**
- * Close the writer.
- */
- public void close() throws IOException;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.toolkit;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Access to the localizable resources used by a doclet.
+ * The resources are split across two resource bundles:
+ * one that contains format-neutral strings common to
+ * all supported formats, and one that contains strings
+ * specific to the selected doclet, such as the standard
+ * HTML doclet.
+ */
+public class Resources {
+ private final Configuration configuration;
+ private final String commonBundleName;
+ private final String docletBundleName;
+
+ protected ResourceBundle commonBundle;
+ protected ResourceBundle docletBundle;
+
+ /**
+ * Creates a {@code Resources} to provide access the resource
+ * bundles used by a doclet.
+ *
+ * @param configuration the configuration for the doclet,
+ * to provide access the locale to be used when accessing the
+ * names resource bundles.
+ * @param commonBundleName the name of the bundle containing the strings
+ * common to all output formats
+ * @param docletBundleName the name of the bundle containing the strings
+ * specific to a particular format
+ */
+ public Resources(Configuration configuration, String commonBundleName, String docletBundleName) {
+ this.configuration = configuration;
+ this.commonBundleName = commonBundleName;
+ this.docletBundleName = docletBundleName;
+ }
+
+ /**
+ * Gets the string for the given key from one of the doclet's
+ * resource bundles.
+ *
+ * The more specific bundle is checked first;
+ * if it is not there, the common bundle is then checked.
+ *
+ * @param key the key for the desired string
+ * @return the string for the given key
+ * @throws MissingResourceException if the key is not found in either
+ * bundle.
+ */
+ public String getText(String key) throws MissingResourceException {
+ initBundles();
+
+ if (docletBundle.containsKey(key))
+ return docletBundle.getString(key);
+
+ return commonBundle.getString(key);
+ }
+ /**
+ * Gets the string for the given key from one of the doclet's
+ * resource bundles, substituting additional arguments into
+ * into the resulting string with {@link MessageFormat#format}.
+ *
+ * The more specific bundle is checked first;
+ * if it is not there, the common bundle is then checked.
+ *
+ * @param key the key for the desired string
+ * @param args values to be substituted into the resulting string
+ * @return the string for the given key
+ * @throws MissingResourceException if the key is not found in either
+ * bundle.
+ */
+ public String getText(String key, Object... args) throws MissingResourceException {
+ return MessageFormat.format(getText(key), args);
+ }
+
+ /**
+ * Lazily initializes the bundles. This is (currently) necessary because
+ * this object may be created before the locale to be used is known.
+ */
+ protected void initBundles() {
+ if (commonBundle == null) {
+ Locale locale = configuration.getLocale();
+ this.commonBundle = ResourceBundle.getBundle(commonBundleName, locale);
+ this.docletBundle = ResourceBundle.getBundle(docletBundleName, locale);
+ }
+ }
+}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -138,11 +138,6 @@
public SerialMethodWriter getSerialMethodWriter(TypeElement typeElement);
/**
- * Close the writer.
- */
- public abstract void close() throws IOException;
-
- /**
* Get the serialized content.
*
* @param serializedTreeContent content for serialized data
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -33,6 +33,7 @@
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -89,6 +90,7 @@
*/
protected final Configuration configuration;
+ protected final Messages messages;
protected final Utils utils;
/**
@@ -112,6 +114,7 @@
*/
public AbstractBuilder(Context c) {
this.configuration = c.configuration;
+ this.messages = configuration.getMessages();
this.utils = configuration.utils;
this.containingPackagesSeen = c.containingPackagesSeen;
this.layoutParser = c.layoutParser;
@@ -144,13 +147,18 @@
new Class<?>[]{XMLNode.class, Content.class},
new Object[]{node, contentTree});
} catch (NoSuchMethodException e) {
- e.printStackTrace();
+ e.printStackTrace(System.err);
configuration.reporter.print(ERROR, "Unknown element: " + component);
throw new DocletAbortException(e);
} catch (InvocationTargetException e) {
- throw new DocletAbortException(e.getCause());
+ Throwable cause = e.getCause();
+ if (cause instanceof DocletAbortException) {
+ throw (DocletAbortException) cause;
+ } else {
+ throw new DocletAbortException(e.getCause());
+ }
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace(System.err);
configuration.reporter.print(ERROR, "Exception " +
e.getClass().getName() +
" thrown while processing element: " + component);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -124,7 +124,6 @@
writer.addAnnotationContentTree(contentTree, annotationContentTree);
writer.addFooter(contentTree);
writer.printDocument(contentTree);
- writer.close();
copyDocFiles();
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -152,7 +152,6 @@
writer.addClassContentTree(contentTree, classContentTree);
writer.addFooter(contentTree);
writer.printDocument(contentTree);
- writer.close();
copyDocFiles();
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -153,7 +153,6 @@
buildChildren(node, contentTree);
writer.addFooter(contentTree);
writer.printDocument(contentTree);
- writer.close();
}
/**
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -132,7 +132,6 @@
buildChildren(node, contentTree);
moduleWriter.addModuleFooter(contentTree);
moduleWriter.printDocument(contentTree);
- moduleWriter.close();
// TEMPORARY:
// The use of SOURCE_PATH on the next line is temporary. As we transition into the
// modules world, this should migrate into using a location for the appropriate module
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -131,7 +131,6 @@
buildChildren(node, contentTree);
packageWriter.addPackageFooter(contentTree);
packageWriter.printDocument(contentTree);
- packageWriter.close();
utils.copyDocFiles(packageElement);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -140,7 +140,6 @@
throw new DocletAbortException(e);
}
build(layoutParser.parseXML(NAME), contentTree);
- writer.close();
}
/**
@@ -162,7 +161,6 @@
buildChildren(node, serializedTree);
writer.addFooter(serializedTree);
writer.printDocument(serializedTree);
- writer.close();
}
/**
@@ -362,7 +360,7 @@
&& utils.getSerialDataTrees(method).isEmpty()) {
if (configuration.serialwarn) {
TypeElement encl = (TypeElement) method.getEnclosingElement();
- configuration.getDocletSpecificMsg().warning(currentMember,
+ messages.warning(currentMember,
"doclet.MissingSerialDataTag", encl.getQualifiedName().toString(),
method.getSimpleName().toString());
}
@@ -526,7 +524,7 @@
// Process default Serializable field.
if ((utils.getSerialTrees(field).isEmpty()) /*&& ! field.isSynthetic()*/
&& configuration.serialwarn) {
- configuration.message.warning(field,
+ messages.warning(field,
"doclet.MissingSerialTag", utils.getFullyQualifiedName(te),
utils.getSimpleName(field));
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,6 +31,7 @@
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Input;
@@ -135,6 +136,7 @@
Element e, DocTree holderTag, boolean isFirstSentence) {
Content replacement = writer.getOutputInstance();
Configuration configuration = writer.configuration();
+ Messages messages = configuration.getMessages();
Utils utils = configuration.utils;
CommentHelper ch = utils.getCommentHelper(e);
Taglet inheritableTaglet = holderTag == null
@@ -147,7 +149,7 @@
? utils.flatSignature((ExecutableElement)e)
: "");
//This tag does not support inheritence.
- configuration.message.warning(e, "doclet.noInheritedDoc", message);
+ messages.warning(e, "doclet.noInheritedDoc", message);
}
Input input = new DocFinder.Input(utils, e,
(InheritableTaglet) inheritableTaglet, new DocFinder.DocTreeInfo(holderTag, e),
@@ -165,7 +167,7 @@
((utils.isExecutableElement(e))
? utils.flatSignature((ExecutableElement)e)
: "");
- configuration.message.warning(e, "doclet.noInheritedDoc", message);
+ messages.warning(e, "doclet.noInheritedDoc", message);
}
return replacement;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java Thu Aug 11 17:02:00 2016 +0000
@@ -34,6 +34,7 @@
import com.sun.source.doctree.DocTree;
import com.sun.source.doctree.ParamTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Input;
@@ -288,6 +289,7 @@
private Content processParamTags(Element e, boolean isParams,
List<? extends DocTree> paramTags, Map<String, String> rankMap, TagletWriter writer,
Set<String> alreadyDocumented) {
+ Messages messages = writer.configuration().getMessages();
Content result = writer.getOutputInstance();
if (!paramTags.isEmpty()) {
CommentHelper ch = writer.configuration().utils.getCommentHelper(e);
@@ -296,22 +298,22 @@
? ch.getParameterName(dt)
: "<" + ch.getParameterName(dt) + ">";
if (!rankMap.containsKey(ch.getParameterName(dt))) {
- writer.getMsgRetriever().warning(ch.getDocTreePath(dt),
- isParams ?
- "doclet.Parameters_warn" :
- "doclet.Type_Parameters_warn",
- paramName);
+ messages.warning(ch.getDocTreePath(dt),
+ isParams
+ ? "doclet.Parameters_warn"
+ : "doclet.Type_Parameters_warn",
+ paramName);
}
String rank = rankMap.get(ch.getParameterName(dt));
if (rank != null && alreadyDocumented.contains(rank)) {
- writer.getMsgRetriever().warning(ch.getDocTreePath(dt),
- isParams ?
- "doclet.Parameters_dup_warn" :
- "doclet.Type_Parameters_dup_warn",
- paramName);
+ messages.warning(ch.getDocTreePath(dt),
+ isParams
+ ? "doclet.Parameters_dup_warn"
+ : "doclet.Type_Parameters_dup_warn",
+ paramName);
}
result.addContent(processParamTag(e, isParams, writer, dt,
- ch.getParameterName(dt), alreadyDocumented.isEmpty()));
+ ch.getParameterName(dt), alreadyDocumented.isEmpty()));
alreadyDocumented.add(rank);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java Thu Aug 11 17:02:00 2016 +0000
@@ -34,6 +34,7 @@
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Input;
@@ -87,6 +88,7 @@
* {@inheritDoc}
*/
public Content getTagletOutput(Element holder, TagletWriter writer) {
+ Messages messages = writer.configuration().getMessages();
Utils utils = writer.configuration().utils;
TypeMirror returnType = utils.getReturnType((ExecutableElement)holder);
List<? extends DocTree> tags = utils.getBlockTags(holder, name);
@@ -94,7 +96,7 @@
//Make sure we are not using @return tag on method with void return type.
if (returnType != null && utils.isVoid(returnType)) {
if (!tags.isEmpty()) {
- writer.getMsgRetriever().warning(holder, "doclet.Return_tag_on_void_method");
+ messages.warning(holder, "doclet.Return_tag_on_void_method");
}
return null;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java Thu Aug 11 17:02:00 2016 +0000
@@ -26,7 +26,6 @@
package jdk.javadoc.internal.doclets.toolkit.taglets;
import java.io.*;
-import java.lang.reflect.Method;
import java.util.*;
import javax.lang.model.element.Element;
@@ -42,9 +41,11 @@
import com.sun.source.doctree.DocTree;
import com.sun.tools.javac.util.DefinedBy;
import com.sun.tools.javac.util.DefinedBy.Api;
+import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
-import jdk.javadoc.internal.doclets.toolkit.util.MessageRetriever;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static javax.tools.DocumentationTool.Location.*;
@@ -126,10 +127,8 @@
*/
private List<Taglet> serializedFormTags;
- /**
- * The message retriever that will be used to print error messages.
- */
- private final MessageRetriever message;
+ private final Messages messages;
+ private final Resources resources;
/**
* Keep track of standard tags.
@@ -191,7 +190,7 @@
*/
public TagletManager(boolean nosince, boolean showversion,
boolean showauthor, boolean javafx,
- MessageRetriever message) {
+ Configuration configuration) {
overridenStandardTags = new HashSet<>();
potentiallyConflictingTags = new HashSet<>();
standardTags = new HashSet<>();
@@ -202,7 +201,8 @@
this.showversion = showversion;
this.showauthor = showauthor;
this.javafx = javafx;
- this.message = message;
+ this.messages = configuration.getMessages();
+ this.resources = configuration.getResources();
initStandardTaglets();
initStandardTagsLowercase();
}
@@ -260,9 +260,9 @@
customTags.remove(tname);
}
customTags.put(tname, newLegacy);
- message.notice("doclet.Notice_taglet_registered", classname);
+ messages.notice("doclet.Notice_taglet_registered", classname);
} catch (Exception exc) {
- message.error("doclet.Error_taglet_not_registered", exc.getClass().getName(), classname);
+ messages.error("doclet.Error_taglet_not_registered", exc.getClass().getName(), classname);
}
}
@@ -359,10 +359,10 @@
}
if (! (standardTags.contains(name) || customTags.containsKey(name))) {
if (standardTagsLowercase.contains(Utils.toLowerCase(name))) {
- message.warning(ch.getDocTreePath(tag), "doclet.UnknownTagLowercase", ch.getTagName(tag));
+ messages.warning(ch.getDocTreePath(tag), "doclet.UnknownTagLowercase", ch.getTagName(tag));
continue;
} else {
- message.warning(ch.getDocTreePath(tag), "doclet.UnknownTag", ch.getTagName(tag));
+ messages.warning(ch.getDocTreePath(tag), "doclet.UnknownTag", ch.getTagName(tag));
continue;
}
}
@@ -481,7 +481,7 @@
}
combined_locations.append(locations[i]);
}
- message.warning(ch.getDocTreePath(tag), "doclet.tag_misuse",
+ messages.warning(ch.getDocTreePath(tag), "doclet.tag_misuse",
"@" + taglet.getName(), holderType, combined_locations.toString());
}
@@ -698,17 +698,17 @@
addStandardTaglet(new ThrowsTaglet());
addStandardTaglet(new SimpleTaglet(EXCEPTION.tagName, null,
SimpleTaglet.METHOD + SimpleTaglet.CONSTRUCTOR));
- addStandardTaglet(!nosince, new SimpleTaglet(SINCE.tagName, message.getText("doclet.Since"),
+ addStandardTaglet(!nosince, new SimpleTaglet(SINCE.tagName, resources.getText("doclet.Since"),
SimpleTaglet.ALL));
- addStandardTaglet(showversion, new SimpleTaglet(VERSION.tagName, message.getText("doclet.Version"),
+ addStandardTaglet(showversion, new SimpleTaglet(VERSION.tagName, resources.getText("doclet.Version"),
SimpleTaglet.MODULE + SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
- addStandardTaglet(showauthor, new SimpleTaglet(AUTHOR.tagName, message.getText("doclet.Author"),
+ addStandardTaglet(showauthor, new SimpleTaglet(AUTHOR.tagName, resources.getText("doclet.Author"),
SimpleTaglet.MODULE + SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
- addStandardTaglet(new SimpleTaglet(SERIAL_DATA.tagName, message.getText("doclet.SerialData"),
+ addStandardTaglet(new SimpleTaglet(SERIAL_DATA.tagName, resources.getText("doclet.SerialData"),
SimpleTaglet.EXCLUDED));
- addStandardTaglet(new SimpleTaglet(HIDDEN.tagName, message.getText("doclet.Hidden"),
+ addStandardTaglet(new SimpleTaglet(HIDDEN.tagName, resources.getText("doclet.Hidden"),
SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE));
- customTags.put((temp = new SimpleTaglet("factory", message.getText("doclet.Factory"),
+ customTags.put((temp = new SimpleTaglet("factory", resources.getText("doclet.Factory"),
SimpleTaglet.METHOD)).getName(), temp);
addStandardTaglet(new SeeTaglet());
//Standard inline tags
@@ -735,9 +735,9 @@
addStandardTaglet(new PropertyGetterTaglet());
addStandardTaglet(new PropertySetterTaglet());
addStandardTaglet(new SimpleTaglet("propertyDescription",
- message.getText("doclet.PropertyDescription"),
+ resources.getText("doclet.PropertyDescription"),
SimpleTaglet.FIELD + SimpleTaglet.METHOD));
- addStandardTaglet(new SimpleTaglet("defaultValue", message.getText("doclet.DefaultValue"),
+ addStandardTaglet(new SimpleTaglet("defaultValue", resources.getText("doclet.DefaultValue"),
SimpleTaglet.FIELD + SimpleTaglet.METHOD));
addStandardTaglet(new SimpleTaglet("treatAsPrivate", null,
SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE));
@@ -790,7 +790,7 @@
result += ", ";
}
}
- message.notice(noticeKey, result);
+ messages.notice(noticeKey, result);
}
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -36,7 +36,6 @@
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.taglets.Taglet.UnsupportedTagletOperationException;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
-import jdk.javadoc.internal.doclets.toolkit.util.MessageRetriever;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
/**
@@ -107,13 +106,6 @@
protected abstract Content literalTagOutput(Element element, DocTree tag);
/**
- * Returns {@link MessageRetriever} for output purposes.
- *
- * @return {@link MessageRetriever} for output purposes.
- */
- protected abstract MessageRetriever getMsgRetriever();
-
- /**
* Return the header for the param tags.
*
* @param header the header to display.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java Thu Aug 11 17:02:00 2016 +0000
@@ -34,6 +34,7 @@
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -181,15 +182,16 @@
*/
public Content getTagletOutput(Element holder, DocTree tag, TagletWriter writer) {
Utils utils = writer.configuration().utils;
+ Messages messages = writer.configuration().getMessages();
VariableElement field = getVariableElement(holder, writer.configuration(), tag);
if (field == null) {
if (tag.toString().isEmpty()) {
//Invalid use of @value
- writer.getMsgRetriever().warning(holder,
+ messages.warning(holder,
"doclet.value_tag_invalid_use");
} else {
//Reference is unknown.
- writer.getMsgRetriever().warning(holder,
+ messages.warning(holder,
"doclet.value_tag_invalid_reference", tag.toString());
}
} else if (field.getConstantValue() != null) {
@@ -202,7 +204,7 @@
);
} else {
//Referenced field is not a constant.
- writer.getMsgRetriever().warning(holder,
+ messages.warning(holder,
"doclet.value_tag_invalid_constant", utils.getSimpleName(field));
}
return writer.getOutputInstance();
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java Thu Aug 11 17:02:00 2016 +0000
@@ -44,6 +44,7 @@
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
* Build Class Hierarchy for all the Classes. This class builds the Class
@@ -105,9 +106,12 @@
* true.
*/
public ClassTree(Configuration configuration, boolean noDeprecated) {
- configuration.message.notice("doclet.Building_Tree");
this.configuration = configuration;
this.utils = configuration.utils;
+
+ Messages messages = configuration.getMessages();
+ messages.notice("doclet.Building_Tree");
+
comparator = utils.makeClassUseComparator();
baseAnnotationTypes = new TreeSet<>(comparator);
baseEnums = new TreeSet<>(comparator);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,6 +31,7 @@
import javax.lang.model.element.PackageElement;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
@@ -87,6 +88,7 @@
* The global configuration information for this run.
*/
private final Configuration configuration;
+ private Messages messages;
/**
* Since we need to sort the keys in the reverse order(longest key first),
@@ -101,6 +103,7 @@
public Group(Configuration configuration) {
this.configuration = configuration;
+ messages = configuration.getMessages();
}
/**
@@ -120,14 +123,16 @@
public boolean checkPackageGroups(String groupname, String pkgNameFormList) {
StringTokenizer strtok = new StringTokenizer(pkgNameFormList, ":");
if (groupList.contains(groupname)) {
- configuration.message.warning("doclet.Groupname_already_used", groupname);
+ initMessages();
+ messages.warning("doclet.Groupname_already_used", groupname);
return false;
}
groupList.add(groupname);
while (strtok.hasMoreTokens()) {
String id = strtok.nextToken();
if (id.length() == 0) {
- configuration.message.warning("doclet.Error_in_packagelist", groupname, pkgNameFormList);
+ initMessages();
+ messages.warning("doclet.Error_in_packagelist", groupname, pkgNameFormList);
return false;
}
if (id.endsWith("*")) {
@@ -148,6 +153,14 @@
return true;
}
+ // Lazy init of the messages for now, because Group is created
+ // in Configuration before configuration is fully initialized.
+ private void initMessages() {
+ if (messages == null) {
+ messages = configuration.getMessages();
+ }
+ }
+
/**
* Search if the given map has given the package format.
*
@@ -158,7 +171,8 @@
*/
boolean foundGroupFormat(Map<String,?> map, String pkgFormat) {
if (map.containsKey(pkgFormat)) {
- configuration.message.error("doclet.Same_package_name_used", pkgFormat);
+ initMessages();
+ messages.error("doclet.Same_package_name_used", pkgFormat);
return true;
}
return false;
@@ -181,8 +195,8 @@
Map<String, SortedSet<PackageElement>> groupPackageMap = new HashMap<>();
String defaultGroupName =
(pkgNameGroupMap.isEmpty() && regExpGroupMap.isEmpty())?
- configuration.message.getText("doclet.Packages") :
- configuration.message.getText("doclet.Other_Packages");
+ configuration.getResources().getText("doclet.Packages") :
+ configuration.getResources().getText("doclet.Other_Packages");
// if the user has not used the default group name, add it
if (!groupList.contains(defaultGroupName)) {
groupList.add(defaultGroupName);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java Thu Aug 11 17:02:00 2016 +0000
@@ -33,6 +33,7 @@
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
* Build the mapping of each Unicode character with it's member lists
@@ -98,11 +99,14 @@
boolean classesOnly) {
this.configuration = configuration;
this.utils = configuration.utils;
+
+ Messages messages = configuration.getMessages();
if (classesOnly) {
- configuration.message.notice("doclet.Building_Index_For_All_Classes");
+ messages.notice("doclet.Building_Index_For_All_Classes");
} else {
- configuration.message.notice("doclet.Building_Index");
+ messages.notice("doclet.Building_Index");
}
+
this.noDeprecated = noDeprecated;
this.classesOnly = classesOnly;
this.javafx = configuration.javafx;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MessageRetriever.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.toolkit.util;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import javax.lang.model.element.Element;
-
-import com.sun.source.util.DocTreePath;
-import jdk.javadoc.internal.doclets.toolkit.Configuration;
-
-import static javax.tools.Diagnostic.Kind.*;
-
-
-/**
- * Retrieve and format messages stored in a resource.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- */
-public class MessageRetriever {
- /**
- * The global configuration information for this run.
- */
- private final Configuration configuration;
-
- /**
- * The location from which to lazily fetch the resource..
- */
- private final String resourcelocation;
-
- /**
- * The lazily fetched resource..
- */
- private ResourceBundle messageRB;
-
- /**
- * Initialize the ResourceBundle with the given resource.
- *
- * @param rb the resource bundle to read.
- */
- public MessageRetriever(ResourceBundle rb) {
- this.configuration = null;
- this.messageRB = rb;
- this.resourcelocation = null;
- }
-
- /**
- * Initialize the ResourceBundle with the given resource.
- *
- * @param configuration the configuration
- * @param resourcelocation Resource.
- */
- public MessageRetriever(Configuration configuration,
- String resourcelocation) {
- this.configuration = configuration;
- this.resourcelocation = resourcelocation;
- }
-
- private ResourceBundle initRB() {
- ResourceBundle bundle = messageRB;
- if (bundle == null) {
- try {
- messageRB = bundle =
- ResourceBundle.getBundle(resourcelocation, configuration.getLocale());
- } catch (MissingResourceException e) {
- throw new Error("Fatal: Resource (" + resourcelocation
- + ") for javadoc doclets is missing.");
- }
- }
- return bundle;
- }
-
- /**
- * Determines whether the given <code>key</code> can be retrieved
- * from this <code>MessageRetriever</code>
- *
- * @param key
- * the resource <code>key</code>
- * @return <code>true</code> if the given <code>key</code> is
- * contained in the underlying <code>ResourceBundle</code>.
- */
- public boolean containsKey(String key) {
- ResourceBundle bundle = initRB();
- return bundle.containsKey(key);
- }
-
- /**
- * Get and format message string from resource
- *
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- * @return the composed text
- * @throws MissingResourceException when the key does not
- * exist in the properties file.
- */
- public String getText(String key, Object... args) throws MissingResourceException {
- ResourceBundle bundle = initRB();
- String message = bundle.getString(key);
- return MessageFormat.format(message, args);
- }
-
- /**
- * Print error message, increment error count.
- *
- * @param pos the position of the source
- * @param msg message to print
- */
- private void printError(DocTreePath path, String msg) {
- configuration.reporter.print(ERROR, path, msg);
- }
-
- /**
- * Print error message, increment error count.
- *
- * @param msg message to print
- */
- private void printError(String msg) {
- configuration.reporter.print(ERROR, msg);
- }
-
- /**
- * Print warning message, increment warning count.
- *
- * @param pos the position of the source
- * @param msg message to print
- */
- private void printWarning(DocTreePath path, String msg) {
- configuration.reporter.print(WARNING, path, msg);
- }
-
- private void printWarning(Element e, String msg) {
- configuration.reporter.print(WARNING, e, msg);
- }
-
- /**
- * Print warning message, increment warning count.
- *
- * @param msg message to print
- */
- private void printWarning(String msg) {
- configuration.reporter.print(WARNING, msg);
- }
-
-// Note: the following do not appear to be needed any more, delete me.
-// /**
-// * Print a message.
-// *
-// * @param pos the position of the source
-// * @param msg message to print
-// */
-// private void printNotice(DocTreePath path, String msg) {
-// DocEnv env = ((RootDocImpl)configuration.root).env;
-// if (env.isQuiet() || env.isSilent()) {
-// return;
-// }
-// configuration.reporter.print(NOTE, path, msg);
-// }
-
-// Note: does not appear to be needed any more.
-// /**
-// * Print a message.
-// *
-// * @param pos the position of the source
-// * @param key selects message from resource
-// * @param args arguments to be replaced in the message.
-// */
-// public void notice(DocTreePath path, String key, Object... args) {
-// printNotice(path, getText(key, args));
-// }
-
- // ERRORS
- /**
- * Print error message, increment error count.
- *
- * @param path the path to the source
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void error(DocTreePath path, String key, Object... args) {
- printError(path, getText(key, args));
- }
-
- /**
- * Print error message, increment error count.
- *
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void error(String key, Object... args) {
- printError(getText(key, args));
- }
-
- // WARNINGS
- /**
- * Print warning message, increment warning count.
-
- * @param path the path to the source
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void warning(DocTreePath path, String key, Object... args) {
- if (configuration.showMessage(path, key))
- printWarning(path, getText(key, args));
- }
-
- /**
- * Print warning message, increment warning count.
- *
- * @param e element target of the message
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void warning(Element e, String key, Object... args) {
- if (configuration.showMessage(e, key))
- printWarning(e, getText(key, args));
- }
-
- /**
- * Print warning message, increment warning count.
- *
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void warning(String key, Object... args) {
- printWarning(getText(key, args));
- }
-
- // NOTICES
- /**
- * Print a message.
- *
- * @param msg message to print
- */
- private void printNotice(String msg) {
- if (configuration.quiet) {
- return;
- }
- configuration.reporter.print(NOTE, msg);
- }
-
- /**
- * Print a message.
- *
- * @param key selects message from resource
- * @param args arguments to be replaced in the message.
- */
- public void notice(String key, Object... args) {
- printNotice(getText(key, args));
- }
-}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java Thu Aug 11 17:02:00 2016 +0000
@@ -32,6 +32,7 @@
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
@@ -73,7 +74,8 @@
packgen.generatePackageListFile(configuration.docEnv);
packgen.close();
} catch (IOException exc) {
- configuration.message.error("doclet.exception_encountered",
+ Messages messages = configuration.getMessages();
+ messages.error("doclet.exception_encountered",
exc.toString(), DocPaths.PACKAGE_LIST);
throw new DocletAbortException(exc);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Thu Aug 11 17:02:00 2016 +0000
@@ -85,7 +85,10 @@
import static javax.lang.model.type.TypeKind.*;
import static com.sun.source.doctree.DocTree.Kind.*;
+
import com.sun.source.util.SimpleDocTreeVisitor;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
+
import static jdk.javadoc.internal.doclets.toolkit.builders.ConstantsSummaryBuilder.MAX_CONSTANT_VALUE_INDEX_LENGTH;
@@ -102,12 +105,14 @@
*/
public class Utils {
public final Configuration configuration;
+ public final Messages messages;
public final DocTrees docTrees;
public final Elements elementUtils;
public final Types typeUtils;
public Utils(Configuration c) {
configuration = c;
+ messages = configuration.getMessages();
elementUtils = c.docEnv.getElementUtils();
typeUtils = c.docEnv.getTypeUtils();
docTrees = c.docEnv.getDocTrees();
@@ -293,11 +298,10 @@
DocFile destfile = destdir.resolve(srcfile.getName());
if (srcfile.isFile()) {
if (destfile.exists() && !first) {
- configuration.message.warning("doclet.Copy_Overwrite_warning",
+ messages.warning("doclet.Copy_Overwrite_warning",
srcfile.getPath(), destdir.getPath());
} else {
- configuration.message.notice(
- "doclet.Copying_File_0_To_Dir_1",
+ messages.notice("doclet.Copying_File_0_To_Dir_1",
srcfile.getPath(), destdir.getPath());
destfile.copyFile(srcfile);
}
@@ -1577,11 +1581,10 @@
DocFile destfile = destdir.resolve(srcfile.getName());
if (srcfile.isFile()) {
if (destfile.exists() && !first) {
- configuration.message.warning("doclet.Copy_Overwrite_warning",
+ messages.warning("doclet.Copy_Overwrite_warning",
srcfile.getPath(), destdir.getPath());
} else {
- configuration.message.notice(
- "doclet.Copying_File_0_To_Dir_1",
+ messages.notice("doclet.Copying_File_0_To_Dir_1",
srcfile.getPath(), destdir.getPath());
destfile.copyFile(srcfile);
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java Thu Aug 11 17:02:00 2016 +0000
@@ -39,6 +39,7 @@
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
+import jdk.javadoc.internal.doclets.toolkit.Messages;
/**
* A data structure that encapsulates the visible members of a particular
@@ -126,6 +127,7 @@
* The configuration this VisibleMemberMap was created with.
*/
private final Configuration configuration;
+ private final Messages messages;
private final Utils utils;
private final Comparator<Element> comparator;
@@ -149,6 +151,7 @@
this.typeElement = typeElement;
this.kind = kind;
this.configuration = configuration;
+ this.messages = configuration.getMessages();
this.utils = configuration.utils;
propertiesCache = configuration.propertiesCache;
classPropertiesMap = configuration.classPropertiesMap;
@@ -697,7 +700,7 @@
|| tagName.equals("@propertyGetter")
|| tagName.equals("@propertyDescription")) {
if (!isPropertyGetterOrSetter(members, ee)) {
- configuration.message.warning(ch.getDocTreePath(tree),
+ messages.warning(ch.getDocTreePath(tree),
"doclet.javafx_tag_misuse");
}
break;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java Thu Aug 11 17:02:00 2016 +0000
@@ -190,7 +190,7 @@
// Parse file objects provide via the DocumentationTool API
parse(fileObjects, classTrees, true);
- modules.initModules(classTrees.toList(), Collections.emptySet(), Collections.emptySet());
+ modules.initModules(classTrees.toList());
// Build up the complete list of any packages to be documented
Location location = modules.multiModuleMode ? StandardLocation.MODULE_SOURCE_PATH
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java Thu Aug 11 17:02:00 2016 +0000
@@ -172,7 +172,7 @@
}
void usage(boolean exit) {
- usage("main.usage", "-help", null, exit);
+ usage("main.usage", "-help", "main.usage.foot", exit);
}
@Override
@@ -355,14 +355,14 @@
((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
}
- String platformString = compOpts.get("-release");
+ String platformString = compOpts.get("--release");
if (platformString != null) {
if (compOpts.isSet("-source")) {
usageError("main.release.bootclasspath.conflict", "-source");
}
- if (fileManagerOpts.containsKey(BOOTCLASSPATH)) {
- usageError("main.release.bootclasspath.conflict", BOOTCLASSPATH.getText());
+ if (fileManagerOpts.containsKey(BOOT_CLASS_PATH)) {
+ usageError("main.release.bootclasspath.conflict", BOOT_CLASS_PATH.getPrimaryName());
}
PlatformDescription platformDescription =
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -49,21 +49,28 @@
BOOTCLASSPATH("-bootclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
CLASSPATH("-classpath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CLASSPATH, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
CP("-cp", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CP, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
+ }
+ },
+
+ CLASS_PATH("--class-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
@@ -77,28 +84,49 @@
SOURCEPATH("-sourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.SOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
+ }
+ },
+
+ SOURCE_PATH("--source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
}
},
SYSCLASSPATH("-sysclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
MODULESOURCEPATH("-modulesourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULESOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
+ }
+ },
+
+ MODULE_SOURCE_PATH("--module-source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
}
},
UPGRADEMODULEPATH("-upgrademodulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.UPGRADEMODULEPATH, arg);
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
+ }
+ },
+
+ UPGRADE_MODULE_PATH("--upgrade-module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
}
},
@@ -109,24 +137,59 @@
}
},
+ SYSTEM_("--system", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SYSTEM, arg);
+ }
+ },
+
MODULEPATH("-modulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ MODULE_PATH("--module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ P("-p", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
}
},
ADDMODS("-addmods", true) {
@Override
public void process(Helper helper, String arg) {
- Option.ADDMODS.process(helper.getOptionHelper(), opt, arg);
+ Option.ADD_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ ADD_MODULES("--add-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_MODULES.process(helper.getOptionHelper(), opt, arg);
}
},
LIMITMODS("-limitmods", true) {
@Override
public void process(Helper helper, String arg) {
- Option.LIMITMODS.process(helper.getOptionHelper(), opt, arg);
+ Option.LIMIT_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ LIMIT_MODULES("--limit-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.LIMIT_MODULES.process(helper.getOptionHelper(), opt, arg);
}
},
@@ -138,7 +201,14 @@
}
},
- RELEASE("-release", true) {
+ RELEASE("--release", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.RELEASE.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ RELEASE_OLD("-release", true) {
@Override
public void process(Helper helper, String arg) {
Option.RELEASE.process(helper.getOptionHelper(), opt, arg);
@@ -169,14 +239,28 @@
XADDREADS("-XaddReads:", false) {
@Override
public void process(Helper helper, String arg) {
- Option.XADDREADS.process(helper.getOptionHelper(), arg);
+ Option.ADD_READS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_READS("--add-reads", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_READS.process(helper.getOptionHelper(), opt, arg);
}
},
- XADDEXPORTS("-XaddExports:", false) {
+ ADDEXPORTS("-XaddExports:", false) {
@Override
public void process(Helper helper, String arg) {
- Option.XADDEXPORTS.process(helper.getOptionHelper(), arg);
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_EXPORTS("--add-exports", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), opt, arg);
}
},
@@ -194,6 +278,13 @@
}
},
+ PATCH_MODULE("--patch-module", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.PATCH_MODULE.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
// ----- doclet options -----
DOCLET("-doclet", true), // handled in setDocletInvoker
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties Thu Aug 11 17:02:00 2016 +0000
@@ -37,21 +37,27 @@
\ -help Display command line options and exit\n\
\ -doclet <class> Generate output via alternate doclet\n\
\ -docletpath <path> Specify where to find doclet class files\n\
-\ -modulesourcepath <path> Specify where to find input source files for multiple modules\n\
-\ -upgrademodulepath <path> Override location of upgradeable modules\n\
-\ -modulepath <path> Specify where to find application modules\n\
-\ -mp <path> Specify where to find application modules\n\
-\ -addmods <module>(,<module>)* Root modules to resolve in addition to the initial modules,\n\
+\ --module-source-path <path> Specify where to find input source files for multiple modules\n\
+\ --upgrade-module-path <path> Override location of upgradeable modules\n\
+\ --module-path <path>, -p <path> Specify where to find application modules\n\
+\ --add-modules <module>(,<module>)*\n\
+\ Root modules to resolve in addition to the initial modules,\n\
\ or all modules on the module path if <module> is ALL-MODULE-PATH.\n\
-\ -limitmods <module>(,<module>)* Limit the universe of observable modules\n\
-\ -sourcepath <pathlist> Specify where to find source files\n\
-\ -classpath <pathlist> Specify where to find user class files\n\
-\ -cp <pathlist> Specify where to find user class files\n\
+\ --limit-modules <module>(,<module>)*\n\
+\ Limit the universe of observable modules\n\
+\ --source-path <path> Specify where to find source files\n\
+\ -sourcepath <path> Specify where to find source files\n\
+\ --class-path <path> Specify where to find user class files\n\
+\ -classpath <path> Specify where to find user class files\n\
+\ -cp <path> Specify where to find user class files\n\
\ -exclude <pkglist> Specify a list of packages to exclude\n\
\ -subpackages <subpkglist> Specify subpackages to recursively load\n\
\ -breakiterator Compute first sentence with BreakIterator\n\
-\ -bootclasspath <pathlist> Override location of class files loaded\n\
-\ by the bootstrap class loader\n\
+\ -bootclasspath <path> Override location of platform class files\n\
+\ used for non-modular releases\n\
+\ --system <jdk> Override location of system modules used\n\
+\ for modular releases.\n\
+\ --release <release> Provide source compatibility with specified release\n\
\ -source <release> Provide source compatibility with specified release\n\
\ -extdirs <dirlist> Override location of installed extensions\n\
\ -verbose Output messages about what Javadoc is doing\n\
@@ -61,19 +67,23 @@
\ -J<flag> Pass <flag> directly to the runtime system\n\
\ -X Print a synopsis of nonstandard options and exit\n
+main.usage.foot=\n\
+GNU-style options may use '=' instead whitespace to separate the name of an option\n\
+from its value.\n
+
main.Xusage=\
\ -Xmaxerrs <number> Set the maximum number of errors to print\n\
\ -Xmaxwarns <number> Set the maximum number of warnings to print\n\
-\ -XaddExports:<module>/<package>=<other-module>(,<other-module>)*\n\
+\ --add-exports <module>/<package>=<other-module>(,<other-module>)*\n\
\ Specify a package to be considered as exported from its \n\
\ defining module to additional modules, or to all unnamed \n\
\ modules if <other-module> is ALL-UNNAMED.\n\
-\ -XaddReads:<module>=<other-module>(,<other-module>)*\n\
+\ --add-reads <module>=<other-module>(,<other-module>)*\n\
\ Specify additional modules to be considered as required by a\n\
\ given module. <other-module> may be ALL-UNNAMED to require\n\
\ the unnamed module.\n\
\ -Xmodule:<module-name> Specify a module to which the classes being compiled belong.\n\
-\ -Xpatch:<module>=<file>(:<file>)*\n\
+\ --patch-module <module>=<file>(:<file>)*\n\
\ Override or augment a module with classes and resources\n\
\ in JAR files or directories\n\
\ -Xold Invoke the legacy javadoc tool\n
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java Thu Aug 11 17:02:00 2016 +0000
@@ -126,24 +126,28 @@
static final Option[] recognizedOptions = {
new Option(false, "-help", "--help", "-?") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.help = true;
}
},
new Option(false, "-version") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.version = true;
}
},
new Option(false, "-fullversion") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.fullVersion = true;
}
},
new Option(false, "-v", "-verbose", "-all") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.verbose = true;
task.options.showDescriptors = true;
@@ -153,12 +157,14 @@
},
new Option(false, "-l") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.showLineAndLocalVariableTables = true;
}
},
new Option(false, "-public") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.accessOptions.add(opt);
task.options.showAccess = AccessFlags.ACC_PUBLIC;
@@ -166,6 +172,7 @@
},
new Option(false, "-protected") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.accessOptions.add(opt);
task.options.showAccess = AccessFlags.ACC_PROTECTED;
@@ -173,6 +180,7 @@
},
new Option(false, "-package") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.accessOptions.add(opt);
task.options.showAccess = 0;
@@ -180,6 +188,7 @@
},
new Option(false, "-p", "-private") {
+ @Override
void process(JavapTask task, String opt, String arg) {
if (!task.options.accessOptions.contains("-p") &&
!task.options.accessOptions.contains("-private")) {
@@ -190,24 +199,28 @@
},
new Option(false, "-c") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.showDisassembled = true;
}
},
new Option(false, "-s") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.showDescriptors = true;
}
},
new Option(false, "-sysinfo") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.sysInfo = true;
}
},
new Option(false, "-XDdetails") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.details = EnumSet.allOf(InstructionDetailWriter.Kind.class);
}
@@ -221,6 +234,7 @@
return sep != -1 && super.matches(opt.substring(0, sep + 1));
}
+ @Override
void process(JavapTask task, String opt, String arg) throws BadArgs {
int sep = opt.indexOf(":");
for (String v: opt.substring(sep + 1).split("[,: ]+")) {
@@ -258,12 +272,14 @@
},
new Option(false, "-constants") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.showConstants = true;
}
},
new Option(false, "-XDinner") {
+ @Override
void process(JavapTask task, String opt, String arg) {
task.options.showInnerClasses = true;
}
@@ -276,6 +292,7 @@
return sep != -1 && super.matches(opt.substring(0, sep + 1));
}
+ @Override
void process(JavapTask task, String opt, String arg) throws BadArgs {
int sep = opt.indexOf(":");
try {
@@ -294,6 +311,7 @@
return sep != -1 && super.matches(opt.substring(0, sep + 1));
}
+ @Override
void process(JavapTask task, String opt, String arg) throws BadArgs {
int sep = opt.indexOf(":");
try {
@@ -305,7 +323,7 @@
}
},
- new Option(true, "-m") {
+ new Option(true, "--module", "-m") {
@Override
void process(JavapTask task, String opt, String arg) throws BadArgs {
task.options.moduleName = arg;
@@ -929,21 +947,26 @@
private void showHelp() {
printLines(getMessage("main.usage", progname));
for (Option o: recognizedOptions) {
- String name = o.aliases[0].substring(1); // there must always be at least one name
+ String name = o.aliases[0].replaceAll("^-+", "").replaceAll("-+", "_"); // there must always be at least one name
if (name.startsWith("X") || name.equals("fullversion") || name.equals("h") || name.equals("verify"))
continue;
printLines(getMessage("main.opt." + name));
}
+
String[] fmOptions = {
- "-classpath", "-cp", "-bootclasspath",
- "-upgrademodulepath", "-system", "-modulepath" };
+ "--module-path", "--system",
+ "--class-path", "-classpath", "-cp",
+ "-bootclasspath"
+ };
+
for (String o: fmOptions) {
if (fileManager.isSupportedOption(o) == -1)
continue;
- String name = o.substring(1);
+ String name = o.replaceAll("^-+", "").replaceAll("-+", "_");
printLines(getMessage("main.opt." + name));
}
+ printLines(getMessage("main.usage.foot"));
}
private void showVersion(boolean full) {
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties Thu Aug 11 17:02:00 2016 +0000
@@ -41,61 +41,73 @@
main.opt.help=\
-\ -help --help -? Print this usage message
+\ -help --help -? Print this usage message
main.opt.version=\
-\ -version Version information
+\ -version Version information
main.opt.v=\
-\ -v -verbose Print additional information
+\ -v -verbose Print additional information
main.opt.l=\
-\ -l Print line number and local variable tables
+\ -l Print line number and local variable tables
main.opt.public=\
-\ -public Show only public classes and members
+\ -public Show only public classes and members
main.opt.protected=\
-\ -protected Show protected/public classes and members
+\ -protected Show protected/public classes and members
main.opt.package=\
-\ -package Show package/protected/public classes\n\
-\ and members (default)
+\ -package Show package/protected/public classes\n\
+\ and members (default)
main.opt.p=\
-\ -p -private Show all classes and members
+\ -p -private Show all classes and members
main.opt.c=\
-\ -c Disassemble the code
+\ -c Disassemble the code
main.opt.s=\
-\ -s Print internal type signatures
+\ -s Print internal type signatures
+
+main.opt.class_path=\
+\ --class-path <path> Specify where to find user class files
main.opt.classpath=\
-\ -classpath <path> Specify where to find user class files
+\ -classpath <path> Specify where to find user class files
main.opt.cp=\
-\ -cp <path> Specify where to find user class files
+\ -cp <path> Specify where to find user class files
main.opt.bootclasspath=\
-\ -bootclasspath <path> Override location of bootstrap class files
+\ -bootclasspath <path> Override location of bootstrap class files
-main.opt.upgrademodulepath=\
-\ -upgrademodulepath <path> Specify where to find upgradeable modules
+main.opt.upgrade_module_path=\
+\ --upgrade-module-path <path> Specify where to find upgradeable modules
main.opt.system=\
-\ -system <jdk> Specify where to find system modules
+\ --system <jdk> Specify where to find system modules
-main.opt.modulepath=\
-\ -modulepath <path> Specify where to find application modules
+main.opt.module_path=\
+\ --module-path <path> Specify where to find application modules
main.opt.constants=\
-\ -constants Show final constants
-
+\ -constants Show final constants
main.opt.sysinfo=\
-\ -sysinfo Show system info (path, size, date, MD5 hash)\n\
-\ of class being processed
+\ -sysinfo Show system info (path, size, date, MD5 hash)\n\
+\ of class being processed
+
+main.opt.module=\
+\ --module <module>, -m <module> Specify module containing classes to be disassembled
-main.opt.m=\
-\ -m <module-name> Specify module containing classes to be disassembled
+main.usage.foot=\n\
+GNU-style options may use '=' instead of whitespace to separate the name of an option\n\
+from its value.\n\
+\n\
+Each class to be shown may be specified by a filename, a URL, or by its fully\n\
+qualified class name. Examples:\n\
+\ path/to/MyClass.class\n\
+\ jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n\
+\ java.lang.Object\n
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Thu Aug 11 17:02:00 2016 +0000
@@ -514,7 +514,7 @@
}
/*
- * This method is for -check option to find all target modules specified
+ * This method is for --check option to find all target modules specified
* in qualified exports.
*
* Include all system modules and modules found on modulepath
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java Thu Aug 11 17:02:00 2016 +0000
@@ -144,7 +144,7 @@
}
static Option[] recognizedOptions = {
- new Option(false, "-h", "-?", "-help") {
+ new Option(false, "-h", "-?", "-help", "--help") {
void process(JdepsTask task, String opt, String arg) {
task.options.help = true;
}
@@ -195,14 +195,14 @@
task.options.apiOnly = true;
}
},
- new Option(true, "-check") {
+ new Option(true, "--check") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
Set<String> mods = Set.of(arg.split(","));
task.options.checkModuleDeps = mods;
task.options.addmods.addAll(mods);
}
},
- new Option(true, "-genmoduleinfo") {
+ new Option(true, "--gen-module-info") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
Path p = Paths.get(arg);
if (Files.exists(p) && (!Files.isDirectory(p) || !Files.isWritable(p))) {
@@ -222,22 +222,22 @@
},
// ---- paths option ----
- new Option(true, "-cp", "-classpath") {
+ new Option(true, "-cp", "-classpath", "--class-path") {
void process(JdepsTask task, String opt, String arg) {
task.options.classpath = arg;
}
},
- new Option(true, "-mp", "-modulepath") {
+ new Option(true, "--module-path") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
task.options.modulePath = arg;
}
},
- new Option(true, "-upgrademodulepath") {
+ new Option(true, "--upgrade-module-path") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
task.options.upgradeModulePath = arg;
}
},
- new Option(true, "-system") {
+ new Option(true, "--system") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
if (arg.equals("none")) {
task.options.systemModulePath = null;
@@ -250,13 +250,13 @@
}
}
},
- new Option(true, "-addmods") {
+ new Option(true, "--add-modules") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
Set<String> mods = Set.of(arg.split(","));
task.options.addmods.addAll(mods);
}
},
- new Option(true, "-m") {
+ new Option(true, "-m", "--module") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
task.options.rootModule = arg;
task.options.addmods.add(arg);
@@ -314,7 +314,7 @@
},
// Another alternative to list modules in -addmods option
- new HiddenOption(true, "-include-system-modules") {
+ new HiddenOption(true, "--include-system-modules") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
task.options.includeSystemModulePattern = Pattern.compile(arg);
}
@@ -345,7 +345,7 @@
}
},
- new Option(false, "-ct", "-compile-time") {
+ new Option(false, "--compile-time") {
void process(JdepsTask task, String opt, String arg) {
task.options.compileTimeView = true;
task.options.filterSamePackage = true;
@@ -375,7 +375,7 @@
task.options.showLabel = true;
}
},
- new HiddenOption(false, "-hide-module") {
+ new HiddenOption(false, "--hide-show-module") {
void process(JdepsTask task, String opt, String arg) {
task.options.showModule = false;
}
@@ -464,7 +464,7 @@
return EXIT_CMDERR;
}
if (options.checkModuleDeps != null && !inputArgs.isEmpty()) {
- reportError("err.invalid.module.option", inputArgs, "-check");
+ reportError("err.invalid.module.option", inputArgs, "--check");
}
boolean ok = run();
@@ -501,12 +501,12 @@
.forEach(mn -> config.findModule(mn).orElseThrow(() ->
new UncheckedBadArgs(new BadArgs("err.module.not.found", mn))));
- // -genmoduleinfo
+ // --gen-module-info
if (options.genModuleInfo != null) {
return genModuleInfo(config);
}
- // -check
+ // --check
if (options.checkModuleDeps != null) {
return new ModuleAnalyzer(config, log, options.checkModuleDeps).run();
}
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java Thu Aug 11 17:02:00 2016 +0000
@@ -77,7 +77,7 @@
String list = config.initialArchives().stream()
.map(Archive::getPathName).collect(joining(" "));
throw new JdepsTask.UncheckedBadArgs(new BadArgs("err.invalid.module.option",
- list, "-check"));
+ list, "--check"));
}
this.configuration = config;
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties Thu Aug 11 17:02:00 2016 +0000
@@ -1,6 +1,6 @@
main.usage.summary=\
Usage: {0} <options> <path ...>]\n\
-use -h, -? or -help for a list of possible options
+use -h, -?, -help, or --help for a list of possible options
main.usage=\
Usage: {0} <options> <path ...>]\n\
@@ -12,7 +12,8 @@
warn.prefix=Warning:
main.opt.h=\
-\ -h -? -help Print this usage message
+\ -h -? -help\n\
+\ --help Print this usage message
main.opt.version=\
\ -version Version information
@@ -64,24 +65,26 @@
\ -P -profile Show profile containing a package
main.opt.cp=\
-\ -cp <path> -classpath <path> Specify where to find class files
+\ -cp <path>\n\
+\ -classpath <path>\n\
+\ --class-path <path> Specify where to find class files
-main.opt.mp=\
-\ -mp <module path>...\n\
-\ -modulepath <module path>... Specify module path
+main.opt.module-path=\
+\ --module-path <module path>... Specify module path
-main.opt.upgrademodulepath=\
-\ -upgrademodulepath <module path>... Specify upgrade module path
+main.opt.upgrade-module-path=\
+\ --upgrade-module-path <module path>... Specify upgrade module path
main.opt.system=\
-\ -system <java-home> Specify an alternate system module path
+\ --system <java-home> Specify an alternate system module path
-main.opt.addmods=\
-\ -addmods <module-name>[,<module-name>...]\n\
+main.opt.add-modules=\
+\ --add-modules <module-name>[,<module-name>...]\n\
\ Adds modules to the root set for analysis
main.opt.m=\
-\ -m <module-name> Specify the root module for analysis
+\ -m <module-name>\n\
+\ --module <module-name> Specify the root module for analysis
main.opt.R=\
\ -R -recursive Recursively traverse all run-time dependencies.\n\
@@ -98,8 +101,8 @@
\ dependency summary. This option must use\n\
\ with -requires, -package or -regex option.
-main.opt.ct=\
-\ -ct -compile-time Compile-time view of transitive dependencies\n\
+main.opt.compile-time=\
+\ --compile-time Compile-time view of transitive dependencies\n\
\ i.e. compile-time view of -R option.\n\
\ Analyzes the dependences per other given options\n\
\ If a dependence is found from a directory,\n\
@@ -113,14 +116,14 @@
\ type, method parameter types, returned type,\n\
\ checked exception types etc.
-main.opt.genmoduleinfo=\
-\ -genmoduleinfo <dir> Generate module-info.java under the specified\n\
+main.opt.gen-module-info=\
+\ --gen-module-info <dir> Generate module-info.java under the specified\n\
\ directory. The specified JAR files will be\n\
\ analyzed. This option cannot be used with\n\
\ -dotoutput or -cp.
main.opt.check=\
-\ -check <module-name>[,<module-name>...\n\
+\ --check <module-name>[,<module-name>...\n\
\ Analyze the dependence of the specified modules\n\
\ It prints the module descriptor, the resulting\n\
\ module dependences after analysis and the\n\
@@ -151,7 +154,7 @@
err.missing.arg=no value given for {0}
err.invalid.arg.for.option=invalid argument for option: {0}
err.option.after.class=option must be specified before classes: {0}
-err.genmoduleinfo.not.jarfile={0} not valid for -genmoduleinfo option (must be non-modular JAR file)
+err.genmoduleinfo.not.jarfile={0} not valid for --gen-module-info option (must be non-modular JAR file)
err.profiles.msg=No profile information
err.exception.message={0}
err.invalid.path=invalid path: {0}
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Thu Aug 11 17:02:00 2016 +0000
@@ -973,10 +973,10 @@
p.getFileName().toString().endsWith(".jar"));
}
- private CompletionProvider snippetCompletion(Supplier<List<? extends Snippet>> snippetsSupplier) {
+ private CompletionProvider snippetCompletion(Supplier<Stream<? extends Snippet>> snippetsSupplier) {
return (prefix, cursor, anchor) -> {
anchor[0] = 0;
- return snippetsSupplier.get() .stream()
+ return snippetsSupplier.get()
.flatMap(k -> (k instanceof DeclarationSnippet)
? Stream.of(String.valueOf(k.id()), ((DeclarationSnippet) k).name())
: Stream.of(String.valueOf(k.id())))
@@ -986,7 +986,7 @@
};
}
- private CompletionProvider snippetKeywordCompletion(Supplier<List<? extends Snippet>> snippetsSupplier) {
+ private CompletionProvider snippetKeywordCompletion(Supplier<Stream<? extends Snippet>> snippetsSupplier) {
return (code, cursor, anchor) -> {
List<Suggestion> result = new ArrayList<>();
result.addAll(KEYWORD_COMPLETION_PROVIDER.completionSuggestions(code, cursor, anchor));
@@ -1020,36 +1020,32 @@
// Snippet lists
- List<Snippet> allSnippets() {
+ Stream<Snippet> allSnippets() {
return state.snippets();
}
- List<PersistentSnippet> dropableSnippets() {
- return state.snippets().stream()
+ Stream<PersistentSnippet> dropableSnippets() {
+ return state.snippets()
.filter(sn -> state.status(sn).isActive() && sn instanceof PersistentSnippet)
- .map(sn -> (PersistentSnippet) sn)
- .collect(toList());
+ .map(sn -> (PersistentSnippet) sn);
}
- List<VarSnippet> allVarSnippets() {
- return state.snippets().stream()
+ Stream<VarSnippet> allVarSnippets() {
+ return state.snippets()
.filter(sn -> sn.kind() == Snippet.Kind.VAR)
- .map(sn -> (VarSnippet) sn)
- .collect(toList());
+ .map(sn -> (VarSnippet) sn);
}
- List<MethodSnippet> allMethodSnippets() {
- return state.snippets().stream()
+ Stream<MethodSnippet> allMethodSnippets() {
+ return state.snippets()
.filter(sn -> sn.kind() == Snippet.Kind.METHOD)
- .map(sn -> (MethodSnippet) sn)
- .collect(toList());
+ .map(sn -> (MethodSnippet) sn);
}
- List<TypeDeclSnippet> allTypeSnippets() {
- return state.snippets().stream()
+ Stream<TypeDeclSnippet> allTypeSnippets() {
+ return state.snippets()
.filter(sn -> sn.kind() == Snippet.Kind.TYPE_DECL)
- .map(sn -> (TypeDeclSnippet) sn)
- .collect(toList());
+ .map(sn -> (TypeDeclSnippet) sn);
}
// Table of commands -- with command forms, argument kinds, helpKey message, implementation, ...
@@ -1549,7 +1545,7 @@
* string
* @return a Stream of referenced snippets or null if no matches are found
*/
- private <T extends Snippet> Stream<T> argsOptionsToSnippets(List<T> snippets,
+ private <T extends Snippet> Stream<T> argsOptionsToSnippets(Supplier<Stream<T>> snippetSupplier,
Predicate<Snippet> defFilter, String rawargs, String cmd) {
ArgTokenizer at = new ArgTokenizer(cmd, rawargs.trim());
at.allowedOptions("-all", "-start");
@@ -1571,38 +1567,38 @@
}
if (at.hasOption("-all")) {
// all snippets including start-up, failed, and overwritten
- return snippets.stream();
+ return snippetSupplier.get();
}
if (at.hasOption("-start")) {
// start-up snippets
- return snippets.stream()
+ return snippetSupplier.get()
.filter(this::inStartUp);
}
if (args.isEmpty()) {
// Default is all active user snippets
- return snippets.stream()
+ return snippetSupplier.get()
.filter(defFilter);
}
- return argsToSnippets(snippets, args);
+ return argsToSnippets(snippetSupplier, args);
}
/**
* Convert user arguments to a Stream of snippets referenced by those
* arguments.
*
- * @param snippets the base list of possible snippets
+ * @param snippetSupplier the base list of possible snippets
* @param args the user's argument to the command, maybe be the empty list
* @return a Stream of referenced snippets or null if no matches to specific
* arg
*/
- private <T extends Snippet> Stream<T> argsToSnippets(List<T> snippets,
+ private <T extends Snippet> Stream<T> argsToSnippets(Supplier<Stream<T>> snippetSupplier,
List<String> args) {
Stream<T> result = null;
for (String arg : args) {
// Find the best match
- Stream<T> st = layeredSnippetSearch(snippets, arg);
+ Stream<T> st = layeredSnippetSearch(snippetSupplier, arg);
if (st == null) {
- Stream<Snippet> est = layeredSnippetSearch(state.snippets(), arg);
+ Stream<Snippet> est = layeredSnippetSearch(state::snippets, arg);
if (est == null) {
errormsg("jshell.err.no.such.snippets", arg);
} else {
@@ -1620,10 +1616,10 @@
return result;
}
- private <T extends Snippet> Stream<T> layeredSnippetSearch(List<T> snippets, String arg) {
+ private <T extends Snippet> Stream<T> layeredSnippetSearch(Supplier<Stream<T>> snippetSupplier, String arg) {
return nonEmptyStream(
// the stream supplier
- () -> snippets.stream(),
+ snippetSupplier,
// look for active user declarations matching the name
sn -> isActive(sn) && matchingDeclaration(sn, arg),
// else, look for any declarations matching the name
@@ -1648,7 +1644,7 @@
errormsg("jshell.err.drop.arg");
return false;
}
- Stream<PersistentSnippet> stream = argsToSnippets(dropableSnippets(), args);
+ Stream<PersistentSnippet> stream = argsToSnippets(this::dropableSnippets, args);
if (stream == null) {
// Snippet not found. Error already printed
fluffmsg("jshell.msg.see.classes.etc");
@@ -1670,7 +1666,7 @@
}
private boolean cmdEdit(String arg) {
- Stream<Snippet> stream = argsOptionsToSnippets(state.snippets(),
+ Stream<Snippet> stream = argsOptionsToSnippets(state::snippets,
this::mainActive, arg, "/edit");
if (stream == null) {
return false;
@@ -1775,7 +1771,7 @@
if (arg.length() >= 2 && "-history".startsWith(arg)) {
return cmdHistory();
}
- Stream<Snippet> stream = argsOptionsToSnippets(state.snippets(),
+ Stream<Snippet> stream = argsOptionsToSnippets(state::snippets,
this::mainActive, arg, "/list");
if (stream == null) {
return false;
@@ -1896,13 +1892,12 @@
} else if (at.hasOption("-start")) {
writer.append(startup);
} else {
- List<Snippet> sns = at.hasOption("-all")
+ String sources = (at.hasOption("-all")
? state.snippets()
- : state.snippets().stream().filter(this::mainActive).collect(toList());
- for (Snippet sn : sns) {
- writer.write(sn.source());
- writer.write("\n");
- }
+ : state.snippets().filter(this::mainActive))
+ .map(Snippet::source)
+ .collect(Collectors.joining("\n"));
+ writer.write(sources);
}
} catch (FileNotFoundException e) {
errormsg("jshell.err.file.not.found", "/save", filename, e.getMessage());
@@ -1915,7 +1910,7 @@
}
private boolean cmdVars(String arg) {
- Stream<VarSnippet> stream = argsOptionsToSnippets(allVarSnippets(),
+ Stream<VarSnippet> stream = argsOptionsToSnippets(this::allVarSnippets,
this::isActive, arg, "/vars");
if (stream == null) {
return false;
@@ -1931,7 +1926,7 @@
}
private boolean cmdMethods(String arg) {
- Stream<MethodSnippet> stream = argsOptionsToSnippets(allMethodSnippets(),
+ Stream<MethodSnippet> stream = argsOptionsToSnippets(this::allMethodSnippets,
this::isActive, arg, "/methods");
if (stream == null) {
return false;
@@ -1943,7 +1938,7 @@
}
private boolean cmdTypes(String arg) {
- Stream<TypeDeclSnippet> stream = argsOptionsToSnippets(allTypeSnippets(),
+ Stream<TypeDeclSnippet> stream = argsOptionsToSnippets(this::allTypeSnippets,
this::isActive, arg, "/types");
if (stream == null) {
return false;
@@ -1982,7 +1977,7 @@
}
private boolean cmdUseHistoryEntry(int index) {
- List<Snippet> keys = state.snippets();
+ List<Snippet> keys = state.snippets().collect(toList());
if (index < 0)
index += keys.size();
else
@@ -2012,7 +2007,7 @@
}
private boolean rerunHistoryEntryById(String id) {
- Optional<Snippet> snippet = state.snippets().stream()
+ Optional<Snippet> snippet = state.snippets()
.filter(s -> s.id().equals(id))
.findFirst();
return snippet.map(s -> {
@@ -2135,7 +2130,7 @@
debug("Event with null key: %s", ste);
return false;
}
- List<Diag> diagnostics = state.diagnostics(sn);
+ List<Diag> diagnostics = state.diagnostics(sn).collect(toList());
String source = sn.source();
if (ste.causeSnippet() == null) {
// main event
@@ -2212,7 +2207,7 @@
//where
void printUnresolvedException(UnresolvedReferenceException ex) {
DeclarationSnippet corralled = ex.getSnippet();
- List<Diag> otherErrors = errorsOnly(state.diagnostics(corralled));
+ List<Diag> otherErrors = errorsOnly(state.diagnostics(corralled).collect(toList()));
new DisplayEvent(corralled, state.status(corralled), FormatAction.USED, true, null, otherErrors)
.displayDeclarationAndValue();
}
@@ -2280,13 +2275,13 @@
for (Diag d : errors) {
displayDiagnostics(sn.source(), d, errorLines);
}
- int unresolvedCount;
+ long unresolvedCount;
if (sn instanceof DeclarationSnippet && (status == Status.RECOVERABLE_DEFINED || status == Status.RECOVERABLE_NOT_DEFINED)) {
resolution = (status == Status.RECOVERABLE_NOT_DEFINED)
? FormatResolve.NOTDEFINED
: FormatResolve.DEFINED;
unresolved = unresolved((DeclarationSnippet) sn);
- unresolvedCount = state.unresolvedDependencies((DeclarationSnippet) sn).size();
+ unresolvedCount = state.unresolvedDependencies((DeclarationSnippet) sn).count();
} else {
resolution = FormatResolve.OK;
unresolved = "";
@@ -2305,7 +2300,7 @@
}
private String unresolved(DeclarationSnippet key) {
- List<String> unr = state.unresolvedDependencies(key);
+ List<String> unr = state.unresolvedDependencies(key).collect(toList());
StringBuilder sb = new StringBuilder();
int fromLast = unr.size();
if (fromLast > 0) {
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java Thu Aug 11 17:02:00 2016 +0000
@@ -43,6 +43,7 @@
import java.util.function.Consumer;
import java.util.function.Supplier;
+import java.util.stream.Stream;
import jdk.internal.jshell.debug.InternalDebugControl;
import jdk.jshell.Snippet.Status;
import jdk.jshell.execution.JDIDefaultExecutionControl;
@@ -504,9 +505,9 @@
* @return the snippets for all current snippets in id order.
* @throws IllegalStateException if this JShell instance is closed.
*/
- public List<Snippet> snippets() throws IllegalStateException {
+ public Stream<Snippet> snippets() throws IllegalStateException {
checkIfAlive();
- return Collections.unmodifiableList(maps.snippetList());
+ return maps.snippetList().stream();
}
/**
@@ -518,11 +519,10 @@
* @return the active declared variables.
* @throws IllegalStateException if this JShell instance is closed.
*/
- public List<VarSnippet> variables() throws IllegalStateException {
- return snippets().stream()
+ public Stream<VarSnippet> variables() throws IllegalStateException {
+ return snippets()
.filter(sn -> status(sn).isActive() && sn.kind() == Snippet.Kind.VAR)
- .map(sn -> (VarSnippet) sn)
- .collect(collectingAndThen(toList(), Collections::unmodifiableList));
+ .map(sn -> (VarSnippet) sn);
}
/**
@@ -534,11 +534,10 @@
* @return the active declared methods.
* @throws IllegalStateException if this JShell instance is closed.
*/
- public List<MethodSnippet> methods() throws IllegalStateException {
- return snippets().stream()
+ public Stream<MethodSnippet> methods() throws IllegalStateException {
+ return snippets()
.filter(sn -> status(sn).isActive() && sn.kind() == Snippet.Kind.METHOD)
- .map(sn -> (MethodSnippet)sn)
- .collect(collectingAndThen(toList(), Collections::unmodifiableList));
+ .map(sn -> (MethodSnippet)sn);
}
/**
@@ -550,11 +549,10 @@
* @return the active declared type declarations.
* @throws IllegalStateException if this JShell instance is closed.
*/
- public List<TypeDeclSnippet> types() throws IllegalStateException {
- return snippets().stream()
+ public Stream<TypeDeclSnippet> types() throws IllegalStateException {
+ return snippets()
.filter(sn -> status(sn).isActive() && sn.kind() == Snippet.Kind.TYPE_DECL)
- .map(sn -> (TypeDeclSnippet) sn)
- .collect(collectingAndThen(toList(), Collections::unmodifiableList));
+ .map(sn -> (TypeDeclSnippet) sn);
}
/**
@@ -566,11 +564,10 @@
* @return the active declared import declarations.
* @throws IllegalStateException if this JShell instance is closed.
*/
- public List<ImportSnippet> imports() throws IllegalStateException {
- return snippets().stream()
+ public Stream<ImportSnippet> imports() throws IllegalStateException {
+ return snippets()
.filter(sn -> status(sn).isActive() && sn.kind() == Snippet.Kind.IMPORT)
- .map(sn -> (ImportSnippet) sn)
- .collect(collectingAndThen(toList(), Collections::unmodifiableList));
+ .map(sn -> (ImportSnippet) sn);
}
/**
@@ -598,8 +595,8 @@
* @throws IllegalArgumentException if the snippet is not associated with
* this {@code JShell} instance.
*/
- public List<Diag> diagnostics(Snippet snippet) {
- return Collections.unmodifiableList(checkValidSnippet(snippet).diagnostics());
+ public Stream<Diag> diagnostics(Snippet snippet) {
+ return checkValidSnippet(snippet).diagnostics().stream();
}
/**
@@ -611,13 +608,13 @@
* {@code eval()} or {@code drop()} of another snippet causes
* an update of a dependency.
* @param snippet the declaration {@code Snippet} to look up
- * @return the list of symbol names that are currently unresolvedDependencies.
+ * @return a stream of symbol names that are currently unresolvedDependencies.
* @throws IllegalStateException if this {@code JShell} instance is closed.
* @throws IllegalArgumentException if the snippet is not associated with
* this {@code JShell} instance.
*/
- public List<String> unresolvedDependencies(DeclarationSnippet snippet) {
- return Collections.unmodifiableList(checkValidSnippet(snippet).unresolved());
+ public Stream<String> unresolvedDependencies(DeclarationSnippet snippet) {
+ return checkValidSnippet(snippet).unresolved().stream();
}
/**
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java Thu Aug 11 17:02:00 2016 +0000
@@ -414,25 +414,29 @@
// types are the same. if so, consider it an overwrite replacement.
private Status overwriteMatchingMethod(MethodSnippet msi) {
String qpt = msi.qualifiedParameterTypes();
+ List<MethodSnippet> matching = state.methods()
+ .filter(sn ->
+ sn != null
+ && sn != msi
+ && sn.status().isActive()
+ && sn.name().equals(msi.name())
+ && qpt.equals(sn.qualifiedParameterTypes()))
+ .collect(toList());
// Look through all methods for a method of the same name, with the
// same computed qualified parameter types
Status overwrittenStatus = null;
- for (MethodSnippet sn : state.methods()) {
- if (sn != null && sn != msi && sn.status().isActive() && sn.name().equals(msi.name())) {
- if (qpt.equals(sn.qualifiedParameterTypes())) {
- overwrittenStatus = sn.status();
- SnippetEvent se = new SnippetEvent(
- sn, overwrittenStatus, OVERWRITTEN,
- false, msi, null, null);
- sn.setOverwritten();
- secondaryEvents.add(se);
- state.debug(DBG_EVNT,
- "Overwrite event #%d -- key: %s before: %s status: %s sig: %b cause: %s\n",
- secondaryEvents.size(), se.snippet(), se.previousStatus(),
- se.status(), se.isSignatureChange(), se.causeSnippet());
- }
- }
+ for (MethodSnippet sn : matching) {
+ overwrittenStatus = sn.status();
+ SnippetEvent se = new SnippetEvent(
+ sn, overwrittenStatus, OVERWRITTEN,
+ false, msi, null, null);
+ sn.setOverwritten();
+ secondaryEvents.add(se);
+ state.debug(DBG_EVNT,
+ "Overwrite event #%d -- key: %s before: %s status: %s sig: %b cause: %s\n",
+ secondaryEvents.size(), se.snippet(), se.previousStatus(),
+ se.status(), se.isSignatureChange(), se.causeSnippet());
}
return overwrittenStatus;
}
--- a/langtools/test/ProblemList.txt Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/ProblemList.txt Thu Aug 11 17:02:00 2016 +0000
@@ -26,36 +26,16 @@
###########################################################################
#
# javadoc
-
-jdk/javadoc/tool/6176978/T6176978.java 8152049 generic-all no longer applicable, should delete
-jdk/javadoc/tool/InlineTagsWithBraces.java 8152050 generic-all API, re-evaluate @bold, @maybe causes doclint to throw up.
-jdk/javadoc/tool/LangVers.java 8152051 generic-all API, re-evaluate, unsure of this test.
jdk/javadoc/tool/VerifyLocale.java 8149565 generic-all -locale option issues
-jdk/javadoc/tool/enum/docComments/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/enum/enumType/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/genericClass/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/genericInnerAndOuter/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/genericInterface/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/genericMethod/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/genericSuper/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/supertypes/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/throwsGeneric/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/tparamCycle/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/tparamTagOnMethod/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/tparamTagOnType/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/generics/wildcards/Main.java 8152054 generic-all API modifications
-jdk/javadoc/tool/imports/MissingImport.java 8152054 generic-all API modifications, testing deprecated APIs.
-jdk/javadoc/tool/sourceOnly/Test.java 8152054 generic-all API modifications
-jdk/javadoc/tool/sourceOption/SourceOption.java 8152054 generic-all API modifications
-jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java 8152054 generic-all API modifications
-jdk/javadoc/tool/varArgs/Main.java 8152054 generic-all API modifications
+jdk/javadoc/tool/enum/docComments/Main.java 8152313 generic-all convert to doclet test framework
+jdk/javadoc/tool/enum/enumType/Main.java 8152313 generic-all convert to doclet test framework
+jdk/javadoc/tool/varArgs/Main.java 8152313 generic-all convert to doclet test framework
###########################################################################
#
# jshell
-jdk/jshell/EditorPadTest.java 8139872 generic-all test requires a non-headless environment
-jdk/jshell/ExternalEditorTest.java 8080843 generic-all invalid key error occurs when external editor is used.
+jdk/jshell/EditorPadTest.java 8161276 windows-all Test set-up cannot press buttons
jdk/jshell/ToolBasicTest.java 8139873 generic-all JShell tests failing
###########################################################################
@@ -88,6 +68,11 @@
tools/sjavac/IncCompileFullyQualifiedRef.java 8152055 generic-all Requires dependency code to deal with in-method dependencies.
tools/sjavac/IncCompileWithChanges.java 8152055 generic-all Requires dependency code to deal with in-method dependencies.
+tools/sjavac/ApiExtraction.java 8158002 generic-all Requires investigation
+tools/sjavac/IgnoreSymbolFile.java 8158002 generic-all Requires investigation
+tools/sjavac/ClasspathDependencies.java 8158002 generic-all Requires investigation
+
+
###########################################################################
#
# jdeps
--- a/langtools/test/TEST.ROOT Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/TEST.ROOT Thu Aug 11 17:02:00 2016 +0000
@@ -14,8 +14,8 @@
# Group definitions
groups=TEST.groups
-# Tests using jtreg 4.2 b02 features
-requiredVersion=4.2 b02
+# Tests using jtreg 4.2 b03 features
+requiredVersion=4.2 b03
-# Use new form of -Xpatch
-useNewXpatch=true
+# Use new module options
+useNewOptions=true
--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Thu Aug 11 17:02:00 2016 +0000
@@ -42,8 +42,8 @@
@Test
void test1() {
javadoc("-d", "out", "-use",
- "-modulesourcepath", testSrc,
- "-addmods", "module1,module2",
+ "--module-source-path", testSrc,
+ "--add-modules", "module1,module2",
"testpkgmdl1", "testpkgmdl2");
checkExit(Exit.OK);
testDescription(true);
@@ -57,8 +57,8 @@
@Test
void test2() {
javadoc("-d", "out-html5", "-html5", "-use",
- "-modulesourcepath", testSrc,
- "-addmods", "module1,module2",
+ "--module-source-path", testSrc,
+ "--add-modules", "module1,module2",
"testpkgmdl1", "testpkgmdl2");
checkExit(Exit.OK);
testHtml5Description(true);
@@ -72,8 +72,8 @@
@Test
void test3() {
javadoc("-d", "out-nocomment", "-nocomment", "-use",
- "-modulesourcepath", testSrc,
- "-addmods", "module1,module2",
+ "--module-source-path", testSrc,
+ "--add-modules", "module1,module2",
"testpkgmdl1", "testpkgmdl2");
checkExit(Exit.OK);
testDescription(false);
@@ -84,8 +84,8 @@
@Test
void test4() {
javadoc("-d", "out-html5-nocomment", "-nocomment", "-html5", "-use",
- "-modulesourcepath", testSrc,
- "-addmods", "module1,module2",
+ "--module-source-path", testSrc,
+ "--add-modules", "module1,module2",
"testpkgmdl1", "testpkgmdl2");
checkExit(Exit.OK);
testHtml5Description(false);
@@ -108,8 +108,8 @@
javadoc("-d", "out-mdltags", "-author", "-version",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
- "-modulesourcepath", testSrc,
- "-addmods", "moduletags,module2",
+ "--module-source-path", testSrc,
+ "--add-modules", "moduletags,module2",
"testpkgmdltags", "testpkgmdl2");
checkExit(Exit.OK);
testModuleTags();
--- a/langtools/test/jdk/javadoc/tool/6964914/TestStdDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/6964914/TestStdDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -47,8 +47,6 @@
*/
void run() throws Exception {
File javaHome = new File(System.getProperty("java.home"));
- if (javaHome.getName().equals("jre"))
- javaHome = javaHome.getParentFile();
File javadoc = new File(new File(javaHome, "bin"), "javadoc");
File testSrc = new File(System.getProperty("test.src"));
@@ -57,11 +55,6 @@
String thisClassName = TestStdDoclet.class.getName();
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
- int i = 0;
- String prop;
- while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
- cmdArgs.add("-J-Xpatch:" + prop);
- }
cmdArgs.addAll(Arrays.asList(
"-classpath", ".", // insulates us from ambient classpath
"-Xdoclint:none",
--- a/langtools/test/jdk/javadoc/tool/6964914/TestUserDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/6964914/TestUserDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -68,11 +68,6 @@
String thisClassName = TestUserDoclet.class.getName();
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
- int i = 0;
- String prop;
- while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
- cmdArgs.add("-J-Xpatch:" + prop);
- }
cmdArgs.addAll(Arrays.asList(
"-doclet", thisClassName,
"-docletpath", testClasses.getPath(),
--- a/langtools/test/jdk/javadoc/tool/8025693/Test.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/8025693/Test.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 8025693
* @summary javadoc should ignore <clinit> methods found in classes on classpath
- * @modules jdk.javadoc
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
*/
import java.io.*;
@@ -69,7 +69,7 @@
PrintStream prev = System.err;
System.setErr(ps);
try {
- int rc = com.sun.tools.javadoc.Main.execute(args);
+ int rc = jdk.javadoc.internal.tool.Main.execute(args);
} finally {
System.err.flush();
System.setErr(prev);
--- a/langtools/test/jdk/javadoc/tool/CheckResourceKeys.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/CheckResourceKeys.java Thu Aug 11 17:02:00 2016 +0000
@@ -148,7 +148,7 @@
if (codeKeys.contains(rk))
continue;
- error("Resource key not found in code: " + rk);
+ error("Resource key not found in code: '" + rk + '"');
}
}
--- a/langtools/test/jdk/javadoc/tool/ReleaseOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/ReleaseOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -21,6 +21,7 @@
* questions.
*/
+import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
@@ -53,16 +54,16 @@
List<String> options = new ArrayList<>();
options.addAll(Arrays.asList(args));
options.add("-XDrawDiagnostics");
- options.add(System.getProperty("test.src", ".") + java.io.File.separatorChar + "ReleaseOptionSource.java");
+ options.add(new File(System.getProperty("test.src", "."), "ReleaseOptionSource.java").getPath());
StringWriter out = new StringWriter();
PrintWriter pw = new PrintWriter(out);
int actualResult = Main.execute(options.toArray(new String[0]), pw);
System.err.println("actual result=" + actualResult);
System.err.println("actual output=" + out.toString());
if (actualResult != expectedResult)
- throw new Error();
+ throw new Error("Exit code not as expected");
if (!validate.test(out.toString())) {
- throw new Error("Not an expected error output: " + out.toString());
+ throw new Error("Output not as expected");
}
}
}
--- a/langtools/test/jdk/javadoc/tool/T4696488.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/T4696488.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,16 +21,17 @@
* questions.
*/
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
/**
* @test
* @bug 4696488
* @summary javadoc doesn't handle UNC paths for destination directory
* @author Jesse Glick
- * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ * @modules jdk.javadoc/jdk.javadoc.internal.doclets.toolkit
* @run main T4696488 T4696488.java
*/
+
+import jdk.javadoc.internal.doclets.toolkit.Configuration;
+
public class T4696488 {
public static void main(String... args) {
@@ -53,5 +54,4 @@
throw new Error("expected " + expectedOutput + " but was " + output);
}
}
-
}
--- a/langtools/test/jdk/javadoc/tool/badSuper/BadSuper.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/badSuper/BadSuper.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4983023
* @summary A bad superclass shouldn't throw the standard doclet into a loop
- * @modules jdk.javadoc
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
*/
public class BadSuper {
@@ -33,7 +33,7 @@
public static void main(String[] args) {
String srcpath = System.getProperty("test.src", ".");
- if (com.sun.tools.javadoc.Main.execute(
+ if (jdk.javadoc.internal.tool.Main.execute(
new String[] {"-d", "doc", "-sourcepath", srcpath, "p"}) != 0)
throw new Error("Javadoc encountered warnings or errors.");
}
--- a/langtools/test/jdk/javadoc/tool/enum/docComments/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/enum/docComments/Main.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4421066
* @summary Verify the comments in an enum type.
- * @ignore API modifications
+ * @ignore 8152313 convert to doclet test framework
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
--- a/langtools/test/jdk/javadoc/tool/enum/enumType/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/enum/enumType/Main.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4421066
* @summary Verify the contents of an enum type.
- * @ignore API modifications
+ * @ignore 8152313 convert to doclet test framework
* @library ../../lib
* @modules jdk.javadoc
* @compile ../../lib/Tester.java Main.java
--- a/langtools/test/jdk/javadoc/tool/generics/genericClass/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the contents of the ClassDoc of a generic class.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- tester.printClass(cd);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericClass/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-class pkg1.A<T>
- name: A / A / pkg1.A
- type parameters:
- T
- superclass:
- java.lang.Object
- fields:
- T t
- pkg1.A<T> at
- pkg1.A<java.lang.String> as
- constructors:
- A()
- methods:
- void m1(T)
- void m2(A<T>)
- void m3(A<String>)
--- a/langtools/test/jdk/javadoc/tool/generics/genericClass/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class A<T> {
- public T t;
- public A<T> at;
- public A<String> as;
-
- public void m1(T t) {}
- public void m2(A<T> at) {}
- public void m3(A<String> as) {}
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the contents of the ClassDoc of
- * a generic class with a generic inner class.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import java.util.Arrays;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- ClassDoc[] cds = root.classes();
- Arrays.sort(cds);
- for (ClassDoc cd : cds) {
- tester.printClass(cd);
- tester.println();
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-class pkg1.O<T>
- name: O / O / pkg1.O
- type parameters:
- T
- superclass:
- java.lang.Object
- constructors:
- O()
-
-class pkg1.O<T>.I<S>
- name: I / O.I / pkg1.O.I
- type parameters:
- S
- nested in:
- pkg1.O<T>
- superclass:
- java.lang.Object
- constructors:
- I()
- methods:
- void m1(O<String>.I<Number>)
-
-class pkg1.X<T>
- name: X / X / pkg1.X
- type parameters:
- T
- superclass:
- java.lang.Object
- constructors:
- X()
-
-class pkg1.X<T>.Y
- name: Y / X.Y / pkg1.X.Y
- nested in:
- pkg1.X<T>
- superclass:
- java.lang.Object
- constructors:
- Y()
-
-class pkg1.X<T>.Y.Z<S>
- name: Z / X.Y.Z / pkg1.X.Y.Z
- type parameters:
- S
- nested in:
- pkg1.X<T>.Y
- superclass:
- java.lang.Object
- constructors:
- Z()
- methods:
- void m1(X<String>.Y.Z<Number>)
-
--- a/langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/O.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class O<T> {
- public class I<S> {
- public void m1(O<String>.I<Number> a) {}
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/X.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class X<T> {
- public class Y {
- public class Z<S> {
- public void m1(X<String>.Y.Z<Number> a) {}
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericInterface/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the contents of the ClassDoc of a generic interface.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- tester.printClass(cd);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericInterface/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-interface pkg1.A<T>
- name: A / A / pkg1.A
- type parameters:
- T
- methods:
- void m1(T)
--- a/langtools/test/jdk/javadoc/tool/generics/genericInterface/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface A<T> {
- void m1(T t);
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericMethod/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the reading of generic methods and constructors.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- for (ConstructorDoc c : cd.constructors())
- tester.printConstructor(c);
- for (MethodDoc m : cd.methods())
- tester.printMethod(m);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericMethod/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-constructor <T>pkg1.A()
- signature: ()
- ()
- type parameters:
- T
-method pkg1.A.<T>m1(T)
- signature: (T)
- (T)
- type parameters:
- T
- returns:
- void
-method pkg1.A.<T extends java.lang.Number, U>m2(T, U)
- signature: (T, U)
- (T, U)
- type parameters:
- T extends java.lang.Number
- U
- returns:
- void
--- a/langtools/test/jdk/javadoc/tool/generics/genericMethod/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class A {
- public <T> A() {}
- public <T> void m1(T t) {}
- public <T extends Number, U> void m2(T t, U u) {}
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericSuper/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the contents of the ClassDoc of a generic class.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import java.util.Arrays;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester =
- new Tester("Main", "pkg1", "-package");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- ClassDoc[] cds = root.classes();
- Arrays.sort(cds);
- for (ClassDoc cd : cds) {
- tester.printClass(cd);
- tester.println();
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/genericSuper/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-class pkg1.A<V, W>
- name: A / A / pkg1.A
- type parameters:
- V
- W
- superclass:
- pkg1.S<W, V>
- interfaces:
- pkg1.I<java.lang.String>
- constructors:
- A()
-
-interface pkg1.I<R>
- name: I / I / pkg1.I
- type parameters:
- R
-
-class pkg1.S<T, U>
- name: S / S / pkg1.S
- type parameters:
- T
- U
- superclass:
- java.lang.Object
- constructors:
- S()
-
--- a/langtools/test/jdk/javadoc/tool/generics/genericSuper/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-class S<T,U> {
-}
-
-interface I<R> {
-}
-
-public class A<V,W> extends S<W,V> implements I<String> {
-}
--- a/langtools/test/jdk/javadoc/tool/generics/supertypes/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4922918
- * @summary Check supertypes and superinterfaces of parameterized types.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.Arrays;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- ClassDoc[] cds = root.classes();
- Arrays.sort(cds);
- for (ClassDoc cd : cds) {
- ParameterizedType arrayList =
- cd.superclassType().asParameterizedType();
- tester.println(arrayList);
- tester.println();
-
- tester.println(arrayList.superclassType());
- Type[] interfaces = arrayList.interfaceTypes();
- // Sort interfaces by type name, for consistent output.
- Arrays.sort(interfaces,
- new Comparator<Type>() {
- public int compare(Type t1, Type t2) {
- String name1 = t1.qualifiedTypeName();
- String name2 = t2.qualifiedTypeName();
- return name1.compareTo(name2);
- }
- });
- for (Type t : interfaces) {
- tester.println(t);
- }
- tester.println();
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/supertypes/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-java.util.ArrayList<java.lang.String>
-
-java.util.AbstractList<java.lang.String>
-java.io.Serializable
-java.lang.Cloneable
-java.util.List<java.lang.String>
-java.util.RandomAccess
-
-java.util.ArrayList<X>
-
-java.util.AbstractList<X>
-java.io.Serializable
-java.lang.Cloneable
-java.util.List<X>
-java.util.RandomAccess
-
--- a/langtools/test/jdk/javadoc/tool/generics/supertypes/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.util.ArrayList;
-
-public class A extends ArrayList<String> {
-}
--- a/langtools/test/jdk/javadoc/tool/generics/supertypes/pkg1/B.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.util.ArrayList;
-
-public class B<X> extends ArrayList<X> {
-}
--- a/langtools/test/jdk/javadoc/tool/generics/throwsGeneric/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the reading of generic methods and constructors.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- for (MethodDoc m : cd.methods())
- tester.printMethod(m);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/throwsGeneric/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-method pkg1.A.m1()
- signature: ()
- ()
- throws:
- T extends java.lang.Throwable
- returns:
- void
-method pkg1.A.<U extends java.lang.Throwable>m2()
- signature: ()
- ()
- type parameters:
- U extends java.lang.Throwable
- throws:
- U extends java.lang.Throwable
- returns:
- void
--- a/langtools/test/jdk/javadoc/tool/generics/throwsGeneric/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface A<T extends Throwable> {
- void m1() throws T;
- <U extends Throwable> void m2() throws U;
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamCycle/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Check a type parameter whose bound cycles back on itself.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- }
-
- public static boolean run(DocletEnvironment root) {
- ClassDoc cd = root.classes()[0];
- System.out.println("*** " + cd);
- TypeVariable E = cd.typeParameters()[0];
- System.out.println("*** " + E);
- Type bound = E.bounds()[0];
- System.out.println("*** " + bound);
-
- // Verify that we have an instantiation of Enum<E>, and not
- // the generic interface.
- ParameterizedType enumE = (ParameterizedType)bound;
-
- if (enumE.asClassDoc() != cd) {
- throw new Error("Type declaration and type use don't match up.");
- } else {
- return true;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamCycle/pkg1/LikeEnum.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface LikeEnum<E extends LikeEnum<E>> {
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the reading of type parameter tags on methods.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- for (MethodDoc m : cd.methods()) {
- tester.printMethod(m);
- }
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-method pkg1.A.<T, U>m1(T, U)
- signature: (T, U)
- (T, U)
- @param <T> the kind of thing
- @param <U> the other kind of thing
- @param t the thing itself
- @param u the other thing
- type parameters:
- T
- U
- returns:
- void
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface A {
- /**
- * @param <T> the kind of thing
- * @param <U> the other kind of thing
- * @param t the thing itself
- * @param u the other thing
- */
- public <T,U> void m1(T t, U u);
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the reading of a type parameter tag on an interface.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- tester.printClass(cd);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-interface pkg1.A<T>
- name: A / A / pkg1.A
- type parameters:
- T
- @param <T> the type parameter
--- a/langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * @param <T> the type parameter
- */
-public interface A<T> {
-}
--- a/langtools/test/jdk/javadoc/tool/generics/wildcards/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4421066
- * @summary Verify the contents of the ClassDoc of a generic class.
- * @ignore API modifications
- * @library ../../lib
- * @modules jdk.javadoc
- * @compile ../../lib/Tester.java Main.java
- * @run main Main
- */
-
-import java.io.IOException;
-import com.sun.javadoc.*;
-
-public class Main extends Tester.Doclet {
-
- private static final Tester tester = new Tester("Main", "pkg1");
-
- public static void main(String[] args) throws IOException {
- tester.run();
- tester.verify();
- }
-
- public static boolean run(DocletEnvironment root) {
- try {
- for (ClassDoc cd : root.classes()) {
- tester.printClass(cd);
- }
-
- return true;
- } catch (IOException e) {
- return false;
- }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/generics/wildcards/expected.out Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-class pkg1.A<T>
- name: A / A / pkg1.A
- type parameters:
- T
- superclass:
- java.lang.Object
- fields:
- pkg1.A<?> f1
- pkg1.A<? extends java.lang.Number> f2
- pkg1.A<? super java.lang.Long> f3
- constructors:
- A()
- methods:
- void m1(A<?>)
- void m2(A<? extends Number>)
- void m3(A<? super Long>)
--- a/langtools/test/jdk/javadoc/tool/generics/wildcards/pkg1/A.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class A<T> {
- public A<?> f1;
- public A<? extends Number> f2;
- public A<? super Long> f3;
-
- public void m1(A<?> p1) {}
- public void m2(A<? extends Number> p2) {}
- public void m3(A<? super Long> p3) {}
-}
--- a/langtools/test/jdk/javadoc/tool/imports/I.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// The following imported class is bogus, but should still be returned
-// when inquired of.
-import bo.o.o.o.Gus;
-
-public interface I {
-}
--- a/langtools/test/jdk/javadoc/tool/imports/MissingImport.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 5012972
- * @summary ClassDoc.getImportedClasses should return a class even if
- * it's not in the classpath.
- * @ignore API modifications, testing deprecated APIs.
- * @modules jdk.javadoc
- */
-
-import java.util.Collections;
-import java.util.Set;
-import javax.lang.model.SourceVersion;
-import jdk.javadoc.doclet.Doclet;
-import jdk.javadoc.doclet.Doclet.Option;
-import jdk.javadoc.doclet.DocletEnvironment;
-
-
-public class MissingImport implements Doclet {
-
- public static void main(String[] args) {
- String thisFile = "" +
- new java.io.File(System.getProperty("test.src", "."),
- "I.java");
- String[] toolargs = {
- "-doclet", "MissingImport",
- "-docletpath", System.getProperty("test.classes", "."),
- thisFile
- };
- if (com.sun.tools.javadoc.Main.execute(toolargs) != 0)
- throw new Error("Javadoc encountered warnings or errors.");
- }
-
- /*
- * The world's simplest doclet.
- */
- public static boolean run(DocletEnvironment root) {
- ClassDoc c = root.classNamed("I");
- ClassDoc[] imps = c.importedClasses();
- if (imps.length == 0 ||
- !imps[0].qualifiedName().equals("bo.o.o.o.Gus")) {
- throw new Error("Import bo.o.o.o.Gus not found");
- }
- return true;
- }
-
- @Override
- public String getName() {
- return "Test";
- }
-
- @Override
- public Set<Option> getSupportedOptions() {
- return Collections.emptySet();
- }
-
- @Override
- public SourceVersion getSupportedSourceVersion() {
- return SourceVersion.latest();
- }
-}
--- a/langtools/test/jdk/javadoc/tool/lib/Tester.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * A utility used to invoke and test the javadoc tool.
- *
- * @author Scott Seligman
- */
-
-
-import java.io.*;
-import java.util.*;
-
-import javax.lang.model.SourceVersion;
-
-
-public class Tester {
-
- protected final String TEST_SRC = System.getProperty("test.src", ".");
- protected final String TEST_CLASSES = System.getProperty("test.classes",
- ".");
- private final String DEFAULT_ARGS[] = {
- "-sourcepath", TEST_SRC,
- };
-
- private final File outputFile = new File(TEST_CLASSES, "testrun.out");
- private final File expectedOutputFile = new File(TEST_SRC, "expected.out");
-
- private String docletName;
- private String[] args;
- private Writer out = null;
-
-
- /*
- * Individual tests can extend this to create generics-aware doclets.
- */
- public abstract class Doclet extends jdk.javadoc.doclet.Doclet {
-
- @Override
- public SourceVersion getSupportedSourceVersion() {
- return super.getSourceVersion();
- }
-
- }
-
-
- public Tester(String docletName) {
- this(docletName, new String[0]);
- }
-
- public Tester(String docletName, String... additionalArgs) {
- this.docletName = docletName;
- List<String> args = new ArrayList<>();
- args.addAll(Arrays.asList(DEFAULT_ARGS));
- args.addAll(Arrays.asList(additionalArgs));
-
- try {
- out = new BufferedWriter(new FileWriter(outputFile));
- } catch (IOException e) {
- throw new Error("Could not open output file " + outputFile);
- }
- }
-
- public void run() throws IOException {
- try {
- if (Main.execute("javadoc", docletName, getClass().getClassLoader(), args) != 0) {
- throw new Error("Javadoc errors encountered.");
- }
- System.out.println("--> Output written to " + outputFile);
- } finally {
- out.close();
- }
- }
-
- /*
- * Compare output of test run to expected output.
- * Throw an Error if they don't match.
- */
- public void verify() throws IOException {
- BufferedReader thisRun =
- new BufferedReader(new FileReader(outputFile));
- BufferedReader expected =
- new BufferedReader(new FileReader(expectedOutputFile));
-
- for (int lineNum = 1; true; lineNum++) {
- String line1 = thisRun.readLine();
- String line2 = expected.readLine();
- if (line1 == null && line2 == null) {
- return; // EOF with all lines matching
- }
- if (line1 == null || !line1.equals(line2)) {
- throw new Error(outputFile + ":" + lineNum +
- ": output doesn't match");
- }
- }
- }
-
-
- public void println(Object o) throws IOException {
- prln(0, o);
- }
-
- public void println() throws IOException {
- prln();
- }
-//
-// public void printPackage(PackageDoc p) throws IOException {
-// prPackage(0, p);
-// }
-//
-// public void printClass(ClassDoc cd) throws IOException {
-// if (cd.isAnnotationType())
-// printAnnotationType((AnnotationTypeDoc)cd);
-// else
-// prClass(0, cd);
-// }
-//
-// public void printAnnotationType(AnnotationTypeDoc at) throws IOException {
-// prAnnotationType(0, at);
-// }
-//
-// public void printField(FieldDoc f) throws IOException {
-// prField(0, f);
-// }
-//
-// public void printParameter(Parameter p) throws IOException {
-// prParameter(0, p);
-// }
-//
-// public void printMethod(MethodDoc m) throws IOException {
-// prln(0, "method " + m);
-// prMethod(0, m);
-// }
-//
-// public void printAnnotationTypeElement(AnnotationTypeElementDoc e)
-// throws IOException {
-// prln(0, "element " + e);
-// prMethod(0, e);
-// }
-//
-// public void printConstructor(ConstructorDoc c) throws IOException {
-// prln(0, "constructor " + c);
-// prExecutable(0, c);
-// }
-//
-//
-// private void prPackage(int off, PackageDoc p) throws IOException {
-// prln(off, "package " + p);
-// prAnnotations(off + 2, p.annotations());
-// }
-//
-// private void prClass(int off, ClassDoc cd) throws IOException {
-// prln(off,
-// (cd.isInterface() ? "interface" : cd.isEnum() ? "enum" : "class")
-// + " " + cd);
-// prln(off + 2, "name: " + cd.simpleTypeName() + " / " +
-// cd.typeName() + " / " + cd.qualifiedTypeName());
-// prAnnotations(off + 2, cd.annotations());
-// prLabel(off + 2, "type parameters");
-// for (Type t : cd.typeParameters())
-// prln(off + 4, t);
-// prParamTags(off + 2, cd.typeParamTags());
-// prLabel(off + 2, "nested in");
-// prln(off + 4, cd.containingClass());
-// prLabel(off + 2, "superclass");
-// prln(off + 4, cd.superclassType());
-// prLabel(off + 2, "interfaces");
-// Type[] ts = cd.interfaceTypes();
-// Arrays.sort(ts);
-// for (Type t : ts)
-// prln(off + 4, t);
-// prLabel(off + 2, "enum constants");
-// for (FieldDoc f : cd.enumConstants())
-// prln(off + 4, f.name());
-// prLabel(off + 2, "fields");
-// for (FieldDoc f : cd.fields())
-// prln(off + 4, f.type() + " " + f.name());
-// prLabel(off + 2, "constructors");
-// for (ConstructorDoc c : cd.constructors())
-// prln(off + 4, c.name() + c.flatSignature());
-// prLabel(off + 2, "methods");
-// for (MethodDoc m : cd.methods())
-// prln(off + 4, typeUseString(m.returnType()) + " " +
-// m.name() + m.flatSignature());
-// }
-//
-// private void prAnnotationType(int off, AnnotationTypeDoc at)
-// throws IOException {
-// prln(off, "@interface " + at);
-// prAnnotations(off + 2, at.annotations());
-// prLabel(off + 2, "elements");
-// for (AnnotationTypeElementDoc e : at.elements()) {
-// String def = (e.defaultValue() == null)
-// ? ""
-// : " default " + e.defaultValue();
-// prln(off + 4, typeUseString(e.returnType()) + " " + e.name() +
-// e.flatSignature() + def);
-// }
-// }
-//
-// private void prField(int off, FieldDoc f) throws IOException {
-// prln(off, "field " + typeUseString(f.type()) + " " + f.name());
-// prAnnotations(off + 2, f.annotations());
-// }
-//
-// private void prParameter(int off, Parameter p) throws IOException {
-// prln(off, "parameter " + p);
-// prAnnotations(off + 2, p.annotations());
-// }
-//
-// private void prMethod(int off, MethodDoc m) throws IOException {
-// prExecutable(off, m);
-// prLabel(off + 2, "returns");
-// prln(off + 4, typeUseString(m.returnType()));
-// prLabel(off + 2, "overridden type");
-// prln(off + 4, m.overriddenType());
-// }
-//
-// private void prExecutable(int off, ExecutableMemberDoc m)
-// throws IOException {
-// if (!m.isAnnotationTypeElement()) {
-// prln(off + 2, "signature: " + m.flatSignature());
-// prln(off + 2, " " + m.signature());
-// }
-// prAnnotations(off + 2, m.annotations());
-// prParamTags(off + 2, m.typeParamTags());
-// prParamTags(off + 2, m.paramTags());
-// prLabel(off + 2, "type parameters");
-// for (Type t : m.typeParameters())
-// prln(off + 4, t);
-// prLabel(off + 2, "throws");
-// Type[] ts = m.thrownExceptionTypes();
-// Arrays.sort(ts);
-// for (Type t : ts)
-// prln(off + 4, t);
-// }
-//
-// private void prAnnotations(int off, AnnotationDesc[] as)
-// throws IOException {
-// prLabel(off, "annotations");
-// for (AnnotationDesc a : as)
-// prln(off + 2, a.toString());
-// }
-//
-// private void prParamTags(int off, ParamTag tags[]) throws IOException {
-// for (ParamTag tag : tags)
-// prParamTag(off, tag);
-// }
-//
-// private void prParamTag(int off, ParamTag tag) throws IOException {
-// String name = tag.parameterName();
-// if (tag.isTypeParameter()) name = "<" + name + ">";
-// prln(off, "@param " + name + " " + tag.parameterComment());
-// }
-//
-//
-// private String typeUseString(Type t) {
-// return (t instanceof ClassDoc || t instanceof TypeVariable)
-// ? t.typeName()
-// : t.toString();
-// }
-
-
- // Labels queued for possible printing. Innermost is first in list.
- List<Line> labels = new ArrayList<Line>();
-
- // Print label if its section is nonempty.
- void prLabel(int off, String s) {
- while (!labels.isEmpty() && labels.get(0).off >= off)
- labels.remove(0);
- labels.add(0, new Line(off, s));
- }
-
- // Print queued labels with offsets less than "off".
- void popLabels(int off) throws IOException {
- while (!labels.isEmpty()) {
- Line label = labels.remove(0);
- if (label.off < off)
- prln(label.off, label.o + ":");
- }
- }
-
- // Print "o" at given offset.
- void pr(int off, Object o) throws IOException {
- popLabels(off);
- for (int i = 0; i < off; i++)
- out.write(' ');
- if (o != null)
- out.write(o.toString());
- }
-
- // Print "o" (if non-null) at given offset, then newline.
- void prln(int off, Object o) throws IOException {
- if (o != null) {
- pr(off, o);
- prln();
- }
- }
-
- // Print newline.
- void prln() throws IOException {
- out.write('\n'); // don't want platform-dependent separator
- }
-
-
- static class Line {
- int off;
- Object o;
- Line(int off, Object o) { this.off = off; this.o = o; }
- }
-}
--- a/langtools/test/jdk/javadoc/tool/sourceOnly/Test.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/sourceOnly/Test.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,15 @@
* @bug 4548768
* @summary Javadoc in JDK 1.4 uses classpath and not just source dir
* @author gafter
- * @ignore API modifications
- * @modules jdk.javadoc
- * @compile p/SourceOnly.java
- * @run main p.SourceOnly
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @compile p/SourceOnly.java p/NonSource.jasm
+ * @run main Test
*/
-// this file is just a dummy to get the javadoc started.
-//
-// NOTE: this test only seems to work in separate JVM mode for
-// reasons having something to do with javing tools.jar
-// on the classpath. Until that is sorted out, these tests
-// must be run in separate VM mode.
+public class Test {
+ public static void main(String[] args) {
+ // run javadoc on package p
+ if (jdk.javadoc.internal.tool.Main.execute("javadoc", "p.SourceOnly", "p") != 0)
+ throw new Error();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/tool/sourceOnly/p/NonSource.jasm Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package p;
+
+super public class NonSource
+ version 46:0
+{
+ public Method "<init>":"()V"
+ stack 1 locals 1
+ {
+ aload_0;
+ invokespecial Method java/lang/Object."<init>":"()V";
+ return;
+ }
+}
--- a/langtools/test/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/sourceOnly/p/SourceOnly.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,29 +23,27 @@
package p;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.Locale;
import java.util.Set;
import javax.lang.model.SourceVersion;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
/** Test that when running javadoc on a package, we only get
* documentation for those classes for which source was provided.
*/
public class SourceOnly implements Doclet {
- public static void main(String[] args) {
- // run javadoc on package p
- int result = jdk.javadoc.internal.tool.Main.
- execute("javadoc", "p.SourceOnly", SourceOnly.class.getClassLoader(), new String[] {"p"});
- if (result != 0)
- throw new Error();
- }
-
- public boolean start(DocletEnvironment root) {
+ NonSource dependency; // force a compilation error if not on classpath.
+ @Override
+ public boolean run(DocletEnvironment root) {
if (root.getIncludedClasses().size() != 1)
- throw new Error("wrong set of classes documented: " + java.util.Arrays.asList(root.getIncludedClasses()));
+ throw new Error("wrong set of classes documented: " +
+ Arrays.asList(root.getIncludedClasses()));
return true;
}
@@ -63,4 +61,9 @@
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
+
+ @Override
+ public void init(Locale locale, Reporter reporter) {
+ // do nothing
+ }
}
--- a/langtools/test/jdk/javadoc/tool/sourceOption/SourceOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/sourceOption/SourceOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
* @bug 6507179
* @summary Ensure that "-source" option isn't ignored.
* @author Scott Seligman
- * @ignore API modifications
- * @modules jdk.javadoc
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
* @run main/fail SourceOption 7
* @run main SourceOption 9
* @run main SourceOption
@@ -55,34 +54,41 @@
* JDK8, JDK9, or JDK10. Set -source below appropriately.
*/
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
import java.util.Set;
import javax.lang.model.SourceVersion;
+import javax.tools.Diagnostic.Kind;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.Doclet.Option;
import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
public class SourceOption implements Doclet {
public static void main(String[] args) {
- String[] params;
+ List<String> params = new ArrayList<>();
+ params.add("-sourcepath");
+ params.add(System.getProperty("test.src"));
+ params.add("-docletpath");
+ params.add(System.getProperty("test.classes"));
+ params.add("-doclet");
+ params.add("SourceOption");
if ((args == null) || (args.length==0)) {
- params = new String[]{"p"};
System.out.println("NOTE : -source not provided, default taken");
} else {
- params = new String[]{"-source", args[0], "p"};
+ params.add("-source");
+ params.add(args[0]);
System.out.println("NOTE : -source will be: " + args[0]);
}
-
- if (com.sun.tools.javadoc.Main.execute(
- "javadoc",
- "SourceOption",
- SourceOption.class.getClassLoader(),
- params) != 0)
- throw new Error("Javadoc encountered warnings or errors.");
-
+ params.add("p");
+ System.out.println("arguments: " + params);
+ if (jdk.javadoc.internal.tool.Main.execute(params.toArray(new String[params.size()])) != 0)
+ throw new Error("Javadoc encountered warnings or errors.");
}
public boolean run(DocletEnvironment root) {
@@ -104,4 +110,9 @@
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
+
+ @Override
+ public void init(Locale locale, Reporter reporter) {
+ reporter.print(Kind.NOTE, "init");
+ }
}
--- a/langtools/test/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/subpackageIgnore/SubpackageIgnore.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,30 +26,33 @@
* @bug 4773013
* @summary When hunting subpackages, silently ignore any directory name that
* can't be part of a subpackage.
- * @ignore API modifications
- * @modules jdk.javadoc
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
*/
import java.util.Collections;
+import java.util.Locale;
import java.util.Set;
import javax.lang.model.SourceVersion;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
public class SubpackageIgnore implements Doclet {
public static void main(String[] args) {
- if (jdk.javadoc.internal.tool.Main.execute(
- "javadoc",
- "SubpackageIgnore",
- SubpackageIgnore.class.getClassLoader(),
- new String[] {"-Xwerror",
- "-sourcepath",
- System.getProperty("test.src", "."),
- "-subpackages",
- "pkg1"}) != 0)
+ String[] cmds = new String[] {
+ "-docletpath",
+ System.getProperty("test.classes"),
+ "-doclet",
+ "SubpackageIgnore",
+ "-Xwerror",
+ "-sourcepath",
+ System.getProperty("test.src", "."),
+ "-subpackages",
+ "pkg1"};
+ if (jdk.javadoc.internal.tool.Main.execute(cmds) != 0)
throw new Error("Javadoc encountered warnings or errors.");
}
@@ -74,4 +77,9 @@
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
+
+ @Override
+ public void init(Locale locale, Reporter reporter) {
+ // do nothing
+ }
}
--- a/langtools/test/jdk/javadoc/tool/varArgs/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/javadoc/tool/varArgs/Main.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 4421066 5006659
* @summary Verify the contents of a ClassDoc containing a varArgs method.
* Verify that see/link tags can use "..." notation.
- * @ignore API modifications
+ * @ignore 8152313 convert to doclet test framework
* @library ../lib
* @modules jdk.javadoc
* @compile ../lib/Tester.java Main.java
--- a/langtools/test/jdk/jshell/ClassesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/ClassesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -41,6 +41,7 @@
import org.testng.annotations.Test;
import jdk.jshell.Diag;
+import static java.util.stream.Collectors.toList;
import static jdk.jshell.Snippet.Status.VALID;
import static jdk.jshell.Snippet.Status.RECOVERABLE_NOT_DEFINED;
import static jdk.jshell.Snippet.Status.RECOVERABLE_DEFINED;
@@ -210,8 +211,8 @@
ste(b, RECOVERABLE_NOT_DEFINED, RECOVERABLE_NOT_DEFINED, false, MAIN_SNIPPET));
***/
// It is random which one it shows up in, but cyclic error should be there
- List<Diag> diagsA = getState().diagnostics(a);
- List<Diag> diagsB = getState().diagnostics(b);
+ List<Diag> diagsA = getState().diagnostics(a).collect(toList());
+ List<Diag> diagsB = getState().diagnostics(b).collect(toList());
List<Diag> diags;
if (diagsA.isEmpty()) {
diags = diagsB;
--- a/langtools/test/jdk/jshell/EditorTestBase.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/EditorTestBase.java Thu Aug 11 17:02:00 2016 +0000
@@ -125,7 +125,7 @@
);
}
- @Test
+ @Test(enabled = false) // TODO 8163816
public void testEditClass1() {
testEditor(
a -> assertClass(a, "class A {}", "class", "A"),
@@ -163,7 +163,7 @@
);
}
- @Test
+ @Test(enabled = false) // TODO 8163816
public void testEditMethod1() {
testEditor(
a -> assertMethod(a, "void f() {}", "()void", "f"),
--- a/langtools/test/jdk/jshell/ExternalEditorTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/ExternalEditorTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -201,7 +201,7 @@
);
}
- @Test
+ @Test(enabled = false) // TODO 8159229
public void testRemoveTempFile() {
test(new String[]{"-nostartup"},
a -> assertCommandCheckOutput(a, "/set editor " + executionScript,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/jshell/JShellQueryTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8143964
+ * @summary test queries to the JShell that return Streams
+ * @build KullaTesting
+ * @run testng JShellQueryTest
+ */
+import java.util.Set;
+import java.util.stream.Stream;
+import jdk.jshell.Snippet;
+import org.testng.annotations.Test;
+
+import jdk.jshell.ImportSnippet;
+import jdk.jshell.MethodSnippet;
+import jdk.jshell.TypeDeclSnippet;
+import jdk.jshell.VarSnippet;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toSet;
+import static org.testng.Assert.assertEquals;
+
+@Test
+public class JShellQueryTest extends KullaTesting {
+
+ private <T> void checkStreamMatch(Stream<T> result, T... expected) {
+ Set<T> sns = result.collect(toSet());
+ Set<T> exp = Stream.of(expected).collect(toSet());
+ assertEquals(sns, exp);
+ }
+
+ public void testSnippets() {
+ checkStreamMatch(getState().snippets());
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ VarSnippet sfoo = varKey(assertEval("String foo;"));
+ MethodSnippet smm = methodKey(assertEval("int mm() { return 6; }"));
+ MethodSnippet svv = methodKey(assertEval("void vv() { }"));
+ checkStreamMatch(getState().snippets(), sx, sfoo, smm, svv);
+ TypeDeclSnippet sc = classKey(assertEval("class C { }"));
+ TypeDeclSnippet si = classKey(assertEval("interface I { }"));
+ ImportSnippet simp = importKey(assertEval("import java.lang.reflect.*;"));
+ checkStreamMatch(getState().snippets(), sx, sfoo, smm, svv, sc, si, simp);
+ }
+
+ public void testVars() {
+ checkStreamMatch(getState().variables());
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ VarSnippet sfoo = varKey(assertEval("String foo;"));
+ MethodSnippet smm = methodKey(assertEval("int mm() { return 6; }"));
+ MethodSnippet svv = methodKey(assertEval("void vv() { }"));
+ checkStreamMatch(getState().variables(), sx, sfoo);
+ TypeDeclSnippet sc = classKey(assertEval("class C { }"));
+ TypeDeclSnippet si = classKey(assertEval("interface I { }"));
+ ImportSnippet simp = importKey(assertEval("import java.lang.reflect.*;"));
+ checkStreamMatch(getState().variables(), sx, sfoo);
+ }
+
+ public void testMethods() {
+ checkStreamMatch(getState().methods());
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ VarSnippet sfoo = varKey(assertEval("String foo;"));
+ MethodSnippet smm = methodKey(assertEval("int mm() { return 6; }"));
+ MethodSnippet svv = methodKey(assertEval("void vv() { }"));
+ TypeDeclSnippet sc = classKey(assertEval("class C { }"));
+ TypeDeclSnippet si = classKey(assertEval("interface I { }"));
+ ImportSnippet simp = importKey(assertEval("import java.lang.reflect.*;"));
+ checkStreamMatch(getState().methods(), smm, svv);
+ }
+
+ public void testTypes() {
+ checkStreamMatch(getState().types());
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ VarSnippet sfoo = varKey(assertEval("String foo;"));
+ MethodSnippet smm = methodKey(assertEval("int mm() { return 6; }"));
+ MethodSnippet svv = methodKey(assertEval("void vv() { }"));
+ TypeDeclSnippet sc = classKey(assertEval("class C { }"));
+ TypeDeclSnippet si = classKey(assertEval("interface I { }"));
+ ImportSnippet simp = importKey(assertEval("import java.lang.reflect.*;"));
+ checkStreamMatch(getState().types(), sc, si);
+ }
+
+ public void testImports() {
+ checkStreamMatch(getState().imports());
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ VarSnippet sfoo = varKey(assertEval("String foo;"));
+ MethodSnippet smm = methodKey(assertEval("int mm() { return 6; }"));
+ MethodSnippet svv = methodKey(assertEval("void vv() { }"));
+ TypeDeclSnippet sc = classKey(assertEval("class C { }"));
+ TypeDeclSnippet si = classKey(assertEval("interface I { }"));
+ ImportSnippet simp = importKey(assertEval("import java.lang.reflect.*;"));
+ checkStreamMatch(getState().imports(), simp);
+ }
+
+ public void testDiagnostics() {
+ Snippet sx = varKey(assertEval("int x = 5;"));
+ checkStreamMatch(getState().diagnostics(sx));
+ Snippet broken = methodKey(assertEvalFail("int m() { blah(); return \"hello\"; }"));
+ String res = getState().diagnostics(broken)
+ .map(d -> d.getCode())
+ .collect(joining("+"));
+ assertEquals(res, "compiler.err.cant.resolve.location.args+compiler.err.prob.found.req");
+ }
+
+ public void testUnresolvedDependencies() {
+ VarSnippet sx = varKey(assertEval("int x = 5;"));
+ checkStreamMatch(getState().unresolvedDependencies(sx));
+ MethodSnippet unr = methodKey(getState().eval("void uu() { baz(); zips(); }"));
+ checkStreamMatch(getState().unresolvedDependencies(unr), "method zips()", "method baz()");
+ }
+}
--- a/langtools/test/jdk/jshell/KullaTesting.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/KullaTesting.java Thu Aug 11 17:02:00 2016 +0000
@@ -70,6 +70,7 @@
import org.testng.annotations.BeforeMethod;
import jdk.jshell.Diag;
+import static java.util.stream.Collectors.toList;
import static jdk.jshell.Snippet.Status.*;
import static org.testng.Assert.*;
import static jdk.jshell.Snippet.SubKind.METHOD_SUBKIND;
@@ -183,7 +184,7 @@
}
public List<String> assertUnresolvedDependencies(DeclarationSnippet key, int unresolvedSize) {
- List<String> unresolved = getState().unresolvedDependencies(key);
+ List<String> unresolved = getState().unresolvedDependencies(key).collect(toList());
assertEquals(unresolved.size(), unresolvedSize, "Input: " + key.source() + ", checking unresolved: ");
return unresolved;
}
@@ -202,8 +203,8 @@
SnippetEvent ste = events.get(0);
DeclarationSnippet sn = ((UnresolvedReferenceException) ste.exception()).getSnippet();
assertEquals(sn.name(), name, "Given input: " + input + ", checking name");
- assertEquals(getState().unresolvedDependencies(sn).size(), unresolvedSize, "Given input: " + input + ", checking unresolved");
- assertEquals(getState().diagnostics(sn).size(), diagnosticsSize, "Given input: " + input + ", checking diagnostics");
+ assertEquals(getState().unresolvedDependencies(sn).count(), unresolvedSize, "Given input: " + input + ", checking unresolved");
+ assertEquals(getState().diagnostics(sn).count(), (long) diagnosticsSize, "Given input: " + input + ", checking diagnostics");
return sn;
}
@@ -546,7 +547,7 @@
" got: " + main.exception().toString());
}
}
- List<Diag> diagnostics = getState().diagnostics(mainKey);
+ List<Diag> diagnostics = getState().diagnostics(mainKey).collect(toList());
switch (diagMain) {
case DIAG_OK:
assertEquals(diagnostics.size(), 0, "Expected no diagnostics, got: " + diagnosticsToString(diagnostics));
@@ -560,7 +561,7 @@
}
if (eventChain.mainInfo != null) {
for (STEInfo ste : eventChain.updates) {
- diagnostics = getState().diagnostics(ste.snippet());
+ diagnostics = getState().diagnostics(ste.snippet()).collect(toList());
switch (diagUpdates) {
case DIAG_OK:
assertEquals(diagnostics.size(), 0, "Expected no diagnostics, got: " + diagnosticsToString(diagnostics));
@@ -637,7 +638,7 @@
SnippetEvent e = events.get(0);
Snippet key = e.snippet();
assertEquals(getState().status(key), REJECTED);
- List<Diag> diagnostics = getState().diagnostics(e.snippet());
+ List<Diag> diagnostics = getState().diagnostics(e.snippet()).collect(toList());
assertTrue(diagnostics.size() > 0, "Expected diagnostics, got none");
assertDiagnostic(input, diagnostics.get(0), expectedDiagnostic);
assertTrue(key != null, "key must never be null, but it was for: " + input);
@@ -656,7 +657,7 @@
List<SnippetEvent> events = assertEval(input, IGNORE_VALUE, null,
DiagCheck.DIAG_WARNING, DiagCheck.DIAG_IGNORE, mainInfo, updates);
SnippetEvent e = events.get(0);
- List<Diag> diagnostics = getState().diagnostics(e.snippet());
+ List<Diag> diagnostics = getState().diagnostics(e.snippet()).collect(toList());
if (expectedDiagnostic != null) assertDiagnostic(input, diagnostics.get(0), expectedDiagnostic);
return e.snippet();
}
@@ -704,12 +705,12 @@
String source = declarationKey.source();
assertEquals(declarationKey.name(), expectedName,
"Expected " + source + " to have the name: " + expectedName + ", got: " + declarationKey.name());
- List<String> unresolved = getState().unresolvedDependencies(declarationKey);
- assertEquals(unresolved.size(), unressz, "Expected " + source + " to have " + unressz
- + " unresolved symbols, got: " + unresolved.size());
- List<Diag> otherCorralledErrors = getState().diagnostics(declarationKey);
- assertEquals(otherCorralledErrors.size(), othersz, "Expected " + source + " to have " + othersz
- + " other errors, got: " + otherCorralledErrors.size());
+ long unresolved = getState().unresolvedDependencies(declarationKey).count();
+ assertEquals(unresolved, unressz, "Expected " + source + " to have " + unressz
+ + " unresolved symbols, got: " + unresolved);
+ long otherCorralledErrorsCount = getState().diagnostics(declarationKey).count();
+ assertEquals(otherCorralledErrorsCount, othersz, "Expected " + source + " to have " + othersz
+ + " other errors, got: " + otherCorralledErrorsCount);
}
public void assertKey(Snippet key, Status expectedStatus, SubKind expectedSubKind) {
@@ -757,31 +758,20 @@
}
public void assertNumberOfActiveVariables(int cnt) {
- Collection<VarSnippet> variables = getState().variables();
- assertEquals(variables.size(), cnt, "Variables : " + variables);
+ assertEquals(getState().variables().count(), cnt, "Variables : " + getState().variables().collect(toList()));
}
public void assertNumberOfActiveMethods(int cnt) {
- Collection<MethodSnippet> methods = getState().methods();
- assertEquals(methods.size(), cnt, "Methods : " + methods);
+ assertEquals(getState().methods().count(), cnt, "Methods : " + getState().methods().collect(toList()));
}
public void assertNumberOfActiveClasses(int cnt) {
- Collection<TypeDeclSnippet> classes = getState().types();
- assertEquals(classes.size(), cnt, "Classes : " + classes);
- }
-
- public void assertMembers(Collection<? extends Snippet> members, Set<MemberInfo> expected) {
- assertEquals(members.size(), expected.size(), "Expected : " + expected + ", actual : " + members);
- assertEquals(members.stream()
- .map(this::getMemberInfo)
- .collect(Collectors.toSet()),
- expected);
+ assertEquals(getState().types().count(), cnt, "Types : " + getState().types().collect(toList()));
}
public void assertKeys(MemberInfo... expected) {
int index = 0;
- List<Snippet> snippets = getState().snippets();
+ List<Snippet> snippets = getState().snippets().collect(toList());
assertEquals(allSnippets.size(), snippets.size());
for (Snippet sn : snippets) {
if (sn.kind().isPersistent() && getState().status(sn).isActive()) {
@@ -801,7 +791,7 @@
public void assertActiveKeys(Snippet... expected) {
int index = 0;
- for (Snippet key : getState().snippets()) {
+ for (Snippet key : getState().snippets().collect(toList())) {
if (state.status(key).isActive()) {
assertEquals(expected[index], key, String.format("Difference in #%d. Expected: %s, actual: %s", index, key, expected[index]));
++index;
@@ -809,31 +799,43 @@
}
}
- private List<Snippet> filterDeclaredKeys(Predicate<Snippet> p) {
- return getActiveKeys().stream()
+ private void assertActiveSnippets(Stream<? extends Snippet> snippets, Predicate<Snippet> p, String label) {
+ Set<Snippet> active = getActiveKeys().stream()
.filter(p)
- .collect(Collectors.toList());
+ .collect(Collectors.toSet());
+ Set<Snippet> got = snippets
+ .collect(Collectors.toSet());
+ assertEquals(active, got, label);
}
public void assertVariables() {
- assertEquals(getState().variables(), filterDeclaredKeys((key) -> key instanceof VarSnippet), "Variables");
+ assertActiveSnippets(getState().variables(), (key) -> key instanceof VarSnippet, "Variables");
}
public void assertMethods() {
- assertEquals(getState().methods(), filterDeclaredKeys((key) -> key instanceof MethodSnippet), "Methods");
+ assertActiveSnippets(getState().methods(), (key) -> key instanceof MethodSnippet, "Methods");
}
public void assertClasses() {
- assertEquals(getState().types(), filterDeclaredKeys((key) -> key instanceof TypeDeclSnippet), "Classes");
+ assertActiveSnippets(getState().types(), (key) -> key instanceof TypeDeclSnippet, "Classes");
+ }
+
+ public void assertMembers(Stream<? extends Snippet> members, MemberInfo...expectedInfos) {
+ Set<MemberInfo> expected = Stream.of(expectedInfos).collect(Collectors.toSet());
+ Set<MemberInfo> got = members
+ .map(this::getMemberInfo)
+ .collect(Collectors.toSet());
+ assertEquals(got.size(), expected.size(), "Expected : " + expected + ", actual : " + members);
+ assertEquals(got, expected);
}
public void assertVariables(MemberInfo...expected) {
- assertMembers(getState().variables(), Stream.of(expected).collect(Collectors.toSet()));
+ assertMembers(getState().variables(), expected);
}
public void assertMethods(MemberInfo...expected) {
- assertMembers(getState().methods(), Stream.of(expected).collect(Collectors.toSet()));
- for (MethodSnippet methodKey : getState().methods()) {
+ assertMembers(getState().methods(), expected);
+ getState().methods().forEach(methodKey -> {
MemberInfo expectedInfo = null;
for (MemberInfo info : expected) {
if (info.name.equals(methodKey.name()) && info.type.equals(methodKey.signature())) {
@@ -843,11 +845,11 @@
assertNotNull(expectedInfo, "Not found method: " + methodKey.name());
int lastIndexOf = expectedInfo.type.lastIndexOf(')');
assertEquals(methodKey.parameterTypes(), expectedInfo.type.substring(1, lastIndexOf), "Parameter types");
- }
+ });
}
public void assertClasses(MemberInfo...expected) {
- assertMembers(getState().types(), Stream.of(expected).collect(Collectors.toSet()));
+ assertMembers(getState().types(), expected);
}
public void assertCompletion(String code, String... expected) {
--- a/langtools/test/jdk/jshell/RejectedFailedTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/RejectedFailedTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -39,6 +39,7 @@
import jdk.jshell.Snippet.Status;
import jdk.jshell.SnippetEvent;
+import static java.util.stream.Collectors.toList;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -49,7 +50,7 @@
List<SnippetEvent> events = assertEvalFail(input);
assertEquals(events.size(), 1, "Expected one event, got: " + events.size());
SnippetEvent e = events.get(0);
- List<Diag> diagnostics = getState().diagnostics(e.snippet());
+ List<Diag> diagnostics = getState().diagnostics(e.snippet()).collect(toList());
assertTrue(diagnostics.size() > 0, "Expected diagnostics, got none");
assertEquals(e.exception(), null, "Expected exception to be null.");
assertEquals(e.value(), null, "Expected value to be null.");
@@ -60,7 +61,7 @@
SubKind expectedSubKind = kind == Kind.ERRONEOUS ? SubKind.UNKNOWN_SUBKIND : SubKind.METHOD_SUBKIND;
assertEquals(key.subKind(), expectedSubKind, "SubKind: ");
assertTrue(key.id().compareTo(prevId) > 0, "Current id: " + key.id() + ", previous: " + prevId);
- assertEquals(getState().diagnostics(key), diagnostics, "Expected retrieved diagnostics to match, but didn't.");
+ assertEquals(getState().diagnostics(key).collect(toList()), diagnostics, "Expected retrieved diagnostics to match, but didn't.");
assertEquals(key.source(), input, "Expected retrieved source: " +
key.source() + " to match input: " + input);
assertEquals(getState().status(key), Status.REJECTED, "Expected status of REJECTED, got: " + getState().status(key));
--- a/langtools/test/jdk/jshell/ReplaceTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/ReplaceTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -28,9 +28,9 @@
* @run testng ReplaceTest
*/
-import java.util.Collection;
-
+import java.util.Iterator;
import java.util.List;
+import java.util.stream.Stream;
import jdk.jshell.Snippet;
import jdk.jshell.MethodSnippet;
import jdk.jshell.PersistentSnippet;
@@ -42,6 +42,7 @@
import jdk.jshell.SnippetEvent;
import jdk.jshell.UnresolvedReferenceException;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
import static jdk.jshell.Snippet.Status.*;
import static jdk.jshell.Snippet.SubKind.*;
import static org.testng.Assert.assertTrue;
@@ -90,17 +91,22 @@
assertActiveKeys();
}
+ private <T extends Snippet> void identityMatch(Stream<T> got, T expected) {
+ Iterator<T> it = got.iterator();
+ assertTrue(it.hasNext(), "expected exactly one");
+ assertTrue(expected == it.next(), "Identity must not change");
+ assertFalse(it.hasNext(), "expected exactly one");
+ }
+
public void testReplaceVarToMethod() {
Snippet x = varKey(assertEval("int x;"));
- Snippet musn = methodKey(assertEval("double mu() { return x * 4; }"));
+ MethodSnippet musn = methodKey(assertEval("double mu() { return x * 4; }"));
assertEval("x == 0;", "true");
assertEval("mu() == 0.0;", "true");
assertEval("double x = 2.5;",
ste(MAIN_SNIPPET, VALID, VALID, true, null),
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
- Collection<MethodSnippet> meths = getState().methods();
- assertEquals(meths.size(), 1);
- assertTrue(musn == meths.iterator().next(), "Identity must not change");
+ identityMatch(getState().methods(), musn);
assertEval("x == 2.5;", "true");
assertEval("mu() == 10.0;", "true"); // Auto redefine
assertActiveKeys();
@@ -132,15 +138,13 @@
public void testReplaceVarToClass() {
Snippet x = varKey(assertEval("int x;"));
- Snippet c = classKey(assertEval("class A { double a = 4 * x; }"));
+ TypeDeclSnippet c = classKey(assertEval("class A { double a = 4 * x; }"));
assertEval("x == 0;", "true");
assertEval("new A().a == 0.0;", "true");
assertEval("double x = 2.5;",
ste(MAIN_SNIPPET, VALID, VALID, true, null),
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
- Collection<TypeDeclSnippet> classes = getState().types();
- assertEquals(classes.size(), 1);
- assertTrue(c == classes.iterator().next(), "Identity must not change");
+ identityMatch(getState().types(), c);
assertEval("x == 2.5;", "true");
assertEval("new A().a == 10.0;", "true");
assertActiveKeys();
@@ -148,16 +152,14 @@
public void testReplaceMethodToClass() {
Snippet x = methodKey(assertEval("int x() { return 0; }"));
- Snippet c = classKey(assertEval("class A { double a = 4 * x(); }"));
+ TypeDeclSnippet c = classKey(assertEval("class A { double a = 4 * x(); }"));
assertEval("x() == 0;", "true");
assertEval("new A().a == 0.0;", "true");
assertEval("double x() { return 2.5; }",
ste(MAIN_SNIPPET, VALID, VALID, true, null),
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
assertEval("x();", "2.5");
- Collection<TypeDeclSnippet> classes = getState().types();
- assertEquals(classes.size(), 1);
- assertTrue(c == classes.iterator().next(), "Identity must not change");
+ identityMatch(getState().types(), c);
assertEval("x() == 2.5;", "true");
assertEval("new A().a == 10.0;", "true");
assertActiveKeys();
@@ -313,8 +315,8 @@
Snippet assn = ste.snippet();
DeclarationSnippet unsn = ((UnresolvedReferenceException) ste.exception()).getSnippet();
assertEquals(unsn.name(), "A", "Wrong with unresolved");
- assertEquals(getState().unresolvedDependencies(unsn).size(), 1, "Wrong size unresolved");
- assertEquals(getState().diagnostics(unsn).size(), 0, "Expected no diagnostics");
+ assertEquals(getState().unresolvedDependencies(unsn).count(), 1, "Wrong size unresolved");
+ assertEquals(getState().diagnostics(unsn).count(), 0L, "Expected no diagnostics");
Snippet g = varKey(assertEval("int g = 10;", "10",
added(VALID),
--- a/langtools/test/jdk/jshell/VariablesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/jdk/jshell/VariablesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -39,6 +39,7 @@
import jdk.jshell.SnippetEvent;
import org.testng.annotations.Test;
+import static java.util.stream.Collectors.toList;
import static jdk.jshell.Snippet.Status.*;
import static jdk.jshell.Snippet.SubKind.VAR_DECLARATION_SUBKIND;
import static org.testng.Assert.assertEquals;
@@ -331,7 +332,7 @@
//assertEquals(getState().source(snippet), src);
//assertEquals(snippet, undefKey);
assertEquals(getState().status(undefKey), RECOVERABLE_NOT_DEFINED);
- List<String> unr = getState().unresolvedDependencies((VarSnippet) undefKey);
+ List<String> unr = getState().unresolvedDependencies((VarSnippet) undefKey).collect(toList());;
assertEquals(unr.size(), 1);
assertEquals(unr.get(0), "class undefined");
assertVariables(variable("undefined", "d"));
--- a/langtools/test/tools/all/RunCodingRules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/all/RunCodingRules.java Thu Aug 11 17:02:00 2016 +0000
@@ -111,11 +111,11 @@
Path crulesTarget = targetDir.resolve("crules");
Files.createDirectories(crulesTarget);
List<String> crulesOptions = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-d", crulesTarget.toString());
javaCompiler.getTask(null, fm, noErrors, crulesOptions, null,
fm.getJavaFileObjectsFromFiles(crulesFiles)).call();
@@ -178,7 +178,7 @@
List<String> options = Arrays.asList(
"-d", sourceTarget.toString(),
- "-modulesourcepath", mainSrcDir + FS + "*" + FS + "share" + FS + "classes" + PS
+ "--module-source-path", mainSrcDir + FS + "*" + FS + "share" + FS + "classes" + PS
+ genSrcTarget + FS + "*" + FS + "share" + FS + "classes",
"-XDaccessInternalAPI",
"-processorpath", processorPath,
--- a/langtools/test/tools/javac/6410653/T6410653.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/6410653/T6410653.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,9 +49,8 @@
compiler.run(null, null, out, "-d", source, source);
System.err.println(">>>" + out + "<<<");
useRawMessages.setBoolean(null, false);
- if (!out.toString().equals(String.format("%s%n%s%n",
- "javac: javac.err.file.not.directory",
- "javac.msg.usage"))) {
+ if (!out.toString().equals(String.format("%s%n",
+ "javac: javac.err.file.not.directory"))) {
throw new AssertionError(out);
}
System.out.println("Test PASSED. Running javac again to see localized output:");
--- a/langtools/test/tools/javac/T6358024.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T6358024.java Thu Aug 11 17:02:00 2016 +0000
@@ -70,9 +70,9 @@
JavacTool tool = JavacTool.create();
List<String> flags = new ArrayList<String>();
flags.addAll(Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"));
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"));
for (Option opt: opts) {
flags.add(opt.name);
for (Object arg : opt.args)
--- a/langtools/test/tools/javac/T6358166.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T6358166.java Thu Aug 11 17:02:00 2016 +0000
@@ -56,10 +56,10 @@
JavaFileObject f = fm.getJavaFileObject(testSrc + File.separatorChar + self + ".java");
List<String> addExports = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
test(fm, f, addExports, "-verbose", "-d", ".");
--- a/langtools/test/tools/javac/T6403466.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T6403466.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,10 +58,10 @@
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrcDir, self + ".java")));
Iterable<String> options = Arrays.asList(
- "-XaddExports:"
- + "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,"
+ "--add-exports",
+ "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,"
+ "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
- "-processorpath", testClassDir,
+ "--processor-path", testClassDir,
"-processor", self,
"-s", ".",
"-d", ".");
--- a/langtools/test/tools/javac/T6406771.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T6406771.java Thu Aug 11 17:02:00 2016 +0000
@@ -50,8 +50,8 @@
JavaFileObject f = fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, self+".java"))).iterator().next();
List<String> opts = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"-XDaccessInternalAPI",
"-d", ".",
"-processorpath", testClasses,
--- a/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java Thu Aug 11 17:02:00 2016 +0000
@@ -116,6 +116,8 @@
"moduleFinderClass", "ofMethod");
ignore("com/sun/tools/javac/util/JDK9Wrappers$ServiceLoaderHelper",
"loadMethod");
+ ignore("com/sun/tools/javac/util/JDK9Wrappers$VMHelper",
+ "vmClass", "getRuntimeArgumentsMethod");
}
private final List<String> errors = new ArrayList<>();
--- a/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -143,11 +143,11 @@
Arrays.asList(new File(System.getProperty("test.src"),
this.getClass().getName() + ".java")));
java.util.List<String> options = Arrays.asList(
- "-XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-d", System.getProperty("user.dir")
);
JavacTask task = (JavacTask) c.getTask(null, fm, null, options, null, fos);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8160156/LetExpressionsAreUnnecessarilyGeneratedTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test 8160156
+ * @summary javac is generating let expressions unnecessarily
+ * @library /tools/lib
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main LetExpressionsAreUnnecessarilyGeneratedTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class LetExpressionsAreUnnecessarilyGeneratedTest extends TestRunner {
+ ToolBox tb;
+
+ public static void main(String... args) throws Exception {
+ new LetExpressionsAreUnnecessarilyGeneratedTest().runTests();
+ }
+
+ public LetExpressionsAreUnnecessarilyGeneratedTest() {
+ super(System.err);
+ tb = new ToolBox();
+ }
+
+ protected void runTests() throws Exception {
+ runTests(m -> new Object[] { Paths.get(m.getName()) });
+ }
+
+ @Test
+ public void testDontGenerateLetExpr(Path testBase) throws Exception {
+ Path src = testBase.resolve("src");
+ tb.writeJavaFiles(src,
+ "package base;\n" +
+ "public abstract class Base {\n" +
+ " protected int i = 1;\n" +
+ "}",
+
+ "package sub;\n" +
+ "import base.Base;\n" +
+ "public class Sub extends Base {\n" +
+ " private int i = 4;\n" +
+ " void m() {\n" +
+ " new Runnable() {\n" +
+ " public void run() {\n" +
+ " Sub.super.i += 10;\n" +
+ " }\n" +
+ " };\n" +
+ " }\n" +
+ "}");
+
+ Path out = testBase.resolve("out");
+ Files.createDirectories(out);
+ Path base = src.resolve("base");
+ Path sub = src.resolve("sub");
+
+ new JavacTask(tb)
+ .outdir(out)
+ .files(tb.findJavaFiles(base))
+ .run(Task.Expect.SUCCESS);
+
+ new JavacTask(tb)
+ .classpath(out)
+ .outdir(out)
+ .files(tb.findJavaFiles(sub))
+ .run(Task.Expect.SUCCESS);
+ }
+}
--- a/langtools/test/tools/javac/api/T6358786.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/api/T6358786.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
String srcdir = System.getProperty("test.src");
File file = new File(srcdir, args[0]);
List<String> options = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
);
JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, fm, null, options, null, fm.getJavaFileObjectsFromFiles(Arrays.asList(file)));
Elements elements = task.getElements();
--- a/langtools/test/tools/javac/api/T6412669.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/api/T6412669.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
String[] opts = {
"-proc:only",
"-processor", T6412669.class.getName(),
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
};
StringWriter sw = new StringWriter();
JavacTask task = tool.getTask(sw, fm, null, Arrays.asList(opts), null, files);
--- a/langtools/test/tools/javac/api/TestClientCodeWrapper.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/api/TestClientCodeWrapper.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@
PrintWriter pw = new PrintWriter(sw);
List<String> javacOptions = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"-extdirs", extDirs.getPath(), // for use by filemanager handleOption
"-processor", TestClientCodeWrapper.class.getName()
);
--- a/langtools/test/tools/javac/api/TestJavacTaskScanner.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/api/TestJavacTaskScanner.java Thu Aug 11 17:02:00 2016 +0000
@@ -74,10 +74,10 @@
fm.getJavaFileObjects(new File[] {file});
StandardJavaFileManager fm = getLocalFileManager(tool, null, null);
java.util.List<String> options = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
task = (JavacTaskImpl)tool.getTask(null, fm, null, options, null, compilationUnits);
task.getContext().put(ScannerFactory.scannerFactoryKey,
new MyScanner.Factory(task.getContext(), this));
--- a/langtools/test/tools/javac/api/TestTrees.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/api/TestTrees.java Thu Aug 11 17:02:00 2016 +0000
@@ -79,8 +79,7 @@
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrcDir, self + ".java")));
Iterable<String> opts = Arrays.asList(
- "-XaddExports:"
- + "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"-d", ".",
"-XDcompilePolicy=simple");
@@ -91,8 +90,7 @@
throw new AssertionError("compilation failed");
opts = Arrays.asList(
- "-XaddExports:"
- + "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"-XDaccessInternalAPI",
"-d", ".",
"-processorpath", testClassDir,
--- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java Thu Aug 11 17:02:00 2016 +0000
@@ -35,6 +35,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -127,8 +128,9 @@
tr.checkContains(actualProvides, moduleDescriptor.provides, "Lists of provides don't match");
}
- protected void compile(Path base) throws IOException {
+ protected void compile(Path base, String... options) throws IOException {
new JavacTask(tb)
+ .options(options)
.files(findJavaFiles(base))
.run(Task.Expect.SUCCESS)
.writeAll();
--- a/langtools/test/tools/javac/diags/Example.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/Example.java Thu Aug 11 17:02:00 2016 +0000
@@ -223,7 +223,7 @@
// source for import statements or a magic comment
for (File pf: procFiles) {
if (pf.getName().equals("CreateBadClassFile.java")) {
- pOpts.add("-XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED");
+ pOpts.add("--add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED");
}
}
@@ -248,7 +248,7 @@
}
if (moduleSourcePathDir != null) {
- opts.add("-modulesourcepath");
+ opts.add("--module-source-path");
opts.add(moduleSourcePathDir.getPath());
files = moduleSourcePathFiles;
}
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt Thu Aug 11 17:02:00 2016 +0000
@@ -122,6 +122,7 @@
compiler.err.locn.cant.read.file # bad class file
compiler.misc.module.info.invalid.super.class # bad class file
compiler.err.locn.cant.read.directory # file system issue
+compiler.err.locn.invalid.arg.for.xpatch # command line option error
compiler.misc.unnamed.module # fragment uninteresting in and of itself
compiler.misc.kindname.module # fragment uninteresting in and of itself
compiler.misc.locn.module_path # fragment uninteresting in and of itself
--- a/langtools/test/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/AddmodsAllModulePathInvalid/module-info.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,5 +22,5 @@
*/
// key: compiler.err.addmods.all.module.path.invalid
-// options: -addmods ALL-MODULE-PATH
+// options: --add-modules ALL-MODULE-PATH
module m {}
--- a/langtools/test/tools/javac/diags/examples/CantFindModule/CantFindModule.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/CantFindModule/CantFindModule.java Thu Aug 11 17:02:00 2016 +0000
@@ -24,7 +24,7 @@
// key: compiler.err.cant.find.module
// key: compiler.err.doesnt.exist
-// options: -XaddExports:undef/undef=ALL-UNNAMED
+// options: --add-exports undef/undef=ALL-UNNAMED
import undef.Any;
--- a/langtools/test/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
// key: compiler.err.illegal.argument.for.option
-// options: -modulepath doesNotExist
+// options: --module-path doesNotExist
// run: simple
class X {}
--- a/langtools/test/tools/javac/diags/examples/InvalidArgForXPatch/InvalidArgForXpatch.java Thu Aug 11 15:47:10 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.locn.invalid.arg.for.xpatch
-// options: -Xpatch:blah
-
-class InvalidArgForXpatch {}
--- a/langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,7 +25,7 @@
// key: compiler.misc.bad.class.file.header
// key: compiler.err.cant.access
// options: -processor CreateBadClassFile
-// run: exec -XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED
+// run: exec --add-exports jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED
/* The annotation processor will create an invalid classfile with version 51.0
* and a non-abstract method in an interface. Loading the classfile will produce
--- a/langtools/test/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,7 +25,7 @@
// key: compiler.misc.bad.class.file.header
// key: compiler.err.cant.access
// options: -processor CreateBadClassFile
-// run: exec -XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED
+// run: exec --add-exports jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED
/* The annotation processor will create an invalid classfile with version 51.0
* and a static method in an interface. Loading the classfile will produce
--- a/langtools/test/tools/javac/diags/examples/XaddexportsMalformedEntry.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/XaddexportsMalformedEntry.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
// key: compiler.err.xaddexports.malformed.entry
-// options: -XaddExports:jdk.compiler/com.sun.tools.javac.util
+// options: --add-exports jdk.compiler/com.sun.tools.javac.util
public class XaddexportsMalformedEntry {
}
--- a/langtools/test/tools/javac/diags/examples/XaddexportsTooMany.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/XaddexportsTooMany.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
// key: compiler.err.xaddexports.too.many
-// options: -XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+// options: --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
public class XaddexportsTooMany {
}
--- a/langtools/test/tools/javac/diags/examples/XaddreadsMalformedEntry.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/XaddreadsMalformedEntry.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
// key: compiler.err.xaddreads.malformed.entry
-// options: -XaddReads:jdk.compiler
+// options: --add-reads jdk.compiler
public class XaddreadsMalformedEntry {
}
--- a/langtools/test/tools/javac/diags/examples/XaddreadsTooMany.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/diags/examples/XaddreadsTooMany.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
// key: compiler.err.xaddreads.too.many
-// options: -XaddReads:jdk.compiler=ALL-UNNAMED -XaddReads:jdk.compiler=ALL-UNNAMED
+// options: --add-reads jdk.compiler=ALL-UNNAMED --add-reads jdk.compiler=ALL-UNNAMED
public class XaddreadsTooMany {
}
--- a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -88,7 +88,7 @@
.run();
// ideally we'd have a better message for this case
- String[] mpOpts = { "-system", "none", "-modulepath", "modules" };
+ String[] mpOpts = { "--system", "none", "--module-path", "modules" };
test(mpOpts, compilerErrorMessage);
}
--- a/langtools/test/tools/javac/file/T7018098.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/file/T7018098.java Thu Aug 11 17:02:00 2016 +0000
@@ -60,9 +60,9 @@
_assert(!testDir.exists());
compile(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDaccessInternalAPI",
"-proc:only",
"-processor", myName,
@@ -73,9 +73,9 @@
_assert(testDir.exists());
compile(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDaccessInternalAPI",
"-proc:only",
"-processor", myName,
--- a/langtools/test/tools/javac/modules/AddLimitMods.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/AddLimitMods.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,7 +23,7 @@
/**
* @test
- * @summary Test -addmods and -limitmods; also test the "enabled" modules.
+ * @summary Test --add-modules and --limit-modules; also test the "enabled" modules.
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
@@ -103,14 +103,14 @@
Files.createDirectories(modulePath);
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m3))
.run()
.writeAll();
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m2))
.run()
@@ -118,57 +118,57 @@
//real test
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "java.base")
+ "--limit-modules", "java.base")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "java.base",
- "-addmods", "m2")
+ "--limit-modules", "java.base",
+ "--add-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "java.base",
- "-addmods", "m2,m3")
+ "--limit-modules", "java.base",
+ "--add-modules", "m2,m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "m2")
+ "--limit-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "m3")
+ "--limit-modules", "m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
+ .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
- "-limitmods", "m3",
- "-addmods", "m2")
+ "--limit-modules", "m3",
+ "--add-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
@@ -219,11 +219,11 @@
"Test.java:2:18: compiler.err.doesnt.exist: javax.annotation\n"
+ "Test.java:5:19: compiler.err.doesnt.exist: javax.xml.bind\n"
+ "2 errors\n"),
- new SimpleEntry<String[], String>(new String[] {"-addmods", "java.annotations.common,java.xml.bind"},
+ new SimpleEntry<String[], String>(new String[] {"--add-modules", "java.annotations.common,java.xml.bind"},
null),
- new SimpleEntry<String[], String>(new String[] {"-limitmods", "java.xml.ws,jdk.compiler"},
+ new SimpleEntry<String[], String>(new String[] {"--limit-modules", "java.xml.ws,jdk.compiler"},
null),
- new SimpleEntry<String[], String>(new String[] {"-addmods", "ALL-SYSTEM"},
+ new SimpleEntry<String[], String>(new String[] {"--add-modules", "ALL-SYSTEM"},
null)
);
@@ -244,7 +244,7 @@
Files.createDirectories(modulePath);
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@@ -258,15 +258,15 @@
Files.createDirectories(cpOut);
new JavacTask(tb)
- .options("-modulepath", modulePath.toString())
+ .options("--module-path", modulePath.toString())
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
- "-addmods", "ALL-MODULE-PATH")
+ .options("--module-path", modulePath.toString(),
+ "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run()
@@ -278,9 +278,9 @@
"1 error");
actual = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(),
+ .options("--module-source-path", moduleSrc.toString(),
"-XDrawDiagnostics",
- "-addmods", "ALL-MODULE-PATH")
+ "--add-modules", "ALL-MODULE-PATH")
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
@@ -294,7 +294,7 @@
actual = new JavacTask(tb)
.options("-Xmodule:java.base",
"-XDrawDiagnostics",
- "-addmods", "ALL-MODULE-PATH")
+ "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
@@ -308,14 +308,14 @@
actual = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-source", "8", "-target", "8",
"-XDrawDiagnostics",
- "-addmods", "ALL-MODULE-PATH")
+ "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
- if (!actual.contains("javac: option -addmods not allowed with target 1.8")) {
+ if (!actual.contains("javac: option --add-modules not allowed with target 1.8")) {
throw new IllegalStateException("incorrect errors; actual=" + actual);
}
@@ -323,7 +323,7 @@
actual = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-addmods", "ALL-MODULE-PATH")
+ "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
@@ -386,7 +386,7 @@
"package api; public class Api { public void test() { } }");
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@@ -428,7 +428,7 @@
tb.writeJavaFiles(m2Runtime, moduleInfo, testClassNamed.toString());
new JavacTask(tb)
- .options("-modulepath", modulePath.toString())
+ .options("--module-path", modulePath.toString())
.outdir(out)
.files(findJavaFiles(m2Runtime))
.run()
@@ -441,9 +441,9 @@
output = new JavaTask(tb)
.vmOptions(augmentOptions(options,
Collections.emptyList(),
- "-modulepath", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
- "-classpath", classpathOut.toString(),
- "-XaddReads:m2=ALL-UNNAMED,automatic",
+ "--module-path", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
+ "--class-path", classpathOut.toString(),
+ "--add-reads", "m2=ALL-UNNAMED,automatic",
"-m", "m2/test.Test"))
.run()
.writeAll()
@@ -463,7 +463,7 @@
"public class Test {}\n");
List<String> auxOptions = success ? Arrays.asList(
- "-processorpath", System.getProperty("test.class.path"),
+ "--processor-path", System.getProperty("test.class.path"),
"-processor", CheckVisibleModule.class.getName(),
"-Aoutput=" + output,
"-XDaccessInternalAPI=true"
@@ -471,8 +471,8 @@
new JavacTask(tb)
.options(augmentOptions(options,
auxOptions,
- "-modulepath", modulePath.toString(),
- "-classpath", classpathOut.toString(),
+ "--module-path", modulePath.toString(),
+ "--class-path", classpathOut.toString(),
"-Xshouldstop:ifNoError=FLOW"))
.outdir(modulePath)
.files(findJavaFiles(m2))
@@ -578,14 +578,14 @@
};
private static final String[][] OPTIONS_VARIANTS = {
- {"-addmods", "automatic"},
- {"-addmods", "m1,automatic"},
- {"-addmods", "jdk.compiler,automatic"},
- {"-addmods", "m1,jdk.compiler,automatic"},
- {"-addmods", "ALL-SYSTEM,automatic"},
- {"-limitmods", "java.base", "-addmods", "automatic"},
- {"-limitmods", "java.base", "-addmods", "ALL-SYSTEM,automatic"},
- {"-limitmods", "m2", "-addmods", "automatic"},
- {"-limitmods", "jdk.compiler", "-addmods", "automatic"},
+ {"--add-modules", "automatic"},
+ {"--add-modules", "m1,automatic"},
+ {"--add-modules", "jdk.compiler,automatic"},
+ {"--add-modules", "m1,jdk.compiler,automatic"},
+ {"--add-modules", "ALL-SYSTEM,automatic"},
+ {"--limit-modules", "java.base", "--add-modules", "automatic"},
+ {"--limit-modules", "java.base", "--add-modules", "ALL-SYSTEM,automatic"},
+ {"--limit-modules", "m2", "--add-modules", "automatic"},
+ {"--limit-modules", "jdk.compiler", "--add-modules", "automatic"},
};
}
--- a/langtools/test/tools/javac/modules/AddReadsTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/AddReadsTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @summary Test the -XaddReads option
+ * @summary Test the --add-reads option
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@@ -73,7 +73,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -85,8 +85,8 @@
//test add dependencies:
new JavacTask(tb)
- .options("-XaddReads:m2=m1",
- "-modulesourcepath", src.toString(),
+ .options("--add-reads", "m2=m1",
+ "--module-source-path", src.toString(),
"-processor", VerifyRequires.class.getName())
.outdir(classes)
.files(findJavaFiles(src))
@@ -104,8 +104,8 @@
//cyclic dependencies OK when created through addReads:
new JavacTask(tb)
- .options("-XaddReads:m2=m1,m1=m2",
- "-modulesourcepath", src.toString())
+ .options("--add-reads", "m2=m1,m1=m2",
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
@@ -115,8 +115,8 @@
"module m2 { requires m1; }");
new JavacTask(tb)
- .options("-XaddReads:m1=m2",
- "-modulesourcepath", src.toString())
+ .options("--add-reads", "m1=m2",
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
@@ -165,8 +165,8 @@
"package impl; public class Impl { api.Api api; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--add-reads", "m1=ALL-UNNAMED",
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -191,9 +191,9 @@
"package impl; public class Impl { { api.Api.test(); } }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-modulesourcepath", moduleSrc.toString(),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--module-source-path", moduleSrc.toString(),
+ "--add-reads", "m1=ALL-UNNAMED",
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("impl").resolve("Impl.java"))
@@ -213,8 +213,8 @@
"package impl; public class Impl { api.Api a; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:java.base=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--add-reads", "java.base=ALL-UNNAMED",
"-Xmodule:java.base")
.outdir(classes)
.files(src.resolve("impl").resolve("Impl.java"))
@@ -233,7 +233,7 @@
"package impl; public class Impl { javax.swing.JButton b; }");
new JavacTask(tb)
- .options("-XaddReads:java.base=java.desktop",
+ .options("--add-reads", "java.base=java.desktop",
"-Xmodule:java.base")
.outdir(classes)
.files(findJavaFiles(src))
@@ -285,7 +285,7 @@
tb.createDirectories(classes);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
@@ -300,9 +300,9 @@
"package impl; public class Impl { }");
new JavacTask(tb)
- .options("-XaddReads:m1=ALL-UNNAMED",
+ .options("--add-reads", "m1=ALL-UNNAMED",
"-Xmodule:m1",
- "-modulepath", classes.toString())
+ "--module-path", classes.toString())
.outdir(unnamedClasses)
.files(findJavaFiles(unnamedSrc))
.run()
--- a/langtools/test/tools/javac/modules/AnnotationProcessing.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/AnnotationProcessing.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,6 +23,7 @@
/**
* @test
+ * @bug 8133884 8162711
* @summary Verify that annotation processing works.
* @library /tools/lib
* @modules
@@ -43,6 +44,7 @@
import java.util.stream.Collectors;
import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Messager;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedOptions;
@@ -53,13 +55,15 @@
import javax.lang.model.element.ModuleElement.UsesDirective;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.ElementScanner9;
+import javax.tools.Diagnostic.Kind;
import toolbox.JavacTask;
import toolbox.Task;
-import toolbox.ToolBox;
+import toolbox.Task.Mode;
public class AnnotationProcessing extends ModuleTestBase {
@@ -81,7 +85,7 @@
"package impl; public class Impl { }");
String log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(),
+ .options("--module-source-path", moduleSrc.toString(),
"-processor", AP.class.getName(),
"-AexpectedEnclosedElements=m1=>impl")
.outdir(classes)
@@ -113,7 +117,7 @@
"package impl2; public class Impl2 { }");
String log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(),
+ .options("--module-source-path", moduleSrc.toString(),
"-processor", AP.class.getName(),
"-AexpectedEnclosedElements=m1=>impl1,m2=>impl2")
.outdir(classes)
@@ -300,6 +304,76 @@
}
+ @Test
+ public void testQualifiedClassForProcessing(Path base) throws Exception {
+ Path moduleSrc = base.resolve("module-src");
+ Path m1 = moduleSrc.resolve("m1");
+ Path m2 = moduleSrc.resolve("m2");
+
+ Path classes = base.resolve("classes");
+
+ Files.createDirectories(classes);
+
+ tb.writeJavaFiles(m1,
+ "module m1 { }",
+ "package impl; public class Impl { int m1; }");
+
+ tb.writeJavaFiles(m2,
+ "module m2 { }",
+ "package impl; public class Impl { int m2; }");
+
+ new JavacTask(tb)
+ .options("--module-source-path", moduleSrc.toString())
+ .outdir(classes)
+ .files(findJavaFiles(moduleSrc))
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ List<String> expected = Arrays.asList("Note: field: m1");
+
+ for (Mode mode : new Mode[] {Mode.API, Mode.CMDLINE}) {
+ List<String> log = new JavacTask(tb, mode)
+ .options("-processor", QualifiedClassForProcessing.class.getName(),
+ "--module-path", classes.toString())
+ .classes("m1/impl.Impl")
+ .outdir(classes)
+ .run()
+ .writeAll()
+ .getOutputLines(Task.OutputKind.DIRECT);
+
+ if (!expected.equals(log))
+ throw new AssertionError("Unexpected output: " + log);
+ }
+ }
+
+ @SupportedAnnotationTypes("*")
+ public static final class QualifiedClassForProcessing extends AbstractProcessor {
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ if (processingEnv.getElementUtils().getModuleElement("m1") == null) {
+ throw new AssertionError("No m1 module found.");
+ }
+
+ Messager messager = processingEnv.getMessager();
+
+ for (TypeElement clazz : ElementFilter.typesIn(roundEnv.getRootElements())) {
+ for (VariableElement field : ElementFilter.fieldsIn(clazz.getEnclosedElements())) {
+ messager.printMessage(Kind.NOTE, "field: " + field.getSimpleName());
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ }
+
private static void assertNonNull(String msg, Object val) {
if (val == null) {
throw new AssertionError(msg);
--- a/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -136,7 +136,7 @@
annotationProcessor2);
String log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(processorCompiledModules)
.files(findJavaFiles(moduleSrc))
.run()
@@ -159,7 +159,7 @@
public void testUseOnlyOneProcessor(Path base) throws Exception {
initialization(base);
String log = new JavacTask(tb)
- .options("-processormodulepath", processorCompiledModules.toString(),
+ .options("--processor-module-path", processorCompiledModules.toString(),
"-processor", "mypkg2.MyProcessor2")
.outdir(classes)
.sources(testClass)
@@ -175,7 +175,7 @@
public void testAnnotationProcessorExecutionOrder(Path base) throws Exception {
initialization(base);
List<String> log = new JavacTask(tb)
- .options("-processormodulepath", processorCompiledModules.toString(),
+ .options("--processor-module-path", processorCompiledModules.toString(),
"-processor", "mypkg1.MyProcessor1,mypkg2.MyProcessor2")
.outdir(classes)
.sources(testClass)
@@ -188,7 +188,7 @@
}
log = new JavacTask(tb)
- .options("-processormodulepath", processorCompiledModules.toString(),
+ .options("--processor-module-path", processorCompiledModules.toString(),
"-processor", "mypkg2.MyProcessor2,mypkg1.MyProcessor1")
.outdir(classes)
.sources(testClass)
@@ -205,7 +205,8 @@
public void testErrorOutputIfOneProcessorNameIsIncorrect(Path base) throws Exception {
initialization(base);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(),
+ .options("-XDrawDiagnostics",
+ "--processor-module-path", processorCompiledModules.toString(),
"-processor", "mypkg2.MyProcessor2,noPackage.noProcessor,mypkg1.MyProcessor1")
.outdir(classes)
.sources(testClass)
@@ -221,8 +222,9 @@
public void testOptionsExclusion(Path base) throws Exception {
initialization(base);
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(),
- "-processorpath", processorCompiledModules.toString())
+ .options("-XDrawDiagnostics",
+ "--processor-module-path", processorCompiledModules.toString(),
+ "--processor-path", processorCompiledModules.toString())
.outdir(classes)
.sources(testClass)
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/AutomaticModules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/AutomaticModules.java Thu Aug 11 17:02:00 2016 +0000
@@ -93,7 +93,7 @@
"package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }");
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString())
+ .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
@@ -151,7 +151,7 @@
"package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }");
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString(), "-classpath", baseJar.toString())
+ .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString(), "--class-path", baseJar.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
@@ -197,7 +197,7 @@
"package dep; public class Dep { api.Api api; }");
new JavacTask(tb)
- .options("-modulepath", modulePath.toString())
+ .options("--module-path", modulePath.toString())
.outdir(depClasses)
.files(findJavaFiles(depSrc))
.run()
@@ -221,7 +221,7 @@
"package test; public class Test { }");
new JavacTask(tb)
- .options("-modulepath", modulePath.toString())
+ .options("--module-path", modulePath.toString())
.outdir(testClasses)
.files(findJavaFiles(testSrc))
.run()
@@ -273,9 +273,9 @@
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(),
- "-modulepath", modulePath.toString(),
- "-addmods", "automaticB",
+ .options("--module-source-path", moduleSrc.toString(),
+ "--module-path", modulePath.toString(),
+ "--add-modules", "automaticB",
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -291,8 +291,8 @@
}
log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString(),
- "-modulepath", modulePath.toString(),
+ .options("--module-source-path", moduleSrc.toString(),
+ "--module-path", modulePath.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
--- a/langtools/test/tools/javac/modules/DoclintOtherModules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/DoclintOtherModules.java Thu Aug 11 17:02:00 2016 +0000
@@ -61,7 +61,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString(), "-Xlint:deprecation", "-Xdoclint:-reference", "-Werror")
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString(), "-Xlint:deprecation", "-Xdoclint:-reference", "-Werror")
.outdir(classes)
.files(findJavaFiles(m1))
.run(Task.Expect.SUCCESS)
--- a/langtools/test/tools/javac/modules/DuplicateClassTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/DuplicateClassTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -60,7 +60,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-modulesourcepath", base.toString())
+ .options("--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run()
--- a/langtools/test/tools/javac/modules/EdgeCases.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/EdgeCases.java Thu Aug 11 17:02:00 2016 +0000
@@ -73,7 +73,7 @@
tb.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-XaddExports:undef/undef=ALL-UNNAMED", "-XDrawDiagnostics")
+ .options("--add-exports", "undef/undef=ALL-UNNAMED", "-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -167,7 +167,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -222,16 +222,16 @@
tb.createDirectories(classes);
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
- "-modulesourcepath", src.toString())
+ .options("--module-path", modulePath.toString(),
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src_m2))
.run()
.writeAll();
new JavacTask(tb)
- .options("-modulepath", modulePath.toString(),
- "-modulesourcepath", src.toString())
+ .options("--module-path", modulePath.toString(),
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src_m3))
.run()
@@ -250,7 +250,7 @@
tb.createDirectories(classes);
new JavacTask(tb)
- .options("-sourcepath", src_m1.toString(),
+ .options("--source-path", src_m1.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(src_m1.resolve("test")))
@@ -261,7 +261,7 @@
"module m1 {}");
new JavacTask(tb)
- .options("-sourcepath", src_m1.toString())
+ .options("--source-path", src_m1.toString())
.outdir(classes)
.files(findJavaFiles(src_m1.resolve("test")))
.run()
@@ -286,7 +286,7 @@
tb.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-modulesourcepath", src.toString(),
+ .options("--module-source-path", src.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(src))
--- a/langtools/test/tools/javac/modules/EnvVarTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/EnvVarTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -63,7 +63,7 @@
tb.out.println("test that addExports can be given to javac");
new JavacTask(tb)
- .options("-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
+ .options("--add-exports", "jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(src))
.run(Expect.SUCCESS)
@@ -71,7 +71,7 @@
tb.out.println("test that addExports can be provided with env variable");
new JavacTask(tb, Mode.EXEC)
- .envVar("_JAVAC_OPTIONS", "-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
+ .envVar("_JAVAC_OPTIONS", "--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(src))
.run(Expect.SUCCESS)
@@ -80,7 +80,7 @@
tb.out.println("test that addExports can be provided with env variable using @file");
Path atFile = src.resolve("at-file.txt");
tb.writeFile(atFile,
- "-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED");
+ "--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED");
new JavacTask(tb, Mode.EXEC)
.envVar("_JAVAC_OPTIONS", "@" + atFile)
--- a/langtools/test/tools/javac/modules/GraphsTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/GraphsTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -117,7 +117,7 @@
.write(base.resolve("positiveSrc"));
new JavacTask(tb)
- .options("-XDrawDiagnostics", "-mp", modules + File.pathSeparator + jarModules)
+ .options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
.outdir(Files.createDirectories(base.resolve("positive")))
.files(findJavaFiles(positiveSrc))
.run()
@@ -126,7 +126,7 @@
Path negativeSrc = m.classes("package p; public class Negative { closedO.O o; closedN.N n; closedL.L l; }")
.write(base.resolve("negativeSrc"));
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-mp", modules + File.pathSeparator + jarModules)
+ .options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
.outdir(Files.createDirectories(base.resolve("negative")))
.files(findJavaFiles(negativeSrc))
.run(Task.Expect.FAIL)
@@ -144,8 +144,8 @@
m.write(modSrc);
List<String> out = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", modSrc.toString(),
- "-mp", jarModules.toString()
+ "--module-source-path", modSrc.toString(),
+ "-p", jarModules.toString()
)
.outdir(Files.createDirectories(base.resolve("negative")))
.files(findJavaFiles(modSrc))
--- a/langtools/test/tools/javac/modules/HelloWorldTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/HelloWorldTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -76,7 +76,7 @@
new JavacTask(tb)
.options("-source", "8",
"-target", "8",
- "-bootclasspath", smallRtJar.toString())
+ "--boot-class-path", smallRtJar.toString())
.outdir(classes)
.files(src.resolve("HelloWorld.java"))
.run();
@@ -131,7 +131,7 @@
Files.createDirectories(classes);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(classes)
.files(src_m1.resolve("p/HelloWorld.java"))
.run()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/InheritRuntimeEnvironmentTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8156998
+ * @summary Test --inherit-runtime-environment
+ * @library /tools/lib
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavaTask ModuleTestBase
+ * @run main InheritRuntimeEnvironmentTest
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import toolbox.ModuleBuilder;
+import toolbox.JavaTask;
+import toolbox.JavacTask;
+import toolbox.Task;
+
+/**
+ * Tests that javac picks up runtime options with --inherit-runtime-environment.
+ * For each option, javac is first run using the option directly, as a control.
+ * javac is then run again, with the same option(s) being passed to the runtime,
+ * and --inherit-runtime-environment being used by javac.
+ * @author jjg
+ */
+public class InheritRuntimeEnvironmentTest extends ModuleTestBase {
+ public static void main(String... args) throws Exception {
+ InheritRuntimeEnvironmentTest t = new InheritRuntimeEnvironmentTest();
+ t.runTests();
+ }
+
+ /**
+ * Tests that code being compiled can access JDK-internal API using -add-exports.
+ * @param base
+ * @throws Exception
+ */
+ @Test
+ public void testAddExports(Path base) throws Exception {
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "class C { com.sun.tools.javac.main.Main main; }");
+
+ new TestCase(base)
+ .testOpts("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED")
+ .files(findJavaFiles(src))
+ .run();
+ }
+
+ /**
+ * Tests that code in the unnamed module can access a module on the module path using --add-modules.
+ */
+ @Test
+ public void testAddModules(Path base) throws Exception {
+ Path modules = base.resolve("modules");
+ new ModuleBuilder(tb, "m1")
+ .exports("pkg1")
+ .classes("package pkg1; public class C1 { }")
+ .build(modules);
+
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "class C { pkg1.C1 c1; }");
+
+ new TestCase(base)
+ .testOpts("--module-path", modules.toString(), "--add-modules", "m1")
+ .files(findJavaFiles(src))
+ .run();
+ }
+
+ /**
+ * Tests that a module on the module path is not visible when --limit-modules is used to
+ * restrict the set of observable modules.
+ */
+ @Test
+ public void testLimitModules(Path base) throws Exception {
+ Path modules = base.resolve("modules");
+ new ModuleBuilder(tb, "m1")
+ .exports("pkg1")
+ .classes("package pkg1; public class C1 { }")
+ .build(modules);
+
+ Path src = base.resolve("src");
+ new ModuleBuilder(tb, "m2")
+ .requires("m1")
+ .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
+ .write(src);
+
+ // This is the control, to verify that by default, the module being compiled will
+ // be able to read modules on the module path
+ new TestCase(base)
+ .testOpts("--module-path", modules.toString())
+ .otherOpts("--module-source-path", src.toString())
+ .files(findJavaFiles(src))
+ .run();
+
+ // This is the test, to verify that the module being compiled will not be able to read
+ // modules on the module path when a --limit-modules is used
+ new TestCase(base)
+ .testOpts("--module-path", modules.toString(), "--limit-modules", "jdk.compiler")
+ .otherOpts("-XDrawDiagnostics",
+ "--module-source-path", src.toString())
+ .files(findJavaFiles(src))
+ .expect(Task.Expect.FAIL, "compiler.err.module.not.found")
+ .run();
+ }
+
+ /**
+ * Tests that a module being compiled can see another module on the module path
+ * using --module-path.
+ */
+ @Test
+ public void testModulePath(Path base) throws Exception {
+ Path modules = base.resolve("modules");
+ new ModuleBuilder(tb, "m1")
+ .exports("pkg1")
+ .classes("package pkg1; public class C1 { }")
+ .build(modules);
+
+ Path src = base.resolve("src");
+ new ModuleBuilder(tb, "m2")
+ .requires("m1")
+ .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
+ .write(src);
+
+ new TestCase(base)
+ .testOpts("--module-path", modules.toString())
+ .otherOpts("--module-source-path", src.toString())
+ .files(findJavaFiles(src))
+ .run();
+ }
+
+ /**
+ * Tests that a module being compiled can see classes patches into an existing module
+ * with --patch-module
+ */
+ @Test
+ public void testPatchModule(Path base) throws Exception {
+ Path patchSrc = base.resolve("patchSrc");
+ tb.writeJavaFiles(patchSrc,
+ "package java.util; public class Xyzzy { }");
+ Path patch = base.resolve("patch");
+ Files.createDirectories(patch);
+
+ new JavacTask(tb)
+ .options("-Xmodule:java.base")
+ .outdir(patch)
+ .sourcepath(patchSrc)
+ .files(findJavaFiles(patchSrc))
+ .run()
+ .writeAll();
+
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "public class C { java.util.Xyzzy x; }");
+
+ new TestCase(base)
+ .testOpts("--patch-module", "java.base=" + patch)
+ .files(findJavaFiles(src))
+ .run();
+ }
+
+ /**
+ * Tests that options in @files are also effective.
+ * The test is similar to testModulePath, except that the test options are provided in an @-file.
+ */
+ @Test
+ public void testAtFile(Path base) throws Exception {
+ Path modules = base.resolve("modules");
+ new ModuleBuilder(tb, "m1")
+ .exports("pkg1")
+ .classes("package pkg1; public class C1 { }")
+ .build(modules);
+
+ Path src = base.resolve("src");
+ new ModuleBuilder(tb, "m2")
+ .requires("m1")
+ .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
+ .write(src);
+
+ Path atFile = base.resolve("atFile");
+ tb.writeFile(atFile, "--module-path " + modules);
+
+ new TestCase(base)
+ .testOpts("@" + atFile)
+ .otherOpts("--module-source-path", src.toString())
+ .files(findJavaFiles(src))
+ .run();
+ }
+
+ /**
+ * Tests that --inherit-runtime-environment works in conjunction with
+ * environment variables.
+ * This is a variant of testAddExports.
+ * The use of environment variables is sufficiently custom that it is
+ * not easy to do this directly with a simple TestCase.
+ */
+ @Test
+ public void testEnvVars(Path base) throws Exception {
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "class C { com.sun.tools.javac.main.Main main; }");
+ List<String> testOpts =
+ Arrays.asList("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED");
+ List<Path> files = Arrays.asList(findJavaFiles(src));
+
+ String envName = "_JAVAC_OPTIONS";
+ String envValue = String.join(" ", testOpts);
+
+ out.println(" javac:");
+ Path javacOutDir = base.resolve("out-javac");
+ Files.createDirectories(javacOutDir);
+
+ out.println(" env: " + envName + "=" + envValue);
+ out.println(" outdir: " + javacOutDir);
+ out.println(" files: " + files);
+
+ new JavacTask(tb, Task.Mode.EXEC)
+ .envVar(envName, envValue)
+ .outdir(javacOutDir)
+ .files(files)
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ out.println(" java:");
+ Path javaOutDir = base.resolve("out-java");
+ Files.createDirectories(javaOutDir);
+
+ Path atFile = base.resolve("atFile");
+ tb.writeFile(atFile, String.join(" ", testOpts));
+
+ List<String> vmOpts = Arrays.asList(
+ "@" + atFile,
+ "--module", "jdk.compiler/com.sun.tools.javac.Main"
+ );
+
+ List<String> classArgs = join(
+ Arrays.asList("-d", javaOutDir.toString()),
+ files.stream()
+ .map(p -> p.toString())
+ .collect(Collectors.toList())
+ );
+
+ envValue = "--inherit-runtime-environment";
+
+ out.println(" env: " + envName + "=" + envValue);
+ out.println(" vmOpts: " + vmOpts);
+ out.println(" classArgs: " + classArgs);
+
+ new JavaTask(tb)
+ .envVar(envName, envValue)
+ .vmOptions(vmOpts)
+ .classArgs(classArgs)
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.STDERR);
+ }
+
+ /**
+ * Runs javac with given test options, first directly, and then again, specifying the
+ * options to the runtime, and using --inherit-runtime-environment.
+ */
+ class TestCase {
+ final Path base;
+ List<String> testOpts = Collections.emptyList();
+ List<String> otherOpts = Collections.emptyList();
+ List<Path> files = Collections.emptyList();
+ Task.Expect expect = Task.Expect.SUCCESS;
+ String expectedText;
+
+ /**
+ * Creates a test case, specifying a base directory for work files.
+ */
+ TestCase(Path base) {
+ this.base = base;
+ }
+
+ /**
+ * Set the "test options" to be passed to javac or to the runtime.
+ */
+ TestCase testOpts(String... testOpts) {
+ this.testOpts = Arrays.asList(testOpts);
+ return this;
+ }
+
+ /**
+ * Sets additional options required for the compilation.
+ */
+ TestCase otherOpts(String... otherOpts) {
+ this.otherOpts = Arrays.asList(otherOpts);
+ return this;
+ }
+
+ /**
+ * Sets the files to be compiled.
+ */
+ TestCase files(Path... files) {
+ this.files = Arrays.asList(files);
+ return this;
+ }
+
+ /**
+ * Sets the expected output, and any expected output from javac.
+ * The default is {@code Expect.SUCCESS} and no specific output expected.
+ */
+ TestCase expect(Task.Expect expect, String expectedText) {
+ this.expect = expect;
+ this.expectedText = expectedText;
+ return this;
+ }
+
+ /**
+ * Runs the test case.
+ * First, javac is run passing the test options directly to javac.
+ * Then, javac is run again, passing the test options to the runtime,
+ * and using --inherit-runtime-environment.
+ */
+ void run() throws IOException {
+ runJavac();
+ runJava();
+ }
+
+ private void runJavac() throws IOException {
+ out.println(" javac:");
+ Path javacOutDir = base.resolve("out-javac");
+ Files.createDirectories(javacOutDir);
+
+ List<String> options = join(testOpts, otherOpts);
+
+ out.println(" options: " + options);
+ out.println(" outdir: " + javacOutDir);
+ out.println(" files: " + files);
+
+ String log = new JavacTask(tb, Task.Mode.CMDLINE)
+ .options(options)
+ .outdir(javacOutDir)
+ .files(files)
+ .run(expect)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (expectedText != null && !log.contains(expectedText))
+ error("expected text not found");
+ }
+
+ private void runJava() throws IOException {
+ out.println(" java:");
+ Path javaOutDir = base.resolve("out-java");
+ Files.createDirectories(javaOutDir);
+
+ List<String> vmOpts = join(
+ testOpts,
+ Arrays.asList("--module", "jdk.compiler/com.sun.tools.javac.Main")
+ );
+
+ List<String> classArgs = join(
+ Arrays.asList("--inherit-runtime-environment",
+ "-d", javaOutDir.toString()),
+ otherOpts,
+ files.stream()
+ .map(p -> p.toString())
+ .collect(Collectors.toList())
+ );
+
+ out.println(" vmOpts: " + vmOpts);
+ out.println(" classArgs: " + classArgs);
+
+ String log = new JavaTask(tb)
+ .vmOptions(vmOpts)
+ .classArgs(classArgs)
+ .run(expect)
+ .writeAll()
+ .getOutput(Task.OutputKind.STDERR);
+
+ if (expectedText != null && !log.contains(expectedText))
+ error("expected text not found");
+ }
+ }
+
+ /**
+ * Join a series of lists.
+ */
+ @SafeVarargs
+ private <T> List<T> join(List<T>... lists) {
+ return Arrays.stream(lists)
+ .flatMap(list -> list.stream())
+ .collect(Collectors.toList());
+ }
+
+}
+
--- a/langtools/test/tools/javac/modules/MOptionTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/MOptionTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -58,7 +58,7 @@
"package test; public class Test {}");
new JavacTask(tb)
- .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -81,7 +81,7 @@
Thread.sleep(2000); //timestamps
new JavacTask(tb)
- .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -98,7 +98,7 @@
Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
new JavacTask(tb)
- .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -125,7 +125,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
"-m", "m1",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
@@ -174,7 +174,7 @@
"package p2; public class C2 {}");
new JavacTask(tb)
- .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -215,7 +215,7 @@
Thread.sleep(2000); //timestamps
new JavacTask(tb)
- .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -241,7 +241,7 @@
Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
new JavacTask(tb)
- .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
+ .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
.run(Task.Expect.SUCCESS)
.writeAll();
--- a/langtools/test/tools/javac/modules/MissingJarInModulePathTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/MissingJarInModulePathTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8154824
* @summary Compiler should handle java.nio.file.FileSystemNotFoundException gracefully and not abort
- * @compile/fail/ref=MissingJarInModulePathTest.out -XDrawDiagnostics -Xlint:path -Werror -modulepath missing.jar MissingJarInModulePathTest.java
+ * @compile/fail/ref=MissingJarInModulePathTest.out -XDrawDiagnostics -Xlint:path -Werror --module-path missing.jar MissingJarInModulePathTest.java
*/
class MissingJarInModulePathTest {}
--- a/langtools/test/tools/javac/modules/ModuleFinderTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModuleFinderTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -78,7 +78,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-XDrawDiagnostics", "-modulepath", modules.toString())
+ .options("-XDrawDiagnostics", "--module-path", modules.toString())
.outdir(classes)
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/ModuleInfoTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModuleInfoTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -188,7 +188,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -216,7 +216,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -242,7 +242,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -289,7 +289,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -315,7 +315,7 @@
Files.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -356,7 +356,7 @@
tb.writeFile(src_m1.resolve("module-info.java"), moduleInfo);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/ModulePathTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModulePathTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @summary tests for -modulepath
+ * @summary tests for --module-path
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
@@ -62,13 +62,13 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", "doesNotExist")
+ "--module-path", "doesNotExist")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, doesNotExist"))
+ if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, doesNotExist"))
throw new Exception("expected output not found");
}
@@ -80,13 +80,13 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", "dummy.txt")
+ "--module-path", "dummy.txt")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, dummy.txt"))
+ if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, dummy.txt"))
throw new Exception("expected output not found");
}
@@ -98,13 +98,13 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", "dummy.jimage")
+ "--module-path", "dummy.jimage")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, dummy.jimage"))
+ if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, dummy.jimage"))
throw new Exception("expected output not found");
}
@@ -132,7 +132,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
- .options("-modulepath", modClasses.toString())
+ .options("--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -153,7 +153,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
.options("-XDrawDiagnostics",
- "-modulepath", modClasses.toString())
+ "--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@@ -190,7 +190,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
- .options("-modulepath", moduleJar.toString(), "-addmods", "m1")
+ .options("--module-path", moduleJar.toString(), "--add-modules", "m1")
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -226,7 +226,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
- .options("-modulepath", moduleJar.toString())
+ .options("--module-path", moduleJar.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -240,7 +240,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", "dummy.jar")
+ "--module-path", "dummy.jar")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@@ -277,7 +277,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
- .options("-modulepath", jmod.toString())
+ .options("--module-path", jmod.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -291,7 +291,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", "dummy.jmod")
+ "--module-path", "dummy.jmod")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@@ -311,7 +311,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", modules + "/./../modules")
+ "--module-path", modules + "/./../modules")
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -327,7 +327,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", modules + "/./../modules" + PATH_SEP + modules)
+ "--module-path", modules + "/./../modules" + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -343,8 +343,8 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", modules.toString(),
- "-modulepath", modules.toString())
+ "--module-path", modules.toString(),
+ "--module-path", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -370,7 +370,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", deepModuleDir + PATH_SEP + modules)
+ "--module-path", deepModuleDir + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -400,7 +400,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", modules.toString())
+ "--module-path", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
--- a/langtools/test/tools/javac/modules/ModuleSourcePathTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModuleSourcePathTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -62,14 +62,14 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-sourcepath", sp.toString().replace('/', File.separatorChar),
- "-modulesourcepath", msp.toString().replace('/', File.separatorChar),
+ "--source-path", sp.toString().replace('/', File.separatorChar),
+ "--module-source-path", msp.toString().replace('/', File.separatorChar),
"dummyClass")
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("cannot specify both -sourcepath and -modulesourcepath"))
+ if (!log.contains("cannot specify both --source-path and --module-source-path"))
throw new Exception("expected diagnostic not found");
}
@@ -83,7 +83,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(modules)
.files(prefixAll(findJavaFiles(src), Paths.get("./")))
.run()
@@ -100,7 +100,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", "./" + src)
+ "--module-source-path", "./" + src)
.outdir(modules)
.files(findJavaFiles(src))
.run()
@@ -123,7 +123,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{src1,src2/inner_dir}")
+ "--module-source-path", base + "/{src1,src2/inner_dir}")
.files(base.resolve("src1/m0/pkg0/A.java"), base.resolve("src2/inner_dir/m1/pkg1/A.java"))
.outdir(modules)
.run()
@@ -154,12 +154,12 @@
for (String sourcepath : sourcePaths) {
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", sourcepath.replace('/', File.separatorChar))
+ "--module-source-path", sourcepath.replace('/', File.separatorChar))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("- compiler.err.illegal.argument.for.option: -modulesourcepath, mismatched braces"))
+ if (!log.contains("- compiler.err.illegal.argument.for.option: --module-source-path, mismatched braces"))
throw new Exception("expected output for path [" + sourcepath + "] not found");
}
}
@@ -182,7 +182,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath",
+ "--module-source-path",
base + "/{src/{{src1,src2,src3},{srcB,srcC}/{src1,src2/srcX{X,Y}/}},.}"
.replace('/', File.separatorChar))
.files(findJavaFiles(base.resolve(modulePaths[modulePaths.length - 1])))
@@ -207,7 +207,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{dummy.txt,src}")
+ "--module-source-path", base + "/{dummy.txt,src}")
.files(src.resolve("kettle$/electric/Heater.java"))
.outdir(modules)
.run()
@@ -227,7 +227,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{src}")
+ "--module-source-path", base + "/{src}")
.files(src.resolve("kettle$/electric/Heater.java"))
.outdir(modules)
.run()
@@ -246,7 +246,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{}")
+ "--module-source-path", base + "/{}")
.files(base.resolve("kettle$/electric/Heater.java"))
.outdir(modules)
.run()
@@ -267,7 +267,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", "{" + src + "," + src + "/car}")
+ "--module-source-path", "{" + src + "," + src + "/car}")
.files(findJavaFiles(src))
.outdir(modules)
.run()
@@ -286,7 +286,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/src/./../src")
+ "--module-source-path", base + "/src/./../src")
.files(src.resolve("kettle/electric/Heater.java"))
.outdir(modules)
.run()
@@ -305,7 +305,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{src,src,src}")
+ "--module-source-path", base + "/{src,src,src}")
.files(src.resolve("m1/a/A.java"))
.outdir(modules)
.run()
@@ -323,7 +323,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/not_exist" + PATH_SEP + base + "/{not_exist,}")
+ "--module-source-path", base + "/not_exist" + PATH_SEP + base + "/{not_exist,}")
.files(base.resolve("m1/a/A.java"))
.outdir(modules)
.run(Task.Expect.FAIL)
@@ -342,7 +342,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "{/not_exist,/}")
+ "--module-source-path", base + "{/not_exist,/}")
.files(base.resolve("m1/a/A.java"))
.outdir(modules)
.run()
@@ -361,7 +361,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/{,{,,,,src,,,}}")
+ "--module-source-path", base + "/{,{,,,,src,,,}}")
.files(src.resolve("m1/a/A.java"))
.outdir(modules)
.run()
@@ -380,7 +380,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", base + "/*/classes/")
+ "--module-source-path", base + "/*/classes/")
.files(base.resolve("kettle/classes/electric/Heater.java"))
.outdir(modules)
.run()
@@ -403,7 +403,7 @@
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src + "{/*/gensrc/,/*/classes/}" + PATH_SEP
+ "--module-source-path", src + "{/*/gensrc/,/*/classes/}" + PATH_SEP
+ src + "/*/special/classes")
.files(findJavaFiles(src))
.outdir(modules)
@@ -432,12 +432,12 @@
for (String sourcepath : sourcePaths) {
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", sourcepath.replace('/', File.separatorChar))
+ "--module-source-path", sourcepath.replace('/', File.separatorChar))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!log.contains("- compiler.err.illegal.argument.for.option: -modulesourcepath, illegal use of *"))
+ if (!log.contains("- compiler.err.illegal.argument.for.option: --module-source-path, illegal use of *"))
throw new Exception("expected output for path [" + sourcepath + "] not found");
}
}
--- a/langtools/test/tools/javac/modules/ModuleTestBase.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModuleTestBase.java Thu Aug 11 17:02:00 2016 +0000
@@ -21,28 +21,10 @@
* questions.
*/
-import java.io.File;
import java.io.IOException;
-import java.io.PrintStream;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-import toolbox.JavacTask;
import toolbox.TestRunner;
import toolbox.ToolBox;
--- a/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -46,7 +46,6 @@
import toolbox.JarTask;
import toolbox.JavacTask;
import toolbox.Task;
-import toolbox.ToolBox;
public class ModulesAndClassPathTest extends ModuleTestBase {
@@ -70,7 +69,7 @@
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -86,8 +85,8 @@
}
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:m1=ALL-UNNAMED")
+ .options("--class-path", jar.toString(),
+ "--add-reads", "m1=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
@@ -95,8 +94,8 @@
.getOutputLines(Task.OutputKind.DIRECT);
new JavacTask(tb)
- .options("-classpath", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
+ "--add-reads", "m1=ALL-UNNAMED",
"-processor", ProcessorImpl.class.getName())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -121,7 +120,7 @@
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-sourcepath", m1.toString(),
"-XDrawDiagnostics")
.outdir(classes)
@@ -154,7 +153,7 @@
"package impl; public class Impl { api.Api api; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("module-info.java"))
@@ -163,7 +162,7 @@
.getOutputLines(Task.OutputKind.DIRECT);
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("impl").resolve("Impl.java"))
--- a/langtools/test/tools/javac/modules/MultiModuleModeTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/MultiModuleModeTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -60,7 +60,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -83,7 +83,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(join(findJavaFiles(src), findJavaFiles(misc)))
.run(Task.Expect.FAIL)
@@ -104,7 +104,7 @@
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -124,7 +124,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(modules)
.files(src.resolve("m2/module-info.java"))
.run()
@@ -139,7 +139,7 @@
Files.createDirectories(modules1);
new JavacTask(tb)
- .options("-modulesourcepath", src1.toString())
+ .options("--module-source-path", src1.toString())
.outdir(modules1)
.files(src1.resolve("m1/module-info.java"))
.run()
@@ -151,8 +151,8 @@
Files.createDirectories(modules2);
new JavacTask(tb)
- .options("-modulepath", modules1.toString(),
- "-modulesourcepath", src2.toString())
+ .options("--module-path", modules1.toString(),
+ "--module-source-path", src2.toString())
.outdir(modules2)
.files(src2.resolve("m2/module-info.java"))
.run()
--- a/langtools/test/tools/javac/modules/NPEEmptyFileTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/NPEEmptyFileTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -51,7 +51,7 @@
Path emptyJavaFile = base.resolve("Test.java");
tb.writeFile(emptyJavaFile, "");
new JavacTask(tb, Task.Mode.EXEC)
- .options("-modulesourcepath", modules.toString(),
+ .options("--module-source-path", modules.toString(),
"-d", modules.toString(), emptyJavaFile.toString())
.run()
.writeAll();
--- a/langtools/test/tools/javac/modules/OutputDirTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/OutputDirTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -63,7 +63,7 @@
public void testError(Path base) throws Exception {
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@@ -78,7 +78,7 @@
new JavacTask(tb)
.options("-XDrawDiagnostics",
"-proc:only",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -90,7 +90,7 @@
new JavacTask(tb)
.options("-XDrawDiagnostics",
"-d", classes.toString(),
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll();
@@ -120,7 +120,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(modClasses) // an exploded module
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@@ -157,7 +157,7 @@
.outdir(classes) // within an exploded module
.options("-XDrawDiagnostics",
"-Xlint", "-Werror",
- "-modulepath", modClasses.toString())
+ "--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
--- a/langtools/test/tools/javac/modules/PackageConflictTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/PackageConflictTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -82,7 +82,7 @@
Files.createDirectories(classes);
new JavacTask(tb)
- .options("-Werror", "-modulesourcepath", base.toString())
+ .options("-Werror", "--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run()
@@ -107,7 +107,7 @@
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", base.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run(Task.Expect.FAIL)
@@ -137,7 +137,7 @@
.write(modSrc);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-mp", modules.toString())
+ .options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("M")))
.run(Task.Expect.FAIL)
@@ -162,7 +162,7 @@
.write(modSrc);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", modSrc.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc))
.run(Task.Expect.SUCCESS)
@@ -189,7 +189,7 @@
.write(modSrc);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-mp", modules.toString())
+ .options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("M")))
.run(Task.Expect.SUCCESS)
@@ -220,7 +220,7 @@
.write(modSrc);
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-mp", modules.toString())
+ .options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.FAIL)
@@ -252,7 +252,7 @@
.classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ")
.write(modSrc);
new JavacTask(tb)
- .options("-modulesourcepath", modSrc.toString())
+ .options("--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.SUCCESS)
@@ -265,7 +265,7 @@
List<String> output = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", modSrc.toString())
+ "--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/PackageMultipleModules.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/PackageMultipleModules.java Thu Aug 11 17:02:00 2016 +0000
@@ -39,7 +39,6 @@
import toolbox.JavacTask;
import toolbox.Task;
-import toolbox.ToolBox;
public class PackageMultipleModules extends ModuleTestBase {
@@ -64,7 +63,7 @@
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", base.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run(Task.Expect.FAIL)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/PatchModulesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160489
+ * @summary tests for --patch-modules
+ * @library /tools/lib
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.file
+ * jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
+ * @run main PatchModulesTest
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.tools.JavaFileObject;
+import javax.tools.ToolProvider;
+
+import com.sun.source.util.JavacTask;
+import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.file.BaseFileManager;
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.file.Locations;
+
+import static java.util.Arrays.asList;
+
+
+public class PatchModulesTest extends ModuleTestBase {
+
+ public static void main(String... args) throws Exception {
+ PatchModulesTest t = new PatchModulesTest();
+ t.init();
+ t.runTests();
+ }
+
+ private static String PS = File.pathSeparator;
+
+ void init() throws IOException {
+ tb.createDirectories("a", "b", "c", "d", "e");
+ tb.writeJavaFiles(Paths.get("."), "class C { }");
+ }
+
+ @Test
+ public void testSimple(Path base) throws Exception {
+ test(asList("java.base=a"),
+ "{java.base=[a]}");
+ }
+
+ @Test
+ public void testPair(Path base) throws Exception {
+ test(asList("java.base=a", "java.compiler=b"),
+ "{java.base=[a], java.compiler=[b]}");
+ }
+
+ @Test
+ public void testMultiple(Path base) throws Exception {
+ test(asList("java.base=a:b"),
+ "{java.base=[a, b]}");
+ }
+
+ @Test
+ public void testLastOneWins(Path base) throws Exception {
+ test(asList("java.base=a", "java.compiler=b", "java.base=c"),
+ "{java.base=[c], java.compiler=[b]}");
+ }
+
+ void test(List<String> patches, String expect) throws Exception {
+ JavacTool tool = (JavacTool) ToolProvider.getSystemJavaCompiler();
+ StringWriter sw = new StringWriter();
+ try (PrintWriter pw = new PrintWriter(sw)) {
+ JavacFileManager fm = tool.getStandardFileManager(null, null, null);
+ List<String> opts = patches.stream()
+ .map(p -> "--patch-module=" + p.replace(":", PS))
+ .collect(Collectors.toList());
+ Iterable<? extends JavaFileObject> files = fm.getJavaFileObjects("C.java");
+ JavacTask task = tool.getTask(pw, fm, null, opts, null, files);
+
+ Field locationsField = BaseFileManager.class.getDeclaredField("locations");
+ locationsField.setAccessible(true);
+ Object locations = locationsField.get(fm);
+
+ Field patchMapField = Locations.class.getDeclaredField("patchMap");
+ patchMapField.setAccessible(true);
+ Map<?,?> patchMap = (Map<?,?>) patchMapField.get(locations);
+ String found = patchMap.toString();
+
+ if (!found.equals(expect)) {
+ tb.out.println("Expect: " + expect);
+ tb.out.println("Found: " + found);
+ error("output not as expected");
+ }
+ }
+ }
+}
+
--- a/langtools/test/tools/javac/modules/PluginsInModulesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/PluginsInModulesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -107,7 +107,7 @@
plugin1);
String log = new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(processorCompiledModules)
.files(findJavaFiles(moduleSrc))
.run()
@@ -130,7 +130,7 @@
public void testUseOnlyOneProcessor(Path base) throws Exception {
initialization(base);
List<String> log = new JavacTask(tb)
- .options("-processormodulepath", processorCompiledModules.toString(),
+ .options("--processor-module-path", processorCompiledModules.toString(),
"-Xplugin:simpleplugin1")
.outdir(classes)
.sources(testClass)
--- a/langtools/test/tools/javac/modules/ProvidesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ProvidesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -77,7 +77,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
@@ -160,7 +160,7 @@
List<String> output = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", modules.toString())
+ "--module-source-path", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modules))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/QueryBeforeEnter.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/QueryBeforeEnter.java Thu Aug 11 17:02:00 2016 +0000
@@ -94,7 +94,7 @@
Files.createDirectories(modulePath);
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@@ -131,8 +131,8 @@
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
- Arrays.asList("-modulepath", modulePath.toString(),
- "-classpath", cp.toString(),
+ Arrays.asList("--module-path", modulePath.toString(),
+ "--class-path", cp.toString(),
"-sourcepath", src.toString()),
null,
fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
@@ -170,7 +170,7 @@
Files.createDirectories(modulePath);
new JavacTask(tb)
- .options("-modulesourcepath", moduleSrc.toString())
+ .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@@ -207,8 +207,8 @@
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
- Arrays.asList("-modulepath", modulePath.toString(),
- "-classpath", cp.toString(),
+ Arrays.asList("--module-path", modulePath.toString(),
+ "--class-path", cp.toString(),
"-sourcepath", src.toString()),
null,
fm.getJavaFileObjects(findJavaFiles(src)));
@@ -245,7 +245,7 @@
Files.createDirectories(modulePath);
new JavacTask(tb)
- .options("-modulesourcepath", modulePathSrc.toString())
+ .options("--module-source-path", modulePathSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(modulePathSrc))
.run()
@@ -289,9 +289,9 @@
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
- Arrays.asList("-modulepath", modulePath.toString(),
- "-classpath", cp.toString(),
- "-modulesourcepath", moduleSrc.toString(),
+ Arrays.asList("--module-path", modulePath.toString(),
+ "--class-path", cp.toString(),
+ "--module-source-path", moduleSrc.toString(),
"-d", out.toString()),
null,
fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
@@ -339,7 +339,7 @@
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
- Arrays.asList("-processorpath", processorPath,
+ Arrays.asList("--processor-path", processorPath,
"-processor", AP.class.getName(),
"-Xplugin:test"),
null,
@@ -347,7 +347,7 @@
task.call();
}
- Main.compile(new String[] {"-processorpath", processorPath,
+ Main.compile(new String[] {"--processor-path", processorPath,
"-Xplugin:test",
testSource.toString()});
}
--- a/langtools/test/tools/javac/modules/RequiresPublicTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/RequiresPublicTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -80,7 +80,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics")
.files(findJavaFiles(src))
- .outdir(classes.toString()) // should allow Path here
+ .outdir(classes)
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
@@ -96,7 +96,7 @@
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.files(findJavaFiles(src))
.outdir(classes)
.run()
@@ -113,7 +113,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.files(findJavaFiles(src))
.outdir(classes)
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/ResolveTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ResolveTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -93,7 +93,7 @@
Files.createDirectories(modules);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -117,7 +117,7 @@
Files.createDirectories(modules);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -143,7 +143,7 @@
Files.createDirectories(modules);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -167,7 +167,7 @@
Files.createDirectories(modules);
String log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -191,7 +191,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run()
@@ -211,7 +211,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run()
--- a/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -90,7 +90,7 @@
Files.createDirectories(modules);
List<String> output = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/SingleModuleModeTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/SingleModuleModeTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -128,7 +128,7 @@
new JavacTask(tb)
.options("-processor", VerifyUsesProvides.class.getName(),
- "-processorpath", System.getProperty("test.classes"))
+ "--processor-path", System.getProperty("test.classes"))
.outdir(classes)
.classpath(classes)
.files(src.resolve("C.java"))
@@ -147,7 +147,7 @@
new JavacTask(tb)
.options("-processor", VerifyUsesProvides.class.getName(),
- "-processorpath", System.getProperty("test.classes"))
+ "--processor-path", System.getProperty("test.classes"))
.outdir(classes)
.sourcepath(src)
.classpath(classes)
--- a/langtools/test/tools/javac/modules/SubpackageTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/SubpackageTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -110,7 +110,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run()
--- a/langtools/test/tools/javac/modules/UpgradeModulePathTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/UpgradeModulePathTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -66,8 +66,8 @@
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", modules.toString(),
- "-upgrademodulepath", upgradeModules.toString())
+ .options("--module-path", modules.toString(),
+ "--upgrade-module-path", upgradeModules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -92,7 +92,7 @@
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-upgrademodulepath", upgradeModule + File.pathSeparator + module)
+ .options("--upgrade-module-path", upgradeModule + File.pathSeparator + module)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -126,9 +126,9 @@
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", module.toString(),
- "-modulesourcepath", src + File.pathSeparator + s,
- "-upgrademodulepath", upgradeModule + File.pathSeparator + upgradeModule3)
+ .options("--module-path", module.toString(),
+ "--module-source-path", src + File.pathSeparator + s,
+ "--upgrade-module-path", upgradeModule + File.pathSeparator + upgradeModule3)
.outdir(module)
.files(findJavaFiles(src))
.run()
@@ -154,8 +154,8 @@
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", upgradeModule + File.pathSeparator + module,
- "-upgrademodulepath", upgradeModule.toString())
+ .options("--module-path", upgradeModule + File.pathSeparator + module,
+ "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -178,13 +178,13 @@
String output = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", module.toString(),
- "-upgrademodulepath", dummy.toString())
+ "--module-path", module.toString(),
+ "--upgrade-module-path", dummy.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
- if (!output.contains("compiler.err.illegal.argument.for.option: -upgrademodulepath, " + dummy)) {
+ if (!output.contains("compiler.err.illegal.argument.for.option: --upgrade-module-path, " + dummy)) {
throw new Exception("Expected output was not found");
}
}
@@ -217,8 +217,8 @@
"package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", module.toString(),
- "-upgrademodulepath", upgradeModule.toString())
+ .options("--module-path", module.toString(),
+ "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -229,8 +229,8 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", module.toString(),
- "-upgrademodulepath", upgradeModule.toString())
+ "--module-path", module.toString(),
+ "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
@@ -265,9 +265,9 @@
"package p; class A { void main() { pkg2.EC2.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", module.toString(),
- "-upgrademodulepath", upgradeModule1.toString(),
- "-upgrademodulepath", upgradeModule2.toString())
+ .options("--module-path", module.toString(),
+ "--upgrade-module-path", upgradeModule1.toString(),
+ "--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -278,9 +278,9 @@
final String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", module.toString(),
- "-upgrademodulepath", upgradeModule1.toString(),
- "-upgrademodulepath", upgradeModule2.toString())
+ "--module-path", module.toString(),
+ "--upgrade-module-path", upgradeModule1.toString(),
+ "--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
--- a/langtools/test/tools/javac/modules/UsesTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/UsesTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -154,7 +154,7 @@
Files.createDirectories(modules);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
@@ -175,7 +175,7 @@
.write(modSrc);
new JavacTask(tb)
- .options("-mp", modules.toString())
+ .options("-p", modules.toString())
.outdir(modules)
.files(findJavaFiles(modSrc.resolve("m2")))
.run(Task.Expect.SUCCESS)
@@ -196,7 +196,7 @@
.write(modSrc);
new JavacTask(tb)
- .options("-mp", modules.toString())
+ .options("-p", modules.toString())
.outdir(modules)
.files(findJavaFiles(modSrc.resolve("m2")))
.run(Task.Expect.SUCCESS)
@@ -255,7 +255,7 @@
"module m2 { requires m1; uses p.C; }");
List<String> output = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(Files.createDirectories(base.resolve("modules")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -279,7 +279,7 @@
"module m2 { requires m1; uses p.C; }");
List<String> output = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(Files.createDirectories(base.resolve("modules")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
--- a/langtools/test/tools/javac/modules/XModuleTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/modules/XModuleTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -112,7 +112,7 @@
tb.createDirectories(classes);
String log = new JavacTask(tb)
- .options("-Xmodule:java.compiler", "-classpath", cpClasses.toString())
+ .options("-Xmodule:java.compiler", "--class-path", cpClasses.toString())
.outdir(classes)
.files(src.resolve("javax/lang/model/element/Extra.java"))
.run()
@@ -197,7 +197,7 @@
tb.createDirectories(classes);
List<String> log = new JavacTask(tb)
- .options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-modulesourcepath", src.toString())
+ .options("-XDrawDiagnostics", "-Xmodule:java.compiler", "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@@ -229,7 +229,7 @@
List<String> expected = Arrays.asList("javac: option -Xmodule: can only be specified once",
"Usage: javac <options> <source files>",
- "use -help for a list of possible options");
+ "use --help for a list of possible options");
if (!expected.equals(log))
throw new Exception("expected output not found: " + log);
@@ -247,7 +247,7 @@
tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", modules.toString(),
+ .options("--module-path", modules.toString(),
"-Xmodule:m1")
.files(findJavaFiles(src))
.run()
@@ -263,7 +263,7 @@
List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-modulepath", modules.toString(),
+ "--module-path", modules.toString(),
"-Xmodule:m1")
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
@@ -295,8 +295,8 @@
tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }");
new JavacTask(tb, Task.Mode.CMDLINE)
- .options("-modulepath", modules.toString(),
- "-upgrademodulepath", upgrade.toString(),
+ .options("--module-path", modules.toString(),
+ "--upgrade-module-path", upgrade.toString(),
"-Xmodule:m1")
.files(findJavaFiles(src))
.run()
--- a/langtools/test/tools/javac/platform/PlatformProviderTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/platform/PlatformProviderTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -97,10 +97,9 @@
Task.Result result =
new JavacTask(tb, Task.Mode.EXEC)
.outdir(".")
- .options("-J-classpath",
- "-J" + System.getProperty("test.classes"),
- "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
- "-J-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ .options("-J--class-path=" + System.getProperty("test.classes"),
+ "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
+ "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDrawDiagnostics",
"-release",
platformSpec,
@@ -133,10 +132,9 @@
Task.Result result =
new JavacTask(tb, Task.Mode.EXEC)
.outdir(".")
- .options("-J-classpath",
- "-J" + System.getProperty("test.classes"),
- "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
- "-J-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ .options("-J--class-path=" + System.getProperty("test.classes"),
+ "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
+ "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-release",
"fail",
System.getProperty("test.src") + "/PlatformProviderTestSource.java")
--- a/langtools/test/tools/javac/processing/T8142931.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/processing/T8142931.java Thu Aug 11 17:02:00 2016 +0000
@@ -54,12 +54,12 @@
try (StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null)) {
Iterable<? extends JavaFileObject> files =
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, T8142931.class.getName()+".java")));
- Iterable<String> opts = Arrays.asList("-XaddExports:" +
- "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XDaccessInternalAPI",
- "-proc:only",
- "-processor", "T8142931",
- "-processorpath", testClasses);
+ Iterable<String> opts = Arrays.asList(
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "-XDaccessInternalAPI",
+ "-proc:only",
+ "-processor", "T8142931",
+ "-processorpath", testClasses);
StringWriter out = new StringWriter();
JavacTask task = (JavacTask)tool.getTask(out, fm, dl, opts, null, files);
task.call();
--- a/langtools/test/tools/javac/processing/loader/testClose/TestClose.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/processing/loader/testClose/TestClose.java Thu Aug 11 17:02:00 2016 +0000
@@ -132,8 +132,8 @@
new MemFile("AnnoProc.java", annoProc),
new MemFile("Callback.java", callback));
List<String> options = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDaccessInternalAPI");
JavacTask task = tool.getTask(null, fm, null, options, null, files);
check(task.call());
--- a/langtools/test/tools/javac/processing/loader/testClose/TestClose2.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/processing/loader/testClose/TestClose2.java Thu Aug 11 17:02:00 2016 +0000
@@ -92,9 +92,9 @@
Iterable<? extends JavaFileObject> files =
fm.getJavaFileObjects(new File(testSrc, TestClose2.class.getName() + ".java"));
List<String> options = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-processor", TestClose2.class.getName());
JavacTask task = tool.getTask(null, fm, null, options, null, files);
--- a/langtools/test/tools/javac/processing/messager/MessagerDiags.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/processing/messager/MessagerDiags.java Thu Aug 11 17:02:00 2016 +0000
@@ -80,7 +80,6 @@
}
public static void main(String... args) throws IOException {
- final String bootPath = System.getProperty("sun.boot.class.path");
final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
assert tool != null;
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java Thu Aug 11 17:02:00 2016 +0000
@@ -64,7 +64,7 @@
static JavacTask javac;
static Elements elements;
- static List<String> addmods_ALL_SYSTEM = Arrays.asList("-addmods", "ALL-SYSTEM");
+ static List<String> addmods_ALL_SYSTEM = Arrays.asList("--add-modules", "ALL-SYSTEM");
public static void main(String[] args) throws Exception {
JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
--- a/langtools/test/tools/javac/util/T6597678.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javac/util/T6597678.java Thu Aug 11 17:02:00 2016 +0000
@@ -59,8 +59,8 @@
PrintWriter pw = new PrintWriter(sw);
compile(sw, pw,
- "-XaddExports:jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDaccessInternalAPI",
"-proc:only",
"-processor", myName,
--- a/langtools/test/tools/javadoc/6964914/TestStdDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javadoc/6964914/TestStdDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -47,8 +47,6 @@
*/
void run() throws Exception {
File javaHome = new File(System.getProperty("java.home"));
- if (javaHome.getName().equals("jre"))
- javaHome = javaHome.getParentFile();
File javadoc = new File(new File(javaHome, "bin"), "javadoc");
File testSrc = new File(System.getProperty("test.src"));
@@ -57,11 +55,6 @@
String thisClassName = TestStdDoclet.class.getName();
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
- int i = 0;
- String prop;
- while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
- cmdArgs.add("-J-Xpatch:" + prop);
- }
cmdArgs.addAll(Arrays.asList(
"-classpath", ".", // insulates us from ambient classpath
"-Xdoclint:none",
--- a/langtools/test/tools/javadoc/6964914/TestUserDoclet.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javadoc/6964914/TestUserDoclet.java Thu Aug 11 17:02:00 2016 +0000
@@ -59,11 +59,6 @@
String thisClassName = TestUserDoclet.class.getName();
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
- int i = 0;
- String prop;
- while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
- cmdArgs.add("-J-Xpatch:" + prop);
- }
cmdArgs.addAll(Arrays.asList(
"-doclet", thisClassName,
"-docletpath", testClasses.getPath(),
--- a/langtools/test/tools/javadoc/CheckResourceKeys.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javadoc/CheckResourceKeys.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -121,7 +121,7 @@
if (codeKeys.contains(rk))
continue;
- error("Resource key not found in code: " + rk);
+ error("Resource key not found in code: '" + rk + "'");
}
}
--- a/langtools/test/tools/javadoc/ReleaseOption.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javadoc/ReleaseOption.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
* questions.
*/
-import com.sun.tools.javadoc.Main;
+import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
@@ -29,6 +29,8 @@
import java.util.List;
import java.util.function.Predicate;
+import com.sun.tools.javadoc.Main;
+
/**
* @test
* @bug 8086737
@@ -52,16 +54,16 @@
List<String> options = new ArrayList<>();
options.addAll(Arrays.asList(args));
options.add("-XDrawDiagnostics");
- options.add(System.getProperty("test.src", ".") + java.io.File.separatorChar + "ReleaseOptionSource.java");
+ options.add(new File(System.getProperty("test.src", "."), "ReleaseOptionSource.java").getPath());
StringWriter out = new StringWriter();
PrintWriter pw = new PrintWriter(out);
int actualResult = Main.execute("javadoc", pw, pw, pw, "com.sun.tools.doclets.formats.html.HtmlDoclet", options.toArray(new String[0]));
System.err.println("actual result=" + actualResult);
System.err.println("actual output=" + out.toString());
if (actualResult != expectedResult)
- throw new Error();
+ throw new Error("Exit code not as expected");
if (!validate.test(out.toString())) {
- throw new Error("Not an expected error output: " + out.toString());
+ throw new Error("Output not as expected");
}
}
}
--- a/langtools/test/tools/javap/T7004698.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/javap/T7004698.java Thu Aug 11 17:02:00 2016 +0000
@@ -42,7 +42,7 @@
File srcFile = new File(srcDir, T7004698.class.getSimpleName() + ".java");
File classesDir = new File(".");
compile("-Xjcov",
- "-XaddExports:jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED",
+ "--add-exports", "jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED",
"-d", classesDir.getPath(),
srcFile.getPath());
--- a/langtools/test/tools/jdeps/APIDeps.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/APIDeps.java Thu Aug 11 17:02:00 2016 +0000
@@ -60,13 +60,13 @@
Path testsrc = Paths.get(System.getProperty("test.src"));
List<String> options = new ArrayList<>();
- // add -XaddExports
+ // add --add-exports
String testModules = System.getProperty("test.modules", "");
List<String> addExports = new ArrayList<>();
for (String s : testModules.split("\\s+")) {
if (s.isEmpty()) continue;
if (s.indexOf('/') != -1)
- addExports.add("-XaddExports:" + s.trim() + "=ALL-UNNAMED");
+ addExports.add("--add-exports=" + s.trim() + "=ALL-UNNAMED");
}
options.addAll(addExports);
--- a/langtools/test/tools/jdeps/jdkinternals/ShowReplacement.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/jdkinternals/ShowReplacement.java Thu Aug 11 17:02:00 2016 +0000
@@ -64,7 +64,7 @@
assertTrue(CompilerUtils.compile(Paths.get(TEST_SRC, "src", "q"),
CLASSES_DIR,
"-cp", tmp.toString(),
- "-XaddExports:java.base/sun.security.util=ALL-UNNAMED"));
+ "--add-exports=java.base/sun.security.util=ALL-UNNAMED"));
}
@Test
--- a/langtools/test/tools/jdeps/lib/JdepsUtil.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/lib/JdepsUtil.java Thu Aug 11 17:02:00 2016 +0000
@@ -198,7 +198,7 @@
}
public ModuleAnalyzer getModuleAnalyzer(Set<String> mods) throws IOException {
- // if -check is set, add to the root set and all modules are observable
+ // if --check is set, add to the root set and all modules are observable
addmods(mods);
builder.allModules();
return new ModuleAnalyzer(configuration(), pw, mods);
--- a/langtools/test/tools/jdeps/modules/CheckModuleTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/CheckModuleTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -78,7 +78,7 @@
@Test(dataProvider = "javaBase")
public void testJavaBase(String name, ModuleMetaData data) throws Exception {
- String cmd = String.format("jdeps -check %s -mp %s%n", name, MODS_DIR);
+ String cmd = String.format("jdeps --check %s --module-path %s%n", name, MODS_DIR);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
jdeps.appModulePath(MODS_DIR.toString());
@@ -137,7 +137,7 @@
@Test(dataProvider = "modules")
public void modularTest(String name, ModuleMetaData[] data) throws Exception {
- String cmd = String.format("jdeps -check %s -mp %s%n", name, MODS_DIR);
+ String cmd = String.format("jdeps --check %s --module-path %s%n", name, MODS_DIR);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
jdeps.appModulePath(MODS_DIR.toString());
--- a/langtools/test/tools/jdeps/modules/GenModuleInfo.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/GenModuleInfo.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @summary Tests jdeps -genmoduleinfo option
+ * @summary Tests jdeps --gen-module-info option
* @library ../lib
* @build CompilerUtils JdepsUtil
* @modules jdk.jdeps/com.sun.tools.jdeps
@@ -73,7 +73,7 @@
CompilerUtils.cleanDir(NEW_MODS_DIR);
assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
- "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
+ "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
Arrays.asList("m1", "m2", "m3")
.forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
@@ -106,7 +106,7 @@
.map(mn -> LIBS_DIR.resolve(mn + ".jar"))
.map(Path::toString);
- JdepsUtil.jdeps(Stream.concat(Stream.of("-genmoduleinfo", DEST_DIR.toString()),
+ JdepsUtil.jdeps(Stream.concat(Stream.of("--gen-module-info", DEST_DIR.toString()),
files).toArray(String[]::new));
// check file exists
@@ -132,11 +132,11 @@
// compile new module-info.java
assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED,
- "-mp", NEW_MODS_DIR.toString(), "-verbose",
- "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
+ "-p", NEW_MODS_DIR.toString(), "-verbose",
+ "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
Arrays.asList("m1", "m2", "m3")
.forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR,
- mn, "-mp", NEW_MODS_DIR.toString())));
+ mn, "-p", NEW_MODS_DIR.toString())));
for (String mn : modules) {
Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO);
--- a/langtools/test/tools/jdeps/modules/InverseDeps.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/InverseDeps.java Thu Aug 11 17:02:00 2016 +0000
@@ -117,7 +117,7 @@
@Test(dataProvider = "testrequires")
public void testrequires(String name, String[][] expected) throws Exception {
- String cmd1 = String.format("jdeps -inverse -modulepath %s -requires %s -addmods %s%n",
+ String cmd1 = String.format("jdeps -inverse --module-path %s -requires %s --add-modules %s%n",
MODS_DIR, name, modules.stream().collect(Collectors.joining(",")));
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd1)) {
@@ -128,8 +128,8 @@
runJdeps(jdeps, expected);
}
- String cmd2 = String.format("jdeps -inverse -modulepath %s -requires %s" +
- " -addmods ALL-MODULE-PATH%n", LIBS_DIR, name);
+ String cmd2 = String.format("jdeps -inverse --module-path %s -requires %s" +
+ " --add-modules ALL-MODULE-PATH%n", LIBS_DIR, name);
// automatic module
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd2)) {
@@ -164,7 +164,7 @@
@Test(dataProvider = "testpackage")
public void testpackage(String name, String[][] expected) throws Exception {
- String cmd = String.format("jdeps -inverse -modulepath %s -package %s -addmods %s%n",
+ String cmd = String.format("jdeps -inverse --module-path %s -package %s --add-modules %s%n",
MODS_DIR, name, modules.stream().collect(Collectors.joining(",")));
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
jdeps.appModulePath(MODS_DIR.toString())
@@ -195,7 +195,7 @@
@Test(dataProvider = "testregex")
public void testregex(String name, String[][] expected) throws Exception {
- String cmd = String.format("jdeps -inverse -modulepath %s -regex %s -addmods %s%n",
+ String cmd = String.format("jdeps -inverse --module-path %s -regex %s --add-modules %s%n",
MODS_DIR, name, modules.stream().collect(Collectors.joining(",")));
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
--- a/langtools/test/tools/jdeps/modules/ModuleTest.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/ModuleTest.java Thu Aug 11 17:02:00 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @summary Tests jdeps -m and -mp options on named modules and unnamed modules
+ * @summary Tests jdeps -m and --module-path options on named modules and unnamed modules
* @library ../lib
* @build CompilerUtils JdepsUtil
* @modules jdk.jdeps/com.sun.tools.jdeps
@@ -68,12 +68,12 @@
CompilerUtils.cleanDir(UNNAMED_DIR);
assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
- "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
+ "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
// m4 is not referenced
Arrays.asList("m1", "m2", "m3", "m4")
.forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
- assertTrue(CompilerUtils.compile(SRC_DIR.resolve("m3"), UNNAMED_DIR, "-mp", MODS_DIR.toString()));
+ assertTrue(CompilerUtils.compile(SRC_DIR.resolve("m3"), UNNAMED_DIR, "-p", MODS_DIR.toString()));
Files.delete(UNNAMED_DIR.resolve("module-info.class"));
}
@@ -112,10 +112,10 @@
@Test(dataProvider = "modules")
public void modularTest(String name, ModuleMetaData data) throws IOException {
- // jdeps -modulepath mods -m <name>
+ // jdeps --module-path mods -m <name>
runTest(data, MODS_DIR.toString(), Set.of(name));
- // jdeps -modulepath libs/m1.jar:.... -m <name>
+ // jdeps --module-path libs/m1.jar:.... -m <name>
String mp = Arrays.stream(modules)
.filter(mn -> !mn.equals(name))
.map(mn -> MODS_DIR.resolve(mn).toString())
@@ -150,8 +150,8 @@
Set<String> roots, Path... paths)
throws IOException
{
- // jdeps -modulepath <modulepath> -m root paths
- String cmd = String.format("jdeps -modulepath %s -addmods %s %s%n",
+ // jdeps --module-path <modulepath> -m root paths
+ String cmd = String.format("jdeps --module-path %s --add-modules %s %s%n",
MODS_DIR, roots.stream().collect(Collectors.joining(",")), paths);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
--- a/langtools/test/tools/jdeps/modules/SplitPackage.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/SplitPackage.java Thu Aug 11 17:02:00 2016 +0000
@@ -65,12 +65,12 @@
public void runTest() throws Exception {
// Test jdeps classes
runTest(null);
- // Test jdeps -addmods
+ // Test jdeps --add-modules
runTest(JAVA_ANNOTATIONS_COMMON, SPLIT_PKG_NAME);
}
private void runTest(String root, String... splitPackages) throws Exception {
- String cmd = String.format("jdeps -verbose:class -addmods %s %s%n",
+ String cmd = String.format("jdeps -verbose:class --add-modules %s %s%n",
root, CLASSES_DIR);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
--- a/langtools/test/tools/jdeps/modules/TransitiveDeps.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/TransitiveDeps.java Thu Aug 11 17:02:00 2016 +0000
@@ -123,7 +123,7 @@
public void testModulePath(String name, List<ModuleMetaData> data) throws IOException {
Set<String> roots = Set.of("m6", "unsafe");
- String cmd1 = String.format("jdeps -modulepath %s -addmods %s -m %s%n", MODS_DIR,
+ String cmd1 = String.format("jdeps --module-path %s --add-modules %s -m %s%n", MODS_DIR,
roots.stream().collect(Collectors.joining(",")), name);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd1)) {
jdeps.verbose("-verbose:class")
@@ -136,7 +136,7 @@
// run automatic modules
roots = Set.of("ALL-MODULE-PATH", "jdk.unsupported");
- String cmd2 = String.format("jdeps -modulepath %s -addmods %s -m %s%n", LIBS_DIR,
+ String cmd2 = String.format("jdeps --module-path %s --add-modules %s -m %s%n", LIBS_DIR,
roots.stream().collect(Collectors.joining(",")), name);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd2)) {
--- a/langtools/test/tools/jdeps/modules/src/m3/module-info.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/src/m3/module-info.java Thu Aug 11 17:02:00 2016 +0000
@@ -24,7 +24,7 @@
module m3 {
requires public java.sql;
requires public m2;
- requires java.logging; // TODO: genmoduleinfo to do transitive reduction
+ requires java.logging; // TODO: --gen-module-info to do transitive reduction
requires public m1;
exports p3;
}
--- a/langtools/test/tools/jdeps/modules/src/m5/module-info.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/jdeps/modules/src/m5/module-info.java Thu Aug 11 17:02:00 2016 +0000
@@ -22,7 +22,7 @@
*/
module m5 {
- // m4 requires public java.compilerr
+ // m4 requires public java.compiler
requires public m4;
requires public java.compiler;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/lib/toolbox/Assert.java Thu Aug 11 17:02:00 2016 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package toolbox;
+
+import java.util.function.Supplier;
+
+/**
+ * Simple facility for unconditional assertions.
+ * The methods in this class are described in terms of equivalent assert
+ * statements, assuming that assertions have been enabled.
+ */
+public class Assert {
+ /** Equivalent to
+ * assert cond;
+ */
+ public static void check(boolean cond) {
+ if (!cond)
+ error();
+ }
+
+ /** Equivalent to
+ * assert (o == null);
+ */
+ public static void checkNull(Object o) {
+ if (o != null)
+ error();
+ }
+
+ /** Equivalent to
+ * assert (t != null); return t;
+ */
+ public static <T> T checkNonNull(T t) {
+ if (t == null)
+ error();
+ return t;
+ }
+
+ /** Equivalent to
+ * assert cond : value;
+ */
+ public static void check(boolean cond, int value) {
+ if (!cond)
+ error(String.valueOf(value));
+ }
+
+ /** Equivalent to
+ * assert cond : value;
+ */
+ public static void check(boolean cond, long value) {
+ if (!cond)
+ error(String.valueOf(value));
+ }
+
+ /** Equivalent to
+ * assert cond : value;
+ */
+ public static void check(boolean cond, Object value) {
+ if (!cond)
+ error(String.valueOf(value));
+ }
+
+ /** Equivalent to
+ * assert cond : msg;
+ */
+ public static void check(boolean cond, String msg) {
+ if (!cond)
+ error(msg);
+ }
+
+ /** Equivalent to
+ * assert cond : msg.get();
+ * Note: message string is computed lazily.
+ */
+ public static void check(boolean cond, Supplier<String> msg) {
+ if (!cond)
+ error(msg.get());
+ }
+
+ /** Equivalent to
+ * assert (o == null) : value;
+ */
+ public static void checkNull(Object o, Object value) {
+ if (o != null)
+ error(String.valueOf(value));
+ }
+
+ /** Equivalent to
+ * assert (o == null) : msg;
+ */
+ public static void checkNull(Object o, String msg) {
+ if (o != null)
+ error(msg);
+ }
+
+ /** Equivalent to
+ * assert (o == null) : msg.get();
+ * Note: message string is computed lazily.
+ */
+ public static void checkNull(Object o, Supplier<String> msg) {
+ if (o != null)
+ error(msg.get());
+ }
+
+ /** Equivalent to
+ * assert (o != null) : msg;
+ */
+ public static <T> T checkNonNull(T t, String msg) {
+ if (t == null)
+ error(msg);
+ return t;
+ }
+
+ /** Equivalent to
+ * assert (o != null) : msg.get();
+ * Note: message string is computed lazily.
+ */
+ public static <T> T checkNonNull(T t, Supplier<String> msg) {
+ if (t == null)
+ error(msg.get());
+ return t;
+ }
+
+ /** Equivalent to
+ * assert false;
+ */
+ public static void error() {
+ throw new AssertionError();
+ }
+
+ /** Equivalent to
+ * assert false : msg;
+ */
+ public static void error(String msg) {
+ throw new AssertionError(msg);
+ }
+
+ /** Prevent instantiation. */
+ private Assert() { }
+}
--- a/langtools/test/tools/lib/toolbox/JavaTask.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/lib/toolbox/JavaTask.java Thu Aug 11 17:02:00 2016 +0000
@@ -67,6 +67,16 @@
}
/**
+ * Sets the VM options.
+ * @param vmOptions the options
+ * @return this task object
+ */
+ public JavaTask vmOptions(List<String> vmOptions) {
+ this.vmOptions = vmOptions;
+ return this;
+ }
+
+ /**
* Sets the name of the class to be executed.
* @param className the name of the class
* @return this task object
@@ -87,6 +97,16 @@
}
/**
+ * Sets the arguments for the class to be executed.
+ * @param classArgs the arguments
+ * @return this task object
+ */
+ public JavaTask classArgs(List<String> classArgs) {
+ this.classArgs = classArgs;
+ return this;
+ }
+
+ /**
* Sets whether or not the standard VM and java options for the test should be passed
* to the new VM instance. If this method is not called, the default behavior is that
* the options will be passed to the new VM instance.
--- a/langtools/test/tools/lib/toolbox/JavacTask.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/lib/toolbox/JavacTask.java Thu Aug 11 17:02:00 2016 +0000
@@ -176,6 +176,16 @@
}
/**
+ * Sets the options.
+ * @param options the options
+ * @return this task object
+ */
+ public JavacTask options(List<String> options) {
+ this.options = options;
+ return this;
+ }
+
+ /**
* Sets the classes to be analyzed.
* @param classes the classes
* @return this task object
--- a/langtools/test/tools/lib/toolbox/TestRunner.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/lib/toolbox/TestRunner.java Thu Aug 11 17:02:00 2016 +0000
@@ -117,7 +117,7 @@
}
}
- public void error(String message) {
+ protected void error(String message) {
out.println("Error: " + message);
errorCount++;
}
--- a/langtools/test/tools/sjavac/ApiExtraction.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/ApiExtraction.java Thu Aug 11 17:02:00 2016 +0000
@@ -29,10 +29,12 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
- * @build Wrapper toolbox.ToolBox
+ * jdk.compiler/com.sun.tools.sjavac.options
+ * jdk.compiler/com.sun.tools.sjavac.pubapi
+ * @build Wrapper toolbox.ToolBox toolbox.JavacTask
* @run main Wrapper ApiExtraction
*/
+
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static javax.lang.model.element.Modifier.FINAL;
@@ -56,6 +58,8 @@
import com.sun.tools.sjavac.pubapi.PubVar;
import com.sun.tools.sjavac.pubapi.ReferenceTypeDesc;
+import toolbox.JavacTask;
+import toolbox.ToolBox;
public class ApiExtraction {
public static void main(String[] args) throws IOException {
@@ -86,7 +90,7 @@
"}");
// Create class file to extract API from
- new ToolBox().new JavacTask().sources(testSrc).run();
+ new JavacTask(new ToolBox()).sources(testSrc).run();
// Extract PubApi
Options options = Options.parseArgs("-d", "bin", "--state-dir=bin", "-cp", ".");
--- a/langtools/test/tools/sjavac/ClasspathDependencies.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/ClasspathDependencies.java Thu Aug 11 17:02:00 2016 +0000
@@ -29,12 +29,10 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
- * @build Wrapper toolbox.ToolBox
+ * @build Wrapper toolbox.ToolBox toolbox.Assert
* @run main Wrapper ClasspathDependencies
*/
-import static com.sun.tools.javac.util.Assert.check;
import java.io.IOException;
import java.nio.file.FileVisitResult;
@@ -45,6 +43,8 @@
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
+import static toolbox.Assert.check;
+
public class ClasspathDependencies extends SjavacBase {
public static void main(String... args) throws Exception {
@@ -134,5 +134,4 @@
}
});
}
-
}
--- a/langtools/test/tools/sjavac/CompileCircularSources.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/CompileCircularSources.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper CompileCircularSources
*/
--- a/langtools/test/tools/sjavac/CompileExcludingDependency.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/CompileExcludingDependency.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper CompileExcludingDependency
*/
@@ -49,7 +48,6 @@
void test() throws Exception {
Files.createDirectories(BIN);
Map<String,Long> previous_bin_state = collectState(BIN);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
"package alfa.omega; public class A { beta.B b; }");
tb.writeFile(GENSRC.resolve("beta/B.java"),
--- a/langtools/test/tools/sjavac/CompileWithAtFile.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/CompileWithAtFile.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper CompileWithAtFile
*/
--- a/langtools/test/tools/sjavac/CompileWithInvisibleSources.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/CompileWithInvisibleSources.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper CompileWithInvisibleSources
*/
@@ -53,7 +52,6 @@
Map<String,Long> previous_bin_state = collectState(BIN);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
"package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }");
tb.writeFile(GENSRC2.resolve("beta/B.java"),
--- a/langtools/test/tools/sjavac/CompileWithOverrideSources.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/CompileWithOverrideSources.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper CompileWithOverrideSources
*/
@@ -51,7 +50,6 @@
Files.createDirectories(BIN);
Map<String,Long> previous_bin_state = collectState(BIN);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
"package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }");
tb.writeFile(GENSRC.resolve("beta/B.java"),
--- a/langtools/test/tools/sjavac/HiddenFiles.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/HiddenFiles.java Thu Aug 11 17:02:00 2016 +0000
@@ -28,22 +28,23 @@
* @bug 8144226
* @summary Ensures that excluded files are inaccessible (even for implicit
* compilation)
- *
- * @modules jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.sjavac
+ * jdk.compiler/com.sun.tools.sjavac.server
* @library /tools/lib
- * @build Wrapper toolbox.ToolBox
+ * @build Wrapper toolbox.ToolBox toolbox.Assert
* @run main Wrapper HiddenFiles
*/
-import com.sun.tools.javac.main.Main.Result;
-import com.sun.tools.javac.util.Assert;
-import com.sun.tools.sjavac.server.Sjavac;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import com.sun.tools.javac.main.Main.Result;
+
+import toolbox.Assert;
+
public class HiddenFiles extends SjavacBase {
public static void main(String[] ignore) throws Exception {
--- a/langtools/test/tools/sjavac/IdleShutdown.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IdleShutdown.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,10 +25,12 @@
* @test
* @bug 8044131
* @summary Tests the hooks used for detecting idleness of the sjavac server.
- * @modules jdk.compiler/com.sun.tools.sjavac.server
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.sjavac.server
* @build Wrapper
* @run main Wrapper IdleShutdown
*/
+
import java.util.concurrent.atomic.AtomicLong;
import com.sun.tools.javac.main.Main.Result;
--- a/langtools/test/tools/sjavac/IgnoreSymbolFile.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IgnoreSymbolFile.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,8 +25,7 @@
* @test
* @bug 8047183
* @summary JDK build fails with sjavac enabled
- *
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.sjavac
* @build Wrapper
* @run main Wrapper IgnoreSymbolFile
*/
--- a/langtools/test/tools/sjavac/IncCompInheritance.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompInheritance.java Thu Aug 11 17:02:00 2016 +0000
@@ -28,7 +28,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * jdk.jdeps/com.sun.tools.javap
+ * jdk.compiler/com.sun.tools.sjavac
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompInheritance
*/
--- a/langtools/test/tools/sjavac/IncCompileChangeNative.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileChangeNative.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompileChangeNative
*/
@@ -48,7 +47,6 @@
// Remember the previous bin and headers state here.
Map<String,Long> previous_bin_state;
Map<String,Long> previous_headers_state;
- ToolBox tb = new ToolBox();
void test() throws Exception {
Files.createDirectories(GENSRC);
--- a/langtools/test/tools/sjavac/IncCompileDropClasses.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileDropClasses.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompileDropClasses
*/
@@ -48,7 +47,6 @@
// Remember the previous bin and headers state here.
Map<String,Long> previous_bin_state;
Map<String,Long> previous_headers_state;
- ToolBox tb = new ToolBox();
void test() throws Exception {
Files.createDirectories(GENSRC);
--- a/langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java Thu Aug 11 17:02:00 2016 +0000
@@ -48,7 +48,6 @@
void test() throws Exception {
clean(TEST_ROOT);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
"package alfa.omega; public class A { "+
" public final static int DEFINITION = 18; "+
--- a/langtools/test/tools/sjavac/IncCompileNoChanges.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileNoChanges.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompileNoChanges
*/
--- a/langtools/test/tools/sjavac/IncCompileUpdateNative.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileUpdateNative.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompileUpdateNative
*/
@@ -48,7 +47,6 @@
// Remember the previous bin and headers state here.
Map<String,Long> previous_bin_state;
Map<String,Long> previous_headers_state;
- ToolBox tb = new ToolBox();
void test() throws Exception {
Files.createDirectories(GENSRC);
--- a/langtools/test/tools/sjavac/IncCompileWithChanges.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncCompileWithChanges.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @ignore Requires dependency code to deal with in-method dependencies.
* @build Wrapper toolbox.ToolBox
* @run main Wrapper IncCompileWithChanges
@@ -51,7 +50,6 @@
// Remember the previous bin and headers state here.
Map<String,Long> previous_bin_state;
Map<String,Long> previous_headers_state;
- ToolBox tb = new ToolBox();
void test() throws Exception {
clean(TEST_ROOT);
--- a/langtools/test/tools/sjavac/IncludeExcludePatterns.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/IncludeExcludePatterns.java Thu Aug 11 17:02:00 2016 +0000
@@ -26,17 +26,14 @@
* @bug 8037085
* @summary Ensures that sjavac can handle various exclusion patterns.
*
- * @modules jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.sjavac
+ * jdk.compiler/com.sun.tools.sjavac.server
* @library /tools/lib
- * @build Wrapper toolbox.ToolBox
+ * @build Wrapper toolbox.ToolBox toolbox.Assert
* @run main Wrapper IncludeExcludePatterns
*/
-import com.sun.tools.javac.main.Main.Result;
-import com.sun.tools.javac.util.Assert;
-import com.sun.tools.sjavac.server.Sjavac;
-
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -49,6 +46,10 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import com.sun.tools.javac.main.Main.Result;
+
+import toolbox.Assert;
+
public class IncludeExcludePatterns extends SjavacBase {
final Path SRC = Paths.get("src");
--- a/langtools/test/tools/sjavac/NoState.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/NoState.java Thu Aug 11 17:02:00 2016 +0000
@@ -29,17 +29,16 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
- * @build Wrapper toolbox.ToolBox
+ * @build Wrapper toolbox.ToolBox toolbox.Assert
* @run main Wrapper NoState
*/
-import com.sun.tools.javac.util.Assert;
-
import java.io.IOException;
import java.nio.file.*;
import java.util.stream.Stream;
+import toolbox.Assert;
+
public class NoState extends SJavacTester {
public static void main(String... args) throws Exception {
new NoState().run();
--- a/langtools/test/tools/sjavac/OptionDecoding.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/OptionDecoding.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
*
* @modules jdk.compiler/com.sun.tools.sjavac
* jdk.compiler/com.sun.tools.sjavac.client
+ * jdk.compiler/com.sun.tools.sjavac.comp
* jdk.compiler/com.sun.tools.sjavac.options
* @build Wrapper
* @run main Wrapper OptionDecoding
@@ -147,13 +148,13 @@
SourceLocation dir2 = new SourceLocation(Paths.get("dir2"), i, x);
String dir1_PS_dir2 = "dir1" + File.pathSeparator + "dir2";
- Options options = Options.parseArgs("-sourcepath", dir1_PS_dir2);
+ Options options = Options.parseArgs("--source-path", dir1_PS_dir2);
assertEquals(options.getSourceSearchPaths(), Arrays.asList(dir1, dir2));
- options = Options.parseArgs("-modulepath", dir1_PS_dir2);
+ options = Options.parseArgs("--module-path", dir1_PS_dir2);
assertEquals(options.getModuleSearchPaths(), Arrays.asList(dir1, dir2));
- options = Options.parseArgs("-classpath", dir1_PS_dir2);
+ options = Options.parseArgs("--class-path", dir1_PS_dir2);
assertEquals(options.getClassSearchPath(), Arrays.asList(dir1, dir2));
}
--- a/langtools/test/tools/sjavac/OverlappingSrcDst.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/OverlappingSrcDst.java Thu Aug 11 17:02:00 2016 +0000
@@ -32,7 +32,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper OverlappingSrcDst
*/
@@ -40,6 +39,8 @@
import java.io.File;
import java.nio.file.Paths;
+import toolbox.ToolBox;
+
public class OverlappingSrcDst extends SJavacTester {
public static void main(String... args) {
new OverlappingSrcDst().run();
--- a/langtools/test/tools/sjavac/PackagePathMismatch.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/PackagePathMismatch.java Thu Aug 11 17:02:00 2016 +0000
@@ -28,7 +28,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * jdk.jdeps/com.sun.tools.javap
+ * jdk.compiler/com.sun.tools.sjavac
* @build Wrapper toolbox.ToolBox
* @run main Wrapper PackagePathMismatch
*/
--- a/langtools/test/tools/sjavac/ParallelCompilations.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/ParallelCompilations.java Thu Aug 11 17:02:00 2016 +0000
@@ -30,7 +30,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper ParallelCompilations
*/
@@ -45,8 +44,6 @@
}
public void run() throws Exception {
- ToolBox tb = new ToolBox();
-
// Generate 10 files
for (int i = 0; i < 10; i++) {
String content = "package foo"+ i + ";\n" +
--- a/langtools/test/tools/sjavac/PermittedArtifact.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/PermittedArtifact.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper PermittedArtifact
*/
@@ -51,7 +50,6 @@
Map<String,Long> previous_bin_state = collectState(BIN);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC + "/alfa/omega/A.java",
"package alfa.omega; public class A { }");
--- a/langtools/test/tools/sjavac/PooledExecution.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/PooledExecution.java Thu Aug 11 17:02:00 2016 +0000
@@ -25,11 +25,13 @@
* @test
* @bug 8044131
* @summary Makes sure sjavac poolsize option is honored.
- * @modules jdk.compiler/com.sun.tools.sjavac.comp
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.sjavac.comp
* jdk.compiler/com.sun.tools.sjavac.server
* @build Wrapper
* @run main Wrapper PooledExecution
*/
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
--- a/langtools/test/tools/sjavac/SjavacBase.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/SjavacBase.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
import java.lang.reflect.Method;
import java.util.Arrays;
+import toolbox.ToolBox;
+
public class SjavacBase {
protected final static ToolBox toolbox = new ToolBox();
@@ -44,5 +46,4 @@
int rc = (Integer) m.invoke(null, (Object) strArgs);
return rc;
}
-
}
--- a/langtools/test/tools/sjavac/StateDir.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/StateDir.java Thu Aug 11 17:02:00 2016 +0000
@@ -31,7 +31,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.sjavac
- * jdk.jdeps/com.sun.tools.javap
* @build Wrapper toolbox.ToolBox
* @run main Wrapper StateDir
*/
@@ -53,7 +52,6 @@
Map<String,Long> previous_bin_state = collectState(BIN);
Map<String,Long> previous_bar_state = collectState(BAR);
- ToolBox tb = new ToolBox();
tb.writeFile(GENSRC.resolve("alfa/omega/A.java"),
"package alfa.omega; public class A { }");
--- a/langtools/test/tools/sjavac/Wrapper.java Thu Aug 11 15:47:10 2016 +0000
+++ b/langtools/test/tools/sjavac/Wrapper.java Thu Aug 11 17:02:00 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,15 @@
* questions.
*/
-import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
import java.util.Arrays;
-
+import java.util.List;
+import java.util.stream.Collectors;
public class Wrapper {
public static void main(String... args) throws Exception {
@@ -36,16 +41,28 @@
String testClassName = args[0];
String[] testArgs = Arrays.copyOfRange(args, 1, args.length);
- File srcDir = new File(System.getProperty("test.src"));
- File clsDir = new File(System.getProperty("test.classes"));
+ Path srcDir = Paths.get(System.getProperty("test.src"));
+ Path clsDir = Paths.get(System.getProperty("test.classes"));
+ String clsPath = System.getProperty("test.class.path");
+ String tstMdls = System.getProperty("test.modules");
+
+ Path src = srcDir.resolve(testClassName + ".java");
+ Path cls = clsDir.resolve(testClassName + ".class");
- File src = new File(srcDir, testClassName + ".java");
- File cls = new File(clsDir, testClassName + ".class");
-
- if (cls.lastModified() < src.lastModified()) {
+ if (isNewer(src, cls)) {
System.err.println("Recompiling test class...");
- String[] javacArgs = { "-d", clsDir.getPath(), src.getPath() };
- int rc = com.sun.tools.javac.Main.compile(javacArgs);
+ List<String> javacArgs = new ArrayList<>();
+ javacArgs.addAll(Arrays.asList("-d", clsDir.toString()));
+ javacArgs.addAll(Arrays.asList("-sourcepath", srcDir.toString()));
+ javacArgs.addAll(Arrays.asList("-classpath", clsPath));
+ Arrays.stream(tstMdls.split("\\s+"))
+ .filter(s -> s.contains("/"))
+ .map(s -> "--add-exports=" + s + "=ALL-UNNAMED")
+ .collect(Collectors.toCollection(() -> javacArgs));
+ javacArgs.add(src.toString());
+ System.out.println("javac: " + javacArgs);
+ int rc = com.sun.tools.javac.Main.compile(
+ javacArgs.toArray(new String[javacArgs.size()]));
if (rc != 0)
throw new Exception("compilation failed");
}
@@ -55,6 +72,12 @@
main.invoke(null, new Object[] { testArgs });
}
+ private static boolean isNewer(Path a, Path b) throws IOException {
+ if (Files.notExists(b))
+ return true;
+ return Files.getLastModifiedTime(a).compareTo(Files.getLastModifiedTime(b)) > 0;
+ }
+
private static boolean isSJavacOnClassPath() {
String cls = "com/sun/tools/sjavac/Main.class";
return Wrapper.class.getClassLoader().getResource(cls) != null;