Merge

6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg

7040883: Compilation error: "length in Array is defined in an inaccessible class or interface" Summary: Fix of 7034511 (now backed out) is causing spurious accessibility errors Reviewed-by: jjg

6492694: @deprecated tag doesn't work in package-info files. Reviewed-by: jjg

Merge

7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments Summary: diamond should be disallowed in cases where explicit generic constructor parameters are specified Reviewed-by: jjg

6550655: com.sun.tools.javac.code.Symbol$CompletionFailure Summary: Accessing a non-existing enum constant from an annotation whose class is available results in an internal error Reviewed-by: jjg

7034495: Javac asserts on usage of wildcards in bounds Summary: Problem with intersection types and wildcards causing javac to crash Reviewed-by: jjg

7039937: Improved catch analysis fails to handle a common idiom in the libraries Summary: Disable generation of 'unreachable catch' warnings for catch statements catching Exception/Throwable Reviewed-by: jjg

7040104: javac NPE on Object a[]; Object o = (a=null)[0]; Summary: When a null literal is found on top of stack, if expected type is 1-dimension array no checkcast is emitted Reviewed-by: jjg

7029150: Project Coin: present union types from the tree API through to javax.lang.model Reviewed-by: mcimadamore

7037081: Remove com.sun.tracing from NON_CORE_PKGS Reviewed-by: ohair, jjg, jmasa

7028815: Missing styles for some bulleted items in the new stylesheet Reviewed-by: jjg

7039822: Project Coin: add explicit tests for the lub of an exception parameter Reviewed-by: mcimadamore, jjg

7038363: cast from object to primitive should be for source >= 1.7 Reviewed-by: mcimadamore

7039019: test cannot run standalone Reviewed-by: dlsmith

7036906: Scope: CompoundScope.getElements() doesn't pass scope filter to subscopes Summary: CompoundScope.getElements() is not filtering elements according to the ScopeFilter argument Reviewed-by: jjg

6758050: javadoc handles nested generic types incorrectly Reviewed-by: jjg

Added tag jdk7-b141 for changeset af4b2168b0f9

Merge

Added tag jdk7-b141 for changeset 76bb81c6327c

Merge

Merge

Merge

Merge

7040147: jaxp 1.4.5 jdk7 integration Reviewed-by: joehw

Added tag jdk7-b141 for changeset cb7a3284b15b

Merge

Merge

7043548: message drop 3 translation integration Reviewed-by: yhuang

Added tag jdk7-b141 for changeset b24cc3620ee4

Merge

Merge

7044019: LocaleEnhanceTest.java needs to be updated for 7004603 Reviewed-by: naoto

Merge

7004603: L10n needed for newly added codes in LocaleNames Reviewed-by: naoto

7043684: Update man pages for JDK 7 tools Reviewed-by: skannan

Merge

7043548: message drop 3 translation integration Reviewed-by: yhuang

7038807: [CCJK] OK button on message dialog of JOptionpane is not translated Reviewed-by: yhuang

7042475: [ja,zh_CN] extra mnemonic key in jconsole Reviewed-by: yhuang

7028447: security-related resources Chinese translation errors Reviewed-by: weijun

7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key Reviewed-by: yhuang

7043580: integrate man page translation drop 2 into jdk7 Reviewed-by: yhuang

7021691: Most log level words are not translated in java logging Reviewed-by: yhuang

Merge

Merge

Merge

Merge

Merge

7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info Summary: Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean Reviewed-by: acorn, dholmes, mchung

Merge

Merge

6738532: Error in Elliptic Curve NamedCurve determination. (related to PKCS11) Reviewed-by: valeriep

Merge

7035172: Reintroduce LICENSE file in JDK/JRE bundle Reviewed-by: billyh

Merge

Merge

Merge

7041044: InetAddress.getByName(String,InetAddress) added in error Reviewed-by: alanb