hg: jdk9/sandbox/jdk: Merge
aleksey.shipilev at oracle.com
aleksey.shipilev at oracle.com
Thu Apr 7 08:26:37 UTC 2016
Changeset: 0c3a602e20b0
Author: shade
Date: 2016-04-07 11:19 +0300
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/0c3a602e20b0
Merge
- make/data/swingbeaninfo/SwingBeanInfo.template
- make/data/swingbeaninfo/images/AbstractButtonColor16.gif
- make/data/swingbeaninfo/images/BorderColor16.gif
- make/data/swingbeaninfo/images/BoxColor16.gif
- make/data/swingbeaninfo/images/BoxColor32.gif
- make/data/swingbeaninfo/images/BoxMono16.gif
- make/data/swingbeaninfo/images/BoxMono32.gif
- make/data/swingbeaninfo/images/JAppletColor16.gif
- make/data/swingbeaninfo/images/JAppletColor32.gif
- make/data/swingbeaninfo/images/JAppletMono16.gif
- make/data/swingbeaninfo/images/JAppletMono32.gif
- make/data/swingbeaninfo/images/JButtonColor16.gif
- make/data/swingbeaninfo/images/JButtonColor32.gif
- make/data/swingbeaninfo/images/JButtonMono16.gif
- make/data/swingbeaninfo/images/JButtonMono32.gif
- make/data/swingbeaninfo/images/JCheckBoxColor16.gif
- make/data/swingbeaninfo/images/JCheckBoxColor32.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemColor16.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemColor32.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemMono16.gif
- make/data/swingbeaninfo/images/JCheckBoxMenuItemMono32.gif
- make/data/swingbeaninfo/images/JCheckBoxMono16.gif
- make/data/swingbeaninfo/images/JCheckBoxMono32.gif
- make/data/swingbeaninfo/images/JColorChooserColor16.gif
- make/data/swingbeaninfo/images/JColorChooserColor32.gif
- make/data/swingbeaninfo/images/JColorChooserMono16.gif
- make/data/swingbeaninfo/images/JColorChooserMono32.gif
- make/data/swingbeaninfo/images/JComboBoxColor16.gif
- make/data/swingbeaninfo/images/JComboBoxColor32.gif
- make/data/swingbeaninfo/images/JComboBoxMono16.gif
- make/data/swingbeaninfo/images/JComboBoxMono32.gif
- make/data/swingbeaninfo/images/JComponentColor16.gif
- make/data/swingbeaninfo/images/JDesktopPaneColor16.gif
- make/data/swingbeaninfo/images/JDesktopPaneColor32.gif
- make/data/swingbeaninfo/images/JDesktopPaneMono16.gif
- make/data/swingbeaninfo/images/JDesktopPaneMono32.gif
- make/data/swingbeaninfo/images/JDialogColor16.gif
- make/data/swingbeaninfo/images/JDialogColor32.gif
- make/data/swingbeaninfo/images/JDialogMono16.gif
- make/data/swingbeaninfo/images/JDialogMono32.gif
- make/data/swingbeaninfo/images/JEditorPaneColor16.gif
- make/data/swingbeaninfo/images/JEditorPaneColor32.gif
- make/data/swingbeaninfo/images/JEditorPaneMono16.gif
- make/data/swingbeaninfo/images/JEditorPaneMono32.gif
- make/data/swingbeaninfo/images/JFileChooserColor16.gif
- make/data/swingbeaninfo/images/JFileChooserColor32.gif
- make/data/swingbeaninfo/images/JFileChooserMono16.gif
- make/data/swingbeaninfo/images/JFileChooserMono32.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldColor16.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldColor32.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldMono16.gif
- make/data/swingbeaninfo/images/JFormattedTextFieldMono32.gif
- make/data/swingbeaninfo/images/JFrameColor16.gif
- make/data/swingbeaninfo/images/JFrameColor32.gif
- make/data/swingbeaninfo/images/JFrameMono16.gif
- make/data/swingbeaninfo/images/JFrameMono32.gif
- make/data/swingbeaninfo/images/JInternalFrameColor16.gif
- make/data/swingbeaninfo/images/JInternalFrameColor32.gif
- make/data/swingbeaninfo/images/JInternalFrameMono16.gif
- make/data/swingbeaninfo/images/JInternalFrameMono32.gif
- make/data/swingbeaninfo/images/JLabelColor16.gif
- make/data/swingbeaninfo/images/JLabelColor32.gif
- make/data/swingbeaninfo/images/JLabelMono16.gif
- make/data/swingbeaninfo/images/JLabelMono32.gif
- make/data/swingbeaninfo/images/JLayeredPaneColor16.gif
- make/data/swingbeaninfo/images/JLayeredPaneColor32.gif
- make/data/swingbeaninfo/images/JLayeredPaneMono16.gif
- make/data/swingbeaninfo/images/JLayeredPaneMono32.gif
- make/data/swingbeaninfo/images/JListColor16.gif
- make/data/swingbeaninfo/images/JListColor32.gif
- make/data/swingbeaninfo/images/JListMono16.gif
- make/data/swingbeaninfo/images/JListMono32.gif
- make/data/swingbeaninfo/images/JMenuBarColor16.gif
- make/data/swingbeaninfo/images/JMenuBarColor32.gif
- make/data/swingbeaninfo/images/JMenuBarMono16.gif
- make/data/swingbeaninfo/images/JMenuBarMono32.gif
- make/data/swingbeaninfo/images/JMenuColor16.gif
- make/data/swingbeaninfo/images/JMenuColor32.gif
- make/data/swingbeaninfo/images/JMenuItemColor16.gif
- make/data/swingbeaninfo/images/JMenuItemColor32.gif
- make/data/swingbeaninfo/images/JMenuItemMono16.gif
- make/data/swingbeaninfo/images/JMenuItemMono32.gif
- make/data/swingbeaninfo/images/JMenuMono16.gif
- make/data/swingbeaninfo/images/JMenuMono32.gif
- make/data/swingbeaninfo/images/JOptionPaneColor16.gif
- make/data/swingbeaninfo/images/JOptionPaneColor32.gif
- make/data/swingbeaninfo/images/JOptionPaneMono16.gif
- make/data/swingbeaninfo/images/JOptionPaneMono32.gif
- make/data/swingbeaninfo/images/JPanelColor16.gif
- make/data/swingbeaninfo/images/JPanelColor32.gif
- make/data/swingbeaninfo/images/JPanelMono16.gif
- make/data/swingbeaninfo/images/JPanelMono32.gif
- make/data/swingbeaninfo/images/JPasswordFieldColor16.gif
- make/data/swingbeaninfo/images/JPasswordFieldColor32.gif
- make/data/swingbeaninfo/images/JPasswordFieldMono16.gif
- make/data/swingbeaninfo/images/JPasswordFieldMono32.gif
- make/data/swingbeaninfo/images/JPopupMenuColor16.gif
- make/data/swingbeaninfo/images/JPopupMenuColor32.gif
- make/data/swingbeaninfo/images/JPopupMenuMono16.gif
- make/data/swingbeaninfo/images/JPopupMenuMono32.gif
- make/data/swingbeaninfo/images/JProgressBarColor16.gif
- make/data/swingbeaninfo/images/JProgressBarColor32.gif
- make/data/swingbeaninfo/images/JProgressBarMono16.gif
- make/data/swingbeaninfo/images/JProgressBarMono32.gif
- make/data/swingbeaninfo/images/JRadioButtonColor16.gif
- make/data/swingbeaninfo/images/JRadioButtonColor32.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemColor16.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemColor32.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemMono16.gif
- make/data/swingbeaninfo/images/JRadioButtonMenuItemMono32.gif
- make/data/swingbeaninfo/images/JRadioButtonMono16.gif
- make/data/swingbeaninfo/images/JRadioButtonMono32.gif
- make/data/swingbeaninfo/images/JRootPaneColor16.gif
- make/data/swingbeaninfo/images/JRootPaneColor32.gif
- make/data/swingbeaninfo/images/JRootPaneMono16.gif
- make/data/swingbeaninfo/images/JRootPaneMono32.gif
- make/data/swingbeaninfo/images/JScrollBarColor16.gif
- make/data/swingbeaninfo/images/JScrollBarColor32.gif
- make/data/swingbeaninfo/images/JScrollBarMono16.gif
- make/data/swingbeaninfo/images/JScrollBarMono32.gif
- make/data/swingbeaninfo/images/JScrollPaneColor16.gif
- make/data/swingbeaninfo/images/JScrollPaneColor32.gif
- make/data/swingbeaninfo/images/JScrollPaneMono16.gif
- make/data/swingbeaninfo/images/JScrollPaneMono32.gif
- make/data/swingbeaninfo/images/JSeparatorColor16.gif
- make/data/swingbeaninfo/images/JSeparatorColor32.gif
- make/data/swingbeaninfo/images/JSeparatorMono16.gif
- make/data/swingbeaninfo/images/JSeparatorMono32.gif
- make/data/swingbeaninfo/images/JSliderColor16.gif
- make/data/swingbeaninfo/images/JSliderColor32.gif
- make/data/swingbeaninfo/images/JSliderMono16.gif
- make/data/swingbeaninfo/images/JSliderMono32.gif
- make/data/swingbeaninfo/images/JSpinnerColor16.gif
- make/data/swingbeaninfo/images/JSpinnerColor32.gif
- make/data/swingbeaninfo/images/JSpinnerMono16.gif
- make/data/swingbeaninfo/images/JSpinnerMono32.gif
- make/data/swingbeaninfo/images/JSplitPaneColor16.gif
- make/data/swingbeaninfo/images/JSplitPaneColor32.gif
- make/data/swingbeaninfo/images/JSplitPaneMono16.gif
- make/data/swingbeaninfo/images/JSplitPaneMono32.gif
- make/data/swingbeaninfo/images/JTabbedPaneColor16.gif
- make/data/swingbeaninfo/images/JTabbedPaneColor32.gif
- make/data/swingbeaninfo/images/JTabbedPaneMono16.gif
- make/data/swingbeaninfo/images/JTabbedPaneMono32.gif
- make/data/swingbeaninfo/images/JTableColor16.gif
- make/data/swingbeaninfo/images/JTableColor32.gif
- make/data/swingbeaninfo/images/JTableMono16.gif
- make/data/swingbeaninfo/images/JTableMono32.gif
- make/data/swingbeaninfo/images/JTextAreaColor16.gif
- make/data/swingbeaninfo/images/JTextAreaColor32.gif
- make/data/swingbeaninfo/images/JTextAreaMono16.gif
- make/data/swingbeaninfo/images/JTextAreaMono32.gif
- make/data/swingbeaninfo/images/JTextFieldColor16.gif
- make/data/swingbeaninfo/images/JTextFieldColor32.gif
- make/data/swingbeaninfo/images/JTextFieldMono16.gif
- make/data/swingbeaninfo/images/JTextFieldMono32.gif
- make/data/swingbeaninfo/images/JTextPaneColor16.gif
- make/data/swingbeaninfo/images/JTextPaneColor32.gif
- make/data/swingbeaninfo/images/JTextPaneMono16.gif
- make/data/swingbeaninfo/images/JTextPaneMono32.gif
- make/data/swingbeaninfo/images/JToggleButtonColor16.gif
- make/data/swingbeaninfo/images/JToggleButtonColor32.gif
- make/data/swingbeaninfo/images/JToggleButtonMono16.gif
- make/data/swingbeaninfo/images/JToggleButtonMono32.gif
- make/data/swingbeaninfo/images/JToolBarColor16.gif
- make/data/swingbeaninfo/images/JToolBarColor32.gif
- make/data/swingbeaninfo/images/JToolBarMono16.gif
- make/data/swingbeaninfo/images/JToolBarMono32.gif
- make/data/swingbeaninfo/images/JTreeColor16.gif
- make/data/swingbeaninfo/images/JTreeColor32.gif
- make/data/swingbeaninfo/images/JTreeMono16.gif
- make/data/swingbeaninfo/images/JTreeMono32.gif
- make/data/swingbeaninfo/images/JViewportColor16.gif
- make/data/swingbeaninfo/images/JViewportColor32.gif
- make/data/swingbeaninfo/images/JViewportMono16.gif
- make/data/swingbeaninfo/images/JViewportMono32.gif
- make/data/swingbeaninfo/images/JWindowColor16.gif
- make/data/swingbeaninfo/images/JWindowColor32.gif
- make/data/swingbeaninfo/images/JWindowMono16.gif
- make/data/swingbeaninfo/images/JWindowMono32.gif
- make/data/swingbeaninfo/javax/swing/SwingBeanInfoBase.java
- make/data/swingbeaninfo/manifest.mf
- make/data/swingbeaninfo/sun/swing/BeanInfoUtils.java
! make/gensrc/Gensrc-java.base.gmk
! make/gensrc/GensrcVarHandles.gmk
- make/src/classes/build/tools/module/Module.java
- make/src/classes/build/tools/module/ModuleInfoReader.java
- make/src/classes/build/tools/module/ModulesXmlReader.java
- make/src/classes/build/tools/module/ModulesXmlWriter.java
- make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java
- make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java
- make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java
- make/src/native/genconstants/ch/genSocketOptionRegistry.c
- make/src/native/genconstants/fs/genSolarisConstants.c
- make/src/native/genconstants/fs/genUnixConstants.c
! src/java.base/share/classes/java/lang/invoke/Invokers.java
! src/java.base/share/classes/java/lang/invoke/MemberName.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
! src/java.base/share/classes/java/lang/invoke/VarForm.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java
! src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java
! src/java.base/share/classes/java/lang/invoke/VarHandles.java
! src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
! src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
! src/java.base/share/classes/java/nio/Buffer.java
! src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
! src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
! src/java.base/share/classes/java/nio/StringCharBuffer.java
! src/java.base/share/classes/java/nio/X-Buffer.java.template
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
! src/java.base/share/classes/jdk/internal/misc/Unsafe.java
- src/java.base/share/classes/sun/misc/GC.java
- src/java.base/share/classes/sun/misc/InvalidJarIndexException.java
- src/java.base/share/classes/sun/misc/JarIndex.java
- src/java.base/share/classes/sun/misc/Resource.java
- src/java.base/share/classes/sun/misc/URLClassPath.java
! src/java.base/share/classes/sun/misc/Unsafe.java
- src/java.base/share/classes/sun/misc/VMSupport.java
- src/java.base/share/classes/sun/misc/resources/Messages.java
- src/java.base/share/classes/sun/misc/resources/Messages_de.java
- src/java.base/share/classes/sun/misc/resources/Messages_es.java
- src/java.base/share/classes/sun/misc/resources/Messages_fr.java
- src/java.base/share/classes/sun/misc/resources/Messages_it.java
- src/java.base/share/classes/sun/misc/resources/Messages_ja.java
- src/java.base/share/classes/sun/misc/resources/Messages_ko.java
- src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java
- src/java.base/share/classes/sun/misc/resources/Messages_sv.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java
- src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java
- src/java.base/share/native/libjava/GC.c
- src/java.base/unix/classes/sun/misc/FileURLMapper.java
- src/java.base/windows/classes/sun/misc/FileURLMapper.java
- src/java.desktop/macosx/classes/com/apple/eawt/AboutHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppEvent.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppEventListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppForegroundListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppHiddenListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/AppReOpenedListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/OpenFilesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/OpenURIHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/PreferencesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/PrintFilesHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitHandler.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitResponse.java
- src/java.desktop/macosx/classes/com/apple/eawt/QuitStrategy.java
- src/java.desktop/macosx/classes/com/apple/eawt/ScreenSleepListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/SystemSleepListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/UserSessionListener.java
- src/java.desktop/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java
- test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
- test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html
- test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html
- test/java/awt/hidpi/properties/HiDPIPropertiesLinuxTest.java
! test/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
! test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
! test/java/lang/invoke/VarHandles/VarHandleTestReflection.java
! test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
! test/java/lang/invoke/VarHandles/generate-vh-tests.sh
! test/java/nio/Buffer/Basic-X.java.template
! test/java/nio/Buffer/BasicByte.java
! test/java/nio/Buffer/BasicChar.java
! test/java/nio/Buffer/BasicDouble.java
! test/java/nio/Buffer/BasicFloat.java
! test/java/nio/Buffer/BasicInt.java
! test/java/nio/Buffer/BasicLong.java
! test/java/nio/Buffer/BasicShort.java
More information about the jdk9-sandbox-changes
mailing list