Merge
authorlana
Thu, 07 Apr 2016 11:03:59 -0700
changeset 36959 d839463825a2
parent 36853 9001df2d68e9 (diff)
parent 36958 8a320111d9fe (current diff)
child 36960 d7731fdfe7c3
Merge
jdk/make/data/swingbeaninfo/SwingBeanInfo.template
jdk/make/data/swingbeaninfo/images/AbstractButtonColor16.gif
jdk/make/data/swingbeaninfo/images/BorderColor16.gif
jdk/make/data/swingbeaninfo/images/BoxColor16.gif
jdk/make/data/swingbeaninfo/images/BoxColor32.gif
jdk/make/data/swingbeaninfo/images/BoxMono16.gif
jdk/make/data/swingbeaninfo/images/BoxMono32.gif
jdk/make/data/swingbeaninfo/images/JAppletColor16.gif
jdk/make/data/swingbeaninfo/images/JAppletColor32.gif
jdk/make/data/swingbeaninfo/images/JAppletMono16.gif
jdk/make/data/swingbeaninfo/images/JAppletMono32.gif
jdk/make/data/swingbeaninfo/images/JButtonColor16.gif
jdk/make/data/swingbeaninfo/images/JButtonColor32.gif
jdk/make/data/swingbeaninfo/images/JButtonMono16.gif
jdk/make/data/swingbeaninfo/images/JButtonMono32.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxColor16.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxColor32.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor16.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor32.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono16.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono32.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMono16.gif
jdk/make/data/swingbeaninfo/images/JCheckBoxMono32.gif
jdk/make/data/swingbeaninfo/images/JColorChooserColor16.gif
jdk/make/data/swingbeaninfo/images/JColorChooserColor32.gif
jdk/make/data/swingbeaninfo/images/JColorChooserMono16.gif
jdk/make/data/swingbeaninfo/images/JColorChooserMono32.gif
jdk/make/data/swingbeaninfo/images/JComboBoxColor16.gif
jdk/make/data/swingbeaninfo/images/JComboBoxColor32.gif
jdk/make/data/swingbeaninfo/images/JComboBoxMono16.gif
jdk/make/data/swingbeaninfo/images/JComboBoxMono32.gif
jdk/make/data/swingbeaninfo/images/JComponentColor16.gif
jdk/make/data/swingbeaninfo/images/JDesktopPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JDesktopPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JDesktopPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JDesktopPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JDialogColor16.gif
jdk/make/data/swingbeaninfo/images/JDialogColor32.gif
jdk/make/data/swingbeaninfo/images/JDialogMono16.gif
jdk/make/data/swingbeaninfo/images/JDialogMono32.gif
jdk/make/data/swingbeaninfo/images/JEditorPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JEditorPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JEditorPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JEditorPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JFileChooserColor16.gif
jdk/make/data/swingbeaninfo/images/JFileChooserColor32.gif
jdk/make/data/swingbeaninfo/images/JFileChooserMono16.gif
jdk/make/data/swingbeaninfo/images/JFileChooserMono32.gif
jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor16.gif
jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor32.gif
jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono16.gif
jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono32.gif
jdk/make/data/swingbeaninfo/images/JFrameColor16.gif
jdk/make/data/swingbeaninfo/images/JFrameColor32.gif
jdk/make/data/swingbeaninfo/images/JFrameMono16.gif
jdk/make/data/swingbeaninfo/images/JFrameMono32.gif
jdk/make/data/swingbeaninfo/images/JInternalFrameColor16.gif
jdk/make/data/swingbeaninfo/images/JInternalFrameColor32.gif
jdk/make/data/swingbeaninfo/images/JInternalFrameMono16.gif
jdk/make/data/swingbeaninfo/images/JInternalFrameMono32.gif
jdk/make/data/swingbeaninfo/images/JLabelColor16.gif
jdk/make/data/swingbeaninfo/images/JLabelColor32.gif
jdk/make/data/swingbeaninfo/images/JLabelMono16.gif
jdk/make/data/swingbeaninfo/images/JLabelMono32.gif
jdk/make/data/swingbeaninfo/images/JLayeredPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JLayeredPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JLayeredPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JLayeredPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JListColor16.gif
jdk/make/data/swingbeaninfo/images/JListColor32.gif
jdk/make/data/swingbeaninfo/images/JListMono16.gif
jdk/make/data/swingbeaninfo/images/JListMono32.gif
jdk/make/data/swingbeaninfo/images/JMenuBarColor16.gif
jdk/make/data/swingbeaninfo/images/JMenuBarColor32.gif
jdk/make/data/swingbeaninfo/images/JMenuBarMono16.gif
jdk/make/data/swingbeaninfo/images/JMenuBarMono32.gif
jdk/make/data/swingbeaninfo/images/JMenuColor16.gif
jdk/make/data/swingbeaninfo/images/JMenuColor32.gif
jdk/make/data/swingbeaninfo/images/JMenuItemColor16.gif
jdk/make/data/swingbeaninfo/images/JMenuItemColor32.gif
jdk/make/data/swingbeaninfo/images/JMenuItemMono16.gif
jdk/make/data/swingbeaninfo/images/JMenuItemMono32.gif
jdk/make/data/swingbeaninfo/images/JMenuMono16.gif
jdk/make/data/swingbeaninfo/images/JMenuMono32.gif
jdk/make/data/swingbeaninfo/images/JOptionPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JOptionPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JOptionPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JOptionPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JPanelColor16.gif
jdk/make/data/swingbeaninfo/images/JPanelColor32.gif
jdk/make/data/swingbeaninfo/images/JPanelMono16.gif
jdk/make/data/swingbeaninfo/images/JPanelMono32.gif
jdk/make/data/swingbeaninfo/images/JPasswordFieldColor16.gif
jdk/make/data/swingbeaninfo/images/JPasswordFieldColor32.gif
jdk/make/data/swingbeaninfo/images/JPasswordFieldMono16.gif
jdk/make/data/swingbeaninfo/images/JPasswordFieldMono32.gif
jdk/make/data/swingbeaninfo/images/JPopupMenuColor16.gif
jdk/make/data/swingbeaninfo/images/JPopupMenuColor32.gif
jdk/make/data/swingbeaninfo/images/JPopupMenuMono16.gif
jdk/make/data/swingbeaninfo/images/JPopupMenuMono32.gif
jdk/make/data/swingbeaninfo/images/JProgressBarColor16.gif
jdk/make/data/swingbeaninfo/images/JProgressBarColor32.gif
jdk/make/data/swingbeaninfo/images/JProgressBarMono16.gif
jdk/make/data/swingbeaninfo/images/JProgressBarMono32.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonColor16.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonColor32.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor16.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor32.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono16.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono32.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMono16.gif
jdk/make/data/swingbeaninfo/images/JRadioButtonMono32.gif
jdk/make/data/swingbeaninfo/images/JRootPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JRootPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JRootPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JRootPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JScrollBarColor16.gif
jdk/make/data/swingbeaninfo/images/JScrollBarColor32.gif
jdk/make/data/swingbeaninfo/images/JScrollBarMono16.gif
jdk/make/data/swingbeaninfo/images/JScrollBarMono32.gif
jdk/make/data/swingbeaninfo/images/JScrollPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JScrollPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JScrollPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JScrollPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JSeparatorColor16.gif
jdk/make/data/swingbeaninfo/images/JSeparatorColor32.gif
jdk/make/data/swingbeaninfo/images/JSeparatorMono16.gif
jdk/make/data/swingbeaninfo/images/JSeparatorMono32.gif
jdk/make/data/swingbeaninfo/images/JSliderColor16.gif
jdk/make/data/swingbeaninfo/images/JSliderColor32.gif
jdk/make/data/swingbeaninfo/images/JSliderMono16.gif
jdk/make/data/swingbeaninfo/images/JSliderMono32.gif
jdk/make/data/swingbeaninfo/images/JSpinnerColor16.gif
jdk/make/data/swingbeaninfo/images/JSpinnerColor32.gif
jdk/make/data/swingbeaninfo/images/JSpinnerMono16.gif
jdk/make/data/swingbeaninfo/images/JSpinnerMono32.gif
jdk/make/data/swingbeaninfo/images/JSplitPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JSplitPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JSplitPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JSplitPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JTabbedPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JTabbedPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JTabbedPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JTabbedPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JTableColor16.gif
jdk/make/data/swingbeaninfo/images/JTableColor32.gif
jdk/make/data/swingbeaninfo/images/JTableMono16.gif
jdk/make/data/swingbeaninfo/images/JTableMono32.gif
jdk/make/data/swingbeaninfo/images/JTextAreaColor16.gif
jdk/make/data/swingbeaninfo/images/JTextAreaColor32.gif
jdk/make/data/swingbeaninfo/images/JTextAreaMono16.gif
jdk/make/data/swingbeaninfo/images/JTextAreaMono32.gif
jdk/make/data/swingbeaninfo/images/JTextFieldColor16.gif
jdk/make/data/swingbeaninfo/images/JTextFieldColor32.gif
jdk/make/data/swingbeaninfo/images/JTextFieldMono16.gif
jdk/make/data/swingbeaninfo/images/JTextFieldMono32.gif
jdk/make/data/swingbeaninfo/images/JTextPaneColor16.gif
jdk/make/data/swingbeaninfo/images/JTextPaneColor32.gif
jdk/make/data/swingbeaninfo/images/JTextPaneMono16.gif
jdk/make/data/swingbeaninfo/images/JTextPaneMono32.gif
jdk/make/data/swingbeaninfo/images/JToggleButtonColor16.gif
jdk/make/data/swingbeaninfo/images/JToggleButtonColor32.gif
jdk/make/data/swingbeaninfo/images/JToggleButtonMono16.gif
jdk/make/data/swingbeaninfo/images/JToggleButtonMono32.gif
jdk/make/data/swingbeaninfo/images/JToolBarColor16.gif
jdk/make/data/swingbeaninfo/images/JToolBarColor32.gif
jdk/make/data/swingbeaninfo/images/JToolBarMono16.gif
jdk/make/data/swingbeaninfo/images/JToolBarMono32.gif
jdk/make/data/swingbeaninfo/images/JTreeColor16.gif
jdk/make/data/swingbeaninfo/images/JTreeColor32.gif
jdk/make/data/swingbeaninfo/images/JTreeMono16.gif
jdk/make/data/swingbeaninfo/images/JTreeMono32.gif
jdk/make/data/swingbeaninfo/images/JViewportColor16.gif
jdk/make/data/swingbeaninfo/images/JViewportColor32.gif
jdk/make/data/swingbeaninfo/images/JViewportMono16.gif
jdk/make/data/swingbeaninfo/images/JViewportMono32.gif
jdk/make/data/swingbeaninfo/images/JWindowColor16.gif
jdk/make/data/swingbeaninfo/images/JWindowColor32.gif
jdk/make/data/swingbeaninfo/images/JWindowMono16.gif
jdk/make/data/swingbeaninfo/images/JWindowMono32.gif
jdk/make/data/swingbeaninfo/javax/swing/SwingBeanInfoBase.java
jdk/make/data/swingbeaninfo/manifest.mf
jdk/make/data/swingbeaninfo/sun/swing/BeanInfoUtils.java
jdk/make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java
jdk/make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java
jdk/make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java
jdk/src/java.base/share/classes/sun/misc/GC.java
jdk/src/java.base/share/classes/sun/misc/VMSupport.java
jdk/src/java.base/share/native/libjava/GC.c
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AboutHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEvent.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppEventListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppForegroundListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppHiddenListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/AppReOpenedListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenFilesHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/OpenURIHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/PreferencesHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/PrintFilesHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitHandler.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitResponse.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/QuitStrategy.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/ScreenSleepListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/SystemSleepListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/UserSessionListener.java
jdk/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html
jdk/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html
jdk/test/java/awt/hidpi/properties/HiDPIPropertiesLinuxTest.java
--- a/jdk/.hgtags	Thu Apr 07 10:12:08 2016 -0700
+++ b/jdk/.hgtags	Thu Apr 07 11:03:59 2016 -0700
@@ -355,3 +355,4 @@
 9417e1bcded6af5532c3b26235437ab227758877 jdk-9+110
 b2a69d66dc65ad1d3aeb3bd362cf5bb0deba040e jdk-9+111
 1565a0efe6f0ca411a6df277df1e069431c60988 jdk-9+112
+68f8be44b6a6b33dfa841ec671c0ba6e4056b372 jdk-9+113