6921979: add test program to verify annotations are attached to nodes as expected Reviewed-by: darcy

6922300: [308] populate the reference_info for type annotations targeting primitive class literals Reviewed-by: darcy, jjg Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

6922429: extend tree position test waiver Reviewed-by: darcy

6918625: handle annotations on array class literals Reviewed-by: jjg, darcy Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

6919986: [308] change size of type_index (of CLASS_EXTENDS and THROWS) from byte to short Reviewed-by: darcy, jjg Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

6499119: Created package-info class file modeled improperly 6920317: package-info.java file has to be specified on the javac cmdline, else it will not be avail. Reviewed-by: darcy

6919889: assorted position errors in compiler syntax trees Reviewed-by: darcy

Merge

6917130: should test that annotations that have been optimized away are not emitted to classfile Reviewed-by: jjg, darcy Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

6919944: incorrect position given for duplicate annotation value error Reviewed-by: darcy

6918127: improve handling of TypeAnnotationPosition fields Reviewed-by: jjg, darcy Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

6917067: refactor type annotations code from TransTypes into new TypeAnnotations class Reviewed-by: jjg, darcy Contributed-by: mali@csail.mit.edu, mernst@cs.washington.edu

Added tag jdk7-b83 for changeset 36fcedcbb231

Merge

Added tag jdk7-b83 for changeset deb836072de4

Merge

Merge

Merge

6923146: Upgrade to JAXP 1.4.3 Reviewed-by: darcy

Added tag jdk7-b83 for changeset ab248239edc6

Merge

Added tag jdk7-b83 for changeset 268bfb70324f

Merge

Merge

Merge

6921057: REGRESSION: persistence delegate issue on Windows and Linux against 5.u23b03/6u17b11 Reviewed-by: peterz, art

Merge

6412286: DOC: LTP: Unspecified NPE in java.beans.DefaultPersistenceDelegate.instantiate method Reviewed-by: peterz

6912118: Incosistency in several SynthUI classes between inherited specs ofupdate() and paint() methods Reviewed-by: rupashka

6912866: (date) java.util.Date.before / after may be expensive Reviewed-by: peytoia

4968536: DOC: Javadoc for java.beans.Encoder.getPersistenceDelegate is incomplete Reviewed-by: peterz

4922835: DOC: Statement javadoc should indicate that target and methodName cannot be null Reviewed-by: peterz

6868503: RuleBasedBreakIterator is inefficient Reviewed-by: okutsu

6584033: (tz) wrong buffer length in TimeZone_md.c Summary: Add testcase for this bug Reviewed-by: darcy, okutsu

6860438: [Nimbus] Code to globally set slider's thumb background doesn't work as specified Reviewed-by: rupashka

6860433: [Nimbus] Code to set a single slider's thumb background doesn't work as specified Reviewed-by: rupashka

Merge

5047314: [Col] Collator.compare() runs indefinitely for a certain set of Thai strings Reviewed-by: okutsu

Merge

6882912: Strange behaviours when typing @ or ' Summary: Eliminate stray lines without a proper unicode->regularKeyID pair (e.g. as there is no "arrow left" unicode, should be no pair) Reviewed-by: rupashka

Merge

6756774: fstdebug jvm fails with assertion (result != deleted_handle(),"Used a deleted global handle.") Reviewed-by: art, anthony

6660258: Java application stops Windows logout/shutdown (regression in 1.5.0_14) Reviewed-by: anthony, art, uta

6916867: Fastdebug build failed after CR 4874070 fix putback. Reviewed-by: art, dcherepanov

Merge

4874070: invoking DragSource's startDrag with an Image renders no image on drag Reviewed-by: art, denis, alexp

6857363: deadlock caused by sun.awt.X11.XTrayIconPeer$Tooltip.display Reviewed-by: ant, art

6893325: JComboBox and dragging to an item outside the bounds of the containing JFrame is not selecting that Reviewed-by: art, dcherepanov

6908299: Missed changes for 6664512 during the merge with 6879044 Reviewed-by: mchung, art

Merge

6904882: java.awt.Font.createFont() causes AccessControlException if executed with "-Djava.security.manager" Summary: Perform FontUtilities initialization in privileged block Reviewed-by: igor, prr

6896335: GraphicsEnvironment.getDefaultScreenDevice() throws UnsatisfiedLinkError in headless mode Summary: Use local ge variable instead of localEnv field in GE. Reviewed-by: igor, prr

6888734: PIT: regression test fails when java.security.manager is enabled Summary: Load FontManager instance in privileged block to avoid AccessControlException Reviewed-by: igor, tdv

Merge

6923692: java/classes_util TEST_BUG:ReadZip.java fails when Summary: to create the test file at test.dir Reviewed-by: alanb

6923976: TestProviderLeak.java is using too small of an initial heap under newer Hotspot (b79+) Reviewed-by: ohair

6919132: Regex \P{Lu} selects half of a surrogate pari Summary: To use StartS for complement category/block class Reviewed-by: martin, okutsu

6922482: keytool's help on -file always shows 'output file' Reviewed-by: wetmore

6921740: Eliminate warnings from sun.io converters and allow compiling with JAVAC_MAX_WARNINGS=true Summary: Fix sun.io converters unchecked and cast warnings produced by -Xlint:all Reviewed-by: alanb, sherman

6920732: opensource test/java/nio/charset Summary: move the test cases to openjdk Reviewed-by: martin

Merge

6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync() Summary: Added small delay to make sure that TextArea animation have finished Reviewed-by: anthony

6905552: libnet/nio portability issues Reviewed-by: alanb

6919185: test/closed/sun/net/ftp/FtpTests fails to compile Summary: Fixed a couple of regressions in FtpClient and updated the test. Reviewed-by: chegar