Commit Graph

1257 Commits

Author SHA1 Message Date
Lana Steuck
09e2e03986 Merge 2012-01-09 19:13:08 -08:00
David Katleman
abee2d7726 Added tag jdk8-b20 for changeset 075cd2a7d88e 2012-01-05 08:42:49 -08:00
Lana Steuck
2836fc5d02 Merge 2012-01-04 10:58:12 -08:00
Jim Holmlund
799afd934d 7046929: tools/javac/api/T6397104.java fails
Reviewed-by: jjg
2012-01-03 17:18:10 -08:00
Jonathan Gibbons
a3f0f7b59c 4881269: improve diagnostic for ill-formed tokens
Reviewed-by: mcimadamore
2012-01-03 11:37:00 -08:00
David Katleman
d09c9a8fd3 Added tag jdk8-b19 for changeset 8e546b2b9dd0 2011-12-29 15:14:53 -08:00
Lana Steuck
99e6dce2a2 Merge 2011-12-28 10:52:11 -08:00
Lana Steuck
9e264f222c Merge 2011-12-23 16:39:22 -08:00
Jonathan Gibbons
42b9d6bc2e 7124605: typos in javac comments
Reviewed-by: ksrini
2011-12-23 22:30:33 +00:00
Christine Lu
d69e5e7e94 Added tag jdk8-b18 for changeset ff9cf1de21fa 2011-12-22 19:00:58 -08:00
Maurizio Cimadamore
61ee75c9d4 7120463: Fix method reference parser support in order to avoid ambiguities
Add lookahead routine to disambiguate between method reference in method context and binary expression

Reviewed-by: jjg, dlsmith
2011-12-19 12:07:07 +00:00
Jim Holmlund
441d03061d 7122342: testPrintProcessorInfo/TestWithXstdout.java failed for JDK8 nightly build at 12/16/2011
Do not pass empty args to javac

Reviewed-by: jjg
2011-12-16 16:41:00 -08:00
Jonathan Gibbons
e559289081 7121961: javadoc is missing a resource property
Reviewed-by: bpatel
2011-12-16 13:49:44 -08:00
Lana Steuck
1289447ac4 Merge 2011-12-15 19:53:04 -08:00
David Katleman
28ab3c9991 Merge 2011-12-15 15:57:51 -08:00
David Katleman
59128f6107 Added tag jdk8-b16 for changeset 3b5651ae449e 2011-12-15 15:47:47 -08:00
David Katleman
a98e5a19c0 Added tag jdk8-b17 for changeset 27c6c6c32d01 2011-12-15 12:16:55 -08:00
Jonathan Gibbons
e850a9fde0 7121682: remove obsolete import
Reviewed-by: jjh
2011-12-14 21:52:59 -08:00
Jonathan Gibbons
b771185497 7121681: compiler message file broken for javac -fullversion
Reviewed-by: jjh
2011-12-14 17:52:41 -08:00
Jonathan Gibbons
9a127e2710 7111022: javac no long prints last round of processing
7121323: Sqe tests using -Xstdout option fail with an invalid flag error message

Reviewed-by: darcy
2011-12-14 16:16:04 -08:00
Jonathan Gibbons
0707071217 7121164: renamed files not committed
Reviewed-by: ksrini
2011-12-13 14:33:39 -08:00
Jonathan Gibbons
ea7f040a8e 7120736: refactor javac option handling
Reviewed-by: mcimadamore
2011-12-13 11:21:28 -08:00
Lana Steuck
ccc8319e5f Merge 2011-12-12 10:08:26 -08:00
Kelly O'Hair
daca795ff4 7119829: Adjust default jprt testing configuration
Reviewed-by: alanb
2011-12-12 08:15:32 -08:00
Maurizio Cimadamore
bf0106a903 7120266: javac fails to compile hotspot code
Parser changes for method references cause bad intercation with method call syntax

Reviewed-by: jjg
2011-12-11 17:48:25 +00:00
Kumar Srinivasan
d7cfaf1336 7119487: JavacParserTest.java test fails on Windows platforms
Reviewed-by: jjg
2011-12-10 17:44:46 -08:00
Jan Lahoda
7beeeca1de 7119032: (javac) increase visibility of JavacParser methods to improve subtyping
Reviewed-by: jjg
2011-12-09 08:40:40 -08:00
Matherey Nunez
2b9e2e9038 7086015: fix test/tools/javac/parser/netbeans/JavacParserTest.java
Reviewed-by: ksrini, jjg
2011-12-07 10:47:46 -08:00
Lana Steuck
0b862d6dc1 Merge 2011-12-06 20:26:09 -08:00
David Katleman
d115f54e18 Added tag jdk8-b15 for changeset 14b0b1e3dd43 2011-12-01 10:33:34 -08:00
Maurizio Cimadamore
b0a9998899 7115052: Add parser support for method references
Add support for parsing method references to JavacParser

Reviewed-by: jjg
2011-11-28 16:05:46 +00:00
Maurizio Cimadamore
4ac518143c 7115050: Add parser support for lambda expressions
Add support for parsing lambda expressions to JavacParser

Reviewed-by: jjg
2011-11-28 15:56:42 +00:00
Maurizio Cimadamore
86e6e6be73 7115049: Add AST node for method references
Add tree nodes for representing method/constructor references and update relevant visitors interfaces

Reviewed-by: jjg
2011-11-24 13:38:40 +00:00
Maurizio Cimadamore
41a3a6c5d3 7115046: Add AST node for lambda expressions
Add tree nodes for representing lambda expressions and update relevant visitors interfaces

Reviewed-by: jjg
2011-11-24 13:36:20 +00:00
Jim Holmlund
5349d9af9a 7110611: compiler message file broken for javac -fullversion
Reviewed-by: jjg
2011-11-19 15:54:04 -08:00
Lana Steuck
a8308c6690 Merge 2011-11-18 11:12:21 -08:00
David Katleman
9fbb77c394 Added tag jdk8-b14 for changeset aab57958af8d 2011-11-17 10:46:10 -08:00
Lana Steuck
674fadf1b3 Merge 2011-11-14 18:16:13 -08:00
Kumar Srinivasan
b7094ba03c 7106166: (javac) re-factor EndPos parser
Reviewed-by: jjg
2011-11-14 15:11:10 -08:00
Kumar Srinivasan
ca1deee4d3 7110974: (javac) add coding conventions and style checkers for langtools
Reviewed-by: jjg
2011-11-14 08:09:47 -08:00
David Katleman
1269b98a27 Added tag jdk8-b13 for changeset 7e7229cae97b 2011-11-10 11:47:25 -08:00
Jonathan Gibbons
ebe950642c 7108669: cleanup Log methods for direct printing to streams
Reviewed-by: mcimadamore
2011-11-08 17:06:58 -08:00
Jonathan Gibbons
738aef1b75 7108668: allow Log to be initialized and used earlier
Reviewed-by: mcimadamore
2011-11-08 17:06:08 -08:00
Vicente Romero
399b71b9f0 6921494: provide way to print javac tree tag values
Reviewed-by: jjg, mcimadamore
2011-11-08 11:51:05 -08:00
Lana Steuck
e31aa294c3 Merge 2011-11-05 00:02:33 -07:00
Maurizio Cimadamore
be5a83c8ce 7104201: Refactor DocCommentScanner
Add new Comment helper class to parse contents of comments in source code

Reviewed-by: jjg
2011-11-04 12:36:40 +00:00
David Katleman
524b8ef2fe Added tag jdk8-b12 for changeset 5ec6698ec5a9 2011-11-03 10:32:39 -07:00
Jim Holmlund
dae561e3ea 7101933: langtools jtreg tests do not work with jprt on windows
Fixed langtools/test/Makefile to work on cygwin. Updated jtreg to 4.1 and JCK to JCK8.

Reviewed-by: jjg, ohair
2011-11-01 15:49:45 -07:00
Lana Steuck
6f4a99a81f Merge 2011-10-28 17:49:36 -07:00
David Katleman
31ff82c1c8 Added tag jdk8-b11 for changeset b44e4293ec86 2011-10-27 13:54:50 -07:00
Lana Steuck
dedae49531 Merge 2011-10-26 12:28:51 -07:00
Lana Steuck
2c50355271 Merge 2011-10-25 21:55:25 -07:00
Jim Holmlund
b171ddacd0 7104905: Java SE build fails on call to CreateSymbols
Reviewed-by: jjg
2011-10-25 19:18:32 -07:00
Lana Steuck
a4d1ec9d5f Merge 2011-10-25 10:52:03 -07:00
Jonathan Gibbons
d20f9f51bc 7104039: refactor/cleanup javac Paths class
Reviewed-by: mcimadamore
2011-10-25 10:48:05 -07:00
Maurizio Cimadamore
1469ebc6da 7104618: MessageInfo.java is failing after lexer changes
Two langtools regression tests cannot be built due to a bad import statement

Reviewed-by: jjg
2011-10-25 15:40:34 +01:00
Maurizio Cimadamore
7873cba6b2 7098660: Write better overload resolution/inference tests
Add overload/inference debug diagnostics - added test harness using annotations to check outcome of overload resolution/inference

Reviewed-by: jjg
2011-10-24 13:00:30 +01:00
Maurizio Cimadamore
063b622daf 7096014: Javac tokens should retain state
Refactor javac tokens from enum constants to stateful instances (to keep track of position, comments, etc.)

Reviewed-by: jjg
2011-10-24 13:00:20 +01:00
Jim Holmlund
5955806228 7098530: tools/javac/javazip/Test.sh can fail on Windows
Fix cygpath command to properly convert path

Reviewed-by: jjg
2011-10-21 14:14:29 -07:00
David Katleman
7cab00227f Added tag jdk8-b10 for changeset 371ba3560eaf 2011-10-20 10:32:56 -07:00
Jonathan Gibbons
6c299173e1 7101146: Paths should more directly managed by BaseFileManager
Reviewed-by: mcimadamore
2011-10-19 15:29:46 -07:00
Maurizio Cimadamore
747169f70e 7102515: javac running very very long and not returning
Verbose resolution diagnostics slow down with operator resolution

Reviewed-by: jjg
2011-10-19 16:56:05 +01:00
Lana Steuck
501fe865e8 Merge 2011-10-17 19:07:26 -07:00
Maurizio Cimadamore
d3efececf3 7093325: Redundant entry in bytecode exception table
Inlining of finalizers does not update gaps list accordingly

Reviewed-by: jjg
2011-10-17 12:57:36 +01:00
Maurizio Cimadamore
1a335eb047 7097436: Project Coin: duplicate varargs warnings on method annotated with @SafeVarargs
Duplicate aliasing check during subtyping leads to spurious varargs diagnostic

Reviewed-by: jjg
2011-10-17 12:54:33 +01:00
David Katleman
5839368eee Added tag jdk8-b09 for changeset 0169651a48bf 2011-10-13 10:35:50 -07:00
Lana Steuck
5cbdf8db6c Merge 2011-10-12 12:26:38 -07:00
David Katleman
0b92e7c70b Added tag jdk8-b08 for changeset c9fb751a1f21 2011-10-06 14:01:45 -07:00
Maurizio Cimadamore
b6f671b41e 7090499: missing rawtypes warnings in anonymous inner class
Javac does not detect raw types inside anonymous inner classes

Reviewed-by: jjg
2011-10-06 18:39:31 +01:00
Lana Steuck
2346a1c754 Merge 2011-10-03 18:26:59 -07:00
David Katleman
4749de17ea Added tag jdk8-b07 for changeset 64ad92439924 2011-09-29 18:54:01 -07:00
Lana Steuck
3ae6cc4f7e Merge 2011-09-26 14:33:34 -07:00
Lana Steuck
d941d29b0c Merge 2011-09-23 23:30:31 -07:00
David Katleman
93cf5130d6 Added tag jdk8-b06 for changeset c579ee9c7624 2011-09-22 16:02:16 -07:00
Jonathan Gibbons
4a8efe66a5 7075721: javac should have public enum for exit codes
Reviewed-by: mcimadamore
2011-09-22 09:24:01 -07:00
Jonathan Gibbons
ff7362918f 7092965: javac should not close processorClassLoader before end of compilation
Reviewed-by: darcy
2011-09-21 21:56:53 -07:00
Jonathan Gibbons
1577e0f073 7030473: Remove dead field JCCompilationUnit.flags
Reviewed-by: dlsmith
2011-09-20 12:08:48 -07:00
Lana Steuck
cdc3810c17 Merge 2011-09-19 19:41:46 -07:00
Jonathan Gibbons
51763c43f7 7091528: javadoc attempts to parse .class files
Reviewed-by: darcy
2011-09-16 16:18:46 -07:00
Maurizio Cimadamore
bd420dc94e 7086586: Inference producing null type argument
Inference should fail in 15.12.2.7 when inference variables with 'nulltype' upper bounds are found

Reviewed-by: dlsmith
2011-09-16 14:16:11 +01:00
Suchen Chien
f843db55a4 Added tag jdk8-b05 for changeset deef5f066e00 2011-09-15 18:53:41 -07:00
Jonathan Gibbons
4589920917 7068437: Regression: Filer.getResource(SOURCE_OUTPUT, ...) no longer works in JDK 7 w/o -s
Reviewed-by: darcy
2011-09-14 18:26:57 -07:00
Jonathan Gibbons
afaeb37bb5 7090700: fix for 7080267 breaks two tests
Reviewed-by: ksrini
2011-09-14 15:49:54 -07:00
Jonathan Gibbons
2bbf651156 7090249: IllegalStateException from Trees.getScope when called from JSR 199
Reviewed-by: mcimadamore
2011-09-14 12:14:30 -07:00
Jonathan Gibbons
1ec8f70fdd 7080267: Call to toString() from an ExpressionStatementTree doesn't take in consideration the ";" at the end
Reviewed-by: mcimadamore
2011-09-14 12:07:50 -07:00
Mandy Chung
12a0dac949 7090297: Remove com.sun.tools.javac.Launcher from tools.jar
Reviewed-by: jjg
2011-09-13 16:37:09 -07:00
Maurizio Cimadamore
08619c2e9c 7086601: Error message bug: cause for method mismatch is 'null'
Inference error during lub() does not set 'cause' for method resolution diagnostic

Reviewed-by: jjg
2011-09-13 14:15:39 +01:00
Maurizio Cimadamore
0208d38b3c 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
Compiler omits unreferenced local inner classes from the InnerClasses attribute

Reviewed-by: jjg
2011-09-13 14:15:22 +01:00
Maurizio Cimadamore
8db2f8de59 7086595: Error message bug: name of initializer is 'null'
Implementation of MethodSymbol.location() should take into account static/instance initializers

Reviewed-by: jjg
2011-09-13 14:14:57 +01:00
Jonathan Gibbons
c1efbbc362 Merge 2011-09-12 11:40:07 -07:00
Jonathan Gibbons
8166c2b32b 7068451: Regression: javac compiles fixed sources against previous, not current, version of generated sources
Reviewed-by: mcimadamore
2011-09-12 11:39:08 -07:00
Lana Steuck
14cdfec16f Merge 2011-09-10 21:31:08 -07:00
Jonathan Gibbons
a0084596d4 7073508: Regression: NullPointerException at com.sun.tools.javac.code.Lint$AugmentVisitor.augment
Reviewed-by: darcy
2011-09-09 17:19:26 -07:00
Suchen Chien
c66c50437c Added tag jdk8-b04 for changeset cd423392ab94 2011-09-08 16:59:53 -07:00
Maurizio Cimadamore
a456f20739 7086261: javac doesn't report error as expected, it only reports ClientCodeWrapper$DiagnosticSourceUnwrapper
Missing override for toString() in ClientCodeUnwrapper.DiagnosticSourceUnwrapper

Reviewed-by: jjg
2011-09-02 17:35:56 +01:00
Bruce Chapman
0da4a58897 7024096: Stack trace has invalid line numbers
Reviewed-by: jjg, darcy
2011-09-02 07:54:16 -07:00
Jim Holmlund
7d7c8d7cdf 7086071: tools/javac/7079713/TestCircularClassfile.java fails on windows
Delete file before renaming another file to it

Reviewed-by: jjg
2011-09-01 14:35:59 -07:00
Suchen Chien
fd8978fa75 Added tag jdk8-b03 for changeset df130f34ab4c 2011-09-01 13:54:50 -07:00
Jan Lahoda
6f70d425f2 7073631: (javac) javac parser improvements for error position reporting
JavacParser improvements for NetBeans, improved by LangTools.

Reviewed-by: mcimadamore, jjg
2011-09-01 09:14:25 -07:00
Jonathan Gibbons
654ae83d8e 7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
Reviewed-by: mcimadamore
2011-08-31 15:39:00 -07:00
Maurizio Cimadamore
67f3781cb1 7079713: javac hangs when compiling a class that references a cyclically inherited class
Types.membersClosure needs to handle pathological cases of cyclic inheritance

Reviewed-by: jjg, jjh
2011-08-31 16:15:19 +01:00
Maurizio Cimadamore
68039c2904 7085024: internal error; cannot instantiate Foo
Types.isConvertible does not handle erroneous types correctly

Reviewed-by: jjg
2011-08-31 16:11:28 +01:00
Suchen Chien
4198da6308 Added tag jdk8-b02 for changeset 88a0fd8156da 2011-08-25 17:18:25 -07:00
Christine Lu
700b93fe42 Added tag jdk8-b01 for changeset cca843a7d258 2011-08-18 18:55:34 -07:00
Kumar Srinivasan
8b16f518cb 7064544: (javadoc) miscellaneous fixes requested by netbeans
Contributed by netbeans team, modified to suit by the langtools team.

Reviewed-by: jjg, bpatel
2011-08-05 19:41:05 -07:00
Jonathan Gibbons
4cd6c8c31e 7074189: some javac tests fail with latest jtreg 4.1 b03
Reviewed-by: darcy
2011-08-05 15:57:59 -07:00
Joe Darcy
dba9612ad9 7071246: Enclosing string literal in parenthesis in switch-case crashes javac
Reviewed-by: mcimadamore
2011-08-04 11:15:37 -07:00
Kumar Srinivasan
53abe0d254 7068902: (javac) allow enabling or disabling of String folding
Contributed by netbeans team, modified to suit by the langtools team.

Reviewed-by: jjg, mcimadamore
2011-07-27 11:53:17 -07:00
Maurizio Cimadamore
5c209a7d2d 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
Diamond in array initializer expressions should be rejected

Reviewed-by: jjg
2011-07-27 19:01:33 +01:00
Maurizio Cimadamore
02802c9449 7046778: Project Coin: problem with diamond and member inner classes
Diamond inference generates spurious error messages when target type is a member inner class

Reviewed-by: jjg
2011-07-27 19:01:08 +01:00
Maurizio Cimadamore
af30a2dbf3 7062745: Regression: difference in overload resolution when two methods are maximally specific
Fix most specific when two methods are maximally specific and only one has non-raw return type

Reviewed-by: jjg, dlsmith
2011-07-27 19:00:53 +01:00
Kelly O'Hair
a6cbb46a23 Merge 2011-07-22 21:31:14 -07:00
Kelly O'Hair
a6b33d5a4a 7069993: Adjust make/jprt.properties file for jdk8
Reviewed-by: katleman
2011-07-22 17:35:20 -07:00
Lana Steuck
d77b9c2ff6 Merge 2011-07-14 18:58:27 -07:00
David Schlosnagle
5f2157a8bc 7061125: Proposed javac argument processing performance improvement
Reviewed-by: jjg, dlsmith, mcimadamore, forax
2011-07-07 13:29:31 -07:00
Joe Darcy
01ee832f44 7025809: Provided new utility visitors supporting SourceVersion.RELEASE_8
Reviewed-by: jjg, mcimadamore
2011-07-05 16:37:24 -07:00
Kumar Srinivasan
69c7455330 7060642: (javadoc) improve performance on accessing inlinedTags
Reviewed-by: jjg, bpatel
2011-07-01 14:28:19 -07:00
Kumar Srinivasan
a195753a0c 6735320: StringIndexOutOfBoundsException for empty @serialField tag
Reviewed-by: jjg, bpatel
2011-07-01 13:34:37 -07:00
Kumar Srinivasan
37aa419c8a 7059905: (javadoc) promote method visibility for netbeans usage
Reviewed-by: jjg, bpatel
2011-06-30 14:33:45 -07:00
Lana Steuck
1dbd0c3e5e Merge 2011-06-30 14:19:25 -07:00
Jonathan Gibbons
00fd0bdcfd 7060926: Attr.PostAttrAnalyzer misses a case
Reviewed-by: mcimadamore
2011-06-30 12:00:53 -07:00
Suchen Chien
17c7ea1f76 Merge 2011-06-27 14:11:09 -07:00
Suchen Chien
a3a8789cac Added tag jdk7-b147 for changeset af62a2ace951 2011-06-27 13:21:47 -07:00
Joe Darcy
faf515b31f 6575445: Update annotation processor to only use java.util.ServiceLoader
Reviewed-by: jjg
2011-06-24 13:52:14 -07:00
Lana Steuck
672c2326e2 Merge 2011-06-23 17:30:49 -07:00
Alexandre Boulgakov
d44dc19842 7058174: Reduce langtools build warnings
Reviewed-by: jjg
2011-06-23 11:49:27 -07:00
Lana Steuck
2eb3bc1633 Merge 2011-06-22 23:26:00 -07:00
Joe Darcy
55d52a83a8 6449184: Provide JavacProcessingEnvironment.getWriter
Reviewed-by: jjg
2011-06-22 17:07:02 -07:00
Lana Steuck
1433317e29 Merge 2011-06-22 12:41:28 -07:00
Jeff Dinkins
de7673ad9d 7057046: Add embedded license to THIRD PARTY README
Reviewed-by: lana
2011-06-22 10:11:58 -07:00
Suchen Chien
2f43bbd50b Merge 2011-06-20 17:39:54 -07:00
Suchen Chien
372f63f99b Added tag jdk7-b146 for changeset 996242032853 2011-06-20 16:25:52 -07:00
Bhavesh Patel
a715a4095a Merge 2011-06-17 20:14:05 -07:00
Bhavesh Patel
0982a2586d 7052425: Change the look and feel of the javadoc generate HTML pages using stylesheet
Reviewed-by: jjg
2011-06-17 20:12:46 -07:00
Joe Darcy
fe7f869e78 7052122: Update JDK_MINOR_VERSION for JDK 8
Reviewed-by: mr, katleman
2011-06-13 12:17:14 -07:00
Jim Holmlund
089c11bb9b 7052782: Two langtools regression tests fail due to fix for 7034977 which removed the invokeGeneric method
Change the tests to call invoke instead of invokeGeneric

Reviewed-by: jrose, mcimadamore
2011-06-09 09:13:50 -07:00
Suchen Chien
4137646027 Merge 2011-06-08 10:25:17 -07:00
Suchen Chien
67cd1c65ef Added tag jdk7-b145 for changeset e4b5be572a36 2011-06-07 14:01:26 -07:00
Lana Steuck
e9d626d5ec Merge 2011-06-02 13:38:55 -07:00
Joe Darcy
42cb36b770 7025784: Add SourceVersion.RELEASE_8
7025786: Add -source 8 and -target 8 to javac
7025789: Change javac source and target default to 8

Reviewed-by: jjg
2011-06-01 23:56:31 -07:00
Jonathan Gibbons
8df816992b 7042623: Regression: javac silently crash when attributing non-existent annotation
Reviewed-by: mcimadamore
2011-06-01 11:25:50 -07:00
Jeff Dinkins
0cd0c8c54f 7045697: JDK7 THIRD PARTY README update
Reviewed-by: lana
2011-05-27 15:02:39 -07:00
Suchen Chien
8e987420b4 Added tag jdk7-b144 for changeset 3e48977e539d 2011-05-26 20:20:16 -07:00
David Katleman
f1744917be 7044486: open jdk repos have files with incorrect copyright headers, which can end up in src bundles
Reviewed-by: ohair, trims
2011-05-25 13:32:10 -07:00
Mark Reinhold
d418cb71c2 7048009: Update .jcheck/conf files for JDK 8
Reviewed-by: jjh
2011-05-24 15:28:18 -07:00
Maurizio Cimadamore
fa196116c7 7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
Types.implementation forces unnecessary symbol completion on superinterfaces of a given type

Reviewed-by: jjg
2011-05-23 11:55:55 +01:00
Suchen Chien
94128d3cf0 Added tag jdk7-b143 for changeset 1eab738591a7 2011-05-20 16:04:23 -07:00
Maurizio Cimadamore
1ee0f8da66 7043922: Regression: internal compiler error for nested anonymous inner class featuring varargs constructor
Attributing a constructor call does not clean up the compiler's attribution context

Reviewed-by: jjg
2011-05-16 09:38:04 +01:00
Lana Steuck
40e9a55470 Merge 2011-05-14 11:29:34 -07:00
Suchen Chien
26adfef762 Added tag jdk7-b142 for changeset 4fc57aa6bbab 2011-05-12 17:17:50 -07:00