src/solaris/classes/sun/awt/X11/XMSelection.java
Print this page
rev 9717 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by:
@@ -58,11 +58,11 @@
private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XMSelection");
/* Name of the selection */
String selectionName;
/* list of listeners to be called for events */
- Vector listeners;
+ Vector<XMSelectionListener> listeners;
/* X atom array (one per screen) for this selection */
XAtom atoms[];
/* Window ids of selection owners */
@@ -73,11 +73,11 @@
static int numScreens;
static XAtom XA_MANAGER;
- static HashMap selectionMap;
+ static HashMap<Long, XMSelection> selectionMap;
static {
long display = XToolkit.getDisplay();
XToolkit.awtLock();
try {
@@ -88,11 +88,11 @@
XA_MANAGER = XAtom.get("MANAGER");
for (int screen = 0; screen < numScreens ; screen ++) {
initScreen(display,screen);
}
- selectionMap = new HashMap();
+ selectionMap = new HashMap<>();
}
static void initScreen(long display, final int screen) {
XToolkit.awtLock();
try {
@@ -225,11 +225,11 @@
}
static XMSelection getInstance(long selection) {
- return (XMSelection) selectionMap.get(Long.valueOf(selection));
+ return selectionMap.get(Long.valueOf(selection));
}
/*
* Default constructor specifies PropertyChangeMask as well
@@ -257,22 +257,22 @@
public synchronized void addSelectionListener(XMSelectionListener listener) {
if (listeners == null) {
- listeners = new Vector();
+ listeners = new Vector<>();
}
listeners.add(listener);
}
public synchronized void removeSelectionListener(XMSelectionListener listener) {
if (listeners != null) {
listeners.remove(listener);
}
}
- synchronized Collection getListeners() {
+ synchronized Collection<XMSelectionListener> getListeners() {
return listeners;
}
synchronized XAtom getAtom(int screen) {
if (atoms != null) {
@@ -308,26 +308,26 @@
synchronized void dispatchSelectionChanged( XPropertyEvent ev, int screen) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Selection Changed : Screen = " + screen + "Event =" + ev);
}
if (listeners != null) {
- Iterator iter = listeners.iterator();
+ Iterator<XMSelectionListener> iter = listeners.iterator();
while (iter.hasNext()) {
- XMSelectionListener disp = (XMSelectionListener) iter.next();
+ XMSelectionListener disp = iter.next();
disp.selectionChanged(screen, this, ev.get_window(), ev);
}
}
}
synchronized void dispatchOwnerDeath(XDestroyWindowEvent de, int screen) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Owner dead : Screen = " + screen + "Event =" + de);
}
if (listeners != null) {
- Iterator iter = listeners.iterator();
+ Iterator<XMSelectionListener> iter = listeners.iterator();
while (iter.hasNext()) {
- XMSelectionListener disp = (XMSelectionListener) iter.next();
+ XMSelectionListener disp = iter.next();
disp.ownerDeath(screen, this, de.get_window());
}
}
}
@@ -347,13 +347,13 @@
}
synchronized void dispatchOwnerChangedEvent(XEvent ev, int screen, long owner, long data, long timestamp) {
if (listeners != null) {
- Iterator iter = listeners.iterator();
+ Iterator<XMSelectionListener> iter = listeners.iterator();
while (iter.hasNext()) {
- XMSelectionListener disp = (XMSelectionListener) iter.next();
+ XMSelectionListener disp = iter.next();
disp.ownerChanged(screen,this, owner, data, timestamp);
}
}
}