infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-17 17:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

8033141: Cleanup of sun.awt.X11 package

Browse Source 
Reviewed-by: azvegint, pchelko
This commit is contained in:
Sergey Bylokhov 2014-07-31 23:00:24 +04:00
parent c8ecef89bb
commit 11c5292dfc
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
View File

@ -165,7 +165,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
public native void nativeLoadSystemColors(int[] systemColors);
private native void nativeLoadSystemColors(int[] systemColors);
static UIDefaults getUIDefaults() {
if (uidefaults == null) {

8
jdk/src/solaris/classes/sun/awt/X11/XWindow.java
View File

@ -43,7 +43,7 @@ import sun.awt.image.PixelConverter;
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 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer {
// 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;

18
jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java
View File

@ -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.security.action.GetPropertyAction;
import sun.misc.*;
final public class XlibWrapper
{
import sun.misc.Unsafe;
import sun.security.action.GetPropertyAction;
final class XlibWrapper {
static Unsafe unsafe = Unsafe.getUnsafe();
// strange constants
static final int MAXSIZE = 32767;
@ -48,7 +48,7 @@ final public class XlibWrapper
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 @@ final public class XlibWrapper
/**
* 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 @@ static native String XSetLocaleModifiers(String modifier_list);
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.