src/solaris/classes/sun/awt/X11/XAwtState.java
Print this page
rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr
@@ -38,21 +38,21 @@
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;
+ 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);
+ componentMouseEnteredRef = new WeakReference<>(component);
}
} finally {
XToolkit.awtUnlock();
}
}
@@ -61,11 +61,11 @@
XToolkit.awtLock();
try {
if (componentMouseEnteredRef == null) {
return null;
}
- return (Component)componentMouseEnteredRef.get();
+ return componentMouseEnteredRef.get();
} finally {
XToolkit.awtUnlock();
}
}
@@ -81,11 +81,11 @@
static boolean isManualGrab() {
return inManualGrab;
}
- private static WeakReference grabWindowRef = null;
+ private static WeakReference<XBaseWindow> grabWindowRef = null;
/**
* The X Active Grab overrides any other active grab by the same
* client see XGrabPointer, XGrabKeyboard
*/
@@ -110,11 +110,11 @@
if (grabWindow == null) {
grabWindowRef = null;
return;
}
if (grabWindow != getGrabWindow()) {
- grabWindowRef = new WeakReference(grabWindow);
+ grabWindowRef = new WeakReference<>(grabWindow);
}
} finally {
XToolkit.awtUnlock();
}
}
@@ -123,11 +123,11 @@
XToolkit.awtLock();
try {
if (grabWindowRef == null) {
return null;
}
- XBaseWindow xbw = (XBaseWindow)grabWindowRef.get();
+ XBaseWindow xbw = grabWindowRef.get();
if( xbw != null && xbw.isDisposed() ) {
xbw = null;
grabWindowRef = null;
}else if( xbw == null ) {
grabWindowRef = null;