svn commit: r1800960 - /openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java

[da...@apache.org]

Author: damjan
Date: Thu Jul  6 02:18:22 2017
New Revision: 1800960

URL: http://svn.apache.org/viewvc?rev=1800960&view=rev
Log:
Update javaunohelper's MultiTypeInterfaceContainer.java to use generics, and
fix performance bugs in getContainer() where O(n) iteration over all keys
was being done instead of an O(1) map.get(), and in getContainedTypes()
where iteration over keys and then n calls to map.get() for the value was
being done instead of iteration over entries.

Patch by: me


Modified:
    openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java

Modified: openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java?rev=1800960&r1=1800959&r2=1800960&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java (original)
+++ openoffice/trunk/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java Thu Jul  6 02:18:22 2017
@@ -31,7 +31,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()
@@ -50,13 +50,12 @@ public class MultiTypeInterfaceContainer
         if ( (size=map.size()) > 0)
         {
             Type [] arTypes= new Type[size];
-            Iterator it= map.keySet().iterator();
             
             int countTypes= 0;
-            while (it.hasNext())
+            for (Map.Entry<Object,InterfaceContainer> entry : map.entrySet())
             {
-                Object key= it.next();
-                InterfaceContainer cont= (InterfaceContainer) map.get(key);
+                Object key= entry.getKey();
+                InterfaceContainer cont= entry.getValue();
                 if (cont != null && cont.size() > 0)
                 {
                     if (key == null)
@@ -64,7 +63,7 @@ public class MultiTypeInterfaceContainer
                     else if (key instanceof Type)
                         arTypes[countTypes++]= (Type) key;
                     else if (key instanceof Class)
-                        arTypes[countTypes++]= new Type((Class) key);
+                        arTypes[countTypes++]= new Type((Class<?>) key);
                     else
                         arTypes[countTypes++]= new Type(key.getClass());
                 }
@@ -86,23 +85,7 @@ public class MultiTypeInterfaceContainer
     /** param key can be null */
     synchronized public InterfaceContainer getContainer(Object key)
     {
-        InterfaceContainer retVal= null;
-        Iterator it= map.keySet().iterator();
-        while (it.hasNext())
-        {
-            Object obj= it.next();
-            if (obj == null && key == null)
-            {
-                retVal= (InterfaceContainer) map.get(null);
-                break;
-            }
-            else if( obj != null && obj.equals(key))
-            {
-                retVal= (InterfaceContainer) map.get(obj);
-                break;
-            }
-        }
-        return retVal;
+        return map.get(key);
     }
     
     
@@ -114,7 +97,7 @@ public class MultiTypeInterfaceContainer
         // Type a= new Type(XInterface.class);
         // Type b= new Type(XInterface.class);
         // Although 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);
@@ -132,7 +115,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);
@@ -143,19 +126,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();
     }
 }