Quantcast

/hg/release/icedtea7-forest-2.6/langtools: 11 new changesets

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

/hg/release/icedtea7-forest-2.6/langtools: 11 new changesets

andrew-127
changeset dec2417f1af8 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=dec2417f1af8
author: jjg
date: Tue Jan 17 03:24:03 2017 +0000

        8008949: javadoc stopped copying doc-files
        Reviewed-by: bpatel


changeset 3fc494634dbb in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=3fc494634dbb
author: jjg
date: Tue Jan 17 04:03:44 2017 +0000

        8000666: javadoc should write directly to Writer instead of composing strings
        Reviewed-by: bpatel


changeset e537073e5360 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=e537073e5360
author: jjg
date: Wed Jan 18 18:23:49 2017 +0000

        8001669: javadoc internal DocletAbortException should set cause when appropriate
        Reviewed-by: darcy


changeset 5d0d1fbcec86 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=5d0d1fbcec86
author: kizune
date: Fri Sep 27 21:20:01 2013 +0400

        6978886: javadoc shows stacktrace after print error resulting from disk full
        Reviewed-by: jjg


changeset 3114d240cf64 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=3114d240cf64
author: jjg
date: Wed Oct 10 18:34:46 2012 -0700

        8000418: javadoc should used a standard "generated by javadoc" string
        Reviewed-by: bpatel


changeset ef4ac41874cf in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=ef4ac41874cf
author: jjg
date: Tue Jan 17 20:49:37 2017 +0000

        8000673: remove dead code from HtmlWriter and subtypes
        Reviewed-by: bpatel


changeset e8688b6f4d38 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=e8688b6f4d38
author: aefimov
date: Wed Jan 18 18:30:54 2017 +0000

        8138725: Add options for Javadoc generation
        Reviewed-by: jjg


changeset bd7d0ced1b3d in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=bd7d0ced1b3d
author: asaha
date: Tue Jan 17 21:37:01 2017 +0000

        8168993: JDK8u121 L10n resource file update
        Reviewed-by: coffeys
        Contributed-by: [hidden email]


changeset 240ca8086e71 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=240ca8086e71
author: asaha
date: Wed Nov 23 00:35:47 2016 -0800

        8170268: 8u121 L10n resource file update - msgdrop 20
        Reviewed-by: coffeys
        Contributed-by: [hidden email]


changeset b1802aa8be3a in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=b1802aa8be3a
author: andrew
date: Tue Feb 07 01:26:22 2017 +0000

        Added tag jdk7u131-b00 for changeset 240ca8086e71


changeset dd8e22d986c8 in /hg/release/icedtea7-forest-2.6/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=dd8e22d986c8
author: andrew
date: Tue Feb 07 04:06:35 2017 +0000

        Merge jdk7u131-b00


diffstat:

 .hgtags                                                                                      |    56 +
 .jcheck/conf                                                                                 |     2 -
 make/Makefile                                                                                |     4 +
 make/build.properties                                                                        |     6 +-
 make/build.xml                                                                               |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java               |    34 -
 src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java              |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java           |     6 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java                     |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java                    |     5 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java                  |    48 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java         |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java               |     4 +-
 src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java                  |     4 +-
 src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java                         |     4 +-
 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java                         |    12 +-
 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java                   |  1006 +--------
 src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java              |    12 -
 src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java             |    10 -
 src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java                 |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java            |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java                 |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java                  |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java                   |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java                  |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java           |    31 +-
 src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java                  |     2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java                   |     4 +-
 src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java              |    70 -
 src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java                         |     4 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java                     |    25 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java                     |    15 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java               |   122 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java                |    14 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java                    |    43 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java                  |  1102 +---------
 src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java                     |    20 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java               |    12 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java                 |    19 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java           |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java                    |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java                  |    72 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java         |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java                        |    20 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java           |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java           |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java       |    15 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java |     4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java          |     4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java |     4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties        |     2 +
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties     |     1 +
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties  |     1 +
 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java            |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java            |     4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java          |     2 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java      |     9 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java                |    39 +
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java         |     4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java                      |    51 +-
 src/share/classes/com/sun/tools/javac/parser/JavacParser.java                                |    37 +-
 src/share/classes/com/sun/tools/javac/resources/compiler.properties                          |     4 +
 src/share/classes/com/sun/tools/javadoc/DocEnv.java                                          |    15 +-
 src/share/classes/com/sun/tools/javadoc/DocImpl.java                                         |    16 +-
 src/share/classes/com/sun/tools/javadoc/JavaScriptScanner.java                               |  1103 ++++++++++
 src/share/classes/com/sun/tools/javadoc/RootDocImpl.java                                     |     7 +-
 src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties                         |     4 +-
 src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties                      |     3 +-
 src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties                   |     3 +-
 test/com/sun/javadoc/VersionNumber/VersionNumber.java                                        |     4 +-
 test/com/sun/javadoc/testDocFiles/TestDocFiles.java                                          |    67 +
 test/com/sun/javadoc/testDocFiles/pkg/Test.java                                              |    27 +
 test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt                                     |     2 +
 test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java                                    |   112 +
 test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java                                        |    29 +
 test/tools/javac/T5090006/broken.jar                                                         |   Bin
 test/tools/javac/diags/examples/ForeachBadInitialization.java                                |    31 +
 test/tools/javac/enum/8069181/T8069181.java                                                  |    45 +
 test/tools/javac/parser/JavacParserTest.java                                                 |   886 ++++++++
 test/tools/javac/parser/netbeans/JavacParserTest.java                                        |   716 ------
 80 files changed, 2861 insertions(+), 3210 deletions(-)

diffs (truncated from 7919 to 500 lines):

diff -r bafda2c80afe -r dd8e22d986c8 .hgtags
--- a/.hgtags Fri Oct 28 03:35:37 2016 +0100
+++ b/.hgtags Tue Feb 07 04:06:35 2017 +0000
@@ -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
@@ -186,11 +192,15 @@
 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10
 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11
 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03
 fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13
 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,11 +268,13 @@
 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
+d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04
 5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
@@ -382,6 +394,7 @@
 ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
 efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
@@ -430,8 +443,11 @@
 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
 b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
+0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01
+f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02
 4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
+702454ac1a074e81890fb07da06ebf00370e42ed icedtea-2.6pre01
 744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
 8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06
 02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07
@@ -441,7 +457,11 @@
 3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
 b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
 3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
+2040d4afc89815f6bf54a597ff58a70798b68e3d icedtea-2.6pre02
+2950924c2b80dc4d3933a8ab15a0ebb39522da5a icedtea-2.6pre03
 a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
+fa084876cf02f2f9996ad8a0ab353254f92c5564 icedtea-2.6pre04
+5f917c4b87a952a8bf79de08f3e2dd3e56c41657 icedtea-2.6pre05
 7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
 057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
 b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
@@ -581,10 +601,27 @@
 e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15
 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
 6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
+3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07
+f43a81252f827395020fe71099bfa62f2ca0de50 icedtea-2.6pre06
+cdf407c97754412b02ebfdda111319dbd3cb9ca9 icedtea-2.6pre08
 5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
+55486a406d9f111eea8996fdf6144befefd86aff icedtea-2.6pre09
+cf836e0ed10de1179ec398a7db323e702b60ca35 icedtea-2.6pre10
+510234036e06ec8d7ed2a39ee11faf1b9a4257b0 icedtea-2.6pre11
 bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03
+987d772301e91c896178f47f39d82d87e9da1e39 icedtea-2.6pre12
+a072de9f83ed85a6a86d052d13488009230d7d4b icedtea-2.6pre13
+ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14
+029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15
+c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16
+e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17
 04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04
 f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05
+bb9d09219d3e74954b46ad53cb99dc307e39e120 icedtea-2.6pre18
+4c600e18a7e415702f6a62073c8c60f6b2cbfc11 icedtea-2.6pre19
+1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20
+5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21
+a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22
 335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06
 6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07
 e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08
@@ -597,15 +634,34 @@
 d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30
 f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15
 f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32
+403eeedf70f4b0e3c88f094d324e5c85959610e2 icedtea-2.6pre23
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6pre24
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6.0
 1b20ca77fa98bb29d1f5601f027b3055e9eb28ee jdk7u85-b00
 dce5a828bdd56d228724f1e9c6253920f613cec5 jdk7u85-b01
+bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6-branchpoint
+9c6e1de67d7d26809d02c8ce3d6629503cb67d19 icedtea-2.6.1
 b22cdae823bac193338d928e86319cd3741ab5fd jdk7u85-b02
+aef681a80dc1e8a8b69c1a06b463bda7999801ea icedtea-2.6.2pre01
+d627a940b6ca8fb4353f844e4f91163a3dcde0bc icedtea-2.6.2pre02
 2741575d96f3985d41de8ebe1ba7fae8afbb0fde jdk7u91-b00
 1a9e2dcc91dc3d0c103b09c478b3ac31ac45733f jdk7u91-b01
+73356b81c5c773a29729ae3b641516e0ac4a015d icedtea-2.6.2
 08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02
+91fdb0c83e50c398bee5f0550600d20650f2a6ef icedtea-2.6.3
 3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00
+fd0a34cb97b40c622fc6d3370f5eca062e280979 icedtea-2.6.4
 93a2788178e6ebebfbd30075f51ab35ac4f1b2a1 jdk7u99-b00
+f6593c32cc46f60438804b6a5b0d61e532f4a235 icedtea-2.6.5
+83f998d6c0afda7f3882ecc03ea873d988174c19 icedtea-2.6.6pre01
 5713b8d2db3f1fc0c9802fdaf30ca802cddf8f65 jdk7u101-b00
+e42dd50480d3aab87668202ed79fb87f2dedcb91 icedtea-2.6.6
+264448dfed4e1bddd2da25aa3d3976bcabbb9ad6 icedtea-2.6.7pre01
 e65eb66727550af75293996fc42e2c49c2002659 jdk7u111-b00
 a5002845bff276d1a8e4bdb4a0dcb972509f7d07 jdk7u111-b01
+ca9d8b242a10f1987375b8eca38b368ee23db334 icedtea-2.6.7
+2e6c46aea99fdd650e5ff40877a98f466361e9dc icedtea-2.6.8pre01
 3715f0221fd743e878ae5198dbaebe61ebd4fa97 jdk7u121-b00
+545e512eb4de948a44e6dd2187f386c644149aa7 icedtea-2.6.8
+4f7f0c054b2d447b4a283810abbba7a0558f0a87 icedtea-2.6.9pre01
+240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00
diff -r bafda2c80afe -r dd8e22d986c8 .jcheck/conf
--- a/.jcheck/conf Fri Oct 28 03:35:37 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r bafda2c80afe -r dd8e22d986c8 make/Makefile
--- a/make/Makefile Fri Oct 28 03:35:37 2016 +0100
+++ b/make/Makefile Tue Feb 07 04:06:35 2017 +0000
@@ -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 bafda2c80afe -r dd8e22d986c8 make/build.properties
--- a/make/build.properties Fri Oct 28 03:35:37 2016 +0100
+++ b/make/build.properties Tue Feb 07 04:06:35 2017 +0000
@@ -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/
@@ -126,7 +127,8 @@
 
 javadoc.includes = \
         com/sun/javadoc/ \
-        com/sun/tools/javadoc/
+        com/sun/tools/javadoc/ \
+ com/sun/tools/doclets/internal/toolkit/util/FatalError.java
 
 javadoc.tests = \
         tools/javadoc/
diff -r bafda2c80afe -r dd8e22d986c8 make/build.xml
--- a/make/build.xml Fri Oct 28 03:35:37 2016 +0100
+++ b/make/build.xml Tue Feb 07 04:06:35 2017 +0000
@@ -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 bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue Feb 07 04:06:35 2017 +0000
@@ -181,23 +181,6 @@
      */
     protected abstract void addNavDetailLink(boolean link, Content liNav);
 
-    /***  ***/
-
-    protected void print(String str) {
-        writer.print(str);
-        writer.displayLength += str.length();
-    }
-
-    protected void print(char ch) {
-        writer.print(ch);
-        writer.displayLength++;
-    }
-
-    protected void strong(String str) {
-        writer.strong(str);
-        writer.displayLength += str.length();
-    }
-
     /**
      * Add the member name to the content tree and modifies the display length.
      *
@@ -304,23 +287,6 @@
         tdSummaryType.addContent(code);
     }
 
-    private void printModifier(ProgramElementDoc member) {
-        if (member.isProtected()) {
-            print("protected ");
-        } else if (member.isPrivate()) {
-            print("private ");
-        } else if (!member.isPublic()) { // Package private
-            writer.printText("doclet.Package_private");
-            print(" ");
-        }
-        if (member.isMethod() && ((MethodDoc)member).isAbstract()) {
-            print("abstract ");
-        }
-        if (member.isStatic()) {
-            print("static");
-        }
-    }
-
     /**
      * Add the modifier for the member.
      *
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Tue Feb 07 04:06:35 2017 +0000
@@ -104,7 +104,7 @@
             configuration.standardmessage.
                      error("doclet.exception_encountered",
                            exc.toString(), filename);
-            throw new DocletAbortException();
+            throw new DocletAbortException(exc);
         }
     }
 
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Feb 07 04:06:35 2017 +0000
@@ -25,6 +25,8 @@
 
 package com.sun.tools.doclets.formats.html;
 
+import java.io.IOException;
+
 import com.sun.javadoc.*;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.util.*;
@@ -187,7 +189,7 @@
     /**
      * {@inheritDoc}
      */
-    public void printDocument(Content contentTree) {
+    public void printDocument(Content contentTree) throws IOException {
         printHtmlDocument(configuration.metakeywords.getMetaKeywords(annotationType),
                 true, contentTree);
     }
@@ -299,7 +301,7 @@
             subDiv.addContent(div);
         } catch (Exception e) {
             e.printStackTrace();
-            throw new DocletAbortException();
+            throw new DocletAbortException(e);
         }
     }
 
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Tue Feb 07 04:06:35 2017 +0000
@@ -210,7 +210,7 @@
             configuration.standardmessage.
                 error("doclet.exception_encountered",
                       exc.toString(), filename);
-            throw new DocletAbortException();
+            throw new DocletAbortException(exc);
         }
     }
 
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue Feb 07 04:06:35 2017 +0000
@@ -25,6 +25,7 @@
 
 package com.sun.tools.doclets.formats.html;
 
+import java.io.IOException;
 import java.util.*;
 
 import com.sun.javadoc.*;
@@ -196,7 +197,7 @@
     /**
      * {@inheritDoc}
      */
-    public void printDocument(Content contentTree) {
+    public void printDocument(Content contentTree) throws IOException {
         printHtmlDocument(configuration.metakeywords.getMetaKeywords(classDoc),
                 true, contentTree);
     }
@@ -578,7 +579,7 @@
             subDiv.addContent(div);
         } catch (Exception e) {
             e.printStackTrace();
-            throw new DocletAbortException();
+            throw new DocletAbortException(e);
         }
     }
 
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Feb 07 04:06:35 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,6 +27,8 @@
 
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.javadoc.JavaScriptScanner;
+import com.sun.tools.javadoc.RootDocImpl;
 
 import com.sun.javadoc.*;
 import java.util.*;
@@ -171,6 +173,11 @@
     public boolean createoverview = false;
 
     /**
+     * Whether or not to check for JavaScript in doc comments.
+     */
+    private boolean allowScriptInComments;
+
+    /**
      * Unique Resource Handler for this package.
      */
     public final MessageRetriever standardmessage;
@@ -266,8 +273,11 @@
                 nooverview = true;
             } else if (opt.equals("-overview")) {
                 overview = true;
+            } else if (opt.equals("--allow-script-in-comments")) {
+                allowScriptInComments = true;
             }
         }
+
         if (root.specifiedClasses().length > 0) {
             Map<String,PackageDoc> map = new HashMap<String,PackageDoc>();
             PackageDoc pd;
@@ -281,6 +291,30 @@
         }
         setCreateOverview();
         setTopFile(root);
+
+        if (root instanceof RootDocImpl) {
+            JavaScriptScanner jss = ((RootDocImpl) root).initJavaScriptScanner(isAllowScriptInComments());
+            if (jss != null) {
+                // In a more object-oriented world, this would be done by methods on the Option objects.
+                // Note that -windowtitle silently removes any and all HTML elements, and so does not need
+                // to be handled here.
+                checkJavaScript(jss, "-header", header);
+                checkJavaScript(jss, "-footer", footer);
+                checkJavaScript(jss, "-top", top);
+                checkJavaScript(jss, "-bottom", bottom);
+                checkJavaScript(jss, "-doctitle", doctitle);
+                checkJavaScript(jss, "-packagesheader", packagesheader);
+            }
+        }
+    }
+
+    private void checkJavaScript(JavaScriptScanner jss, final String opt, String value) {
+        jss.parse(value, new JavaScriptScanner.Reporter() {
+            public void report() {
+                root.printError(getText("doclet.JavaScript_in_option", opt));
+                throw new FatalError();
+            }
+        });
     }
 
     /**
@@ -314,7 +348,8 @@
             option.equals("-serialwarn") ||
             option.equals("-use") ||
             option.equals("-nonavbar") ||
-            option.equals("-nooverview")) {
+            option.equals("-nooverview") ||
+            option.equals("--allow-script-in-comments")) {
             return 1;
         } else if (option.equals("-help")) {
             System.out.println(getText("doclet.usage"));
@@ -518,4 +553,13 @@
         else
             return Locale.getDefault();
     }
+
+    /**
+     * Returns whether or not to allow JavaScript in comments.
+     * Default is off; can be set true from a command line option.
+     * @return the allowScriptInComments
+     */
+    public boolean isAllowScriptInComments() {
+        return allowScriptInComments;
+    }
 }
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Feb 07 04:06:35 2017 +0000
@@ -297,7 +297,7 @@
     /**
      * {@inheritDoc}
      */
-    public void printDocument(Content contentTree) {
+    public void printDocument(Content contentTree) throws IOException {
         printHtmlDocument(null, true, contentTree);
     }
 }
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Tue Feb 07 04:06:35 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -122,7 +122,7 @@
             configuration.standardmessage.error(
                         "doclet.exception_encountered",
                         exc.toString(), filename);
-            throw new DocletAbortException();
+            throw new DocletAbortException(exc);
         }
     }
 
diff -r bafda2c80afe -r dd8e22d986c8 src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Fri Oct 28 03:35:37 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Tue Feb 07 04:06:35 2017 +0000
@@ -81,7 +81,7 @@
             configuration.standardmessage.error(
                         "doclet.exception_encountered",
Loading...