Mercurial > hg > openjdk > jdk8u > langtools
changeset 2678:79177246b3db jdk8u40-b22
Merge
author | asaha |
---|---|
date | Fri, 16 Jan 2015 13:51:52 -0800 |
parents | ec98b7342a52 (current diff) a5eb8f677bd4 (diff) |
children | 39c9e6e984d0 fb294b49373b d8ce0450b95d |
files | |
diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/source/doctree/package-info.java Thu Jan 15 11:21:55 2015 -0800 +++ b/src/share/classes/com/sun/source/doctree/package-info.java Fri Jan 16 13:51:52 2015 -0800 @@ -29,7 +29,7 @@ * * @author Jonathan Gibbons * @since 1.8 - * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> + * @see <a href="https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> */ @jdk.Exported package com.sun.source.doctree;
--- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Thu Jan 15 11:21:55 2015 -0800 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Fri Jan 16 13:51:52 2015 -0800 @@ -29,7 +29,7 @@ /** * See JVMS 4.7.21 - * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 + * https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Thu Jan 15 11:21:55 2015 -0800 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Fri Jan 16 13:51:52 2015 -0800 @@ -1039,7 +1039,7 @@ } /** - * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> + * @see <a href="https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> */ private void initTagParsers() { TagParser[] parsers = {
--- a/src/share/classes/com/sun/tools/javac/util/Convert.java Thu Jan 15 11:21:55 2015 -0800 +++ b/src/share/classes/com/sun/tools/javac/util/Convert.java Fri Jan 16 13:51:52 2015 -0800 @@ -36,9 +36,9 @@ * <p> * See also: * <ul> - * <li><a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> + * <li><a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> * JVMS 4.4.7 </a></li> - * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> + * <li><a href="https://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> java.io.DataInput: Modified UTF-8 </a></li> <li><a href="https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"> Modified UTF-8 (wikipedia) </a></li>
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Thu Jan 15 11:21:55 2015 -0800 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Fri Jan 16 13:51:52 2015 -0800 @@ -60,21 +60,21 @@ }; private static final String[][] NEGATED_TEST1 = { {BUG_ID + FS + "pkg1" + FS + "C1.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" }, {BUG_ID + FS + "pkg1" + FS + "C1.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" }, {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" }, {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" } }; private static final String[][] TEST2 = { {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" + "Refer <a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL + @@ -85,7 +85,7 @@ " <a href=\"../pkg1/C1.html\">Link 2</a>." }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + " Test document 1</a>" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", @@ -100,13 +100,13 @@ "<a href=\"../../technotes/guides/index.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", "<a href=\"../../technotes/guides/index.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" } }; private static final String[] ARGS1 = @@ -115,7 +115,7 @@ }; private static final String[] ARGS2 = new String[]{ - "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" + "-d", BUG_ID + "-1", "-Xdocrootparent", "https://docs.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" }; /**