jdk-sandbox: comparison jdk/src/solaris/classes/sun/awt/X11/XToolkit.java

equal deleted inserted replaced

-:ecad2d59bc19
+:25bf8153fbfe
 import java.awt.dnd.DragGestureEvent;
 import java.awt.dnd.DragGestureRecognizer;
 import java.awt.dnd.MouseDragGestureRecognizer;
 import java.awt.dnd.InvalidDnDOperationException;
 import java.awt.dnd.peer.DragSourceContextPeer;
+import java.awt.font.TextAttribute;
 import java.awt.im.InputMethodHighlight;
 import java.awt.im.spi.InputMethodDescriptor;
 import java.awt.image.ColorModel;
 import java.awt.peer.*;
 import java.beans.PropertyChangeListener;
 private XSettings xs;
 private FontConfigManager fcManager = new FontConfigManager();
 static int arrowCursor;
-static TreeMap winMap = new TreeMap();
+static TreeMap<Long, XBaseWindow> winMap = new TreeMap<>();
-static HashMap specialPeerMap = new HashMap();
+static HashMap<Object, Object> specialPeerMap = new HashMap<>();
-static HashMap winToDispatcher = new HashMap();
+static HashMap<Long, Collection<XEventDispatcher>> winToDispatcher = new HashMap<>();
 private static long _display;
 static UIDefaults uidefaults;
 static X11GraphicsEnvironment localEnv;
 static X11GraphicsDevice device;
 static final X11GraphicsConfig config;
 winMap.remove(Long.valueOf(window));
 }
 }
 static XBaseWindow windowToXWindow(long window) {
 synchronized(winMap) {
-return (XBaseWindow) winMap.get(Long.valueOf(window));
+return winMap.get(Long.valueOf(window));
 }
 }
 static void addEventDispatcher(long window, XEventDispatcher dispatcher) {
 synchronized(winToDispatcher) {
 Long key = Long.valueOf(window);
-Collection dispatchers = (Collection)winToDispatcher.get(key);
+Collection<XEventDispatcher> dispatchers = winToDispatcher.get(key);
 if (dispatchers == null) {
-dispatchers = new Vector();
+dispatchers = new Vector<>();
 winToDispatcher.put(key, dispatchers);
 }
 dispatchers.add(dispatcher);
 }
 }
 static void removeEventDispatcher(long window, XEventDispatcher dispatcher) {
 synchronized(winToDispatcher) {
 Long key = Long.valueOf(window);
-Collection dispatchers = (Collection)winToDispatcher.get(key);
+Collection<XEventDispatcher> dispatchers = winToDispatcher.get(key);
 if (dispatchers != null) {
 dispatchers.remove(dispatcher);
 }
 }
 }
 resetKeyboardSniffer();
 setupModifierMap();
 }
 XBaseWindow.dispatchToWindow(ev);
-Collection dispatchers = null;
+Collection<XEventDispatcher> dispatchers = null;
 synchronized(winToDispatcher) {
 Long key = Long.valueOf(xany.get_window());
-dispatchers = (Collection)winToDispatcher.get(key);
+dispatchers = winToDispatcher.get(key);
 if (dispatchers != null) { // Clone it to avoid synchronization during dispatching
-dispatchers = new Vector(dispatchers);
+dispatchers = new Vector<>(dispatchers);
 }
 }
 if (dispatchers != null) {
-Iterator iter = dispatchers.iterator();
+Iterator<XEventDispatcher> iter = dispatchers.iterator();
 while (iter.hasNext()) {
-XEventDispatcher disp = (XEventDispatcher)iter.next();
+XEventDispatcher disp = iter.next();
 disp.dispatchEvent(ev);
 }
 }
 notifyListeners(ev);
 }
 XAtom XA_NET_WM_STRUT = XAtom.get("_NET_WM_STRUT");
 XAtom XA_NET_WM_STRUT_PARTIAL = XAtom.get("_NET_WM_STRUT_PARTIAL");
 Insets insets = new Insets(0, 0, 0, 0);
-java.util.List search = new LinkedList();
+java.util.List<Object> search = new LinkedList<>();
 search.add(root);
 search.add(0);
 while (!search.isEmpty())
 {
 long window = (Long)search.remove(0);
 public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge) throws InvalidDnDOperationException {
 return XDragSourceContextPeer.createDragSourceContextPeer(dge);
 }
+@SuppressWarnings("unchecked")
 public <T extends DragGestureRecognizer> T
 createDragGestureRecognizer(Class<T> recognizerClass,
 DragSource ds,
 Component c,
 int srcActions,
 public int getMaximumCursorColors() {
 return 2;  // Black and white.
 }
-public Map mapInputMethodHighlight(InputMethodHighlight highlight)     {
+public Map<TextAttribute, ?> mapInputMethodHighlight( InputMethodHighlight highlight) {
 return XInputMethod.mapInputMethodHighlight(highlight);
 }
 @Override
 public boolean getLockingKeyState(int key) {
 if (! (key == KeyEvent.VK_CAPS_LOCK || key == KeyEvent.VK_NUM_LOCK ||
 }
 static void dumpPeers() {
 if (log.isLoggable(PlatformLogger.Level.FINE)) {
 log.fine("Mapped windows:");
-Iterator iter = winMap.entrySet().iterator();
+winMap.forEach((k, v) -> {
-while (iter.hasNext()) {
+log.fine(k + "->" + v);
-Map.Entry entry = (Map.Entry)iter.next();
+if (v instanceof XComponentPeer) {
-log.fine(entry.getKey() + "->" + entry.getValue());
+Component target = (Component)((XComponentPeer)v).getTarget();
-if (entry.getValue() instanceof XComponentPeer) {
-Component target = (Component)((XComponentPeer)entry.getValue()).getTarget();
 log.fine("\ttarget: " + target);
 }
-}
+});
 SunToolkit.dumpPeers(log);
 log.fine("Mapped special peers:");
-iter = specialPeerMap.entrySet().iterator();
+specialPeerMap.forEach((k, v) -> {
-while (iter.hasNext()) {
+log.fine(k + "->" + v);
-Map.Entry entry = (Map.Entry)iter.next();
+});
-log.fine(entry.getKey() + "->" + entry.getValue());
-}
 log.fine("Mapped dispatchers:");
-iter = winToDispatcher.entrySet().iterator();
+winToDispatcher.forEach((k, v) -> {
-while (iter.hasNext()) {
+log.fine(k + "->" + v);
-Map.Entry entry = (Map.Entry)iter.next();
+});
-log.fine(entry.getKey() + "->" + entry.getValue());
-}
 }
 }
 /* Protected with awt_lock. */
 private static boolean initialized;
 * <p>
 * NB: This could be called from any thread if triggered by
 * <code>loadXSettings</code>.  It is called from the System EDT
 * if triggered by an XSETTINGS change.
 */
-void parseXSettings(int screen_XXX_ignored,Map updatedSettings) {
+void parseXSettings(int screen_XXX_ignored,Map<String, Object> updatedSettings) {
 if (updatedSettings == null || updatedSettings.isEmpty()) {
 return;
 }
-Iterator i = updatedSettings.entrySet().iterator();
+Iterator<Map.Entry<String, Object>> i = updatedSettings.entrySet().iterator();
 while (i.hasNext()) {
-Map.Entry e = (Map.Entry)i.next();
+Map.Entry<String, Object> e = i.next();
-String name = (String)e.getKey();
+String name = e.getKey();
 name = "gnome." + name;
 setDesktopProperty(name, e.getValue());
 if (log.isLoggable(PlatformLogger.Level.FINE)) {
 log.fine("name = " + name + " value = " + e.getValue());
 // keycode. We are going to check a state of this modifier.
 // If a modifier is a weird one, we cannot help it.
 long window = 0;
 try{
 // get any application window
-window = ((Long)(winMap.firstKey())).longValue();
+window = winMap.firstKey().longValue();
 }catch(NoSuchElementException nex) {
 // get root window
 window = getDefaultRootWindow();
 }
 boolean res = XlibWrapper.XQueryPointer(getDisplay(), window,
 log.fine("modLockIsShiftLock = " + modLockIsShiftLock);
 }
 }
-private static SortedMap timeoutTasks;
+private static SortedMap<Long, java.util.List<Runnable>> timeoutTasks;
 /**
 * Removed the task from the list of waiting-to-be called tasks.
 * If the task has been scheduled several times removes only first one.
 */
 if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
 timeoutTaskLog.finer("Task is not scheduled");
 }
 return;
 }
-Collection values = timeoutTasks.values();
+Collection<java.util.List<Runnable>> values = timeoutTasks.values();
-Iterator iter = values.iterator();
+Iterator<java.util.List<Runnable>> iter = values.iterator();
 while (iter.hasNext()) {
-java.util.List list = (java.util.List)iter.next();
+java.util.List<Runnable> list = iter.next();
 boolean removed = false;
 if (list.contains(task)) {
 list.remove(task);
 if (list.isEmpty()) {
 iter.remove();
 ";  task being added={2}" + ";  tasks before addition={3}",
 Long.valueOf(System.currentTimeMillis()), Long.valueOf(interval), task, timeoutTasks);
 }
 if (timeoutTasks == null) {
-timeoutTasks = new TreeMap();
+timeoutTasks = new TreeMap<>();
 }
 Long time = Long.valueOf(System.currentTimeMillis() + interval);
-java.util.List tasks = (java.util.List)timeoutTasks.get(time);
+java.util.List<Runnable> tasks = timeoutTasks.get(time);
 if (tasks == null) {
-tasks = new ArrayList(1);
+tasks = new ArrayList<>(1);
 timeoutTasks.put(time, tasks);
 }
 tasks.add(task);
 awtLock();
 try {
 if (timeoutTasks == null || timeoutTasks.isEmpty()) {
 return -1L;
 }
-return (Long)timeoutTasks.firstKey();
+return timeoutTasks.firstKey();
 } finally {
 awtUnlock();
 }
 }
 if (timeoutTasks == null || timeoutTasks.isEmpty()) {
 return;
 }
 Long currentTime = Long.valueOf(System.currentTimeMillis());
-Long time = (Long)timeoutTasks.firstKey();
+Long time = timeoutTasks.firstKey();
 while (time.compareTo(currentTime) <= 0) {
-java.util.List tasks = (java.util.List)timeoutTasks.remove(time);
+java.util.List<Runnable> tasks = timeoutTasks.remove(time);
-for (Iterator iter = tasks.iterator(); iter.hasNext();) {
+for (Iterator<Runnable> iter = tasks.iterator(); iter.hasNext();) {
-Runnable task = (Runnable)iter.next();
+Runnable task = iter.next();
 if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
 timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" +
 ";  about to run task={1}", Long.valueOf(currentTime), task);
 }
 }
 if (timeoutTasks.isEmpty()) {
 break;
 }
-time = (Long)timeoutTasks.firstKey();
+time = timeoutTasks.firstKey();
 }
 }
 static long getAwtDefaultFg() {
 return awt_defaultFg;

changeset 24538	25bf8153fbfe
parent 24520	e8afd90fcb69
child 26004	7507a1b93f67