svn commit: r1818744 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java

[gnodet]

Author: gnodet
Date: Wed Dec 20 08:27:19 2017
New Revision: 1818744

URL: http://svn.apache.org/viewvc?rev=1818744&view=rev
Log:
Use generics for the ServiceTracker in BlueprintEventDispatcher

Modified:
    
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java

Modified: 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java?rev=1818744&r1=1818743&r2=1818744&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java
 Wed Dec 20 08:27:19 2017
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -91,9 +91,9 @@ class BlueprintEventDispatcher implement
         }
         this.eventAdminListener = listener;
 
-        this.containerListenerTracker = new ServiceTracker(bundleContext, 
BlueprintListener.class.getName(), new ServiceTrackerCustomizer() {
-            public Object addingService(ServiceReference reference) {
-                BlueprintListener listener = (BlueprintListener) 
bundleContext.getService(reference);
+        this.containerListenerTracker = new ServiceTracker<BlueprintListener, 
BlueprintListener>(bundleContext, BlueprintListener.class, new 
ServiceTrackerCustomizer<BlueprintListener, BlueprintListener>() {
+            public BlueprintListener 
addingService(ServiceReference<BlueprintListener> reference) {
+                BlueprintListener listener = 
bundleContext.getService(reference);
 
                 synchronized (listeners) {
                     sendInitialEvents(listener);
@@ -103,10 +103,10 @@ class BlueprintEventDispatcher implement
                 return listener;
             }
 
-            public void modifiedService(ServiceReference reference, Object 
service) {
+            public void modifiedService(ServiceReference<BlueprintListener> 
reference, BlueprintListener service) {
             }
 
-            public void removedService(ServiceReference reference, Object 
service) {
+            public void removedService(ServiceReference<BlueprintListener> 
reference, BlueprintListener service) {
                 listeners.remove(service);
                 bundleContext.ungetService(reference);
             }
@@ -228,7 +228,7 @@ class BlueprintEventDispatcher implement
         private final ServiceTracker tracker;
 
         EventAdminListener(BundleContext context) {
-            tracker = new ServiceTracker(context, EventAdmin.class.getName(), 
null);
+            tracker = new ServiceTracker<BlueprintListener, 
BlueprintListener>(context, EventAdmin.class.getName(), null);
             tracker.open();
         }