--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Mar 23 21:44:24 2016 -0700
@@ -282,7 +282,9 @@
* @param env The current environment.
*/
void checkAssignable(DiagnosticPosition pos, VarSymbol v, JCTree base, Env<AttrContext> env) {
- if ((v.flags() & FINAL) != 0 &&
+ if (v.name == names._this) {
+ log.error(pos, Errors.CantAssignValToThis);
+ } else if ((v.flags() & FINAL) != 0 &&
((v.flags() & HASINIT) != 0
||
!((base == null ||
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java Wed Mar 23 21:44:24 2016 -0700
@@ -356,6 +356,7 @@
ListBuffer<Type> minUndetVars = new ListBuffer<>();
for (Type minVar : minVars) {
UndetVar uv = (UndetVar)asUndetVar(minVar);
+ Assert.check(uv.incorporationActions.size() == 0);
UndetVar uv2 = new UndetVar((TypeVar)minVar, infer.incorporationEngine(), types);
for (InferenceBound ib : InferenceBound.values()) {
List<Type> newBounds = uv.getBounds(ib).stream()
@@ -403,15 +404,17 @@
public Void visitUndetVar(UndetVar t, Void _unused) {
if (min.add(t.qtype)) {
Set<Type> deps = minMap.getOrDefault(t.qtype, new HashSet<>(Collections.singleton(t.qtype)));
- for (Type b : t.getBounds(InferenceBound.values())) {
- Type undet = asUndetVar(b);
- if (!undet.hasTag(TypeTag.UNDETVAR)) {
- visit(undet);
- } else if (isEquiv((UndetVar)undet, b)){
- deps.add(b);
- equiv.add(b);
- } else {
- visit(undet);
+ for (InferenceBound boundKind : InferenceBound.values()) {
+ for (Type b : t.getBounds(boundKind)) {
+ Type undet = asUndetVar(b);
+ if (!undet.hasTag(TypeTag.UNDETVAR)) {
+ visit(undet);
+ } else if (isEquiv(t, b, boundKind)) {
+ deps.add(b);
+ equiv.add(b);
+ } else {
+ visit(undet);
+ }
}
}
minMap.put(t.qtype, deps);
@@ -447,11 +450,17 @@
return null;
}
- boolean isEquiv(UndetVar from, Type t) {
+ boolean isEquiv(UndetVar from, Type t, InferenceBound boundKind) {
UndetVar uv = (UndetVar)asUndetVar(t);
for (InferenceBound ib : InferenceBound.values()) {
- List<Type> b1 = uv.getBounds(ib);
- List<Type> b2 = from.getBounds(ib);
+ List<Type> b1 = from.getBounds(ib);
+ if (ib == boundKind) {
+ b1 = b1.diff(List.of(t));
+ }
+ List<Type> b2 = uv.getBounds(ib);
+ if (ib == boundKind.complement()) {
+ b2 = b2.diff(List.of(from.qtype));
+ }
if (!b1.containsAll(b2) || !b2.containsAll(b1)) {
return false;
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Mar 23 21:44:24 2016 -0700
@@ -274,6 +274,9 @@
compiler.err.cant.assign.val.to.final.var=\
cannot assign a value to final variable {0}
+compiler.err.cant.assign.val.to.this=\
+ cannot assign to ''this''
+
# 0: symbol, 1: message segment
compiler.err.cant.ref.non.effectively.final.var=\
local variables referenced from {1} must be final or effectively final
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java Wed Mar 23 21:44:24 2016 -0700
@@ -361,22 +361,22 @@
// Silently create a new javac_state file.
noFileFound = true;
} catch (IOException e) {
- Log.info("Dropping old javac_state because of errors when reading it.");
+ Log.warn("Dropping old javac_state because of errors when reading it.");
db = new JavacState(options, true);
foundCorrectVerNr = true;
newCommandLine = false;
syntaxError = false;
}
if (foundCorrectVerNr == false && !noFileFound) {
- Log.info("Dropping old javac_state since it is of an old version.");
+ Log.debug("Dropping old javac_state since it is of an old version.");
db = new JavacState(options, true);
} else
if (newCommandLine == true && !noFileFound) {
- Log.info("Dropping old javac_state since a new command line is used!");
+ Log.debug("Dropping old javac_state since a new command line is used!");
db = new JavacState(options, true);
} else
if (syntaxError == true) {
- Log.info("Dropping old javac_state since it contains syntax errors.");
+ Log.warn("Dropping old javac_state since it contains syntax errors.");
db = new JavacState(options, true);
}
db.prev.calculateDependents();
@@ -868,7 +868,7 @@
// This is an incremental compile! The pubapi
// did change. Trigger recompilation of dependents.
packagesWithChangedPublicApis.add(pkg);
- Log.info("The API of " + Util.justPackageName(pkg) + " has changed!");
+ Log.debug("The API of " + Util.justPackageName(pkg) + " has changed!");
}
}
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java Wed Mar 23 21:44:24 2016 -0700
@@ -139,7 +139,11 @@
String content = typeAndContent[1];
try {
- Log.log(Log.Level.valueOf(type), "[server] " + content);
+ if (Log.isDebugging()) {
+ // Distinguish server generated output if debugging.
+ content = "[sjavac-server] " + content;
+ }
+ Log.log(Log.Level.valueOf(type), content);
continue;
} catch (IllegalArgumentException e) {
// Parsing of 'type' as log level failed.
@@ -172,7 +176,7 @@
makeSureServerIsRunning(portFile);
int attempt = 0;
while (true) {
- Log.info("Trying to connect. Attempt " + (++attempt) + " of " + MAX_CONNECT_ATTEMPTS);
+ Log.debug("Trying to connect. Attempt " + (++attempt) + " of " + MAX_CONNECT_ATTEMPTS);
try {
return makeConnectionAttempt();
} catch (IOException ex) {
@@ -191,7 +195,7 @@
InetAddress localhost = InetAddress.getByName(null);
InetSocketAddress address = new InetSocketAddress(localhost, portFile.getPort());
socket.connect(address, CONNECTION_TIMEOUT);
- Log.info("Connected");
+ Log.debug("Connected");
return socket;
}
@@ -238,7 +242,7 @@
+ ",keepalive="+ keepalive);
Process serverProcess;
- Log.info("Starting server. Command: " + String.join(" ", cmd));
+ Log.debug("Starting server. Command: " + String.join(" ", cmd));
try {
// If the cmd for some reason can't be executed (file is not found,
// or is not executable for instance) this will throw an
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java Wed Mar 23 21:44:24 2016 -0700
@@ -165,7 +165,7 @@
portFile.lock();
portFile.getValues();
if (portFile.containsPortInfo()) {
- Log.info("Javac server not started because portfile exists!");
+ Log.debug("Javac server not started because portfile exists!");
portFile.unlock();
return -1;
}
@@ -192,10 +192,10 @@
portFileMonitor = new PortFileMonitor(portFile, this);
portFileMonitor.start();
- Log.info("Sjavac server started. Accepting connections...");
- Log.info(" port: " + getPort());
- Log.info(" time: " + new java.util.Date());
- Log.info(" poolsize: " + poolsize);
+ Log.debug("Sjavac server started. Accepting connections...");
+ Log.debug(" port: " + getPort());
+ Log.debug(" time: " + new java.util.Date());
+ Log.debug(" poolsize: " + poolsize);
keepAcceptingRequests.set(true);
@@ -208,7 +208,7 @@
}
} while (keepAcceptingRequests.get());
- Log.info("Shutting down.");
+ Log.debug("Shutting down.");
// No more connections accepted. If any client managed to connect after
// the accept() was interrupted but before the server socket is closed
@@ -216,7 +216,7 @@
// IOException on the client side.
long realTime = System.currentTimeMillis() - serverStart;
- Log.info("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms");
+ Log.debug("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms");
// Shut down
sjavac.shutdown();
@@ -231,7 +231,7 @@
return;
}
- Log.info("Quitting: " + quitMsg);
+ Log.debug("Quitting: " + quitMsg);
portFileMonitor.shutdown(); // No longer any need to monitor port file
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java Wed Mar 23 21:44:24 2016 -0700
@@ -48,7 +48,7 @@
import jdk.internal.jline.NoInterruptUnixTerminal;
import jdk.internal.jline.Terminal;
import jdk.internal.jline.TerminalFactory;
-import jdk.internal.jline.UnsupportedTerminal;
+import jdk.internal.jline.TerminalSupport;
import jdk.internal.jline.WindowsTerminal;
import jdk.internal.jline.console.ConsoleReader;
import jdk.internal.jline.console.KeyMap;
@@ -70,7 +70,7 @@
this.input = new StopDetectingInputStream(() -> repl.state.stop(), ex -> repl.hard("Error on input: %s", ex));
Terminal term;
if (System.getProperty("test.jdk") != null) {
- term = new UnsupportedTerminal();
+ term = new TestTerminal(input);
} else if (System.getProperty("os.name").toLowerCase(Locale.US).contains(TerminalFactory.WINDOWS)) {
term = new JShellWindowsTerminal(input);
} else {
@@ -80,7 +80,7 @@
in = new ConsoleReader(cmdin, cmdout, term);
in.setExpandEvents(false);
in.setHandleUserInterrupt(true);
- in.setHistory(history = new EditingHistory(JShellTool.PREFS) {
+ in.setHistory(history = new EditingHistory(repl.prefs) {
@Override protected CompletionInfo analyzeCompletion(String input) {
return repl.analysis.analyzeCompletion(input);
}
@@ -538,4 +538,22 @@
}
}
+
+ private static final class TestTerminal extends TerminalSupport {
+
+ private final StopDetectingInputStream input;
+
+ public TestTerminal(StopDetectingInputStream input) throws Exception {
+ super(true);
+ setAnsiSupported(false);
+ setEchoEnabled(true);
+ this.input = input;
+ }
+
+ @Override
+ public InputStream wrapInIfNeeded(InputStream in) throws IOException {
+ return input.setInputStream(super.wrapInIfNeeded(in));
+ }
+
+ }
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Wed Mar 23 21:44:24 2016 -0700
@@ -121,6 +121,7 @@
final InputStream userin;
final PrintStream userout;
final PrintStream usererr;
+ final Preferences prefs;
final Feedback feedback = new Feedback();
@@ -137,7 +138,8 @@
*/
public JShellTool(InputStream cmdin, PrintStream cmdout, PrintStream cmderr,
PrintStream console,
- InputStream userin, PrintStream userout, PrintStream usererr) {
+ InputStream userin, PrintStream userout, PrintStream usererr,
+ Preferences prefs) {
this.cmdin = cmdin;
this.cmdout = cmdout;
this.cmderr = cmderr;
@@ -145,6 +147,7 @@
this.userin = userin;
this.userout = userout;
this.usererr = usererr;
+ this.prefs = prefs;
initializeFeedbackModes();
}
@@ -230,8 +233,6 @@
private List<String> replayableHistory;
private List<String> replayableHistoryPrevious;
- static final Preferences PREFS = Preferences.userRoot().node("tool/JShell");
-
static final String STARTUP_KEY = "STARTUP";
static final String REPLAY_RESTORE_KEY = "REPLAY_RESTORE";
@@ -387,7 +388,8 @@
*/
public static void main(String[] args) throws Exception {
new JShellTool(System.in, System.out, System.err, System.out,
- new ByteArrayInputStream(new byte[0]), System.out, System.err)
+ new ByteArrayInputStream(new byte[0]), System.out, System.err,
+ Preferences.userRoot().node("tool/JShell"))
.start(args);
}
@@ -406,7 +408,7 @@
resetState(); // Initialize
// Read replay history from last jshell session into previous history
- String prevReplay = PREFS.get(REPLAY_RESTORE_KEY, null);
+ String prevReplay = prefs.get(REPLAY_RESTORE_KEY, null);
if (prevReplay != null) {
replayableHistoryPrevious = Arrays.asList(prevReplay.split(RECORD_SEPARATOR));
}
@@ -558,10 +560,10 @@
String start;
if (cmdlineStartup == null) {
- start = PREFS.get(STARTUP_KEY, "<nada>");
+ start = prefs.get(STARTUP_KEY, "<nada>");
if (start.equals("<nada>")) {
start = DEFAULT_STARTUP;
- PREFS.put(STARTUP_KEY, DEFAULT_STARTUP);
+ prefs.put(STARTUP_KEY, DEFAULT_STARTUP);
}
} else {
start = cmdlineStartup;
@@ -1198,7 +1200,7 @@
try {
byte[] encoded = Files.readAllBytes(toPathResolvingUserHome(filename));
String init = new String(encoded);
- PREFS.put(STARTUP_KEY, init);
+ prefs.put(STARTUP_KEY, init);
} catch (AccessDeniedException e) {
hard("File '%s' for /set start is not accessible.", filename);
return false;
@@ -1347,7 +1349,7 @@
regenerateOnDeath = false;
live = false;
if (!replayableHistory.isEmpty()) {
- PREFS.put(REPLAY_RESTORE_KEY, replayableHistory.stream().reduce(
+ prefs.put(REPLAY_RESTORE_KEY, replayableHistory.stream().reduce(
(a, b) -> a + RECORD_SEPARATOR + b).get());
}
fluff("Goodbye\n");
--- a/langtools/test/ProblemList.txt Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/ProblemList.txt Wed Mar 23 21:44:24 2016 -0700
@@ -23,8 +23,77 @@
#
###########################################################################
+###########################################################################
+#
+# javadoc
-##### javac ####################################################################
+com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java 8006735 generic-all output type annotations in javadoc
+com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java 8013406 generic-all Test cases fail in javadoc test TestSmoke.java
+
+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
+
+###########################################################################
+#
+# jshell
-tools/javac/Paths/MineField.sh 8149599 generic-all needs rewrite
+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/ToolBasicTest.java 8139873 generic-all JShell tests failing
+
+###########################################################################
+#
+# javac
+tools/javac/Paths/AbsolutePathTest.java 8055768 generic-all ToolBox does not close opened files
+tools/javac/Paths/MineField.sh 8149599 generic-all needs rewrite
+tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java 8057679 generic-all clarify error messages trying to annotate scoping
+tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java 8057679 generic-all clarify error messages trying to annotate scoping
+tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java 8057679 generic-all clarify error messages trying to annotate scoping
+tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.java 8057683 generic-all improve ordering of errors with type annotations
+tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java 8057679 generic-all clarify error messages trying to annotate scoping
+tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java 8057683 generic-all improve order of errors with type annotations
+tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations
+tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java 8057687 generic-all emit correct byte code an attributes for type annotations
+tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java 8057687 generic-all emit correct byte code an attributes for type annotations
+tools/javac/warnings/suppress/TypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations
+
+###########################################################################
+#
+# javap
+
+tools/javap/output/RepeatingTypeAnnotations.java 8057687 generic-all emit correct byte code an attributes for type annotations
+
+###########################################################################
+#
+# sjavac
+
+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.
+
+###########################################################################
+#
+# jdeps
+
+tools/jdeps/modules/GenModuleInfo.java 8152502 windows-all fails to clean up files
+
--- a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4973609 8015249 8025633 8026567 6469561
+ * @bug 4973609 8015249 8025633 8026567 6469561 8071982
* @summary Make sure that annotation types with 0 members does not have
* extra HR tags.
* @author jamieh
@@ -42,7 +42,7 @@
@Test
void test() {
- javadoc("-d", "out",
+ javadoc("-d", "out-1",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -90,5 +90,27 @@
+ "<P>\n\n"
+ "<P>"
+ "<!-- ========= END OF CLASS DATA ========= -->" + "<HR>");
+
+ javadoc("-d", "out-2",
+ "-linksource",
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkOutput("src-html/pkg/AnnotationType.html", true,
+ "<title>Source code</title>",
+ "@Documented public @interface AnnotationType {");
+
+ checkOutput("src-html/pkg/AnnotationTypeField.html", true,
+ "<title>Source code</title>",
+ "@Documented public @interface AnnotationTypeField {");
+
+ checkOutput("pkg/AnnotationType.html", true,
+ "public @interface <a href=\"../src-html/pkg/AnnotationType.html#line.34"
+ + "\">AnnotationType</a></pre>");
+
+ checkOutput("pkg/AnnotationTypeField.html", true,
+ "public @interface <a href=\"../src-html/pkg/AnnotationTypeField.html#line.31"
+ + "\">AnnotationTypeField</a></pre>");
}
}
--- a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/C.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, 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,6 +26,7 @@
* Cross link to inner class: {@link javax.swing.text.AbstractDocument.AttributeContext Link to AttributeContext innerclass} <br>
* Cross link to class: {@link java.math.BigDecimal Link to external class BigDecimal}<br>
* Cross link to member: {@link java.math.BigInteger#gcd(java.math.BigInteger) Link to external member gcd}<br>
+ * Cross link to package: {@link javax.tools.SimpleJavaFileObject#URI Link to external member URI}<br>
*/
public class C {
--- a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4652655 4857717 8025633 8026567
+ * @bug 4652655 4857717 8025633 8026567 8071982
* @summary This test verifies that class cross references work properly.
* @author jamieh
* @library ../lib
@@ -42,9 +42,10 @@
@Test
void test() {
- final String uri = "http://java.sun.com/j2se/1.4/docs/api/";
+ final String uri = "http://docs.oracle.com/javase/8/docs/api/";
javadoc("-d", "out",
+ "-Xdoclint:none",
"-sourcepath", testSrc,
"-linkoffline", uri, testSrc,
testSrc("C.java"));
@@ -59,6 +60,8 @@
+ "title=\"class or interface in java.math\"><code>Link to external class BigDecimal</code></a>",
"<a href=\"" + uri + "java/math/BigInteger.html?is-external=true#gcd-java.math.BigInteger-\" "
+ "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>",
+ "<a href=\"" + uri + "javax/tools/SimpleJavaFileObject.html?is-external=true#URI\" "
+ + "title=\"class or interface in javax.tools\"><code>Link to external member URI</code></a>",
"<dl>\n"
+ "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
+ "<dd><code>toString</code> in class <code>java.lang.Object</code></dd>\n"
--- a/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/package-list Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testClassCrossReferences/package-list Wed Mar 23 21:44:24 2016 -0700
@@ -1,2 +1,3 @@
java.math
+javax.tools
javax.swing.text
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,75 @@
+/*
+ * 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 8071982
+ * @summary Test for package-frame.html.
+ * @library ../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build JavadocTester
+ * @run main TestClassDocCatalog
+ */
+
+public class TestClassDocCatalog extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestClassDocCatalog tester = new TestClassDocCatalog();
+ tester.runTests();
+ }
+
+ @Test
+ void test() {
+ javadoc("-d", "out",
+ testSrc("pkg1/EmptyAnnotation.java"),
+ testSrc("pkg1/EmptyClass.java"),
+ testSrc("pkg1/EmptyEnum.java"),
+ testSrc("pkg1/EmptyError.java"),
+ testSrc("pkg1/EmptyException.java"),
+ testSrc("pkg1/EmptyInterface.java"),
+ testSrc("pkg2/EmptyAnnotation.java"),
+ testSrc("pkg2/EmptyClass.java"),
+ testSrc("pkg2/EmptyEnum.java"),
+ testSrc("pkg2/EmptyError.java"),
+ testSrc("pkg2/EmptyException.java"),
+ testSrc("pkg2/EmptyInterface.java"));
+ checkExit(Exit.OK);
+
+ checkOutput("overview-frame.html", true,
+ "<li><a href=\"pkg1/package-frame.html\" target=\"packageFrame\">pkg1</a>"
+ + "</li>\n<li><a href=\"pkg2/package-frame.html\" target=\"packageFrame\">pkg2</a></li>");
+
+ checkOutput("pkg1/package-frame.html", true,
+ "<li><a href=\"EmptyInterface.html\" title=\"interface in pkg1\" "
+ + "target=\"classFrame\"><span class=\"interfaceName\">EmptyInterface"
+ + "</span></a></li>",
+ "<li><a href=\"EmptyClass.html\" title=\"class in pkg1\" "
+ + "target=\"classFrame\">EmptyClass</a></li>",
+ "<li><a href=\"EmptyEnum.html\" title=\"enum in pkg1\" "
+ + "target=\"classFrame\">EmptyEnum</a></li>",
+ "<li><a href=\"EmptyError.html\" title=\"class in pkg1\" "
+ + "target=\"classFrame\">EmptyError</a></li>",
+ "<li><a href=\"EmptyAnnotation.html\" title=\"annotation in pkg1\""
+ + " target=\"classFrame\">EmptyAnnotation</a></li>");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * 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 pkg1;
+
+import java.lang.annotation.Documented;
+
+@Documented public @interface EmptyAnnotation {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public class EmptyClass {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public enum EmptyEnum {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public class EmptyError extends Error {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public class EmptyException extends Exception {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public interface EmptyInterface {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * 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 pkg2;
+
+import java.lang.annotation.Documented;
+
+@Documented public @interface EmptyAnnotation {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg2;
+
+public class EmptyClass {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg2;
+
+public enum EmptyEnum {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg2;
+
+public class EmptyError extends Error {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg2;
+
+public class EmptyException extends Exception {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg2;
+
+public interface EmptyInterface {
+}
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4927552 8026567
+ * @bug 4927552 8026567 8071982
* @summary <DESC>
* @author jamieh
* @library ../lib
@@ -50,6 +50,7 @@
"annotation_test1 passes",
"annotation_test2 passes",
"annotation_test3 passes",
+ "annotation_test4 passes.",
"class_test1 passes",
"class_test2 passes",
"class_test3 passes",
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 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
@@ -39,4 +39,9 @@
* @deprecated annotation_test3 passes.
*/
int required();
+
+ /**
+ * @deprecated annotation_test4 passes.
+ */
+ int field = 0;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+public class C {}
--- a/langtools/test/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java Wed Mar 23 21:44:24 2016 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 4924383
* @summary Test to make sure the -group option does not cause a bad warning
- * to be printed.
+ * to be printed. Test for the group defined using patterns.
* @author jamieh
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -42,7 +42,7 @@
@Test
void test1() {
- //Make sure the warning is not printed when -group is used correctly.
+ // Make sure the warning is not printed when -group is used correctly.
javadoc("-d", "out-1",
"-sourcepath", testSrc,
"-group", "Package One", "pkg1",
@@ -55,11 +55,29 @@
"-group");
}
- @Test
+ // @Test
+ // @ignore 8149402
+ // Make sure the "Other packages" section is printed and the header for empty section is not.
+ // Make sure that the headers of group that is defined using patterns are printed.
void test2() {
- //Make sure the warning is printed when -group is not used correctly.
javadoc("-d", "out-2",
"-sourcepath", testSrc,
+ "-group", "Group pkg*", "pkg*",
+ "-group", "Group abc*", "abc*",
+ "-group", "Empty group", "qwerty*",
+ "-group", "Group a*", "a*",
+ "pkg1", "pkg2", "pkg3", "abc1", "abc2", "abc3", "other", testSrc("C.java"));
+ checkExit(Exit.OK);
+
+ checkOutput("overview-summary.html", true, "Group pkg*", "Group abc*", "Other Packages");
+ checkOutput("overview-summary.html", false, "Empty group", "Group a*");
+ }
+
+ @Test
+ void test3() {
+ // Make sure the warning is printed when -group is not used correctly.
+ javadoc("-d", "out-3",
+ "-sourcepath", testSrc,
"-group", "Package One", "pkg1",
"-group", "Package One", "pkg2",
"-group", "Package One", "pkg3",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/abc1/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,26 @@
+/*
+ * 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 abc1;
+
+public class C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/abc2/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,26 @@
+/*
+ * 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 abc2;
+
+public class C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/abc3/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,26 @@
+/*
+ * 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 abc3;
+
+public class C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testGroupOption/other/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,26 @@
+/*
+ * 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 other;
+
+public class C {}
--- a/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java Wed Mar 23 21:44:24 2016 -0700
@@ -64,6 +64,7 @@
"-sourcepath", testSrc,
"-nohelp",
testSrc("Sample.java"));
+ checkOutput("Sample.html", false, "<li><a href=\"../help-doc.html\">Help</a></li>");
checkExit(Exit.OK);
}
@@ -76,6 +77,8 @@
checkExit(Exit.OK);
checkOutput("Sample.html", true,
"<li><a href=\"test-help.html\">Help</a></li>");
+ checkOutput("test-help.html", true,
+ "Help, help.");
}
@Test
@@ -135,7 +138,15 @@
"-sourcetab ",
"-keywords ",
"-stylesheetfile ",
- "-docencoding ");
+ "-docencoding ",
+ "-html4 ",
+ "-html5 ",
+ "-top ",
+ "-author ",
+ "-noqualifier ",
+ "-nosince ",
+ "-notimestamp ",
+ "-sourcetab ");
checkOutput("Sample.html", !withOption,
"<li><a href=\"help-doc.html\">Help</a></li>");
--- a/langtools/test/jdk/javadoc/doclet/testIndex/TestIndex.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testIndex/TestIndex.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4852280 4517115 4973608 4994589 8026567
+ * @bug 4852280 4517115 4973608 4994589 8026567 8071982
* @summary Perform tests on index.html file.
* Also test that index-all.html has the appropriate output.
* Test for unnamed package in index.
@@ -75,6 +75,8 @@
+ "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">"
+ "C</a></dt>\n"
+ "<dd> </dd>\n"
- + "</dl>");
+ + "</dl>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/Coin.html#Enum\">Enum</a>"
+ + "</span> - Search tag in pkg.Coin</dt>");
}
}
--- a/langtools/test/jdk/javadoc/doclet/testIndex/pkg/Coin.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testIndex/pkg/Coin.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 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
@@ -24,14 +24,13 @@
package pkg;
/**
- * This is a sample Enum.
- *
+ * This is a sample {@index Enum} Enum.
* @author Jamie Ho
*/
public enum Coin {
- Penny, Nickel, Dime;
+ Penny(1), Nickel(2), Dime(3);
-public Coin(int i) {}
+Coin(int i) {}
}
--- a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4732864 6280605 7064544 8014636 8016328 8025633
+ * @bug 4732864 6280605 7064544 8014636 8016328 8025633 8071982
* @summary Make sure that you can link from one member to another using
* non-qualified name, furthermore, ensure the right one is linked.
* @author jamieh
@@ -54,7 +54,8 @@
+ " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n"
+ " Qualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n"
+ " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n"
- + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(InnerC, InnerC2)</code></a>.<br/>");
+ + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(InnerC, InnerC2)</code></a>.<br/>\n"
+ + " Package Link: <a href=\"../pkg/package-summary.html\"><code>pkg</code></a>.<br/>");
checkOutput("pkg/C.InnerC.html", true,
"Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n"
--- a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testLinkTaglet/checkPkg/B.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 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
@@ -27,10 +27,8 @@
* @see A
*/
public class B {
-
- /**
+ /**
* @see A#m()
*/
- public void m2();
-
+ public void m2() {};
}
--- a/langtools/test/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
@@ -30,6 +30,9 @@
* Qualified Link: {@link #method(pkg.C.InnerC, pkg.C.InnerC2)}.<br/>
* Unqualified Link: {@link #method(C.InnerC, C.InnerC2)}.<br/>
* Unqualified Link: {@link #method(InnerC, InnerC2)}.<br/>
+ * Package Link: {@link pkg}.<br/>
+ *
+ *
*/
public class C {
--- a/langtools/test/jdk/javadoc/doclet/testNavigation/TestNavigation.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testNavigation/TestNavigation.java Wed Mar 23 21:44:24 2016 -0700
@@ -42,22 +42,25 @@
@Test
void test() {
- javadoc("-d", "out",
+ javadoc("-d", "out", "-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
checkOutput("pkg/A.html", true,
"<li>Prev Class</li>",
- "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next Class</span></a>");
+ "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next Class</span></a>",
+ "<li><a href=\"../overview-summary.html\">Overview</a></li>");
checkOutput("pkg/C.html", true,
"<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>",
- "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next Class</span></a>");
+ "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next Class</span></a>",
+ "<li><a href=\"../overview-summary.html\">Overview</a></li>");
checkOutput("pkg/E.html", true,
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>",
- "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next Class</span></a>");
+ "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next Class</span></a>",
+ "<li><a href=\"../overview-summary.html\">Overview</a></li>");
checkOutput("pkg/I.html", true,
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>",
@@ -66,7 +69,8 @@
"<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
+ "<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
- + "</a>");
+ + "</a>",
+ "<li><a href=\"../overview-summary.html\">Overview</a></li>");
// Remaining tests check for additional padding to offset the fixed navigation bar.
checkOutput("pkg/A.html", true,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testNavigation/overview.html Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+
+This document is generated from sample source code and HTML files
+with examples of a wide variety of Java language constructs: packages,
+subclasses, subinterfaces, nested classes, nested interfaces,
+inheriting from other packages, constructors, fields,
+methods, and so forth.
+
+</body>
+</html>
--- a/langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,8 +23,8 @@
/*
* @test
- * @bug 4749567
- * @summary Test the output for -header and -footer options.
+ * @bug 4749567 8071982
+ * @summary Test the output for -header, -footer, -nooverview, -nodeprecatedlist, -nonavbar, -notree, -stylesheetfile options.
* @author Bhavesh Patel
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -32,6 +32,8 @@
* @run main TestOptions
*/
+import java.io.File;
+
public class TestOptions extends JavadocTester {
public static void main(String... args) throws Exception {
@@ -40,8 +42,8 @@
}
@Test
- void test() {
- javadoc("-d", "out",
+ void testHeaderFooter() {
+ javadoc("-d", "out-1",
"-header", "Test header",
"-footer", "Test footer",
"-sourcepath", testSrc,
@@ -52,5 +54,163 @@
"<div class=\"aboutLanguage\">Test header</div>",
"<div class=\"aboutLanguage\">Test footer</div>");
}
+
+ @Test
+ void testNoOverview() {
+ javadoc("-d", "out-4",
+ "-nooverview",
+ "-sourcepath", testSrc,
+ "pkg", "deprecated");
+
+ checkExit(Exit.OK);
+
+ checkFiles(false, "overview-summary.html");
+ }
+
+ @Test
+ void testNoDeprecatedList() {
+ javadoc("-d", "out-5",
+ "-nodeprecatedlist",
+ "-sourcepath", testSrc,
+ "deprecated");
+ checkExit(Exit.OK);
+
+ checkFiles(false, "deprecated-list.html");
+ }
+
+ @Test
+ void testNoNavbar() {
+ javadoc("-d", "out-6",
+ "-nonavbar",
+ "-bottom", "Bottom text",
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/Foo.html", false, "navbar");
+ checkOutput("pkg/Foo.html", true, "Bottom text");
+ }
+
+ @Test
+ void testNoTree() {
+ javadoc("-d", "out-7",
+ "-notree",
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkFiles(false, "overview-tree.html");
+ checkFiles(false, "pkg/package-tree.html");
+ checkOutput("pkg/Foo.html", false, "<li><a href=\"package-tree.html\">Tree</a></li>");
+ }
+
+ @Test
+ void testStylesheetFile() {
+ javadoc("-d", "out-8",
+ "-stylesheetfile", new File(testSrc, "custom-stylesheet.css").getAbsolutePath(),
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkOutput("custom-stylesheet.css", true, "Custom javadoc style sheet");
+ checkOutput("pkg/Foo.html", true, "<link rel=\"stylesheet\" type=\"text/css\" "
+ + "href=\"../custom-stylesheet.css\" title=\"Style\">");
+ }
+
+ @Test
+ void testLinkSource() {
+ javadoc("-d", "out-9",
+ "-linksource",
+ "-javafx",
+ "-sourcepath", testSrc,
+ "-package",
+ "linksource");
+ checkExit(Exit.OK);
+
+ checkOutput("linksource/AnnotationTypeField.html", true,
+ "<pre>@Documented\npublic @interface <a href="
+ + "\"../src-html/linksource/AnnotationTypeField.html#line.31\">"
+ + "AnnotationTypeField</a></pre>",
+ "<h4>DEFAULT_NAME</h4>\n<pre>static final java.lang.String "
+ + "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">"
+ + "DEFAULT_NAME</a></pre>",
+ "<h4>name</h4>\n<pre>java.lang.String <a href="
+ + "\"../src-html/linksource/AnnotationTypeField.html#line.34\">name</a></pre>");
+
+ checkOutput("src-html/linksource/AnnotationTypeField.html", true,
+ "<title>Source code</title>",
+ "<span class=\"sourceLineNo\">031</span><a name=\"line.31\">"
+ + "@Documented public @interface AnnotationTypeField {</a>");
+
+ checkOutput("linksource/Properties.html", true,
+ "<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">"
+ + "Properties</a>",
+ "<pre>public java.lang.Object <a href="
+ + "\"../src-html/linksource/Properties.html#line.31\">someProperty</a></pre>",
+ "<pre>public java.lang.Object <a href="
+ + "\"../src-html/linksource/Properties.html#line.31\">someProperty</a>()</pre>");
+
+ checkOutput("src-html/linksource/Properties.html", true,
+ "<title>Source code</title>",
+ "<span class=\"sourceLineNo\">031</span><a name=\"line.31\"> "
+ + "public Object someProperty() {</a>");
+
+ checkOutput("linksource/SomeClass.html", true,
+ "<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">"
+ + "SomeClass</a>\nextends java.lang.Object</pre>",
+ "<pre>public int <a href=\"../src-html/linksource/SomeClass.html#line.31\">"
+ + "field</a></pre>",
+ "<pre>public <a href=\"../src-html/linksource/SomeClass.html#line.33\">"
+ + "SomeClass</a>()</pre>",
+ "<pre>public int <a href=\"../src-html/linksource/SomeClass.html#line.36\">"
+ + "method</a>()</pre>");
+
+ checkOutput("src-html/linksource/SomeClass.html", true,
+ "<title>Source code</title>",
+ "<span class=\"sourceLineNo\">029</span><a name=\"line.29\">"
+ + "public class SomeClass {</a>",
+ "<span class=\"sourceLineNo\">031</span><a name=\"line.31\"> "
+ + "public int field;</a>",
+ "<span class=\"sourceLineNo\">033</span><a name=\"line.33\"> "
+ + "public SomeClass() {</a>",
+ "<span class=\"sourceLineNo\">036</span><a name=\"line.36\"> "
+ + "public int method() {</a>");
+
+ checkOutput("linksource/SomeEnum.html", true,
+ "<pre>public static final <a href=\"../linksource/SomeEnum.html\" "
+ + "title=\"enum in linksource\">SomeEnum</a> <a href="
+ + "\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></pre>",
+ "<pre>public static final <a href=\"../linksource/SomeEnum.html\" "
+ + "title=\"enum in linksource\">SomeEnum</a> <a href="
+ + "\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></pre>");
+
+ checkOutput("src-html/linksource/SomeEnum.html", true,
+ "<span class=\"sourceLineNo\">029</span><a name=\"line.29\"> VALUE1,</a>",
+ "<span class=\"sourceLineNo\">030</span><a name=\"line.30\"> VALUE2</a>");
+ }
+
+ @Test
+ void testNoQualifier() {
+ javadoc("-d", "out-10",
+ "-noqualifier", "pkg",
+ "-sourcepath", testSrc,
+ "pkg", "deprecated");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/Foo.html", true,
+ "<li>Foo</li>");
+ checkOutput("deprecated/Foo.html", true,
+ "<li>deprecated.Foo</li>");
+
+ javadoc("-d", "out-10a",
+ "-noqualifier", "all",
+ "-sourcepath", testSrc,
+ "pkg", "deprecated");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/Foo.html", true,
+ "<li>Foo</li>");
+ checkOutput("deprecated/Foo.html", true,
+ "<li>Foo</li>");
+ }
}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/custom-stylesheet.css Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,751 @@
+/* Custom javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+ font-size:14px;
+ margin:0;
+ padding:0;
+ height:100%;
+ width:100%;
+}
+iframe {
+ margin:0;
+ padding:0;
+ height:100%;
+ width:100%;
+ overflow-y:scroll;
+ border:none;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color:#4A6782;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color:#bb7a2a;
+}
+a:active {
+ text-decoration:none;
+ color:#4A6782;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+a[name]:before, a[name]:target {
+ content:"";
+ display:block;
+ height:120px;
+ margin:-120px 0 0;
+}
+a[id]:before, a[id]:target {
+ padding-top:129px;
+ margin-top:-129px;
+ color:red;
+}
+pre {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+}
+h1 {
+ font-size:20px;
+}
+h2 {
+ font-size:18px;
+}
+h3 {
+ font-size:16px;
+ font-style:italic;
+}
+h4 {
+ font-size:13px;
+}
+h5 {
+ font-size:12px;
+}
+h6 {
+ font-size:11px;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+ margin-top:8px;
+ line-height:1.4em;
+}
+dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+}
+table tr td dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ vertical-align:top;
+ padding-top:4px;
+}
+sup {
+ font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:11px;
+ z-index:200;
+ margin-top:-9px;
+}
+.legalCopy {
+ margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+ color:#bb7a2a;
+}
+.tab {
+ background-color:#0066FF;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:11px;
+ margin:0;
+}
+.fixedNav {
+ position:fixed;
+ width:100%;
+ z-index:999;
+ background-color:#ffffff;
+}
+.topNav {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.bottomNav {
+ margin-top:10px;
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav {
+ background-color:#dee3e9;
+ float:left;
+ width:100%;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+ text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding: 5px 6px;
+ text-transform:uppercase;
+}
+ul.navListSearch {
+ float:right;
+ margin:0 0 0 0;
+ padding:0;
+}
+ul.navListSearch li {
+ list-style:none;
+ float:right;
+ padding: 5px 6px;
+ text-transform:uppercase;
+}
+ul.navListSearch li span {
+ position:relative;
+ right:-16px;
+}
+ul.subNavList li {
+ list-style:none;
+ float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+ text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color:#bb7a2a;
+ text-transform:uppercase;
+}
+.navBarCell1Rev {
+ background-color:#F8981D;
+ color:#253441;
+ margin: auto 5px;
+}
+.skipNav {
+ position:absolute;
+ top:auto;
+ left:-9999px;
+ overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexNav {
+ margin:10px;
+ position:relative;
+}
+.indexNav ul {
+ padding:0;
+ margin:0;
+}
+.indexNav ul li {
+ display:inline;
+ list-style-type:none;
+ padding-right:10px;
+}
+.indexNav h1 {
+ font-size:13px;
+}
+.title {
+ color:#2c4557;
+ margin:10px 0;
+ padding-top:5.4em;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 15px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+ background-color:#dee3e9;
+ border:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+ padding:0;
+ margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+ padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ clear:both;
+ padding:10px 20px;
+ position:relative;
+}
+.indexContainer {
+ margin:10px;
+ position:relative;
+ font-size:12px;
+}
+.indexContainer h2 {
+ font-size:13px;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+ padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:12px;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:5px 0 10px 0px;
+ font-size:14px;
+ font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+ margin-left:1px;
+ font-size:1.1em;
+ display:inline;
+ font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+ margin:0 0 0 1px;
+ font-size:1.1em;
+ display:inline;
+}
+/*
+List styles
+*/
+li.circle {
+ list-style:circle;
+}
+ul.horizontal li {
+ display:inline;
+ font-size:0.9em;
+}
+ul.inheritance {
+ margin:0;
+ padding:0;
+}
+ul.inheritance li {
+ display:inline;
+ list-style:none;
+}
+ul.inheritance li ul.inheritance {
+ margin-left:15px;
+ padding-left:15px;
+ padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+ margin:10px 0 10px 0;
+ padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+ list-style:none;
+ margin-bottom:15px;
+ line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #ededed;
+ background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+ padding:0 0 5px 8px;
+ background-color:#ffffff;
+ border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+ list-style:none;
+ border-bottom:none;
+ padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+ margin-top:0;
+ margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+ width:100%;
+ border-spacing:0;
+ border-left:1px solid #EEE;
+ border-right:1px solid #EEE;
+ border-bottom:1px solid #EEE;
+}
+.overviewSummary, .memberSummary {
+ padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#253441;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ padding-top:10px;
+ padding-left:1px;
+ margin:0px;
+ white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ padding-bottom:7px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ border: none;
+ height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ height:16px;
+}
+.memberSummary caption span.tableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#4D7A97;
+ height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+ padding-top:0px;
+ padding-left:0px;
+ padding-right:0px;
+ background-image:none;
+ float:none;
+ display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+ display:none;
+ width:5px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ background-color:#4D7A97;
+ float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+ text-align:left;
+ padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+ vertical-align:top;
+ padding-right:0px;
+ padding-top:8px;
+ padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+ white-space:nowrap;
+ font-size:13px;
+}
+td.colLast, th.colLast {
+ font-size:13px;
+}
+td.colOne, th.colOne {
+ font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+ width:25%;
+ vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+ font-weight:bold;
+}
+.tableSubHeadingColor {
+ background-color:#EEEEFF;
+}
+.altColor {
+ background-color:#FFFFFF;
+}
+.rowColor {
+ background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ font-style:normal;
+}
+
+div.block {
+ font-size:14px;
+ font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+ padding-top:0px;
+}
+
+
+td.colLast a {
+ padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:10px;
+}
+.block {
+ display:block;
+ margin:3px 10px 2px 0px;
+ color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink, .searchTagLink {
+ font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+ font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+ font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2 {
+ padding-bottom:0px;
+}
+/*
+IFRAME specific styles
+*/
+.mainContainer {
+ margin:0 auto;
+ padding:0;
+ height:100%;
+ width:100%;
+ position:fixed;
+ top:0;
+ left:0;
+}
+.leftContainer {
+ height:100%;
+ position:fixed;
+ width:320px;
+}
+.leftTop {
+ position:relative;
+ float:left;
+ width:315px;
+ top:0;
+ left:0;
+ height:30%;
+ border-right:6px solid #ccc;
+ border-bottom:6px solid #ccc;
+}
+.leftBottom {
+ position:relative;
+ float:left;
+ width:315px;
+ bottom:0;
+ left:0;
+ height:70%;
+ border-right:6px solid #ccc;
+ border-top:1px solid #000;
+}
+.rightContainer {
+ position:absolute;
+ left:320px;
+ top:0;
+ bottom:0;
+ height:100%;
+ right:0;
+ border-left:1px solid #000;
+}
+.rightIframe {
+ margin:0;
+ padding:0;
+ height:100%;
+ right:30px;
+ width:100%;
+ overflow:visible;
+ margin-bottom:30px;
+}
+/*
+HTML5 specific styles
+*/
+main, nav, header, footer, section {
+ display:block;
+}
+.ui-autocomplete-category {
+ font-weight:bold;
+ font-size:15px;
+ padding:7px 0 7px 3px;
+ background-color:#4D7A97;
+ color:#FFFFFF;
+}
+.resultItem {
+ font-size:13px;
+}
+.ui-autocomplete {
+ max-height:85%;
+ max-width:65%;
+ overflow-y:scroll;
+ overflow-x:scroll;
+ white-space:nowrap;
+ box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+}
+ul.ui-autocomplete {
+ position:fixed;
+ z-index:999999;
+}
+ul.ui-autocomplete li {
+ float:left;
+ clear:both;
+ width:100%;
+}
+.resultHighlight {
+ font-weight:bold;
+}
+#search {
+ background-image:url('resources/glass.png');
+ background-size:13px;
+ background-repeat:no-repeat;
+ background-position:2px 3px;
+ padding-left:20px;
+ position:relative;
+ right:-18px;
+}
+#reset {
+ background-color: rgb(255,255,255);
+ border:0 none;
+ width:16px;
+ height:17px;
+ position:relative;
+ left:-2px;
+ background-image:url('resources/x.png');
+ background-repeat:no-repeat;
+ background-size:12px;
+ background-position:center;
+}
+.watermark {
+ color:#888;
+}
+.searchTagDescResult {
+ font-style:italic;
+ font-size:11px;
+}
+.searchTagHolderResult {
+ font-style:italic;
+ font-size:12px;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/deprecated/Foo.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,30 @@
+/*
+ * 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 deprecated;
+
+import pkg.*;
+
+@Deprecated
+public class Foo {}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/help.html Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,242 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc (9-internal) on Mon Jan 04 22:47:26 MSK 2016 -->
+<title>API Help</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="date" content="2016-01-04">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
+<script type="text/javascript" src="jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="API Help";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "./";loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="pkg/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="pkg/package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+<div class="aboutLanguage">Test header</div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><span>SEARCH: </span>
+<input type="text" id="search" value=" " disabled="disabled">
+<input type="reset" id="reset" value=" " disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="header">
+<h1 class="title">How This API Document Is Organized (custom help file)</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames. All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="pkg/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="pkg/package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+<div class="aboutLanguage">Test footer</div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/linksource/AnnotationTypeField.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,35 @@
+/*
+ * 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 linksource;
+
+import java.lang.annotation.*;
+
+/**
+ * This is just a test for annotation type fields.
+ */
+@Documented public @interface AnnotationTypeField {
+ String DEFAULT_NAME = "test";
+
+ String name() default DEFAULT_NAME;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/linksource/Properties.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,34 @@
+/*
+ * 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 linksource;
+
+/**
+ * This is just a test for property writer.
+ */
+public class Properties {
+
+ public Object someProperty() {
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeClass.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,39 @@
+/*
+ * 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 linksource;
+
+/**
+ * This is just a test for constructor, field and method writers.
+ */
+public class SomeClass {
+
+ public int field;
+
+ public SomeClass() {
+ }
+
+ public int method() {
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/linksource/SomeEnum.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,31 @@
+/*
+ * 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 linksource;
+
+/**
+ * This is just a test for enum constant writers.
+ */
+public enum SomeEnum {
+ VALUE1,
+ VALUE2
+}
--- a/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSearch/TestSearch.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8141492
+ * @bug 8141492 8071982
* @summary Test the search feature of javadoc.
* @author bpatel
* @library ../lib
@@ -234,6 +234,12 @@
checkOutput("index-all.html", expectedOutput,
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg\">"
+ + "pkg</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg2.5\">"
+ + "pkg2.5</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#r\">"
+ + "r</a></span> - Search tag in pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
@@ -290,7 +296,14 @@
+ "SingleWord</a></span> - Search tag in pkg</dt>");
checkOutput("index-files/index-9.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#phrasewithspaces\">"
- + "phrase with spaces</a></span> - Search tag in pkg</dt>");
+ + "phrase with spaces</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#pkg\">"
+ + "pkg</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#pkg2.5\">"
+ + "pkg2.5</a></span> - Search tag in pkg</dt>");
+ checkOutput("index-files/index-11.html", true,
+ "<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#r\">"
+ + "r</a></span> - Search tag in pkg</dt>");
checkOutput("index-files/index-8.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html"
+ "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - "
@@ -309,6 +322,12 @@
checkOutput("index-all.html", false,
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg\">"
+ + "pkg</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg2.5\">"
+ + "pkg2.5</a></span> - Search tag in pkg</dt>",
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#r\">"
+ + "r</a></span> - Search tag in pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
--- a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSearch/pkg/AnotherClass.java Wed Mar 23 21:44:24 2016 -0700
@@ -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
@@ -72,7 +72,7 @@
* @param param some parameter.
* @return a test object.
*/
- public Class method(pkg1.RegClass param) {
+ public pkg1.RegClass method(pkg1.RegClass param) {
return param;
}
}
--- a/langtools/test/jdk/javadoc/doclet/testSearch/pkg/package-info.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSearch/pkg/package-info.java Wed Mar 23 21:44:24 2016 -0700
@@ -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
@@ -23,6 +23,9 @@
/**
* Test package. Testing search tag for package. Single {@index SingleWord} search tag.
- * Search {@index "phrase with spaces"}.
+ * Search tag 1 {@index "phrase with spaces"}.
+ * Search tag 2 {@index "pkg"}.
+ * Search tag 3 {@index "pkg2.5"}.
+ * Search tag 5 {@index "r"}.
*/
package pkg;
--- a/langtools/test/jdk/javadoc/doclet/testSearch/pkgfx/C.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSearch/pkgfx/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -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
@@ -60,24 +60,24 @@
public final void setRate(double value) {}
- public final double getRate() {}
+ public final double getRate() {return 0.0;}
- public final DoubleProperty rateProperty() {}
+ public final DoubleProperty rateProperty() {return null;}
private BooleanProperty paused;
public final void setPaused(boolean value) {}
- public final double isPaused() {}
+ public final double isPaused() {return 0.0;}
class DoubleProperty {}
class BooleanProperty {}
- public final BooleanProperty setTestMethodProperty() {}
+ public final BooleanProperty setTestMethodProperty() {return null;}
private class Inner {
- private BooleanProperty testMethodProperty() {}
+ private BooleanProperty testMethodProperty() {return null;}
/**
* Defines the direction/speed at which the {@code Timeline} is expected to
@@ -88,8 +88,8 @@
public final void setRate(double value) {}
- public final double getRate() {}
+ public final double getRate() {return 0.0;}
- public final DoubleProperty rateProperty() {}
+ public final DoubleProperty rateProperty() {return null;}
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testSerializedForm/ExternalizedForm.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+public class ExternalizedForm implements Externalizable {
+
+ /**
+ * @throws IOException when there is an I/O error.
+ */
+ public void writeExternal(ObjectOutput oo) throws IOException {}
+
+ /**
+ * @throws IOException when there is an I/O error.
+ * @throws ClassNotFoundException if no class found.
+ * @serialData This is a serial data comment.
+ */
+ public void readExternal(ObjectInput oi) throws IOException, ClassNotFoundException {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+
+public class SerializedForm implements Serializable {
+
+ /**
+ * @serialField name String a test
+ * @see TestSerializedForm
+ */
+ @Deprecated
+ private static final ObjectStreamField[] serialPersistentFields = {
+ new ObjectStreamField("i", int.class),
+ new ObjectStreamField("count", Integer.TYPE),
+ new ObjectStreamField("name", String.class)
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+
+ /**
+ * @param s ObjectInputStream.
+ * @throws IOException when there is an I/O error.
+ * @serial
+ */
+ private void readObject(ObjectInputStream s) throws IOException {}
+
+ /**
+ * @param s ObjectOutputStream.
+ * @throws IOException when there is an I/O error.
+ * @serial
+ */
+ private void writeObject(ObjectOutputStream s) throws IOException {}
+
+ /**
+ * @throws IOException when there is an I/O error.
+ * @serialData This is a serial data comment.
+ * @return an object.
+ */
+ protected Object readResolve() throws IOException {return null;}
+
+ /**
+ * @throws IOException when there is an I/O error.
+ * @serialData This is a serial data comment.
+ * @return an object.
+ */
+ protected Object writeReplace() throws IOException {return null;}
+
+ /**
+ * @throws IOException when there is an I/O error.
+ * @serialData This is a serial data comment.
+ * @return an object.
+ */
+ protected Object readObjectNoData() throws IOException {
+ return null;
+ }
+}
--- a/langtools/test/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4341304 4485668 4966728 8032066
+ * @bug 4341304 4485668 4966728 8032066 8071982
* @summary Test that methods readResolve and writeReplace show
* up in serialized-form.html the same way that readObject and writeObject do.
* If the doclet includes readResolve and writeReplace in the serialized-form
@@ -41,7 +41,7 @@
import java.io.*;
-public class TestSerializedForm extends JavadocTester implements Serializable {
+public class TestSerializedForm extends JavadocTester {
public static void main(String... args) throws Exception {
TestSerializedForm tester = new TestSerializedForm();
tester.runTests();
@@ -50,18 +50,23 @@
// tester.printSummary();
}
- @Test
+ // @ignore 8146022
+ // @Test
void testDefault() {
- javadoc("-d", "out-default",
+ javadoc("-d", "out-default", "-serialwarn", "-Xdoclint:none",
"-sourcepath", testSrc,
- testSrc("TestSerializedForm.java"), "pkg1");
+ testSrc("SerializedForm.java"), testSrc("ExternalizedForm.java"), "pkg1");
checkExit(Exit.OK);
checkOutput("serialized-form.html", true,
"protected java.lang.Object readResolve()",
"protected java.lang.Object writeReplace()",
"protected java.lang.Object readObjectNoData()",
- "See Also",
+ "<h3>Serialization Overview</h3>\n<ul class=\"blockList\">\n"
+ + "<li class=\"blockListLast\">\n<div class=\"block\">"
+ + "<span class=\"deprecatedLabel\">Deprecated.</span> </div>\n"
+ + "<dl>\n<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
+ + "<dd><code>TestSerializedForm</code></dd>\n</dl>",
"<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass "
+ "extends java.lang.Object implements Serializable</h3>",
"<h3>Class pkg1.PrivateIncludeInnerClass.PriInnerClass extends "
@@ -86,7 +91,7 @@
javadoc("-private",
"-d", "out-private",
"-sourcepath", testSrc,
- testSrc("TestSerializedForm.java"), "pkg1");
+ testSrc("SerializedForm.java"), testSrc("ExternalizedForm.java"), "pkg1");
checkExit(Exit.OK);
checkOutput("serialized-form.html", true,
@@ -109,53 +114,4 @@
+ "title=\"class in pkg1\">pkg1.PublicExcludeInnerClass.PubInnerClass</a> "
+ "extends java.lang.Object implements Serializable</h3>");
}
-
- /**
- * @serial
- * @see TestSerializedForm
- */
- public final int SERIALIZABLE_CONSTANT = 1;
-
- /**
- * The entry point of the test.
- * @param args the array of command line arguments.
- */
-
- /**
- * @param s ObjectInputStream.
- * @throws IOException when there is an I/O error.
- * @serial
- */
- private void readObject(ObjectInputStream s) throws IOException {}
-
- /**
- * @param s ObjectOutputStream.
- * @throws IOException when there is an I/O error.
- * @serial
- */
- private void writeObject(ObjectOutputStream s) throws IOException {}
-
- /**
- * @throws IOException when there is an I/O error.
- * @serialData This is a serial data comment.
- * @return an object.
- */
- protected Object readResolve() throws IOException {return null;}
-
- /**
- * @throws IOException when there is an I/O error.
- * @serialData This is a serial data comment.
- * @return an object.
- */
- protected Object writeReplace() throws IOException {return null;}
-
- /**
- * @throws IOException when there is an I/O error.
- * @serialData This is a serial data comment.
- * @return an object.
- */
- protected Object readObjectNoData() throws IOException {
- return null;
- }
-
}
--- a/langtools/test/jdk/javadoc/doclet/testSimpleTag/C.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSimpleTag/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -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
@@ -28,4 +28,10 @@
* @tag-with-hyphens a tag that contains hyphens.
*/
-public class C {}
+public class C {
+ /**
+ * @param arg this is an int argument.
+ */
+ public void m(int arg) {
+ }
+}
--- a/langtools/test/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testSimpleTag/TestSimpleTag.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4695326 4750173 4920381 8078320
+ * @bug 4695326 4750173 4920381 8078320 8071982
* @summary Test the declaration of simple tags using -tag. Verify that
* "-tag name" is a shortcut for "-tag name:a:Name:". Also verity that
* you can escape the ":" character with a back slash so that it is not
@@ -46,6 +46,7 @@
void test() {
javadoc("-d", "out",
"-sourcepath", testSrc,
+ "-tag", "param",
"-tag", "todo",
"-tag", "ejb\\:bean:a:EJB Beans:",
"-tag", "regular:a:Regular Tag:",
@@ -57,6 +58,8 @@
"<span class=\"simpleTagLabel\">Todo:</span>",
"<span class=\"simpleTagLabel\">EJB Beans:</span>",
"<span class=\"simpleTagLabel\">Regular Tag:</span>",
- "<span class=\"simpleTagLabel\">Tag-With-Hyphens:</span>");
+ "<span class=\"simpleTagLabel\">Tag-With-Hyphens:</span>",
+ "<dt><span class=\"paramLabel\">Parameters:</span></dt>\n"
+ + "<dd><code>arg</code> - this is an int argument.</dd>");
}
}
--- a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8005091 8009686 8025633 8026567 6469562
+ * @bug 8005091 8009686 8025633 8026567 6469562 8071982 8071984
* @summary Make sure that type annotations are displayed correctly
* @author Bhavesh Patel
* @library ../lib
@@ -355,5 +355,369 @@
checkOutput("typeannos/Generic2.html", true,
"<pre>void test2(<a href=\"../typeannos/RcvrA.html\" title=\""
+ "annotation in typeannos\">@RcvrA</a> Generic2<X> this)</pre>");
+
+
+ // Test for repeated type annotations (RepeatedAnnotations.java).
+ checkOutput("typeannos/RepeatingAtClassLevel.html", true,
+ "<pre><a href=\"../typeannos/RepTypeA.html\" title=\"annotation in "
+ + "typeannos\">@RepTypeA</a> <a href=\"../typeannos/RepTypeA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeA</a>\n<a href="
+ + "\"../typeannos/RepTypeB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeB</a> <a href=\"../typeannos/RepTypeB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeB</a>\nclass <span class="
+ + "\"typeNameLabel\">RepeatingAtClassLevel</span>\nextends "
+ + "java.lang.Object</pre>");
+
+// @ignore 8146008
+// checkOutput("typeannos/RepeatingAtClassLevel2.html", true,
+// "<pre><a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation "
+// + "in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html"
+// + "\" title=\"annotation in typeannos\">@RepTypeUseA</a>\n<a href="
+// + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos"
+// + "\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+// + "title=\"annotation in typeannos\">@RepTypeUseB</a>\nclass <span "
+// + "class=\"typeNameLabel\">RepeatingAtClassLevel2</span>\nextends "
+// + "java.lang.Object</pre>");
+//
+// checkOutput("typeannos/RepeatingAtClassLevel2.html", true,
+// "<pre><a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation"
+// + " in typeannos\">@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html"
+// + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
+// + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos"
+// + "\">@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html"
+// + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+// + "class <span class=\"typeNameLabel\">RepeatingAtClassLevel3</span>\n"
+// + "extends java.lang.Object</pre>");
+
+ checkOutput("typeannos/RepeatingOnConstructor.html", true,
+ "<pre><a href=\"../typeannos/RepConstructorA.html\" title=\"annotation "
+ + "in typeannos\">@RepConstructorA</a> <a href=\"../typeannos/RepConstructorA.html"
+ + "\" title=\"annotation in typeannos\">@RepConstructorA</a>\n<a href="
+ + "\"../typeannos/RepConstructorB.html\" title=\"annotation in typeannos"
+ + "\">@RepConstructorB</a> <a href=\"../typeannos/RepConstructorB.html"
+ + "\" title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ + "RepeatingOnConstructor()</pre>",
+
+ "<pre><a href=\"../typeannos/RepConstructorA.html\" title=\"annotation in typeannos"
+ + "\">@RepConstructorA</a> <a href=\"../typeannos/RepConstructorA.html"
+ + "\" title=\"annotation in typeannos\">@RepConstructorA</a>\n<a href="
+ + "\"../typeannos/RepConstructorB.html\" title=\"annotation in typeannos"
+ + "\">@RepConstructorB</a> <a href=\"../typeannos/RepConstructorB.html"
+ + "\" title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ + "RepeatingOnConstructor(int i,\n int j)</pre>",
+
+ "<pre><a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos"
+ + "\">@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ + "<a href=\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos"
+ + "\">@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ + "RepeatingOnConstructor(int i,\n int j,\n"
+ + " int k)</pre>",
+
+ "<pre>RepeatingOnConstructor(<a href=\"../typeannos/RepParameterA.html"
+ + "\" title=\"annotation in typeannos\">@RepParameterA</a> <a href="
+ + "\"../typeannos/RepParameterA.html\" title=\"annotation in typeannos"
+ + "\">@RepParameterA</a> <a href=\"../typeannos/RepParameterB.html"
+ + "\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos"
+ + "\">@RepParameterB</a>\n java.lang.String parameter,\n"
+ + " <a href=\"../typeannos/RepParameterA.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterA</a> <a href="
+ + "\"../typeannos/RepParameterA.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterA</a> <a href=\"../typeannos/RepParameterB.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterB</a> <a href="
+ + "\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterB</a>\n java.lang.String "
+ + "<a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)</pre>"
+ );
+
+ checkOutput("typeannos/RepeatingOnConstructor.Inner.html", true,
+ "<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnConstructor.Inner.html"
+ + "#Inner-java.lang.String-java.lang.String...-\">Inner</a></span>"
+ + "(java.lang.String parameter,\n java.lang.String <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)</code>",
+
+ "Inner(<a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> RepeatingOnConstructor this,\n <a href="
+ + "\"../typeannos/RepParameterA.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterA</a> <a href=\"../typeannos/RepParameterA.html\" title="
+ + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"../typeannos/RepParameterB.html"
+ + "\" title=\"annotation in typeannos\">@RepParameterB</a> <a href="
+ + "\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterB</a>\n java.lang.String parameter,\n"
+ + " <a href=\"../typeannos/RepParameterA.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterA</a> <a href=\"../typeannos/RepParameterA.html\" title="
+ + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"../typeannos/RepParameterB.html"
+ + "\" title=\"annotation in typeannos\">@RepParameterB</a> <a href="
+ + "\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterB</a>\n java.lang.String <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> ... vararg)");
+
+ checkOutput("typeannos/RepeatingOnField.html", true,
+ "<code>(package private) java.lang.Integer</code></td>\n<td class=\"colLast\">"
+ + "<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnField.html#i1"
+ + "\">i1</a></span></code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\""
+ + "../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code></td>\n"
+ + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href="
+ + "\"../typeannos/RepeatingOnField.html#i2\">i2</a></span></code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code>"
+ + "</td>\n<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"../typeannos/RepeatingOnField.html#i3\">i3</a></span></code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepAllContextsA.html\" title=\""
+ + "annotation in typeannos\">@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html\" title="
+ + "\"annotation in typeannos\">@RepAllContextsB</a> java.lang.Integer</code>"
+ + "</td>\n<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"../typeannos/RepeatingOnField.html#i4\">i4</a></span></code>",
+
+ "<code>(package private) java.lang.String <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> [] <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> []</code></td>\n<td class=\"colLast\"><code><span class="
+ + "\"memberNameLink\"><a href=\"../typeannos/RepeatingOnField.html#sa"
+ + "\">sa</a></span></code>",
+
+ "<pre><a href=\"../typeannos/RepFieldA.html\" title=\"annotation in typeannos\">"
+ + "@RepFieldA</a> <a href=\"../typeannos/RepFieldA.html\" title="
+ + "\"annotation in typeannos\">@RepFieldA</a>\n<a href=\"../typeannos/RepFieldB.html"
+ + "\" title=\"annotation in typeannos\">@RepFieldB</a> <a href="
+ + "\"../typeannos/RepFieldB.html\" title=\"annotation in typeannos\">"
+ + "@RepFieldB</a>\njava.lang.Integer i1</pre>",
+
+ "<pre><a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos"
+ + "\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer i2</pre>",
+
+ "<pre><a href=\"../typeannos/RepFieldA.html\" title=\"annotation in typeannos\">"
+ + "@RepFieldA</a> <a href=\"../typeannos/RepFieldA.html\" title="
+ + "\"annotation in typeannos\">@RepFieldA</a>\n<a href=\"../typeannos/RepFieldB.html"
+ + "\" title=\"annotation in typeannos\">@RepFieldB</a> <a href="
+ + "\"../typeannos/RepFieldB.html\" title=\"annotation in typeannos\">"
+ + "@RepFieldB</a>\n<a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer i3</pre>",
+
+ "<pre><a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ + "<a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html"
+ + "\" title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.Integer i4</pre>",
+
+ "<pre>java.lang.String <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> [] <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> [] sa</pre>");
+
+ checkOutput("typeannos/RepeatingOnMethod.html", true,
+ "<code>(package private) java.lang.String</code></td>\n<td class="
+ + "\"colLast\"><code><span class=\"memberNameLink\"><a href="
+ + "\"../typeannos/RepeatingOnMethod.html#test1--\">test1</a></span>()</code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ + "</td>\n<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"../typeannos/RepeatingOnMethod.html#test2--\">test2</a>"
+ + "</span>()</code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ + "</td>\n<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"../typeannos/RepeatingOnMethod.html#test3--\">test3</a>"
+ + "</span>()</code>",
+
+ "<code>(package private) <a href=\"../typeannos/RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
+ + "\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a> <a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> java.lang.String</code></td>\n<td class=\"colLast\">"
+ + "<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnMethod.html"
+ + "#test4--\">test4</a></span>()</code>",
+
+ "<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnMethod.html"
+ + "#test5-java.lang.String-java.lang.String...-\">test5</a></span>"
+ + "(java.lang.String parameter,\n java.lang.String <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)</code>",
+
+ "<a href=\"../typeannos/RepMethodA.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodA</a> <a href=\"../typeannos/RepMethodA.html\" title="
+ + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"../typeannos/RepMethodB.html\""
+ + " title=\"annotation in typeannos\">@RepMethodB</a> <a href="
+ + "\"../typeannos/RepMethodB.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodB</a>\njava.lang.String test1()",
+
+ "<a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String test2()",
+
+ "<a href=\"../typeannos/RepMethodA.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodA</a> <a href=\"../typeannos/RepMethodA.html\" title="
+ + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"../typeannos/RepMethodB.html\" "
+ + "title=\"annotation in typeannos\">@RepMethodB</a> <a href="
+ + "\"../typeannos/RepMethodB.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodB</a>\n<a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String test3()",
+
+ "<a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a>\n<a href="
+ + "\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
+ + "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String test4()",
+
+ "java.lang.String test5(<a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> RepeatingOnMethod "
+ + "this,\n <a href=\"../typeannos/RepParameterA.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterA</a> <a href="
+ + "\"../typeannos/RepParameterA.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterA</a> <a href=\"../typeannos/RepParameterB.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterB</a> <a href="
+ + "\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterB</a>\n java.lang.String parameter,\n"
+ + " <a href=\"../typeannos/RepParameterA.html\" title="
+ + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"../typeannos/RepParameterA.html\""
+ + " title=\"annotation in typeannos\">@RepParameterA</a> <a href="
+ + "\"../typeannos/RepParameterB.html\" title=\"annotation in typeannos\">"
+ + "@RepParameterB</a> <a href=\"../typeannos/RepParameterB.html\" title="
+ + "\"annotation in typeannos\">@RepParameterB</a>\n "
+ + "java.lang.String <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> ... vararg)");
+
+ checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true,
+ "<code>(package private) <T> java.lang.String</code></td>\n"
+ + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href="
+ + "\"../typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html#"
+ + "genericMethod-T-\">genericMethod</a></span>(T t)</code>",
+
+ "<code>(package private) <T> java.lang.String</code></td>\n"
+ + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href="
+ + "\"../typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html#"
+ + "genericMethod2-T-\">genericMethod2</a></span>(<a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> T t)</code>",
+
+ "<code>(package private) java.lang.String</code></td>\n<td class=\"colLast\"><code>"
+ + "<span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html#"
+ + "test--\">test</a></span>()</code>",
+
+ "java.lang.String test(<a href=\"../typeannos/RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod<<a href="
+ + "\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html"
+ + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> T> this)");
+
+ checkOutput("typeannos/RepeatingOnVoidMethodDeclaration.html", true,
+ "<a href=\"../typeannos/RepMethodA.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodA</a> <a href=\"../typeannos/RepMethodA.html\" title="
+ + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"../typeannos/RepMethodB.html"
+ + "\" title=\"annotation in typeannos\">@RepMethodB</a> <a href="
+ + "\"../typeannos/RepMethodB.html\" title=\"annotation in typeannos\">"
+ + "@RepMethodB</a>\nvoid test()");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/RepeatedAnnotations.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,346 @@
+/*
+ * 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 RepeatingA 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 typeannos;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/*
+ * This class is partially replicated from test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java; CombinationsTargetTest2.java; CombinationsTargetTest3.java
+ */
+@RepTypeA @RepTypeA @RepTypeB @RepTypeB class RepeatingAtClassLevel {
+}
+
+@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB class RepeatingAtClassLevel2 {
+}
+
+@RepAllContextsA @RepAllContextsA @RepAllContextsB @RepAllContextsB class RepeatingAtClassLevel3 {
+}
+
+class RepeatingOnConstructor {
+
+ @RepConstructorA @RepConstructorA @RepConstructorB @RepConstructorB
+ RepeatingOnConstructor() {
+ }
+
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB RepeatingOnConstructor(int i) {
+ }
+
+ @RepConstructorA @RepConstructorA @RepConstructorB @RepConstructorB
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB RepeatingOnConstructor(int i, int j) {
+ }
+
+ @RepAllContextsA @RepAllContextsA @RepAllContextsB @RepAllContextsB RepeatingOnConstructor(int i, int j, int k) {
+ }
+
+ RepeatingOnConstructor(@RepParameterA @RepParameterA @RepParameterB @RepParameterB String parameter, @RepParameterA @RepParameterA @RepParameterB @RepParameterB String @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB ... vararg) {
+ }
+
+ class Inner {
+ Inner(@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB RepeatingOnConstructor RepeatingOnConstructor.this, @RepParameterA @RepParameterA @RepParameterB @RepParameterB String parameter, @RepParameterA @RepParameterA @RepParameterB @RepParameterB String @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB ... vararg) {
+ }
+ }
+}
+
+class RepeatingOnField {
+ @RepFieldA @RepFieldA @RepFieldB @RepFieldB
+ Integer i1;
+
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB Integer i2;
+
+ @RepFieldA @RepFieldA @RepFieldB @RepFieldB
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB Integer i3;
+
+ @RepAllContextsA @RepAllContextsA @RepAllContextsB @RepAllContextsB Integer i4;
+
+ String @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB [] @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB [] sa = null;
+}
+
+class RepeatingOnMethod {
+
+ @RepMethodA @RepMethodA @RepMethodB @RepMethodB
+ String test1() {
+ return null;
+ }
+
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB String test2() {
+ return null;
+ }
+
+ @RepMethodA @RepMethodA @RepMethodB @RepMethodB
+ @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB String test3() {
+ return null;
+ }
+
+ @RepAllContextsA @RepAllContextsA @RepAllContextsB @RepAllContextsB String test4() {
+ return null;
+ }
+
+ String test5(@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB RepeatingOnMethod this, @RepParameterA @RepParameterA @RepParameterB @RepParameterB String parameter, @RepParameterA @RepParameterA @RepParameterB @RepParameterB String @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB ... vararg) {
+ return null;
+ }
+}
+
+class RepeatingOnTypeParametersBoundsTypeArgumentsOnClassDecl <@RepTypeParameterA @RepTypeParameterA @RepTypeParameterB @RepTypeParameterB T extends @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB Object> {
+
+ <T> String genericMethod(T t) {
+ return null;
+ }
+}
+
+class RepeatingOnTypeParametersBoundsTypeArgumentsOnClassDecl2 <@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB T extends @RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB Object> {
+
+ <T> String genericMethod(T t) {
+ return null;
+ }
+}
+
+class RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod <T extends Object> {
+
+ String test(@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod<@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB T> this) {
+ return null;
+ }
+
+ <@RepTypeParameterA @RepTypeParameterA @RepTypeParameterB @RepTypeParameterB T> String genericMethod(@RepParameterA @RepParameterA @RepParameterB @RepParameterB T t) {
+ return null;
+ }
+
+ <@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB T> String genericMethod2(@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB T t) {
+ return null;
+ }
+}
+
+class RepeatingOnVoidMethodDeclaration {
+
+ @RepMethodA @RepMethodA @RepMethodB @RepMethodB void test() {}
+}
+
+class RepeatingOnStaticMethodOfInterface {
+
+ interface I {
+ static @RepMethodA @RepMethodA @RepMethodB @RepMethodB String m() {
+ return null;
+ }
+ }
+}
+
+//------------------------------------------------------------------------------
+@Target({TYPE})
+@Repeatable(ContTypeA.class)
+@Documented
+@interface RepTypeA { }
+
+@Target({TYPE})
+@Documented
+@interface ContTypeA { RepTypeA[] value(); }
+
+@Target({TYPE})
+@Repeatable(ContTypeB.class)
+@Documented
+@interface RepTypeB { }
+
+@Target({TYPE})
+@Documented
+@interface ContTypeB { RepTypeB[] value(); }
+
+//------------------------------------------------------------------------------
+@Target({CONSTRUCTOR})
+@Repeatable(ContConstructorA.class)
+@Documented
+@interface RepConstructorA { }
+
+@Target({CONSTRUCTOR})
+@Documented
+@interface ContConstructorA { RepConstructorA[] value(); }
+
+@Target({CONSTRUCTOR})
+@Repeatable(ContConstructorB.class )
+@Documented
+@interface RepConstructorB { }
+
+@Target({CONSTRUCTOR})
+@Documented
+@interface ContConstructorB { RepConstructorB[] value(); }
+
+//------------------------------------------------------------------------------
+@Target({METHOD})
+@Repeatable(ContMethodA.class)
+@Documented
+@interface RepMethodA {}
+
+@Target({METHOD})
+@Documented
+@interface ContMethodA {
+ RepMethodA[] value();
+}
+
+@Target({METHOD})
+@Repeatable(ContMethodB.class)
+@Documented
+@interface RepMethodB {}
+
+@Target({METHOD})
+@Documented
+@interface ContMethodB {
+ RepMethodB[] value();
+}
+
+//------------------------------------------------------------------------------
+@Target({FIELD})
+@Repeatable(ContFieldA.class)
+@Documented
+@interface RepFieldA {}
+
+@Target({FIELD})
+@Documented
+@interface ContFieldA {
+ RepFieldA[] value();
+}
+
+@Target({FIELD})
+@Repeatable(ContFieldB.class)
+@Documented
+@interface RepFieldB {}
+
+@Target({FIELD})
+@Documented
+@interface ContFieldB {
+ RepFieldB[] value();
+}
+
+//------------------------------------------------------------------------------
+@Target({TYPE_USE})
+@Repeatable(ContTypeUseA.class)
+@Documented
+@interface RepTypeUseA {}
+
+@Target({TYPE_USE})
+@Documented
+@interface ContTypeUseA {
+ RepTypeUseA[] value();
+}
+
+@Target({TYPE_USE})
+@Repeatable(ContTypeUseB.class)
+@Documented
+@interface RepTypeUseB {}
+
+@Target({TYPE_USE})
+@Documented
+@interface ContTypeUseB {
+ RepTypeUseB[] value();
+}
+
+//------------------------------------------------------------------------------
+@Target({TYPE_PARAMETER})
+@Repeatable(ContTypeParameterA.class)
+@Documented
+@interface RepTypeParameterA {}
+
+@Target({TYPE_PARAMETER})
+@Documented
+@interface ContTypeParameterA {
+ RepTypeParameterA[] value();
+}
+
+@Target({TYPE_PARAMETER})
+@Repeatable(ContTypeParameterB.class)
+@Documented
+@interface RepTypeParameterB {}
+
+@Target({TYPE_PARAMETER})
+@Documented
+@interface ContTypeParameterB {
+ RepTypeParameterB[] value();
+}
+
+//------------------------------------------------------------------------------
+@Target({PARAMETER})
+@Repeatable(ContParameterA.class)
+@Documented
+@interface RepParameterA {}
+
+@Target({PARAMETER})
+@Documented
+@interface ContParameterA {
+ RepParameterA[] value();
+}
+
+@Target({PARAMETER})
+@Repeatable(ContParameterB.class)
+@Documented
+@interface RepParameterB {}
+
+@Target({PARAMETER})
+@Documented
+@interface ContParameterB {
+ RepParameterB[] value();
+}
+
+
+//------------------------------------------------------------------------------
+@Target({PACKAGE})
+@Repeatable(ContPackageA.class)
+@Documented
+@interface RepPackageA {}
+
+@Target({PACKAGE})
+@Documented
+@interface ContPackageA {
+ RepPackageA[] value();
+}
+
+@Target({PACKAGE})
+@Repeatable(ContPackageB.class)
+@Documented
+@interface RepPackageB {}
+
+@Target({PACKAGE})
+@Documented
+@interface ContPackageB {
+ RepPackageB[] value();
+}
+
+//------------------------------------------------------------------------------
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, PACKAGE, TYPE_PARAMETER, TYPE_USE})
+@Repeatable(ContAllContextsA.class)
+@Documented
+@interface RepAllContextsA {}
+
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, PACKAGE, TYPE_PARAMETER, TYPE_USE})
+@Documented
+@interface ContAllContextsA {
+ RepAllContextsA[] value();
+}
+
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, PACKAGE, TYPE_PARAMETER, TYPE_USE})
+@Repeatable(ContAllContextsB.class)
+@Documented
+@interface RepAllContextsB {}
+
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, PACKAGE, TYPE_PARAMETER, TYPE_USE})
+@Documented
+@interface ContAllContextsB {
+ RepAllContextsB[] value();
+}
--- a/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java Wed Mar 23 21:44:24 2016 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854
+ * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982
* @summary A simple test to ensure class-use files are correct.
* @author jamieh
* @library ../lib
@@ -121,6 +121,21 @@
"<a href=\"../../pkg1/C10.html#withTypeParametersOfType-java.lang.Class-\">" +
"withTypeParametersOfType</a>"
);
+ checkOutput("pkg1/class-use/UsedInterface.html", true,
+ "Subinterfaces of <a href=\"../../pkg1/UsedInterface.html\" title=\"interface in pkg1\">"
+ + "UsedInterface</a> in <a href=\"../../pkg1/package-summary.html\">pkg1",
+ "<td class=\"colFirst\"><code>interface </code></td>\n<td class=\"colLast\">"
+ + "<code><span class=\"memberNameLink\"><a href=\"../../pkg1/SubInterface.html\" "
+ + "title=\"interface in pkg1\">SubInterface</a><T></span></code> </td>"
+ );
+ checkOutput("pkg1/class-use/UsedThrowable.html", true,
+ "Methods in <a href=\"../../pkg1/package-summary.html\">pkg1</a> that throw "
+ + "<a href=\"../../pkg1/UsedThrowable.html\" title=\"class in pkg1\">UsedThrowable</a>",
+ "<td class=\"colFirst\"><code>void</code></td>\n<td class=\"colLast\"><span class="
+ + "\"typeNameLabel\">C1.</span><code><span class=\"memberNameLink\">"
+ + "<a href=\"../../pkg1/C1.html#methodInC1ThrowsThrowable--\">methodInC1ThrowsThrowable"
+ + "</a></span>()</code> </td>"
+ );
}
@Test
@@ -128,7 +143,7 @@
javadoc("-d", "out-2",
"-sourcepath", testSrc,
"-use",
- testSrc("C.java"), testSrc("UsedInC.java"));
+ testSrc("C.java"), testSrc("UsedInC.java"), "pkg3");
checkExit(Exit.OK);
checkOutput("class-use/UsedInC.html", true,
@@ -140,7 +155,9 @@
);
checkOutput("package-use.html", true,
"<td class=\"colOne\">"
- + "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a> </td>"
+ + "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a> </td>",
+ "<td class=\"colFirst\"><a href=\"#-Unnamed-\"><Unnamed></a></td>\n"
+ + "<td class=\"colLast\"> </td>"
);
}
--- a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C1.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C1.java Wed Mar 23 21:44:24 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, 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
@@ -47,10 +47,13 @@
return null;
}
+ public void methodInC1ThrowsThrowable() throws UsedThrowable {
+ }
+
/*
* this must not appear anywhere.
*/
UsedClass methodInC1Protected(List<UsedClass> p){
- return p;
+ return p.get(0);
}
}
--- a/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C9.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/C9.java Wed Mar 23 21:44:24 2016 -0700
@@ -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
@@ -28,5 +28,10 @@
*
*/
public class C9 implements UsedInterface, UsedInterfaceA {
+ @Override
public void doNothing(){}
+
+ @Override
+ public void doNothingA() {
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/SubInterface.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+/**
+ * An interface
+ *
+ */
+
+package pkg1;
+
+public interface SubInterface<T> extends UsedInterface {
+
+ /**
+ * Does nothing
+ */
+ void doNothingS();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/pkg1/UsedThrowable.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,27 @@
+/*
+ * 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 pkg1;
+
+public class UsedThrowable extends Throwable {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/pkg3/C.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,26 @@
+/*
+ * 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 pkg3;
+
+public class C {}
--- a/langtools/test/jdk/javadoc/tool/VerifyLocale.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/javadoc/tool/VerifyLocale.java Wed Mar 23 21:44:24 2016 -0700
@@ -26,6 +26,7 @@
* @bug 8035473
* @summary Verify that init method works correctly.
* @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @ignore 8149565
*/
import java.util.Collections;
@@ -40,6 +41,10 @@
import jdk.javadoc.doclet.DocletEnvironment;
public class VerifyLocale implements Doclet {
+ static String language;
+ static String country;
+ static String variant;
+
Locale locale;
Reporter reporter;
@@ -48,20 +53,29 @@
new java.io.File(System.getProperty("test.src", "."),
"VerifyLocale.java");
- String[] argarray = {
- // jumble the options in some weird order
- "-doclet", "VerifyLocale",
- "-locale", "ja",
- "-docletpath", System.getProperty("test.classes", "."),
- thisFile
- };
- if (jdk.javadoc.internal.tool.Main.execute(argarray) != 0)
- throw new Error("Javadoc encountered warnings or errors.");
+ for (Locale loc : Locale.getAvailableLocales()) {
+ language = loc.getLanguage();
+ country = loc.getCountry();
+ variant = loc.getVariant();
+ if (!language.equals("")) {
+ String[] command_line = {
+ // jumble the options in some weird order
+ "-doclet", "VerifyLocale",
+ "-locale", language + (country.equals("") ? "" : ("_" + country + (variant.equals("") ? "" : "_" + variant))),
+ "-docletpath", System.getProperty("test.classes", "."),
+ thisFile
+ };
+ if (jdk.javadoc.internal.tool.Main.execute(command_line) != 0)
+ throw new Error("Javadoc encountered warnings or errors.");
+ }
+ }
}
public boolean run(DocletEnvironment root) {
reporter.print(Kind.NOTE, "just a test: Locale is: " + locale.getDisplayName());
- return locale.getDisplayName(Locale.ENGLISH).contains("Japan");
+ return language.equals(locale.getLanguage())
+ && country.equals(locale.getCountry())
+ && variant.equals(locale.getVariant());
}
@Override
--- a/langtools/test/jdk/jshell/ReplToolTesting.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/jshell/ReplToolTesting.java Wed Mar 23 21:44:24 2016 -0700
@@ -33,6 +33,9 @@
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.prefs.AbstractPreferences;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -41,6 +44,8 @@
import jdk.internal.jshell.tool.JShellTool;
import jdk.jshell.SourceCodeAnalysis.Suggestion;
+import org.testng.annotations.BeforeMethod;
+
import static java.util.stream.Collectors.toList;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
@@ -83,6 +88,7 @@
private Map<String, ClassInfo> classes;
private Map<String, ImportInfo> imports;
private boolean isDefaultStartUp = true;
+ private Preferences prefs;
public JShellTool repl = null;
@@ -219,6 +225,11 @@
}
}
+ @BeforeMethod
+ public void setUp() {
+ prefs = new MemoryPreferences();
+ }
+
public void testRaw(String[] args, ReplTest... tests) {
cmdin = new WaitingTestingInputStream();
cmdout = new ByteArrayOutputStream();
@@ -234,7 +245,8 @@
new PrintStream(console),
userin,
new PrintStream(userout),
- new PrintStream(usererr));
+ new PrintStream(usererr),
+ prefs);
repl.testPrompt = true;
try {
repl.start(args);
@@ -447,7 +459,7 @@
private List<String> computeCompletions(String code, boolean isSmart) {
JShellTool js = this.repl != null ? this.repl
- : new JShellTool(null, null, null, null, null, null, null);
+ : new JShellTool(null, null, null, null, null, null, null, prefs);
int cursor = code.indexOf('|');
code = code.replace("|", "");
assertTrue(cursor > -1, "'|' not found: " + code);
@@ -762,4 +774,62 @@
}
}
}
+
+ public static final class MemoryPreferences extends AbstractPreferences {
+
+ private final Map<String, String> values = new HashMap<>();
+ private final Map<String, MemoryPreferences> nodes = new HashMap<>();
+
+ public MemoryPreferences() {
+ this(null, "");
+ }
+
+ public MemoryPreferences(MemoryPreferences parent, String name) {
+ super(parent, name);
+ }
+
+ @Override
+ protected void putSpi(String key, String value) {
+ values.put(key, value);
+ }
+
+ @Override
+ protected String getSpi(String key) {
+ return values.get(key);
+ }
+
+ @Override
+ protected void removeSpi(String key) {
+ values.remove(key);
+ }
+
+ @Override
+ protected void removeNodeSpi() throws BackingStoreException {
+ ((MemoryPreferences) parent()).nodes.remove(name());
+ }
+
+ @Override
+ protected String[] keysSpi() throws BackingStoreException {
+ return values.keySet().toArray(new String[0]);
+ }
+
+ @Override
+ protected String[] childrenNamesSpi() throws BackingStoreException {
+ return nodes.keySet().toArray(new String[0]);
+ }
+
+ @Override
+ protected AbstractPreferences childSpi(String name) {
+ return nodes.computeIfAbsent(name, n -> new MemoryPreferences(this, name));
+ }
+
+ @Override
+ protected void syncSpi() throws BackingStoreException {
+ }
+
+ @Override
+ protected void flushSpi() throws BackingStoreException {
+ }
+
+ }
}
--- a/langtools/test/jdk/jshell/StartOptionTest.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/jdk/jshell/StartOptionTest.java Wed Mar 23 21:44:24 2016 -0700
@@ -54,7 +54,8 @@
private ByteArrayOutputStream err;
private JShellTool getShellTool() {
- return new JShellTool(null, new PrintStream(out), new PrintStream(err), null, null, null, null);
+ return new JShellTool(null, new PrintStream(out), new PrintStream(err), null, null, null,
+ null, new ReplToolTesting.MemoryPreferences());
}
private String getOutput() {
--- a/langtools/test/tools/javac/completionDeps/DepsAndAnno.java Wed Mar 23 19:33:45 2016 -0700
+++ b/langtools/test/tools/javac/completionDeps/DepsAndAnno.java Wed Mar 23 21:44:24 2016 -0700
@@ -26,6 +26,10 @@
* @bug 8078600
* @summary Make sure -XDcompletionDeps does not cause an infinite loop.
* @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
+ * jdk.jdeps/com.sun.tools.javap
* @build ToolBox
* @run main/othervm/timeout=10 DepsAndAnno
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/CantAssignToThis.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,30 @@
+/*
+ * 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.cant.assign.val.to.this
+
+class CantAssignToThis {
+ void m() {
+ this = null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/inference/8152411/T8152411.java Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,18 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8152411
+ * @summary Regression: nested unchecked call does not trigger erasure of return type
+ *
+ * @compile/fail/ref=T8152411.out -XDrawDiagnostics T8152411.java
+ */
+import java.util.List;
+
+class T8152411 {
+ <A2 extends A, A> A m(List<? super A2> a2) { return null; }
+ <B> B g(B b) { return null; }
+
+ void test() {
+ List<Integer> I = null;
+ String s = g(m(I));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/inference/8152411/T8152411.out Wed Mar 23 21:44:24 2016 -0700
@@ -0,0 +1,2 @@
+T8152411.java:16:29: compiler.err.prob.found.req: (compiler.misc.incompatible.upper.bounds: A2, java.lang.String,B,java.lang.Object,java.lang.Integer,A)
+1 error