Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Mon Sep 19 21:13:52 2016 -0700
     1.2 +++ b/.hgtags	Tue Sep 27 13:00:32 2016 -0700
     1.3 @@ -593,6 +593,9 @@
     1.4  12846c3fc5a151a33e9446eff6e6704110c00362 jdk8u92-b13
     1.5  c99c71a68555038fdd1e86a10dab9c9007ec3745 jdk8u92-b14
     1.6  71176efa69475fc737d1245a28e739ddf105fd1c jdk8u92-b31
     1.7 +4e8ce6c84e4ca9dd385012c10e059c15dbfcc468 jdk8u92-b32
     1.8 +18568fe46895af6a7b562ffe6334a24fb5d9ee50 jdk8u92-b33
     1.9 +3ca74ce54c351db2ac551e495a8b7ee65fb09e64 jdk8u92-b34
    1.10  580f87c4d91aa8cc493dbbd84a1be9671fd733f3 jdk8u81-b00
    1.11  a93c1e57407944362e05c79d756425e8c1274d9a jdk8u101-b01
    1.12  86a9d99ffadaf26b3d8417666a3600ea1ce7560f jdk8u101-b02
    1.13 @@ -628,10 +631,36 @@
    1.14  16c58d7af5a4937e46bccd58114a56a7ffcd685c jdk8u102-b12
    1.15  56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13
    1.16  0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14
    1.17 +d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31
    1.18 +90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00
    1.19 +085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01
    1.20 +f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02
    1.21 +386c8bc6dd3ea0d49ea483cbbe95f4b12b66db23 jdk8u111-b03
    1.22 +fd9b6417c521c5ec26224129d90b38d40c04c54d jdk8u111-b04
    1.23 +5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u111-b05
    1.24 +9ce3a6ba45751aaf57cb50609f3fd64c02d66f51 jdk8u111-b06
    1.25 +405b1845ab3995b43efe0e770070b90f4c5c9080 jdk8u111-b07
    1.26 +8a30511b2ea4714f5868b33be07b0562bb1edbfb jdk8u111-b08
    1.27 +62cbd4997d4bf8433186d3fa30847577aa483ea3 jdk8u111-b09
    1.28 +74b16a9a8eda03779e55ba145bdb6a08a1ebd780 jdk8u111-b10
    1.29 +f51f1b8a7b58355c11392effdf0e4f738a79a8ad jdk8u111-b11
    1.30 +8e5e70b9cff8f928d28db4890d4e5905a739d210 jdk8u111-b12
    1.31 +ef3134b243da77d0aed9f3cef2b3855c3be2111a jdk8u111-b13
    1.32 +0e2e745ed6d7bb8a2233e83f4bad40e793a16949 jdk8u111-b14
    1.33  27503e49de52b54dde3a12af28e2d2de473192b3 jdk8u112-b00
    1.34  60a0572cd449e33b7d48b5a40065222ab5accd36 jdk8u112-b01
    1.35  6e20b82db75fbaf5a3e10455d1a28c17381f4be6 jdk8u112-b02
    1.36  e87830f756786db50d89d77ee802f303cf42d0b1 jdk8u112-b03
    1.37  03a192ef78d0ea77f1141174b29835b702f86793 jdk8u112-b04
    1.38 +27a15af81178d312748a45efa457e5ef1a76e088 jdk8u112-b06
    1.39 +35cb56e983d317fd319d2dbb17282264edea02e2 jdk8u112-b07
    1.40 +103e6e2225bbbe779435b2e122e1ff846be54759 jdk8u112-b08
    1.41 +ea5711153422cc1f8d710de08b7f4dc9e20b9333 jdk8u112-b09
    1.42 +96658afeb900cb1bfc6c56b352745f3ede0ee524 jdk8u112-b10
    1.43 +0169856d09008e5718f53a5d6c16e7db95c55887 jdk8u112-b11
    1.44 +f56f9368471aa5bc949a730e2724ceb68e90d717 jdk8u112-b12
    1.45 +04d857308b8c3db33e8fd4099c3a3dd5d50cdaeb jdk8u112-b13
    1.46 +b353281f73db9617d993353e468342d3420c29f1 jdk8u112-b14
    1.47 +6116c6644be0c85556931aaeb9b4f2dbc9c79157 jdk8u112-b15
    1.48  9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
    1.49  85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Mon Sep 19 21:13:52 2016 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Sep 27 13:00:32 2016 -0700
     2.3 @@ -380,11 +380,12 @@
     2.4          HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
     2.5          script.addAttr(HtmlAttr.TYPE, "text/javascript");
     2.6          String scriptCode = DocletConstants.NL +
     2.7 -                "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
     2.8 -                "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
     2.9 -                "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
    2.10 -                "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
    2.11 -                "        targetPage = \"undefined\";" + DocletConstants.NL +
    2.12 +                "    tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
    2.13 +                "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
    2.14 +                "        tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
    2.15 +                "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
    2.16 +                "        tmpTargetPage = \"undefined\";" + DocletConstants.NL +
    2.17 +                "    targetPage = tmpTargetPage;" + DocletConstants.NL +
    2.18                  "    function validURL(url) {" + DocletConstants.NL +
    2.19                  "        try {" + DocletConstants.NL +
    2.20                  "            url = decodeURIComponent(url);" + DocletConstants.NL +

     3.1 --- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Mon Sep 19 21:13:52 2016 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Sep 27 13:00:32 2016 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10 @@ -34,7 +34,7 @@
    3.11  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
    3.12  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
    3.13  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
    3.14 -javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
    3.15 +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
    3.16  javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
    3.17  javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
    3.18  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

     4.1 --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Mon Sep 19 21:13:52 2016 -0700
     4.2 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Sep 27 13:00:32 2016 -0700
     4.3 @@ -23,7 +23,7 @@
     4.4  
     4.5  /*
     4.6   * @test
     4.7 - * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756
     4.8 + * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
     4.9   * @summary  Verify that the output has the right javascript.
    4.10   * @author   jamieh
    4.11   * @library  ../lib/
    4.12 @@ -50,11 +50,12 @@
    4.13              "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
    4.14          {BUG_ID + FS + "index.html",
    4.15              "<script type=\"text/javascript\">" + NL +
    4.16 -                        "    targetPage = \"\" + window.location.search;" + NL +
    4.17 -            "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
    4.18 -            "        targetPage = targetPage.substring(1);" + NL +
    4.19 -            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
    4.20 -            "        targetPage = \"undefined\";" + NL +
    4.21 +            "    tmpTargetPage = \"\" + window.location.search;" + NL +
    4.22 +            "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL +
    4.23 +            "        tmpTargetPage = tmpTargetPage.substring(1);" + NL +
    4.24 +            "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL +
    4.25 +            "        tmpTargetPage = \"undefined\";" + NL +
    4.26 +            "    targetPage = tmpTargetPage;" + NL +
    4.27              "    function validURL(url) {" + NL +
    4.28              "        try {" + NL +
    4.29              "            url = decodeURIComponent(url);" + NL +