OpenJDK / jdk / jdk10
changeset 26021:847033cb0339
8033141: Cleanup of sun.awt.X11 package
Reviewed-by: azvegint, pchelko
| author | serb |
|---|---|
| date | Thu, 31 Jul 2014 23:00:24 +0400 |
| parents | 68deef2ad1c9 |
| children | 45e78fc2279f |
| files | jdk/src/solaris/classes/sun/awt/X11/XToolkit.java jdk/src/solaris/classes/sun/awt/X11/XWindow.java jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java |
| diffstat | 3 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Thu Jul 31 11:33:36 2014 -0700 +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Thu Jul 31 23:00:24 2014 +0400 @@ -165,7 +165,7 @@ } - public native void nativeLoadSystemColors(int[] systemColors); + private native void nativeLoadSystemColors(int[] systemColors); static UIDefaults getUIDefaults() { if (uidefaults == null) {
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Thu Jul 31 11:33:36 2014 -0700 +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Thu Jul 31 23:00:24 2014 +0400 @@ -43,7 +43,7 @@ import sun.java2d.SunGraphics2D; import sun.java2d.SurfaceData; -public class XWindow extends XBaseWindow implements X11ComponentPeer { +class XWindow extends XBaseWindow implements X11ComponentPeer { private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindow"); private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindow"); private static PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XWindow"); @@ -858,8 +858,10 @@ // REMIND: need to implement looking for disabled events - public native boolean x11inputMethodLookupString(long event, long [] keysymArray); - native boolean haveCurrentX11InputMethodInstance(); + private native boolean x11inputMethodLookupString(long event, + long[] keysymArray); + + private native boolean haveCurrentX11InputMethodInstance(); private boolean mouseAboveMe;
--- a/jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java Thu Jul 31 11:33:36 2014 -0700 +++ b/jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java Thu Jul 31 23:00:24 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,12 +26,12 @@ package sun.awt.X11; import java.security.AccessController; -import java.security.PrivilegedAction; + +import sun.misc.Unsafe; import sun.security.action.GetPropertyAction; -import sun.misc.*; -final public class XlibWrapper -{ +final class XlibWrapper { + static Unsafe unsafe = Unsafe.getUnsafe(); // strange constants static final int MAXSIZE = 32767; @@ -48,7 +48,7 @@ char *display_name; */ - public final static String eventToString[]= + static final String[] eventToString = {"<none:0>", "<none:1>", "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose", "NoExpose", "VisibilityNotify", @@ -66,7 +66,7 @@ /** * Gets byte string from str_ptr and copies it into byte array - * String should be NULL terminated + * String should be NULL terminated. */ static native byte[] getStringBytes(long str_ptr); @@ -529,7 +529,7 @@ display Specifies the connection to the X server. onoff Specifies a Boolean value that indicates whether to enable or disable synchronization. */ - public static native int XSynchronize(long display, boolean onoff); + static native int XSynchronize(long display, boolean onoff); /** * Extracts an X event that can be processed in a secondary loop.