src/solaris/classes/sun/awt/X11/XMSelection.java

rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr

*** 58,68 ****
      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;
  
      /* X atom array (one per screen) for this selection */
      XAtom atoms[];
  
      /* Window ids of selection owners */
--- 58,68 ----
      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<XMSelectionListener> listeners;
  
      /* X atom array (one per screen) for this selection */
      XAtom atoms[];
  
      /* Window ids of selection owners */
*** 73,83 ****
  
      static int numScreens;
  
      static XAtom XA_MANAGER;
  
!     static HashMap selectionMap;
  
      static {
          long display = XToolkit.getDisplay();
          XToolkit.awtLock();
          try {
--- 73,83 ----
  
      static int numScreens;
  
      static XAtom XA_MANAGER;
  
!     static HashMap<Long, XMSelection> selectionMap;
  
      static {
          long display = XToolkit.getDisplay();
          XToolkit.awtLock();
          try {
*** 88,98 ****
          XA_MANAGER = XAtom.get("MANAGER");
          for (int screen = 0; screen < numScreens ; screen ++) {
              initScreen(display,screen);
          }
  
!         selectionMap = new HashMap();
      }
  
      static void initScreen(long display, final int screen) {
          XToolkit.awtLock();
          try {
--- 88,98 ----
          XA_MANAGER = XAtom.get("MANAGER");
          for (int screen = 0; screen < numScreens ; screen ++) {
              initScreen(display,screen);
          }
  
!         selectionMap = new HashMap<>();
      }
  
      static void initScreen(long display, final int screen) {
          XToolkit.awtLock();
          try {
*** 225,235 ****
  
      }
  
  
      static XMSelection getInstance(long selection) {
!         return (XMSelection) selectionMap.get(Long.valueOf(selection));
      }
  
  
      /*
       * Default constructor specifies PropertyChangeMask as well
--- 225,235 ----
  
      }
  
  
      static XMSelection getInstance(long selection) {
!         return selectionMap.get(Long.valueOf(selection));
      }
  
  
      /*
       * Default constructor specifies PropertyChangeMask as well
*** 257,278 ****
  
  
  
      public synchronized void addSelectionListener(XMSelectionListener listener) {
          if (listeners == null) {
!             listeners = new Vector();
          }
          listeners.add(listener);
      }
  
      public synchronized void removeSelectionListener(XMSelectionListener listener) {
          if (listeners != null) {
              listeners.remove(listener);
          }
      }
  
!     synchronized Collection getListeners() {
          return listeners;
      }
  
      synchronized XAtom getAtom(int screen) {
          if (atoms != null) {
--- 257,278 ----
  
  
  
      public synchronized void addSelectionListener(XMSelectionListener listener) {
          if (listeners == null) {
!             listeners = new Vector<>();
          }
          listeners.add(listener);
      }
  
      public synchronized void removeSelectionListener(XMSelectionListener listener) {
          if (listeners != null) {
              listeners.remove(listener);
          }
      }
  
!     synchronized Collection<XMSelectionListener> getListeners() {
          return listeners;
      }
  
      synchronized XAtom getAtom(int screen) {
          if (atoms != null) {
*** 308,333 ****
      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();
              while (iter.hasNext()) {
!                 XMSelectionListener disp = (XMSelectionListener) 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();
              while (iter.hasNext()) {
!                 XMSelectionListener disp = (XMSelectionListener) iter.next();
                  disp.ownerDeath(screen, this, de.get_window());
  
              }
          }
      }
--- 308,333 ----
      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<XMSelectionListener> iter = listeners.iterator();
              while (iter.hasNext()) {
!                 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<XMSelectionListener> iter = listeners.iterator();
              while (iter.hasNext()) {
!                 XMSelectionListener disp = iter.next();
                  disp.ownerDeath(screen, this, de.get_window());
  
              }
          }
      }
*** 347,359 ****
      }
  
  
      synchronized void dispatchOwnerChangedEvent(XEvent ev, int screen, long owner, long data, long timestamp) {
          if (listeners != null) {
!             Iterator iter = listeners.iterator();
              while (iter.hasNext()) {
!                 XMSelectionListener disp = (XMSelectionListener) iter.next();
                  disp.ownerChanged(screen,this, owner, data, timestamp);
              }
          }
      }
  
--- 347,359 ----
      }
  
  
      synchronized void dispatchOwnerChangedEvent(XEvent ev, int screen, long owner, long data, long timestamp) {
          if (listeners != null) {
!             Iterator<XMSelectionListener> iter = listeners.iterator();
              while (iter.hasNext()) {
!                 XMSelectionListener disp = iter.next();
                  disp.ownerChanged(screen,this, owner, data, timestamp);
              }
          }
      }