Mercurial > hg > icedtea8-forest > langtools
changeset 3324:a553c153d376 icedtea-3.2.0
Merge jdk8u111-b14
author | andrew |
---|---|
date | Thu, 03 Nov 2016 18:13:11 +0000 |
parents | 04fce5eb4c3b (current diff) 0e2e745ed6d7 (diff) |
children | 56b10dbfe87e |
files | .hgtags |
diffstat | 4 files changed, 34 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Nov 03 02:53:27 2016 +0000 +++ b/.hgtags Thu Nov 03 18:13:11 2016 +0000 @@ -612,6 +612,9 @@ fc69984700e156fe3290daea69e2d2ecc8acccaf icedtea-3.1.0pre04 c99c71a68555038fdd1e86a10dab9c9007ec3745 jdk8u92-b14 71176efa69475fc737d1245a28e739ddf105fd1c jdk8u92-b31 +4e8ce6c84e4ca9dd385012c10e059c15dbfcc468 jdk8u92-b32 +18568fe46895af6a7b562ffe6334a24fb5d9ee50 jdk8u92-b33 +3ca74ce54c351db2ac551e495a8b7ee65fb09e64 jdk8u92-b34 580f87c4d91aa8cc493dbbd84a1be9671fd733f3 jdk8u81-b00 a93c1e57407944362e05c79d756425e8c1274d9a jdk8u101-b01 86a9d99ffadaf26b3d8417666a3600ea1ce7560f jdk8u101-b02 @@ -650,3 +653,19 @@ 56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13 19ea84ae4992037367f85aadb746279ab489422a icedtea-3.2.0pre02 5665ca5e1896dcf47faa2c5c50d1130b8b783944 icedtea-3.2.0pre03 +0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14 +d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31 +90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00 +085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01 +f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02 +386c8bc6dd3ea0d49ea483cbbe95f4b12b66db23 jdk8u111-b03 +fd9b6417c521c5ec26224129d90b38d40c04c54d jdk8u111-b04 +5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u111-b05 +9ce3a6ba45751aaf57cb50609f3fd64c02d66f51 jdk8u111-b06 +405b1845ab3995b43efe0e770070b90f4c5c9080 jdk8u111-b07 +8a30511b2ea4714f5868b33be07b0562bb1edbfb jdk8u111-b08 +62cbd4997d4bf8433186d3fa30847577aa483ea3 jdk8u111-b09 +74b16a9a8eda03779e55ba145bdb6a08a1ebd780 jdk8u111-b10 +f51f1b8a7b58355c11392effdf0e4f738a79a8ad jdk8u111-b11 +8e5e70b9cff8f928d28db4890d4e5905a739d210 jdk8u111-b12 +ef3134b243da77d0aed9f3cef2b3855c3be2111a jdk8u111-b13
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu Nov 03 02:53:27 2016 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu Nov 03 18:13:11 2016 +0000 @@ -380,11 +380,12 @@ HtmlTree script = new HtmlTree(HtmlTag.SCRIPT); script.addAttr(HtmlAttr.TYPE, "text/javascript"); String scriptCode = DocletConstants.NL + - " targetPage = \"\" + window.location.search;" + DocletConstants.NL + - " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + - " targetPage = targetPage.substring(1);" + DocletConstants.NL + - " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + - " targetPage = \"undefined\";" + DocletConstants.NL + + " tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL + + " if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL + + " tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL + + " if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL + + " tmpTargetPage = \"undefined\";" + DocletConstants.NL + + " targetPage = tmpTargetPage;" + DocletConstants.NL + " function validURL(url) {" + DocletConstants.NL + " try {" + DocletConstants.NL + " url = decodeURIComponent(url);" + DocletConstants.NL +
--- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Thu Nov 03 02:53:27 2016 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Thu Nov 03 18:13:11 2016 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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 @@ -34,7 +34,7 @@ javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B -javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B +javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5148\u982D\u306B\u4ED8\u52A0\u3059\u308B javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Nov 03 02:53:27 2016 +0000 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Nov 03 18:13:11 2016 +0000 @@ -23,7 +23,7 @@ /* * @test - * @bug 4665566 4855876 7025314 8012375 8015997 8016328 8024756 + * @bug 4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921 * @summary Verify that the output has the right javascript. * @author jamieh * @library ../lib/ @@ -50,11 +50,12 @@ "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"}, {BUG_ID + FS + "index.html", "<script type=\"text/javascript\">" + NL + - " targetPage = \"\" + window.location.search;" + NL + - " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + - " targetPage = targetPage.substring(1);" + NL + - " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL + - " targetPage = \"undefined\";" + NL + + " tmpTargetPage = \"\" + window.location.search;" + NL + + " if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL + + " tmpTargetPage = tmpTargetPage.substring(1);" + NL + + " if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL + + " tmpTargetPage = \"undefined\";" + NL + + " targetPage = tmpTargetPage;" + NL + " function validURL(url) {" + NL + " try {" + NL + " url = decodeURIComponent(url);" + NL +