--- old/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java	2014-04-18 11:26:26.866158551 -0700
+++ new/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java	2014-04-18 11:26:26.716158558 -0700
@@ -295,7 +295,8 @@
     }
 
     /* Access to HashMap is synchronized on this XDropTargetProtocol instance. */
-    private final HashMap embedderRegistry = new HashMap();
+    private final HashMap<Long, EmbedderRegistryEntry> embedderRegistry =
+        new HashMap<>();
 
     protected final void putEmbedderRegistryEntry(long embedder,
                                                   boolean overriden,
@@ -310,8 +311,7 @@
 
     protected final EmbedderRegistryEntry getEmbedderRegistryEntry(long embedder) {
         synchronized (this) {
-            return
-                (EmbedderRegistryEntry)embedderRegistry.get(Long.valueOf(embedder));
+            return embedderRegistry.get(Long.valueOf(embedder));
         }
     }