changeset 23328:4c53a6ebc779

Merge
author prr
date Thu, 27 Feb 2014 10:43:53 -0800
parents 4c3942938b0d 8b6176ab95fb
children 9d0dc1c406cc
files jdk/make/CompileJavaClasses.gmk jdk/src/aix/classes/sun/awt/fontconfigs/aix.fontconfig.properties jdk/src/macosx/classes/apple/laf/JRSUIUtils.java jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java jdk/src/macosx/classes/com/apple/laf/AquaIcon.java jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java jdk/src/macosx/classes/sun/awt/fontconfigs/macosx.fontconfig.properties jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java jdk/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java jdk/src/macosx/native/com/apple/laf/AquaFileView.m jdk/src/macosx/native/sun/awt/AWTView.h jdk/src/macosx/native/sun/awt/AWTView.m jdk/src/macosx/native/sun/awt/CDataTransferer.m jdk/src/macosx/native/sun/awt/CDragSource.h jdk/src/macosx/native/sun/awt/CDragSource.m jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m jdk/src/macosx/native/sun/awt/CDropTarget.h jdk/src/macosx/native/sun/awt/CImage.m jdk/src/macosx/native/sun/awt/CRobot.m jdk/src/macosx/native/sun/awt/CTrayIcon.m jdk/src/macosx/native/sun/awt/LWCToolkit.m jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java jdk/src/share/classes/java/awt/Label.java jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java jdk/src/share/classes/java/awt/dnd/DragSourceContext.java jdk/src/share/classes/javax/imageio/spi/IIORegistry.java jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java jdk/src/share/classes/javax/swing/JViewport.java jdk/src/share/classes/javax/swing/RepaintManager.java jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java jdk/src/share/classes/javax/swing/text/AbstractWriter.java jdk/src/share/classes/sun/awt/HToolkit.java jdk/src/share/classes/sun/awt/SunToolkit.java jdk/src/share/classes/sun/font/CreatedFontTracker.java jdk/src/share/classes/sun/font/FileFont.java jdk/src/share/classes/sun/font/FontManagerFactory.java jdk/src/share/classes/sun/font/FreetypeFontScaler.java jdk/src/share/classes/sun/font/GlyphLayout.java jdk/src/share/classes/sun/font/Type1Font.java jdk/src/share/classes/sun/swing/SwingAccessor.java jdk/src/share/classes/sun/swing/SwingLazyValue.java jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c jdk/src/share/native/sun/java2d/opengl/OGLContext.c jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java jdk/src/solaris/classes/sun/awt/X11/XDesktopPeer.java jdk/src/solaris/classes/sun/awt/X11/XRepaintArea.java jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties jdk/src/solaris/native/sun/awt/awt_Font.c jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c jdk/src/solaris/native/sun/xawt/XToolkit.c jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java jdk/src/windows/classes/sun/awt/windows/WClipboard.java jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java jdk/src/windows/classes/sun/awt/windows/WFramePeer.java jdk/src/windows/classes/sun/awt/windows/WInputMethod.java jdk/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java jdk/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java jdk/src/windows/classes/sun/awt/windows/WPageDialog.java jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java jdk/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java jdk/src/windows/classes/sun/awt/windows/WToolkit.java jdk/src/windows/classes/sun/awt/windows/fontconfig.properties jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp jdk/test/java/awt/regtesthelpers/Util.java jdk/test/java/rmi/activation/checkusage/CheckUsage.java jdk/test/java/rmi/registry/checkusage/CheckUsage.java jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java
diffstat 7471 files changed, 34559 insertions(+), 14908 deletions(-) [+]