1 files changed, 12 insertions, 12 deletions

diff --git a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index 443a2418eb49..6ebc687bb4b8 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
 public class MultiTypeInterfaceContainer
 {
 
-    private Map map= new HashMap();
+    private Map<Object,InterfaceContainer> map= new HashMap<Object,InterfaceContainer>();
 
     /** Creates a new instance of MultiTypeInterfaceContainer */
     public MultiTypeInterfaceContainer()
@@ -45,13 +45,13 @@ public class MultiTypeInterfaceContainer
         if ( (size=map.size()) > 0)
         {
             Type [] arTypes= new Type[size];
-            Iterator it= map.keySet().iterator();
+            Iterator<Object> it= map.keySet().iterator();
 
             int countTypes= 0;
             while (it.hasNext())
             {
                 Object key= it.next();
-                InterfaceContainer cont= (InterfaceContainer) map.get(key);
+                InterfaceContainer cont= map.get(key);
                 if (cont != null && cont.size() > 0)
                 {
                     if (key == null)
@@ -82,18 +82,18 @@ public class MultiTypeInterfaceContainer
     synchronized public InterfaceContainer getContainer(Object key)
     {
         InterfaceContainer retVal= null;
-        Iterator it= map.keySet().iterator();
+        Iterator<Object> it= map.keySet().iterator();
         while (it.hasNext())
         {
             Object obj= it.next();
             if (obj == null && key == null)
             {
-                retVal= (InterfaceContainer) map.get(null);
+                retVal= map.get(null);
                 break;
             }
             else if( obj != null && obj.equals(key))
             {
-                retVal= (InterfaceContainer) map.get(obj);
+                retVal= map.get(obj);
                 break;
             }
         }
@@ -109,7 +109,7 @@ public class MultiTypeInterfaceContainer
         // Type a= new Type(XInterface.class);
         // Type b= new Type(XInterface.class);
         // Allthough a != b , the map interprets both as being the same.
-        InterfaceContainer cont= (InterfaceContainer) map.get(ckey);
+        InterfaceContainer cont= map.get(ckey);
         if (cont != null)
         {
             cont.add(iface);
@@ -127,7 +127,7 @@ public class MultiTypeInterfaceContainer
     synchronized public int removeInterface(Object key, Object iface)
     {
         int retVal= 0;
-        InterfaceContainer cont= (InterfaceContainer) map.get(key);
+        InterfaceContainer cont= map.get(key);
         if (cont != null)
         {
             cont.remove(iface);
@@ -138,19 +138,19 @@ public class MultiTypeInterfaceContainer
 
     public void disposeAndClear(EventObject evt)
     {
-        Iterator it= null;
+        Iterator<InterfaceContainer> it= null;
         synchronized(this)
         {
             it= map.values().iterator();
         }
         while (it.hasNext() )
-            ((InterfaceContainer) it.next()).disposeAndClear(evt);
+            it.next().disposeAndClear(evt);
     }
 
     synchronized public void clear()
     {
-        Iterator it= map.values().iterator();
+        Iterator<InterfaceContainer> it= map.values().iterator();
         while (it.hasNext())
-            ((InterfaceContainer) it.next()).clear();
+            it.next().clear();
     }
 }