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

rev 9717 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by:

@@ -96,11 +96,11 @@
          * As toolkit cannot yet cope with per-screen desktop properties,
          * only report XSETTINGS changes on the default screen.  This
          * should be "good enough" for most cases.
          */
 
-        Map updatedSettings = null;
+        Map<String, Object> updatedSettings = null;
         XToolkit.awtLock();
         try {
             long display = XToolkit.getDisplay();
             int screen = (int) XlibWrapper.DefaultScreen(display);
             updatedSettings = getUpdatedSettings(settings.getOwner(screen));

@@ -110,30 +110,30 @@
         // we must not  invoke this under Awt Lock
         ((XToolkit)Toolkit.getDefaultToolkit()).parseXSettings(0,updatedSettings);
     }
 
     private void updateXSettings(int screen, long owner) {
-        final Map updatedSettings = getUpdatedSettings(owner);
+        final Map<String, Object> updatedSettings = getUpdatedSettings(owner);
         // this method is called under awt lock and usually on toolkit thread
         // but parseXSettings() causes public code execution, so we need to transfer
         // this to EDT
         EventQueue.invokeLater( new Runnable() {
             public void run() {
                 ((XToolkit) Toolkit.getDefaultToolkit()).parseXSettings( 0, updatedSettings);
             }
         });
     }
 
-    private Map getUpdatedSettings(final long owner) {
+    private Map<String, Object> getUpdatedSettings(final long owner) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("owner =" + owner);
         }
         if (0 == owner) {
             return null;
         }
 
-        Map settings = null;
+        Map<String, Object> settings = null;
         try {
             WindowPropertyGetter getter =
                 new WindowPropertyGetter(owner, xSettingsPropertyAtom, 0, MAX_LENGTH,
                         false, xSettingsPropertyAtom.getAtom() );
             try {