hg: valhalla/valhalla: Merge

david.holmes at oracle.com david.holmes at oracle.com
Mon Dec 18 01:05:09 UTC 2017


Changeset: 6773c29b58f0
Author:    dholmes
Date:      2017-12-17 20:01 -0500
URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/6773c29b58f0

Merge

+ src/hotspot/share/include/jvm.h
- src/java.base/share/classes/java/lang/StringDecoderUTF8.java
- src/java.base/share/classes/java/util/zip/ZStreamRef.java
- src/java.base/share/native/include/jvm.h
- src/java.base/unix/native/include/jvm_md.h
- src/java.base/windows/native/include/jvm_md.h
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopProperty.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/NewFolder.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
- src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
- src/java.desktop/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cache-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/unicodedata_db.h
- src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java
- src/java.management/share/native/include/jmm.h
- src/jdk.compiler/share/classes/com/sun/tools/javah/Gen.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/InternalError.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/JNI.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTool.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/Main.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/NativeHeaderTool.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java
- src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties
- src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
- src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
- src/jdk.compiler/share/classes/com/sun/tools/javah/resources/version.properties-template
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PackageListWriter.java
! test/jdk/ProblemList.txt
- test/jdk/sun/security/tools/keytool/p12importks.sh
- test/langtools/tools/javac/T8152360/DeprecateJavahTest.java
- test/langtools/tools/javac/nativeHeaders/javahComparison/CompareTest.java
- test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass1.java
- test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass4.java
- test/langtools/tools/javac/nativeHeaders/javahComparison/TestClass5.java
- test/langtools/tools/javah/4942232/ParamClassTest.java
- test/langtools/tools/javah/4942232/Test.java
- test/langtools/tools/javah/6257087/T6257087.java
- test/langtools/tools/javah/6572945/T6572945.java
- test/langtools/tools/javah/6572945/TestClass1.java
- test/langtools/tools/javah/6572945/TestClass2.java
- test/langtools/tools/javah/6572945/TestClass3.java
- test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h
- test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h
- test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h
- test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h
- test/langtools/tools/javah/6572945/gold/jni.file.1
- test/langtools/tools/javah/6572945/gold/jni.file.2
- test/langtools/tools/javah/6572945/gold/jni.file.3
- test/langtools/tools/javah/ModuleClass.java
- test/langtools/tools/javah/ReadOldClass.sh
- test/langtools/tools/javah/T4942232/MissingParamClassTest.java
- test/langtools/tools/javah/T5070898.java
- test/langtools/tools/javah/T6893943.java
- test/langtools/tools/javah/T6994608.java
- test/langtools/tools/javah/T7126832/T7126832.java
- test/langtools/tools/javah/T7126832/java.java
- test/langtools/tools/javah/T7185778.java
- test/langtools/tools/javah/TestHelpOpts.java
- test/langtools/tools/javah/VersionTest.java
- test/langtools/tools/javah/constMacroTest/ConstMacroTest.java
- test/langtools/tools/lib/toolbox/JavahTask.java



More information about the valhalla-dev mailing list