/hg/release/icedtea7-forest-2.4/langtools: 48 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Oct 16 07:42:37 PDT 2013


changeset c7024dda4ff3 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c7024dda4ff3
author: asaha
date: Thu Jun 20 21:27:07 2013 -0700

	Merge


changeset ca9a1ac71131 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ca9a1ac71131
author: asaha
date: Fri Jun 21 22:00:39 2013 -0700

	Merge


changeset 9bbfba4981e1 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9bbfba4981e1
author: asaha
date: Fri Jun 28 11:41:33 2013 -0700

	Merge


changeset b8ef7bb9c7b2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b8ef7bb9c7b2
author: katleman
date: Tue Jul 02 15:17:32 2013 -0700

	Added tag jdk7u45-b01 for changeset 9bbfba4981e1


changeset d27b39c92849 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d27b39c92849
author: asaha
date: Wed Jul 03 17:45:42 2013 -0700

	Merge


changeset 61d5b73ae0ac in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=61d5b73ae0ac
author: robm
date: Tue Jul 09 03:31:34 2013 +0100

	8016653: javadoc should ignore ignoreable characters in names
	Reviewed-by: jjg


changeset b9f4c87abb35 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b9f4c87abb35
author: katleman
date: Tue Jul 09 18:23:05 2013 -0700

	Added tag jdk7u45-b02 for changeset 61d5b73ae0ac


changeset 2fe27ae865e7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2fe27ae865e7
author: asaha
date: Wed Jul 10 16:45:12 2013 -0700

	Merge


changeset 57105bd6b5ce in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=57105bd6b5ce
author: cl
date: Tue Jul 16 05:52:21 2013 -0700

	Added tag jdk7u45-b03 for changeset 2fe27ae865e7


changeset de93f4bc2c76 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=de93f4bc2c76
author: bpatel
date: Fri Jul 19 16:02:59 2013 -0700

	8016675: Make Javadoc pages more robust
	Reviewed-by: jlaskey, ksrini


changeset 416fe90ccdf5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=416fe90ccdf5
author: asaha
date: Wed Jul 17 14:53:16 2013 -0700

	Merge


changeset bede296dc848 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bede296dc848
author: asaha
date: Mon Jul 22 12:10:39 2013 -0700

	Merge


changeset 4484d9bef277 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4484d9bef277
author: cl
date: Tue Jul 23 08:11:45 2013 -0700

	Added tag jdk7u45-b04 for changeset bede296dc848


changeset 6eb9444e0f46 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6eb9444e0f46
author: asaha
date: Thu Jul 25 17:23:14 2013 -0700

	Merge


changeset dd914d8a6085 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=dd914d8a6085
author: asaha
date: Mon Jul 29 12:01:45 2013 -0700

	Merge


changeset e989f2f2b5cb in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e989f2f2b5cb
author: asaha
date: Wed Jul 31 23:12:06 2013 -0700

	Merge


changeset f7a971506d01 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f7a971506d01
author: asaha
date: Fri Aug 02 15:23:45 2013 -0700

	Added tag jdk7u45-b05 for changeset e989f2f2b5cb


changeset 993a01f0ab41 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=993a01f0ab41
author: asaha
date: Fri Aug 02 22:29:31 2013 -0700

	Merge


changeset 63f7bbf8a72e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=63f7bbf8a72e
author: cl
date: Fri Aug 02 19:03:50 2013 -0700

	Added tag jdk7u45-b05 for changeset 6eb9444e0f46


changeset a6be1495ff24 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a6be1495ff24
author: asaha
date: Mon Aug 05 11:54:06 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset c8f4a544ada6 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c8f4a544ada6
author: asaha
date: Mon Aug 05 13:50:35 2013 -0700

	Merge


changeset 6f492dc935ad in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6f492dc935ad
author: asaha
date: Wed Aug 07 12:26:10 2013 -0700

	Merge


changeset 56f937be36eb in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=56f937be36eb
author: cl
date: Thu Aug 08 23:26:10 2013 -0700

	Added tag jdk7u45-b06 for changeset 6f492dc935ad


changeset 4c51f98e1eb5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4c51f98e1eb5
author: asaha
date: Mon Aug 12 12:41:45 2013 -0700

	Merge


changeset 240a9b79f6f7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=240a9b79f6f7
author: cl
date: Thu Aug 15 22:17:49 2013 -0700

	Added tag jdk7u45-b07 for changeset 4c51f98e1eb5


changeset 6cf97c9859e7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6cf97c9859e7
author: asaha
date: Mon Aug 19 12:47:31 2013 -0700

	Merge


changeset e6be5016d661 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e6be5016d661
author: cl
date: Tue Aug 20 10:23:20 2013 -0700

	Added tag jdk7u45-b08 for changeset 6cf97c9859e7


changeset 14277771a1b2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=14277771a1b2
author: asaha
date: Thu Aug 22 08:45:06 2013 -0700

	Merge


changeset a9c31d3f8188 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a9c31d3f8188
author: asaha
date: Mon Aug 26 08:48:00 2013 -0700

	Merge


changeset 1f1c0d891144 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1f1c0d891144
author: cl
date: Tue Aug 27 10:57:32 2013 -0700

	Added tag jdk7u45-b09 for changeset a9c31d3f8188


changeset 2c09352066ec in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2c09352066ec
author: asaha
date: Tue Aug 27 15:21:19 2013 -0700

	Merge


changeset da8110204565 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=da8110204565
author: cl
date: Wed Sep 04 11:05:25 2013 -0700

	Added tag jdk7u45-b10 for changeset 2c09352066ec


changeset 53d5c06766b0 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=53d5c06766b0
author: asaha
date: Wed Sep 04 12:12:47 2013 -0700

	Merge


changeset 0b6aa6e95eb9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0b6aa6e95eb9
author: cl
date: Wed Sep 11 11:12:45 2013 -0700

	Added tag jdk7u45-b11 for changeset 53d5c06766b0


changeset 68862f365075 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=68862f365075
author: cl
date: Wed Sep 18 02:16:19 2013 -0700

	Added tag jdk7u45-b12 for changeset 0b6aa6e95eb9


changeset 8c799b9f0cd8 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8c799b9f0cd8
author: cl
date: Mon Sep 23 14:31:40 2013 -0700

	Added tag jdk7u45-b13 for changeset 68862f365075


changeset 36ae3f206b53 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=36ae3f206b53
author: cl
date: Thu Sep 26 10:37:47 2013 -0700

	Added tag jdk7u45-b14 for changeset 8c799b9f0cd8


changeset 18d1864abca9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=18d1864abca9
author: cl
date: Fri Sep 27 11:44:52 2013 -0700

	Added tag jdk7u45-b15 for changeset 36ae3f206b53


changeset 94ea3d062a3c in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=94ea3d062a3c
author: katleman
date: Wed Sep 11 11:00:04 2013 -0700

	Added tag jdk7u40-b61 for changeset b2e29b79e54e


changeset 89e8f0dd7d92 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=89e8f0dd7d92
author: katleman
date: Tue Sep 17 13:05:39 2013 -0700

	Added tag jdk7u40-b62 for changeset 94ea3d062a3c


changeset da3d82321828 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=da3d82321828
author: asaha
date: Thu Sep 19 15:05:57 2013 -0700

	Merge


changeset 5b0c0a847e13 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5b0c0a847e13
author: asaha
date: Fri Sep 27 13:10:47 2013 -0700

	Merge


changeset b9aeec6b9d5a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b9aeec6b9d5a
author: cl
date: Thu Oct 03 11:32:00 2013 -0700

	Added tag jdk7u45-b16 for changeset 18d1864abca9


changeset ba3ff27d4082 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ba3ff27d4082
author: cl
date: Mon Oct 07 21:53:11 2013 -0700

	Added tag jdk7u45-b17 for changeset b9aeec6b9d5a


changeset 164cf7491ba2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=164cf7491ba2
author: cl
date: Tue Oct 08 09:07:15 2013 -0700

	Added tag jdk7u45-b18 for changeset ba3ff27d4082


changeset 6daac5a4016a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6daac5a4016a
author: cl
date: Tue Oct 08 10:57:59 2013 -0700

	Added tag jdk7u45-b30 for changeset 164cf7491ba2


changeset 7f5cfaedb25c in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7f5cfaedb25c
author: asaha
date: Tue Oct 08 11:14:47 2013 -0700

	Merge


changeset 3c8eb52a32ea in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3c8eb52a32ea
author: andrew
date: Wed Oct 16 15:17:06 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                     |  108 ++++++++++
 .jcheck/conf                                                                                |    2 -
 THIRD_PARTY_README                                                                          |   33 ++-
 make/Makefile                                                                               |    4 +
 make/build.properties                                                                       |    3 +-
 make/build.xml                                                                              |    2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java                 |   60 ++--
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java                 |   49 ++++-
 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties       |   65 +++--
 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java                 |   24 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties    |   12 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties |    4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java          |   24 ++-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java         |   12 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java                     |    8 +-
 src/share/classes/com/sun/tools/javac/code/Types.java                                       |    7 +-
 src/share/classes/com/sun/tools/javac/comp/Attr.java                                        |   11 +-
 src/share/classes/com/sun/tools/javac/comp/Check.java                                       |    6 +-
 src/share/classes/com/sun/tools/javac/comp/Flow.java                                        |   10 +-
 src/share/classes/com/sun/tools/javac/comp/Lower.java                                       |    1 -
 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java                                 |    6 +-
 src/share/classes/com/sun/tools/javac/comp/Resolve.java                                     |   23 +-
 src/share/classes/com/sun/tools/javac/parser/Scanner.java                                   |   42 ++-
 src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties                      |   54 ++--
 src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties                   |   18 +-
 src/share/classes/com/sun/tools/javac/resources/javac_ja.properties                         |    8 +-
 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java                                    |   11 +-
 src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties                     |    2 +-
 src/share/classes/com/sun/tools/javah/JavahTask.java                                        |   12 +-
 src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties                          |    6 +-
 src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties                       |    2 +-
 test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java                                   |   81 +++++++
 test/com/sun/javadoc/testDocEncoding/pkg/Test.java                                          |   31 ++
 test/com/sun/javadoc/testSinceTag/TestSinceTag.java                                         |   84 +++++++
 test/com/sun/javadoc/testSinceTag/pkg1/C1.java                                              |  101 +++++++++
 test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java                                   |   82 +++++++
 test/com/sun/javadoc/testWindowTitle/p1/C1.java                                             |   27 ++
 test/com/sun/javadoc/testWindowTitle/p2/C2.java                                             |   27 ++
 test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java                              |   92 ++++++++
 test/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java                              |   38 +++
 test/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java                               |   38 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java                           |   39 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java                          |   39 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java                          |   39 +++
 test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java                               |   42 +++
 test/tools/javac/TryWithResources/T7178324.java                                             |   43 +++
 test/tools/javac/enum/7160084/T7160084a.java                                                |   60 +++++
 test/tools/javac/enum/7160084/T7160084b.java                                                |   68 ++++++
 test/tools/javac/generics/8004094/B.java                                                    |   47 ++++
 test/tools/javac/generics/8004094/T8004094.java                                             |   32 ++
 test/tools/javah/T7185778.java                                                              |   56 +++++
 51 files changed, 1506 insertions(+), 189 deletions(-)

diffs (truncated from 2625 to 500 lines):

diff -r daf200613bbb -r 3c8eb52a32ea .hgtags
--- a/.hgtags	Fri Jun 14 18:10:38 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:06 2013 +0100
@@ -50,6 +50,7 @@
 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
 ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -123,6 +126,7 @@
 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint
 cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
@@ -141,6 +145,7 @@
 f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02
 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03
 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04
@@ -157,6 +162,7 @@
 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10
 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11
 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12
+e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint
 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13
 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14
 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01
@@ -191,6 +197,7 @@
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -215,6 +222,15 @@
 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05
 5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31
 acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32
+a35ca56cf8d09b92511f0cd71208a2ea05c8a338 jdk7u8-b01
+41bc8da868e58f7182d26b2ab9b6f8a4b09894ed jdk7u8-b02
+df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03
+d4296a07e45a0cffbca17c608916ff6bcec78d75 jdk7u8-b04
+1b7eaaffd58359639346661196309005a374192f jdk7u8-b05
+e1f380574f5490ef785282b81b6b38626109444b jdk7u10-b06
+cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07
+3204f355a32d83ffceeed1c0c8a52a2d834ae29f jdk7u10-b08
+0b90d3480dbfc16aa3901df249b3cb21bcfa0b32 jdk7u10-b09
 8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10
 01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11
 1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12
@@ -225,6 +241,7 @@
 7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17
 4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18
 1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30
+87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01
 db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31
 b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20
 aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21
@@ -240,6 +257,21 @@
 761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b10
 8a12629ea21378f96666628f472cd9a6936a4933 jdk7u13-b30
 761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b20
+12996c33d506d741ae7c3cc8e2aa2f650a36b839 jdk7u12-b02
+3fe61a8a2cfb02ee2b1cd4cd257b76c5b8668cd3 jdk7u12-b03
+e2adb6f53caaa618521bdf965bc484c7ffae190f jdk7u12-b04
+454ce2fa72e9ad14e83ebf54636c196d75e35509 jdk7u12-b05
+ab820babd394eed07c58bc2bffc58b0d92ca39b8 jdk7u12-b06
+382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
+7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
+96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
+e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
+db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
+f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
+5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13
+5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14
+5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
 b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30
@@ -265,6 +297,7 @@
 e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11
 ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30
 a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12
+55c56025da9d9833aa8fff50cb897f7aa99f4a13 jdk7u21-b31
 884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01
 1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02
 8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03
@@ -276,10 +309,85 @@
 17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
 41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
 0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
+cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
+aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
+577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
+86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
 28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
 c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
 3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15
+a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b50
+642f469e52174d47ddb745f7fcc44f80340986f5 jdk7u25-b31
+a825dd3a95fd77b891255e88e1a78f6a476a45b3 jdk7u25-b33
+9ef1ee50dfa7c5a43b61d47435e3bdb53ccf5404 jdk7u25-b34
 5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30
 7294a7be7dbde9c3789f9fa881baa6b8fcd51674 jdk7u25-b16
 aaf5e30d5549ec5200b991806e62db3e866181a7 jdk7u25-b32
+cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
+aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
+577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
+86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0
+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
+0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30
+91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1
+9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31
+056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32
+e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33
+08c5065870ef40008711a3d3ee3230323e5f5910 jdk7u40-b34
+524b9f7e6cabc8f7bad1824090e9b0dbf14ece74 jdk7u40-b35
+6837776bcdfafd0f963667156633142d433860f3 jdk7u40-b36
+31908290e4c2241ae9a8000c2a80e0f5fbad2a2c jdk7u40-b37
+21672c0e6691cfa1a477e7f0065afecb4148ddff jdk7u40-b38
+81925e555c94bb19c44bc21ff3e513ea19efbd10 jdk7u40-b39
+0e83f513af688a0b9fd6c9d9389c247ef6fb1afb jdk7u40-b40
+95cefc18bea41615c6c9b85ccbdf62af899174cb jdk7u40-b41
+765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
+988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
+a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
+06ea051f7ffe0f91213c8e7064ddb045c93ba1b4 icedtea-2.4.2
+b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
+94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
+9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
+61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02
+2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03
+bede296dc848533abae859e61584a517df2773ae jdk7u45-b04
+e989f2f2b5cb639a23a5e67da0d52766acf549a2 jdk7u45-b05
+6f492dc935adc6e2878bb6045aee001a829428a7 jdk7u45-b06
+4c51f98e1eb5b8d94dfca08f3b3160ff382b7c3a jdk7u45-b07
+6cf97c9859e731fba6bcff67c46f57dead8d7284 jdk7u45-b08
+a9c31d3f8188b344ed165ec0730ebc2fd11dfa5d jdk7u45-b09
+2c09352066ec34c8608ccff0f933f566a52033af jdk7u45-b10
+53d5c06766b05689cdccfc300b32075878e8aa1d jdk7u45-b11
+0b6aa6e95eb9da58a686edacf5b102116614d3ea jdk7u45-b12
+68862f365075a11dfa291033d05a062590db9337 jdk7u45-b13
+8c799b9f0cd8af3b1cfd151ba075a4f1630967df jdk7u45-b14
+36ae3f206b53f751a0ebf933e5dbf364097b48a5 jdk7u45-b15
+18d1864abca976ca68cb71612e9b20c908455d3d jdk7u45-b16
+b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
+ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
+164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
diff -r daf200613bbb -r 3c8eb52a32ea .jcheck/conf
--- a/.jcheck/conf	Fri Jun 14 18:10:38 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r daf200613bbb -r 3c8eb52a32ea THIRD_PARTY_README
--- a/THIRD_PARTY_README	Fri Jun 14 18:10:38 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:06 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r daf200613bbb -r 3c8eb52a32ea make/Makefile
--- a/make/Makefile	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/Makefile	Wed Oct 16 15:17:06 2013 +0100
@@ -111,6 +111,10 @@
   ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
+ifeq ($(JAVAC_WARNINGS_FATAL), false)
+  ANT_OPTIONS += -Djavac.warnings.fatal=
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION
diff -r daf200613bbb -r 3c8eb52a32ea make/build.properties
--- a/make/build.properties	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/build.properties	Wed Oct 16 15:17:06 2013 +0100
@@ -68,7 +68,8 @@
 # set the following to -version to verify the versions of javac being used
 javac.version.opt =
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.warnings.fatal = -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal}
 
 # options for the <javadoc> task for javac
 #javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r daf200613bbb -r 3c8eb52a32ea make/build.xml
--- a/make/build.xml	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/build.xml	Wed Oct 16 15:17:06 2013 +0100
@@ -877,7 +877,7 @@
         </javac>
         <taskdef name="genstubs"
                  classname="GenStubs$$Ant"
-                 classpath="${build.toolclasses.dir}/"/>
+                 classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
     </target>
 
     <target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Wed Oct 16 15:17:06 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, 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
@@ -227,46 +227,44 @@
             String[] os = options[oi];
             String opt = os[0].toLowerCase();
             if (opt.equals("-footer")) {
-                footer =  os[1];
-            } else  if (opt.equals("-header")) {
-                header =  os[1];
-            } else  if (opt.equals("-packagesheader")) {
-                packagesheader =  os[1];
-            } else  if (opt.equals("-doctitle")) {
-                doctitle =  os[1];
-            } else  if (opt.equals("-windowtitle")) {
-                windowtitle =  os[1];
-            } else  if (opt.equals("-top")) {
-                top =  os[1];
-            } else  if (opt.equals("-bottom")) {
-                bottom =  os[1];
-            } else  if (opt.equals("-helpfile")) {
-                helpfile =  os[1];
-            } else  if (opt.equals("-stylesheetfile")) {
-                stylesheetfile =  os[1];
-            } else  if (opt.equals("-charset")) {
-                charset =  os[1];
+                footer = os[1];
+            } else if (opt.equals("-header")) {
+                header = os[1];
+            } else if (opt.equals("-packagesheader")) {
+                packagesheader = os[1];
+            } else if (opt.equals("-doctitle")) {
+                doctitle = os[1];
+            } else if (opt.equals("-windowtitle")) {
+                windowtitle = os[1];
+            } else if (opt.equals("-top")) {
+                top = os[1];
+            } else if (opt.equals("-bottom")) {
+                bottom = os[1];
+            } else if (opt.equals("-helpfile")) {
+                helpfile = os[1];
+            } else if (opt.equals("-stylesheetfile")) {
+                stylesheetfile = os[1];
+            } else if (opt.equals("-charset")) {
+                charset = os[1];
             } else if (opt.equals("-xdocrootparent")) {
                 docrootparent = os[1];
-            } else  if (opt.equals("-nohelp")) {
+            } else if (opt.equals("-nohelp")) {
                 nohelp = true;
-            } else  if (opt.equals("-splitindex")) {
+            } else if (opt.equals("-splitindex")) {
                 splitindex = true;
-            } else  if (opt.equals("-noindex")) {
+            } else if (opt.equals("-noindex")) {
                 createindex = false;
-            } else  if (opt.equals("-use")) {
+            } else if (opt.equals("-use")) {
                 classuse = true;
-            } else  if (opt.equals("-notree")) {
+            } else if (opt.equals("-notree")) {
                 createtree = false;
-            } else  if (opt.equals("-nodeprecatedlist")) {
+            } else if (opt.equals("-nodeprecatedlist")) {
                 nodeprecatedlist = true;
-            } else  if (opt.equals("-nosince")) {
-                nosince = true;
-            } else  if (opt.equals("-nonavbar")) {
+            } else if (opt.equals("-nonavbar")) {
                 nonavbar = true;
-            } else  if (opt.equals("-nooverview")) {
+            } else if (opt.equals("-nooverview")) {
                 nooverview = true;
-            } else  if (opt.equals("-overview")) {
+            } else if (opt.equals("-overview")) {
                 overview = true;
             }
         }
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Wed Oct 16 15:17:06 2013 +0100
@@ -292,7 +292,7 @@
             script.addAttr(HtmlAttr.TYPE, "text/javascript");
             String scriptCode = "<!--" + DocletConstants.NL +
                     "    if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-                    "        parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
+                    "        parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
                     "    }" + DocletConstants.NL +
                     "//-->" + DocletConstants.NL;
             RawHtml scriptContent = new RawHtml(scriptCode);
@@ -302,6 +302,53 @@
     }
 
     /**
+     * Returns a String with escaped special JavaScript characters.
+     *
+     * @param s String that needs to be escaped
+     * @return a valid escaped JavaScript string
+     */
+    private static String escapeJavaScriptChars(String s) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            switch (ch) {
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                case '\'':
+                    sb.append("\\\'");
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                default:
+                    if (ch < 32 || ch >= 127) {
+                        sb.append(String.format("\\u%04X", (int)ch));
+                    } else {
+                        sb.append(ch);
+                    }
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
      * Returns a content tree for the SCRIPT tag for the main page(index.html).
      *
      * @return a content for the SCRIPT tag
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Wed Oct 16 15:17:06 2013 +0100
@@ -33,7 +33,7 @@
 doclet.navAnnotationTypeMember=\u8981\u7D20
 doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.navEnum=\u5217\u6319\u5B9A\u6570
+doclet.navEnum=\u5217\u6319\u578B\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
 doclet.Index=\u7D22\u5F15
@@ -46,9 +46,9 @@
 doclet.None=\u306A\u3057
 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
 doclet.navDeprecated=\u975E\u63A8\u5968
-doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+doclet.Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8
+doclet.Window_Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8
+doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u975E\u63A8\u5968\u3067\u3059\u3002
 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
 doclet.in_class=\u30AF\u30E9\u30B9\u5185
 doclet.0_Fields_and_Methods=&quot;{0}&quot;\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9
@@ -69,31 +69,31 @@
 doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
 doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0
 doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981
-doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.Deprecated_Packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
-doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
-doclet.deprecated_packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF


More information about the distro-pkg-dev mailing list