/hg/release/icedtea7-forest-2.4/langtools: 15 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 14 01:01:29 PST 2013
changeset aeef1c7e43bc in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=aeef1c7e43bc
author: katleman
date: Fri Jan 11 09:00:00 2013 -0800
Added tag jdk7u11-b20 for changeset b01338429ab6
changeset c38be56292f1 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c38be56292f1
author: katleman
date: Sat Jan 12 14:43:37 2013 -0800
Added tag jdk7u11-b21 for changeset aeef1c7e43bc
changeset e8071ede35dc in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e8071ede35dc
author: katleman
date: Tue Nov 13 16:59:15 2012 -0800
Added tag jdk7u11-b03 for changeset eaa8a0141c35
changeset 330491823a08 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=330491823a08
author: ewendeli
date: Mon Nov 19 16:35:07 2012 +0100
Merge
changeset 17b9bb22f3fd in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=17b9bb22f3fd
author: cl
date: Tue Nov 20 18:12:50 2012 -0800
Added tag jdk7u11-b04 for changeset e8071ede35dc
changeset b964e5d884a4 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b964e5d884a4
author: cl
date: Tue Nov 20 18:32:28 2012 -0800
Added tag jdk7u11-b05 for changeset 17b9bb22f3fd
changeset 96c8b3b817aa in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=96c8b3b817aa
author: ewendeli
date: Thu Nov 22 08:22:49 2012 +0100
Merge
changeset ef64eebfc840 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ef64eebfc840
author: katleman
date: Wed Nov 28 15:44:14 2012 -0800
Added tag jdk7u11-b06 for changeset 96c8b3b817aa
changeset c5d3dabddff7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c5d3dabddff7
author: ewendeli
date: Fri Nov 30 04:59:40 2012 +0100
Merge
changeset 25e6f11f8b75 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=25e6f11f8b75
author: katleman
date: Tue Dec 04 10:40:00 2012 -0800
Added tag jdk7u11-b07 for changeset c5d3dabddff7
changeset a0d9abc40558 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a0d9abc40558
author: ewendeli
date: Thu Dec 06 17:46:51 2012 +0100
Merge
changeset 8ed6f4d15270 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8ed6f4d15270
author: katleman
date: Tue Dec 11 12:14:23 2012 -0800
Added tag jdk7u11-b08 for changeset a0d9abc40558
changeset a778aaf53c52 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a778aaf53c52
author: ewendeli
date: Mon Jan 14 18:42:42 2013 +0100
Merge
changeset 761b933e2696 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=761b933e2696
author: katleman
date: Tue Jan 15 18:57:51 2013 -0800
Added tag jdk7u13-b09 for changeset a778aaf53c52
changeset 43a160f96f49 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=43a160f96f49
author: andrew
date: Thu Feb 14 02:27:26 2013 +0000
Merge jdk7u13-b20
diffstat:
.hgtags | 36 +++
make/Makefile | 6 +
make/build.properties | 2 +-
make/build.xml | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java | 60 ++---
src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java | 24 +-
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/Check.java | 6 +-
src/share/classes/com/sun/tools/javac/comp/Lower.java | 1 -
src/share/classes/com/sun/tools/javac/tree/TreeInfo.java | 2 +-
src/share/classes/com/sun/tools/javah/JavahTask.java | 12 +-
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/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/TryWithResources/T7178324.java | 43 ++++
test/tools/javac/generics/8004094/B.java | 47 ++++
test/tools/javac/generics/8004094/T8004094.java | 32 +++
test/tools/javac/processing/6348499/T6348499.java | 5 +-
test/tools/javac/processing/6414633/T6414633.java | 17 +-
test/tools/javac/processing/6430209/T6430209.java | 5 +-
test/tools/javac/processing/T6920317.java | 6 +-
test/tools/javah/T7185778.java | 56 +++++
31 files changed, 826 insertions(+), 77 deletions(-)
diffs (truncated from 1306 to 500 lines):
diff -r b01338429ab6 -r 43a160f96f49 .hgtags
--- a/.hgtags Tue Dec 04 17:28:46 2012 -0800
+++ b/.hgtags Thu Feb 14 02:27:26 2013 +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
@@ -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
@@ -199,6 +206,7 @@
dd3e29d8892fcaba6d76431d5fa9d49e7c088f76 jdk7u6-b23
6aac89e84fc96d15bb78b13aa71c9e6b73d7237e jdk7u6-b24
bcd1d067d525065630deb98b678bc00b499adbe1 jdk7u6-b30
+2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u6-b31
2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u7-b10
27041587508dbc4e08c956ba98a11ce0d5608dc4 jdk7u7-b30
b92a9f4f6bce4ec500ed3adb8203e6424b579f94 jdk7u7-b11
@@ -212,6 +220,25 @@
0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02
9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04
1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05
+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
+87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01
+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
8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10
01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11
1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12
@@ -222,3 +249,12 @@
7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17
4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18
1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30
+b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20
+aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21
+eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03
+e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04
+17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05
+96c8b3b817aa3e672f78f1d5006616104378ff29 jdk7u11-b06
+c5d3dabddff76c92425cbf6a99ed4e066d16b4fd jdk7u11-b07
+a0d9abc405580d6fa0ae217fab96608285a38c41 jdk7u11-b08
+a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u13-b09
diff -r b01338429ab6 -r 43a160f96f49 make/Makefile
--- a/make/Makefile Tue Dec 04 17:28:46 2012 -0800
+++ b/make/Makefile Thu Feb 14 02:27:26 2013 +0000
@@ -111,6 +111,12 @@
ANT_OPTIONS += -Ddebug.classfiles=true
endif
+ifeq ($(JAVAC_WARNINGS_FATAL), true)
+ ANT_OPTIONS += -Dwarnings.fatal=-Werror
+else
+ ANT_OPTIONS += -Dwarnings.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 b01338429ab6 -r 43a160f96f49 make/build.properties
--- a/make/build.properties Tue Dec 04 17:28:46 2012 -0800
+++ b/make/build.properties Thu Feb 14 02:27:26 2013 +0000
@@ -68,7 +68,7 @@
# 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.lint.opts = -Xlint:all,-deprecation ${warnings.fatal}
# options for the <javadoc> task for javac
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r b01338429ab6 -r 43a160f96f49 make/build.xml
--- a/make/build.xml Tue Dec 04 17:28:46 2012 -0800
+++ b/make/build.xml Thu Feb 14 02:27:26 2013 +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 b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Feb 14 02:27:26 2013 +0000
@@ -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 b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Feb 14 02:27:26 2013 +0000
@@ -364,19 +364,21 @@
if (opt.equals("-d")) {
destDirName = addTrailingFileSep(os[1]);
docFileDestDirName = destDirName;
- } else if (opt.equals("-docfilessubdirs")) {
+ } else if (opt.equals("-docfilessubdirs")) {
copydocfilesubdirs = true;
- } else if (opt.equals("-docencoding")) {
+ } else if (opt.equals("-docencoding")) {
docencoding = os[1];
- } else if (opt.equals("-encoding")) {
+ } else if (opt.equals("-encoding")) {
encoding = os[1];
- } else if (opt.equals("-author")) {
+ } else if (opt.equals("-author")) {
showauthor = true;
- } else if (opt.equals("-version")) {
+ } else if (opt.equals("-nosince")) {
+ nosince = true;
+ } else if (opt.equals("-version")) {
showversion = true;
- } else if (opt.equals("-nodeprecated")) {
+ } else if (opt.equals("-nodeprecated")) {
nodeprecated = true;
- } else if (opt.equals("-sourcepath")) {
+ } else if (opt.equals("-sourcepath")) {
sourcepath = os[1];
} else if (opt.equals("-classpath") &&
sourcepath.length() == 0) {
@@ -400,17 +402,17 @@
message.warning("doclet.sourcetab_warning");
sourcetab = DocletConstants.DEFAULT_TAB_STOP_LENGTH;
}
- } else if (opt.equals("-notimestamp")) {
+ } else if (opt.equals("-notimestamp")) {
notimestamp = true;
- } else if (opt.equals("-nocomment")) {
+ } else if (opt.equals("-nocomment")) {
nocomment = true;
} else if (opt.equals("-tag") || opt.equals("-taglet")) {
customTagStrs.add(os);
} else if (opt.equals("-tagletpath")) {
tagletpath = os[1];
- } else if (opt.equals("-keywords")) {
+ } else if (opt.equals("-keywords")) {
keywords = true;
- } else if (opt.equals("-serialwarn")) {
+ } else if (opt.equals("-serialwarn")) {
serialwarn = true;
} else if (opt.equals("-group")) {
group.checkPackageGroups(os[1], os[2]);
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java Thu Feb 14 02:27:26 2013 +0000
@@ -1,6 +1,26 @@
/*
- * Copyright (c) 2006, 2012 Oracle and/or its affiliates. All rights reserved.
- * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * Copyright (c) 2006, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.tools.doclets.internal.toolkit.taglets;
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Thu Feb 14 02:27:26 2013 +0000
@@ -600,6 +600,7 @@
ArrayList<Taglet> mTags = new ArrayList<Taglet>(customTags.size());
ArrayList<Taglet> iTags = new ArrayList<Taglet>(customTags.size());
ArrayList<Taglet> oTags = new ArrayList<Taglet>(customTags.size());
+ ArrayList<Taglet> sTags = new ArrayList<Taglet>();
Taglet current;
while (it.hasNext()) {
current = it.next();
@@ -634,11 +635,12 @@
inlineTags = iTags.toArray(new Taglet[] {});
//Init the serialized form tags
- serializedFormTags = new Taglet[4];
- serializedFormTags[0] = customTags.get("serialData");
- serializedFormTags[1] = customTags.get("throws");
- serializedFormTags[2] = customTags.get("since");
- serializedFormTags[3] = customTags.get("see");
+ sTags.add(customTags.get("serialData"));
+ sTags.add(customTags.get("throws"));
+ if (!nosince)
+ sTags.add(customTags.get("since"));
+ sTags.add(customTags.get("see"));
+ serializedFormTags = sTags.toArray(new Taglet[] {});
}
/**
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu Feb 14 02:27:26 2013 +0000
@@ -372,7 +372,13 @@
while((n = in.read(buf))>0) out.write(buf,0,n);
} else {
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+ BufferedWriter writer;
+ if (configuration.docencoding == null) {
+ writer = new BufferedWriter(new OutputStreamWriter(out));
+ } else {
+ writer = new BufferedWriter(new OutputStreamWriter(out,
+ configuration.docencoding));
+ }
try {
String line;
while ((line = reader.readLine()) != null) {
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/javac/code/Types.java
--- a/src/share/classes/com/sun/tools/javac/code/Types.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java Thu Feb 14 02:27:26 2013 +0000
@@ -1616,9 +1616,14 @@
* type parameters in t are deleted.
*/
public Type erasure(Type t) {
- return erasure(t, false);
+ return eraseNotNeeded(t)? t : erasure(t, false);
}
//where
+ private boolean eraseNotNeeded(Type t) {
+ return (t.tag <= lastBaseTag) || (syms.stringType.tsym == t.tsym);
+ }
+
+ //where
private Type erasure(Type t, boolean recurse) {
if (t.tag <= lastBaseTag)
return t; /* fast special case */
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Feb 14 02:27:26 2013 +0000
@@ -1649,13 +1649,15 @@
for (Scope.Entry e1 = t1.tsym.members().elems; e1 != null; e1 = e1.sibling) {
Symbol s1 = e1.sym;
Type st1 = null;
- if (s1.kind != MTH || !s1.isInheritedIn(site.tsym, types)) continue;
+ if (s1.kind != MTH || !s1.isInheritedIn(site.tsym, types) ||
+ (s1.flags() & SYNTHETIC) != 0) continue;
Symbol impl = ((MethodSymbol)s1).implementation(site.tsym, types, false);
if (impl != null && (impl.flags() & ABSTRACT) == 0) continue;
for (Scope.Entry e2 = t2.tsym.members().lookup(s1.name); e2.scope != null; e2 = e2.next()) {
Symbol s2 = e2.sym;
if (s1 == s2) continue;
- if (s2.kind != MTH || !s2.isInheritedIn(site.tsym, types)) continue;
+ if (s2.kind != MTH || !s2.isInheritedIn(site.tsym, types) ||
+ (s2.flags() & SYNTHETIC) != 0) continue;
if (st1 == null) st1 = types.memberType(t1, s1);
Type st2 = types.memberType(t2, s2);
if (types.overrideEquivalent(st1, st2)) {
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/javac/comp/Lower.java
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Feb 14 02:27:26 2013 +0000
@@ -3458,7 +3458,6 @@
JCExpression expression = oneCase.getExpression();
if (expression != null) { // expression for a "default" case is null
- expression = TreeInfo.skipParens(expression);
String labelExpr = (String) expression.type.constValue();
Integer mapping = caseLabelToPosition.put(labelExpr, casePosition);
Assert.checkNull(mapping);
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Thu Feb 14 02:27:26 2013 +0000
@@ -247,7 +247,7 @@
JCTry t = (JCTry) tree;
return endPos((t.finalizer != null)
? t.finalizer
- : t.catchers.last().body);
+ : (t.catchers.isEmpty()? t.body : t.catchers.last().body));
} else
return tree.pos;
}
diff -r b01338429ab6 -r 43a160f96f49 src/share/classes/com/sun/tools/javah/JavahTask.java
--- a/src/share/classes/com/sun/tools/javah/JavahTask.java Tue Dec 04 17:28:46 2012 -0800
+++ b/src/share/classes/com/sun/tools/javah/JavahTask.java Thu Feb 14 02:27:26 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -506,7 +506,7 @@
List<String> opts = new ArrayList<String>();
opts.add("-proc:only");
opts.addAll(javac_extras);
- CompilationTask t = c.getTask(log, fileManager, diagnosticListener, opts, internalize(classes), null);
+ CompilationTask t = c.getTask(log, fileManager, diagnosticListener, opts, classes, null);
JavahProcessor p = new JavahProcessor(g);
t.setProcessors(Collections.singleton(p));
@@ -516,14 +516,6 @@
return ok;
}
- private List<String> internalize(List<String> classes) {
- List<String> l = new ArrayList<String>();
- for (String c: classes) {
- l.add(c.replace('$', '.'));
- }
- return l;
- }
-
private List<File> pathToFiles(String path) {
List<File> files = new ArrayList<File>();
for (String f: path.split(File.pathSeparator)) {
diff -r b01338429ab6 -r 43a160f96f49 test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Thu Feb 14 02:27:26 2013 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2002, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/*
+ * @test
+ * @bug 8000743
+ * @summary Run tests on -docencoding to see if the value is
+ used for stylesheet as well.
+ * @author jayashree viswanathan
+ * @library ../lib/
+ * @build JavadocTester TestDocEncoding
More information about the distro-pkg-dev
mailing list