6970930: RuleBasedCollator.compare(String,null) throws IAE (should be NPE) Reviewed-by: okutsu

6986335: 10 regtest failures (test/javax/sound/midi/Gervil) due AudioFloatConverter.PCM_FLOAT not found Reviewed-by: dav

6984047: sound sources needs vendor rebranding changes (jdk7 only) Reviewed-by: ohair

6979793: closed/javax/swing/JFileChooser/6396844/TwentyThousandTest fails due FileNotFound exc. Reviewed-by: malenkov

Merge

Merge

6838089: java.awt.Window.setOpacity() doesn't throw IllegalComponentStateException for two-display conf Reviewed-by: art, anthony

6979568: Test failure: test\closed\java\awt\Component\VisibleHwInLwContTest\VisibleHwInLwContTest.html Summary: Extend iteration to this container in isRecursivelyVisibleUpToHeavyweightContainer() Reviewed-by: art, dcherepanov

6991992: Need to forward-port AWT's part of the fix for 6691674 Reviewed-by: art

6989721: awt native code compiler warnings Reviewed-by: yan, uta

6973199: java/awt/Robot/RobotWheelTest/RobotWheelTest.html failed on JDK7 b102 bug passed on b101 Reviewed-by: art, yan

6990352: SplashScreen.getSplashScreen() does not return null for implicitly closed splash screen Summary: Mark the splash screen closed when it happens implicitly Reviewed-by: art, dcherepanov

6895647: Frame may jump to an unpredicted location upon entering the non-opaque mode on X11 Summary: Make sure the size hints are set before mapping the window on the screen Reviewed-by: art, dcherepanov

6979541: closed/javax/swing/plaf/basic/AWTEventListenerLeak/AWTEventListenerLeak.java fails Reviewed-by: anthony, ant

6828273: javax/swing/system/6799345/TestShutdown.java test fails with RuntimeException. Reviewed-by: anthony, dcherepanov

6829546: Modal dialog causes underlying parent JFrame to be set to "Always on top". Reviewed-by: anthony, dcherepanov

Merge

6804454: RFE: Provide a way to control the printing dpi resolution from MSIE browser print. See also 6801859 Reviewed-by: igor, prr

6984033: imageio vendor references need to change (jdk7 only) Reviewed-by: prr, ohair

6773022: java.awt.image.SampleModel.getDataElements() does't throw ArrayIndexOutOfBoundsEx for Integer.MAX_V Reviewed-by: igor, prr

6725821: Compiler warnings in medialib code Reviewed-by: igor, prr

6975884: sun/java2d/SunGraphics2D/DrawImageBilinear.java failed Reviewed-by: prr

6853488: REGRESSION : A black background is seen for a transparent animated gif image for splash screen Reviewed-by: igor, prr

6976076: sun/java2d/pipe/MutableColorTest/MutableColorTest.java failed Reviewed-by: igor, prr

Added tag jdk7-b115 for changeset d4a3f4d26885

Merge

Added tag jdk7-b115 for changeset 6c5fa35fa077

Added tag jdk7-b115 for changeset 78cff985750d

Added tag jdk7-b115 for changeset 9cb24917216b

Merge