src/solaris/classes/sun/awt/X11/XAwtState.java
Print this page
rev 9717 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by:
*** 38,58 ****
class XAwtState {
/**
* The mouse is over this component.
* If the component is not disabled, it received MOUSE_ENTERED but no MOUSE_EXITED.
*/
! private static WeakReference componentMouseEnteredRef = null;
static void setComponentMouseEntered(Component component) {
XToolkit.awtLock();
try {
if (component == null) {
componentMouseEnteredRef = null;
return;
}
if (component != getComponentMouseEntered()) {
! componentMouseEnteredRef = new WeakReference(component);
}
} finally {
XToolkit.awtUnlock();
}
}
--- 38,58 ----
class XAwtState {
/**
* The mouse is over this component.
* If the component is not disabled, it received MOUSE_ENTERED but no MOUSE_EXITED.
*/
! private static WeakReference<Component> componentMouseEnteredRef = null;
static void setComponentMouseEntered(Component component) {
XToolkit.awtLock();
try {
if (component == null) {
componentMouseEnteredRef = null;
return;
}
if (component != getComponentMouseEntered()) {
! componentMouseEnteredRef = new WeakReference<>(component);
}
} finally {
XToolkit.awtUnlock();
}
}
*** 61,71 ****
XToolkit.awtLock();
try {
if (componentMouseEnteredRef == null) {
return null;
}
! return (Component)componentMouseEnteredRef.get();
} finally {
XToolkit.awtUnlock();
}
}
--- 61,71 ----
XToolkit.awtLock();
try {
if (componentMouseEnteredRef == null) {
return null;
}
! return componentMouseEnteredRef.get();
} finally {
XToolkit.awtUnlock();
}
}
*** 81,91 ****
static boolean isManualGrab() {
return inManualGrab;
}
! private static WeakReference grabWindowRef = null;
/**
* The X Active Grab overrides any other active grab by the same
* client see XGrabPointer, XGrabKeyboard
*/
--- 81,91 ----
static boolean isManualGrab() {
return inManualGrab;
}
! private static WeakReference<XBaseWindow> grabWindowRef = null;
/**
* The X Active Grab overrides any other active grab by the same
* client see XGrabPointer, XGrabKeyboard
*/
*** 110,120 ****
if (grabWindow == null) {
grabWindowRef = null;
return;
}
if (grabWindow != getGrabWindow()) {
! grabWindowRef = new WeakReference(grabWindow);
}
} finally {
XToolkit.awtUnlock();
}
}
--- 110,120 ----
if (grabWindow == null) {
grabWindowRef = null;
return;
}
if (grabWindow != getGrabWindow()) {
! grabWindowRef = new WeakReference<>(grabWindow);
}
} finally {
XToolkit.awtUnlock();
}
}
*** 123,133 ****
XToolkit.awtLock();
try {
if (grabWindowRef == null) {
return null;
}
! XBaseWindow xbw = (XBaseWindow)grabWindowRef.get();
if( xbw != null && xbw.isDisposed() ) {
xbw = null;
grabWindowRef = null;
}else if( xbw == null ) {
grabWindowRef = null;
--- 123,133 ----
XToolkit.awtLock();
try {
if (grabWindowRef == null) {
return null;
}
! XBaseWindow xbw = grabWindowRef.get();
if( xbw != null && xbw.isDisposed() ) {
xbw = null;
grabWindowRef = null;
}else if( xbw == null ) {
grabWindowRef = null;