svn commit: r1185183 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java

[ri...@apache.org]

Author: rickhall
Date: Mon Oct 17 14:04:27 2011
New Revision: 1185183

URL: http://svn.apache.org/viewvc?rev=1185183&view=rev
Log:
Patch to get framework to compile in Eclipse. (FELIX-3166)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java?rev=1185183&r1=1185182&r2=1185183&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java Mon Oct 17 14:04:27 2011
@@ -640,15 +640,15 @@ public class EventDispatcher
         return listeners;
     }
 
-    private Set<BundleContext> createWhitelistFromHooks(
+    private <T> Set<BundleContext> createWhitelistFromHooks(
         EventObject event, Framework felix,
         Map<BundleContext, List<ListenerInfo>> listeners1,
         Map<BundleContext, List<ListenerInfo>> listeners2,
-        Class hookClass)
+        Class<T> hookClass)
     {
         // Create a whitelist of bundle context, if we have hooks.
         Set<BundleContext> whitelist = null;
-        Set<ServiceReference> hooks = m_registry.getHooks(hookClass);
+        Set<ServiceReference<T>> hooks = m_registry.getHooks(hookClass);
         if ((hooks != null) && !hooks.isEmpty())
         {
             whitelist = new HashSet<BundleContext>();
@@ -667,11 +667,11 @@ public class EventDispatcher
             int originalSize = whitelist.size();
             ShrinkableCollection<BundleContext> shrinkable =
                 new ShrinkableCollection<BundleContext>(whitelist);
-            for (ServiceReference sr : hooks)
+            for (ServiceReference<T> sr : hooks)
             {
                 if (felix != null)
                 {
-                    Object eh = null;
+                    T eh = null;
                     try
                     {
                         eh = m_registry.getService(felix, sr);