# HG changeset patch # User ksrini # Date 1502828192 25200 # Node ID f1325703ea859308c0ce16a89bb0abe372644ced # Parent 5091e36e106b47797702ec63d4cffc655c376d8a 8173425: Javadoc needs a new tag to specify the summary. Reviewed-by: jjg diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java Tue Aug 08 23:00:45 2017 +0000 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java Tue Aug 15 13:16:32 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, 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 @@ -205,6 +205,12 @@ START_ELEMENT, /** + * Used for instances of {@link SummaryTree} + * representing the summary of a comment description. + */ + SUMMARY("summary"), + + /** * Used for instances of {@link TextTree} * representing some documentation text. */ diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java Tue Aug 08 23:00:45 2017 +0000 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java Tue Aug 15 13:16:32 2017 -0700 @@ -257,6 +257,19 @@ R visitStartElement(StartElementTree node, P p); /** + * Visits a SummaryTree node. + * + * @implSpec Visits a {@code SummaryTree} node + * by calling {@code visitOther(node, p)}. + * + * @param node the node being visited + * @param p a parameter value + * @return a result value + * @since 10 + */ + default R visitSummary(SummaryTree node, P p) { return visitOther(node, p);} + + /** * Visits a TextTree node. * @param node the node being visited * @param p a parameter value diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/SummaryTree.java Tue Aug 15 13:16:32 2017 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.source.doctree; + +import java.util.List; + +/** + * A tree node for an @summary inline tag. + * + *
+ * {@summary text}
+ *
+ * @since 10
+ */
+public interface SummaryTree extends InlineTagTree {
+ /**
+ * Returns the summary or the first line of a comment.
+ * @return the summary text
+ */
+ List extends DocTree> getSummary();
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@
import com.sun.source.doctree.SerialTree;
import com.sun.source.doctree.SinceTree;
import com.sun.source.doctree.StartElementTree;
+import com.sun.source.doctree.SummaryTree;
import com.sun.source.doctree.TextTree;
import com.sun.source.doctree.ThrowsTree;
import com.sun.source.doctree.UnknownBlockTagTree;
@@ -288,6 +289,19 @@
StartElementTree newStartElementTree(Name name, List extends DocTree> attrs, boolean selfClosing);
/**
+ * Create a new {@code SummaryTree} object, to represent a {@code @summary } tag.
+ *
+ * @implSpec This implementation throws {@code UnsupportedOperationException}.
+ *
+ * @param summary the content of the tag
+ * @return a {@code SummaryTree} object
+ * @since 10
+ */
+ default SummaryTree newSummaryTree(List extends DocTree> summary) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ /**
* Create a new {@code TextTree} object, to represent some plain text.
* @param text the text
* @return a {@code TextTree} object
diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -438,6 +438,20 @@
}
/**
+ * {@inheritDoc} This implementation scans the children in left to right order.
+ *
+ * @param node {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of scanning
+ * @since 10
+ */
+ @Override
+ public R visitSummary(SummaryTree node, P p) {
+ R r = scan(node.getSummary(), p);
+ return r;
+ }
+
+ /**
* {@inheritDoc} This implementation returns {@code null}.
*
* @param node {@inheritDoc}
diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -401,6 +401,19 @@
* @param node {@inheritDoc}
* @param p {@inheritDoc}
* @return the result of {@code defaultAction}
+ * @since 10
+ */
+ @Override
+ public R visitSummary(SummaryTree node, P p) {
+ return defaultAction(node, p);
+ }
+
+ /**
+ * {@inheritDoc} This implementation calls {@code defaultAction}.
+ *
+ * @param node {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of {@code defaultAction}
*/
@Override
public R visitText(TextTree node, P p) {
diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Tue Aug 15 13:16:32 2017 -0700
@@ -70,6 +70,7 @@
import com.sun.source.doctree.SerialFieldTree;
import com.sun.source.doctree.SinceTree;
import com.sun.source.doctree.StartElementTree;
+import com.sun.source.doctree.SummaryTree;
import com.sun.source.doctree.TextTree;
import com.sun.source.doctree.ThrowsTree;
import com.sun.source.doctree.UnknownBlockTagTree;
@@ -107,6 +108,7 @@
Map This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+
+public class SummaryTaglet extends BaseInlineTaglet {
+
+ public SummaryTaglet() {
+ name = SUMMARY.tagName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getTagletOutput(Element holder, DocTree tag, TagletWriter writer) {
+ return writer.commentTagsToOutput(holder, ((SummaryTree)tag).getSummary());
+ }
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java Tue Aug 15 13:16:32 2017 -0700
@@ -726,6 +726,7 @@
addStandardTaglet(new LiteralTaglet());
addStandardTaglet(new CodeTaglet());
addStandardTaglet(new IndexTaglet());
+ addStandardTaglet(new SummaryTaglet());
// Keep track of the names of standard tags for error
// checking purposes. The following are not handled above.
diff -r 5091e36e106b -r f1325703ea85 langtools/test/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java Tue Aug 15 13:16:32 2017 -0700
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8173425
+ * @summary tests for the summary tag behavior
+ * @library ../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build JavadocTester
+ * @run main TestSummaryTag
+ */
+
+public class TestSummaryTag extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestSummaryTag tester = new TestSummaryTag();
+ tester.runTests();
+ }
+
+ @Test
+ void test1() {
+ javadoc("-d", "out1",
+ "-sourcepath", testSrc,
+ "p1");
+ checkExit(Exit.OK);
+
+ checkOutput("index-all.html", true,
+ " {@summary First sentence } Note the trailing whitespace.
+ */
+ public void m1() {}
+
+ /**
+ * {@summary Some html <foo> codes} Second sentence
+ */
+ public void m2() {}
+
+ /**
+ * {@summary First sentence } some text {@summary maybe second sentence}.
+ */
+ public void m3() {}
+
+ /**
+ * {@summary First sentence i.e. the first sentence} the second sentence.
+ */
+ public void m4() {}
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/B.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/B.java Tue Aug 15 13:16:32 2017 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 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 p1;
+
+public class B extends A {
+ /**
+ * {@inheritDoc} Third sentence. Fourth sentence.
+ */
+ public void m() {}
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/package.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testSummaryTag/p1/package.html Tue Aug 15 13:16:32 2017 -0700
@@ -0,0 +1,6 @@
+
+ {@summary illegal} **/
+ public void m1() {}
+
+ /** {@summary legal} text {@summary illegal} **/
+ public void m2() {}
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/test/tools/doclint/SummaryTest.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/SummaryTest.out Tue Aug 15 13:16:32 2017 -0700
@@ -0,0 +1,7 @@
+SummaryTest.java:14: warning: invalid use of @summary
+ /** {@summary illegal} **/
+ ^
+SummaryTest.java:17: warning: invalid use of @summary
+ /** {@summary legal} text {@summary illegal} **/
+ ^
+2 warnings
diff -r 5091e36e106b -r f1325703ea85 langtools/test/tools/javac/completionDeps/DepsAndDocLint.java
--- a/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8078389
* @summary Make sure there is no interference between completionDeps and doclint
diff -r 5091e36e106b -r f1325703ea85 langtools/test/tools/javac/doctree/DocCommentTester.java
--- a/langtools/test/tools/javac/doctree/DocCommentTester.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/test/tools/javac/doctree/DocCommentTester.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -588,6 +588,17 @@
return null;
}
+ @Override
+ public Void visitSummary(SummaryTree node, Void p) {
+ header(node);
+ indent(+1);
+ print("summary", node.getSummary());
+ indent(-1);
+ indent();
+ out.println("]");
+ return null;
+ }
+
public Void visitText(TextTree node, Void p) {
header(node, compress(node.getBody()));
return null;
diff -r 5091e36e106b -r f1325703ea85 langtools/test/tools/javac/doctree/SummaryTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/doctree/SummaryTest.java Tue Aug 15 13:16:32 2017 -0700
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8173425
+ * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.file
+ * jdk.compiler/com.sun.tools.javac.tree
+ * jdk.compiler/com.sun.tools.javac.util
+ * @build DocCommentTester
+ * @run main DocCommentTester SummaryTest.java
+ */
+
+class SummaryTest {
+ /**
+ * {@summary} abc.
+ */
+ void empty() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 1
+ Summary[SUMMARY, pos:1
+ summary: empty
+ ]
+ body: 1
+ Text[TEXT, pos:11, _abc.]
+ block tags: empty
+]
+*/
+ /**
+ * {@summary abc} def.
+ */
+ void simple() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 1
+ Summary[SUMMARY, pos:1
+ summary: 1
+ Text[TEXT, pos:11, abc]
+ ]
+ body: 1
+ Text[TEXT, pos:15, _def.]
+ block tags: empty
+]
+*/
+
+ /**
+ * {@summary abc} def
+ */
+ void leading_space() { }
+/*
+DocComment[DOC_COMMENT, pos:4
+ firstSentence: 1
+ Summary[SUMMARY, pos:4
+ summary: 1
+ Text[TEXT, pos:14, abc]
+ ]
+ body: 1
+ Text[TEXT, pos:18, _def]
+ block tags: empty
+]
+*/
+
+ /**
+ * {@summary abc} def
+ */
+ void leading_html() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 3
+ StartElement[START_ELEMENT, pos:1
+ name:p
+ attributes: empty
+ ]
+ Text[TEXT, pos:4, _]
+ Summary[SUMMARY, pos:5
+ summary: 1
+ Text[TEXT, pos:15, abc]
+ ]
+ body: 1
+ Text[TEXT, pos:19, _def]
+ block tags: empty
+]
+*/
+
+ /**
+ * abc {@summary def} ghi
+ */
+ void leading_text() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 2
+ Text[TEXT, pos:1, abc_]
+ Summary[SUMMARY, pos:5
+ summary: 1
+ Text[TEXT, pos:15, def]
+ ]
+ body: 1
+ Text[TEXT, pos:19, _ghi]
+ block tags: empty
+]
+*/
+
+ /**
+ * abc. {@summary def} ghi
+ */
+ void leading_text_with_break() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 1
+ Text[TEXT, pos:1, abc.]
+ body: 2
+ Summary[SUMMARY, pos:6
+ summary: 1
+ Text[TEXT, pos:16, def]
+ ]
+ Text[TEXT, pos:20, _ghi]
+ block tags: empty
+]
+*/
+
+ /**
+ * {@summary def} ghi
+ */
+ void trailing_html() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 1
+ Summary[SUMMARY, pos:1
+ summary: 1
+ Text[TEXT, pos:11, def]
+ ]
+ body: 3
+ Text[TEXT, pos:15, _]
+ StartElement[START_ELEMENT, pos:16
+ name:p
+ attributes: empty
+ ]
+ Text[TEXT, pos:19, _ghi]
+ block tags: empty
+]
+*/
+
+ /**
+ * {@summary abc <def> ghi} jkl
+ */
+ void with_html() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+ firstSentence: 1
+ Summary[SUMMARY, pos:1
+ summary: 5
+ Text[TEXT, pos:11, abc_]
+ Entity[ENTITY, pos:15, lt]
+ Text[TEXT, pos:19, def]
+ Entity[ENTITY, pos:22, gt]
+ Text[TEXT, pos:26, _ghi]
+ ]
+ body: 1
+ Text[TEXT, pos:31, _jkl]
+ block tags: empty
+]
+*/
+}
diff -r 5091e36e106b -r f1325703ea85 langtools/test/tools/javac/lib/DPrinter.java
--- a/langtools/test/tools/javac/lib/DPrinter.java Tue Aug 08 23:00:45 2017 +0000
+++ b/langtools/test/tools/javac/lib/DPrinter.java Tue Aug 15 13:16:32 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -1136,6 +1136,12 @@
return visitBlockTag(node, null);
}
+ public Void visitSummary(SummaryTree node, Void p) {
+ printString("name", node.getTagName());
+ printList("summary", node.getSummary());
+ return visitInlineTag(node, null);
+ }
+
public Void visitText(TextTree node, Void p) {
printLimitedEscapedString("body", node.getBody());
return visitTree(node, null);
\n"
+ + "
\n",
+ "m3
\n"
+ + "public void m3()
\n"
+ + "