Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Mon, 19 Jan 2015 12:36:43 -0800
- author
- asaha
- date
- Mon, 19 Jan 2015 12:36:43 -0800
- changeset 2756
- d8ce0450b95d
- parent 2755
- 45b96d038dd9
- parent 2680
- 79177246b3db
- child 2757
- 47292f3c0da7
- child 2826
- ac5998942806
Merge
| .hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jan 12 13:51:17 2015 -0800 1.2 +++ b/.hgtags Mon Jan 19 12:36:43 2015 -0800 1.3 @@ -372,6 +372,7 @@ 1.4 94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18 1.5 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19 1.6 c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20 1.7 +9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21 1.8 dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00 1.9 244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01 1.10 401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02
2.1 --- a/src/share/classes/com/sun/source/doctree/package-info.java Mon Jan 12 13:51:17 2015 -0800 2.2 +++ b/src/share/classes/com/sun/source/doctree/package-info.java Mon Jan 19 12:36:43 2015 -0800 2.3 @@ -29,7 +29,7 @@ 2.4 * 2.5 * @author Jonathan Gibbons 2.6 * @since 1.8 2.7 - * @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> 2.8 + * @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> 2.9 */ 2.10 @jdk.Exported 2.11 package com.sun.source.doctree;
3.1 --- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Mon Jan 12 13:51:17 2015 -0800 3.2 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Mon Jan 19 12:36:43 2015 -0800 3.3 @@ -29,7 +29,7 @@ 3.4 3.5 /** 3.6 * See JVMS 4.7.21 3.7 - * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 3.8 + * https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 3.9 * 3.10 * <p><b>This is NOT part of any supported API. 3.11 * If you write code that depends on this, you do so at your own risk.
4.1 --- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Mon Jan 12 13:51:17 2015 -0800 4.2 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Mon Jan 19 12:36:43 2015 -0800 4.3 @@ -1039,7 +1039,7 @@ 4.4 } 4.5 4.6 /** 4.7 - * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> 4.8 + * @see <a href="https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> 4.9 */ 4.10 private void initTagParsers() { 4.11 TagParser[] parsers = {
5.1 --- a/src/share/classes/com/sun/tools/javac/util/Convert.java Mon Jan 12 13:51:17 2015 -0800 5.2 +++ b/src/share/classes/com/sun/tools/javac/util/Convert.java Mon Jan 19 12:36:43 2015 -0800 5.3 @@ -36,9 +36,9 @@ 5.4 * <p> 5.5 * See also: 5.6 * <ul> 5.7 - * <li><a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> 5.8 + * <li><a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> 5.9 * JVMS 4.4.7 </a></li> 5.10 - * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> 5.11 + * <li><a href="https://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> 5.12 java.io.DataInput: Modified UTF-8 </a></li> 5.13 <li><a href="https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"> 5.14 Modified UTF-8 (wikipedia) </a></li>
6.1 --- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Mon Jan 12 13:51:17 2015 -0800 6.2 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Mon Jan 19 12:36:43 2015 -0800 6.3 @@ -155,7 +155,7 @@ 6.4 * Tests if a given package name is exported. 6.5 */ 6.6 public boolean isExportedPackage(String pn) { 6.7 - if (Profile.getProfile(pn) != null) { 6.8 + if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) { 6.9 return true; 6.10 } 6.11 return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;
7.1 --- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Mon Jan 12 13:51:17 2015 -0800 7.2 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Mon Jan 19 12:36:43 2015 -0800 7.3 @@ -60,21 +60,21 @@ 7.4 }; 7.5 private static final String[][] NEGATED_TEST1 = { 7.6 {BUG_ID + FS + "pkg1" + FS + "C1.html", 7.7 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" 7.8 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" 7.9 }, 7.10 {BUG_ID + FS + "pkg1" + FS + "C1.html", 7.11 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" 7.12 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" 7.13 }, 7.14 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 7.15 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" 7.16 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" 7.17 }, 7.18 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 7.19 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" 7.20 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" 7.21 } 7.22 }; 7.23 private static final String[][] TEST2 = { 7.24 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 7.25 - "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" 7.26 + "Refer <a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" 7.27 }, 7.28 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 7.29 "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL + 7.30 @@ -85,7 +85,7 @@ 7.31 " <a href=\"../pkg1/C1.html\">Link 2</a>." 7.32 }, 7.33 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 7.34 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + 7.35 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + 7.36 " Test document 1</a>" 7.37 }, 7.38 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 7.39 @@ -100,13 +100,13 @@ 7.40 "<a href=\"../../technotes/guides/index.html\">" 7.41 }, 7.42 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 7.43 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" 7.44 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" 7.45 }, 7.46 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 7.47 "<a href=\"../../technotes/guides/index.html\">" 7.48 }, 7.49 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 7.50 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" 7.51 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" 7.52 } 7.53 }; 7.54 private static final String[] ARGS1 = 7.55 @@ -115,7 +115,7 @@ 7.56 }; 7.57 private static final String[] ARGS2 = 7.58 new String[]{ 7.59 - "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" 7.60 + "-d", BUG_ID + "-1", "-Xdocrootparent", "https://docs.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" 7.61 }; 7.62 7.63 /**
