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

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

*** 34,45 ****
   * This class is a registry for the supported drag and drop protocols.
   *
   * @since 1.5
   */
  final class XDragAndDropProtocols {
!     private final static List dragProtocols;
!     private final static List dropProtocols;
  
      public static final String XDnD = "XDnD";
      public static final String MotifDnD = "MotifDnD";
  
      static {
--- 34,45 ----
   * This class is a registry for the supported drag and drop protocols.
   *
   * @since 1.5
   */
  final class XDragAndDropProtocols {
!     private final static List<XDragSourceProtocol> dragProtocols;
!     private final static List<XDropTargetProtocol> dropProtocols;
  
      public static final String XDnD = "XDnD";
      public static final String MotifDnD = "MotifDnD";
  
      static {
*** 48,66 ****
              XDragSourceContextPeer.getXDragSourceProtocolListener();
          // Singleton listener for all drop target protocols.
          XDropTargetProtocolListener dropTargetProtocolListener =
              XDropTargetContextPeer.getXDropTargetProtocolListener();
  
!         List tDragSourceProtocols = new ArrayList();
          XDragSourceProtocol xdndDragSourceProtocol =
              XDnDDragSourceProtocol.createInstance(dragSourceProtocolListener);
          tDragSourceProtocols.add(xdndDragSourceProtocol);
          XDragSourceProtocol motifdndDragSourceProtocol =
              MotifDnDDragSourceProtocol.createInstance(dragSourceProtocolListener);
          tDragSourceProtocols.add(motifdndDragSourceProtocol);
  
!         List tDropTargetProtocols = new ArrayList();
          XDropTargetProtocol xdndDropTargetProtocol =
              XDnDDropTargetProtocol.createInstance(dropTargetProtocolListener);
          tDropTargetProtocols.add(xdndDropTargetProtocol);
          XDropTargetProtocol motifdndDropTargetProtocol =
              MotifDnDDropTargetProtocol.createInstance(dropTargetProtocolListener);
--- 48,66 ----
              XDragSourceContextPeer.getXDragSourceProtocolListener();
          // Singleton listener for all drop target protocols.
          XDropTargetProtocolListener dropTargetProtocolListener =
              XDropTargetContextPeer.getXDropTargetProtocolListener();
  
!         List<XDragSourceProtocol> tDragSourceProtocols = new ArrayList<>();
          XDragSourceProtocol xdndDragSourceProtocol =
              XDnDDragSourceProtocol.createInstance(dragSourceProtocolListener);
          tDragSourceProtocols.add(xdndDragSourceProtocol);
          XDragSourceProtocol motifdndDragSourceProtocol =
              MotifDnDDragSourceProtocol.createInstance(dragSourceProtocolListener);
          tDragSourceProtocols.add(motifdndDragSourceProtocol);
  
!         List<XDropTargetProtocol> tDropTargetProtocols = new ArrayList<>();
          XDropTargetProtocol xdndDropTargetProtocol =
              XDnDDropTargetProtocol.createInstance(dropTargetProtocolListener);
          tDropTargetProtocols.add(xdndDropTargetProtocol);
          XDropTargetProtocol motifdndDropTargetProtocol =
              MotifDnDDropTargetProtocol.createInstance(dropTargetProtocolListener);
*** 68,82 ****
  
          dragProtocols = Collections.unmodifiableList(tDragSourceProtocols);
          dropProtocols = Collections.unmodifiableList(tDropTargetProtocols);
      }
  
!     static Iterator getDragSourceProtocols() {
          return dragProtocols.iterator();
      }
  
!     static Iterator getDropTargetProtocols() {
          return dropProtocols.iterator();
      }
  
      /*
       * Returns a XDragSourceProtocol whose name equals to the specified string
--- 68,82 ----
  
          dragProtocols = Collections.unmodifiableList(tDragSourceProtocols);
          dropProtocols = Collections.unmodifiableList(tDropTargetProtocols);
      }
  
!     static Iterator<XDragSourceProtocol> getDragSourceProtocols() {
          return dragProtocols.iterator();
      }
  
!     static Iterator<XDropTargetProtocol> getDropTargetProtocols() {
          return dropProtocols.iterator();
      }
  
      /*
       * Returns a XDragSourceProtocol whose name equals to the specified string
*** 86,99 ****
          // Protocol name cannot be null.
          if (name == null) {
              return null;
          }
  
!         Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols();
          while (dragProtocols.hasNext()) {
!             XDragSourceProtocol dragProtocol =
!                 (XDragSourceProtocol)dragProtocols.next();
              if (dragProtocol.getProtocolName().equals(name)) {
                  return dragProtocol;
              }
          }
  
--- 86,99 ----
          // Protocol name cannot be null.
          if (name == null) {
              return null;
          }
  
!         Iterator<XDragSourceProtocol> dragProtocols =
!             XDragAndDropProtocols.getDragSourceProtocols();
          while (dragProtocols.hasNext()) {
!             XDragSourceProtocol dragProtocol = dragProtocols.next();
              if (dragProtocol.getProtocolName().equals(name)) {
                  return dragProtocol;
              }
          }
  
*** 108,121 ****
          // Protocol name cannot be null.
          if (name == null) {
              return null;
          }
  
!         Iterator dropProtocols = XDragAndDropProtocols.getDropTargetProtocols();
          while (dropProtocols.hasNext()) {
!             XDropTargetProtocol dropProtocol =
!                 (XDropTargetProtocol)dropProtocols.next();
              if (dropProtocol.getProtocolName().equals(name)) {
                  return dropProtocol;
              }
          }
  
--- 108,121 ----
          // Protocol name cannot be null.
          if (name == null) {
              return null;
          }
  
!         Iterator<XDropTargetProtocol> dropProtocols =
!             XDragAndDropProtocols.getDropTargetProtocols();
          while (dropProtocols.hasNext()) {
!             XDropTargetProtocol dropProtocol = dropProtocols.next();
              if (dropProtocol.getProtocolName().equals(name)) {
                  return dropProtocol;
              }
          }