Bug 418661 - [Metadata] Get rid of compile warnings in official build

Remove warnings in org.eclipse.e4.core.di.extensions

2 files changed, 13 insertions, 12 deletions

diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/DIEActivator.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/DIEActivator.java
index 400e113c0..de0094a5c 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/DIEActivator.java
+++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/DIEActivator.java
@@ -24,8 +24,8 @@ public class DIEActivator implements BundleActivator {
 
 	private BundleContext bundleContext;
 
-	private ServiceTracker preferencesTracker;
-	private ServiceTracker eventAdminTracker;
+	private ServiceTracker<IPreferencesService, IPreferencesService> preferencesTracker;
+	private ServiceTracker<EventAdmin, EventAdmin> eventAdminTracker;
 
 	private Set<PreferencesObjectSupplier> preferenceSuppliers = new HashSet<PreferencesObjectSupplier>();
 
@@ -66,20 +66,20 @@ public class DIEActivator implements BundleActivator {
 		if (preferencesTracker == null) {
 			if (bundleContext == null)
 				return null;
-			preferencesTracker = new ServiceTracker(bundleContext, IPreferencesService.class.getName(), null);
+			preferencesTracker = new ServiceTracker<IPreferencesService, IPreferencesService>(bundleContext, IPreferencesService.class, null);
 			preferencesTracker.open();
 		}
-		return (IPreferencesService) preferencesTracker.getService();
+		return preferencesTracker.getService();
 	}
 
 	public EventAdmin getEventAdmin() {
 		if (eventAdminTracker == null) {
 			if (bundleContext == null)
 				return null;
-			eventAdminTracker = new ServiceTracker(bundleContext, EventAdmin.class.getName(), null);
+			eventAdminTracker = new ServiceTracker<EventAdmin, EventAdmin>(bundleContext, EventAdmin.class, null);
 			eventAdminTracker.open();
 		}
-		return (EventAdmin) eventAdminTracker.getService();
+		return eventAdminTracker.getService();
 	}
 
 	public void registerPreferencesSupplier(PreferencesObjectSupplier supplier) {
diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java
index 907466cbd..cac4cab39 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java
+++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java
@@ -132,7 +132,7 @@ public class EventObjectSupplier extends ExtendedObjectSupplier {
 
 	}
 
-	private Map<Subscriber, ServiceRegistration> registrations = new HashMap<Subscriber, ServiceRegistration>();
+	private Map<Subscriber, ServiceRegistration<EventHandler>> registrations = new HashMap<Subscriber, ServiceRegistration<EventHandler>>();
 
 	protected void addCurrentEvent(String topic, Event event) {
 		synchronized (currentEvents) {
@@ -184,7 +184,7 @@ public class EventObjectSupplier extends ExtendedObjectSupplier {
 		Dictionary<String, Object> d = new Hashtable<String, Object>();
 		d.put(EventConstants.EVENT_TOPIC, topics);
 		EventHandler wrappedHandler = makeHandler(topic, requestor);
-		ServiceRegistration registration = bundleContext.registerService(EventHandler.class.getName(), wrappedHandler, d);
+		ServiceRegistration<EventHandler> registration = bundleContext.registerService(EventHandler.class, wrappedHandler, d);
 		// due to the way requestors are constructed this limited synch should be OK
 		synchronized (registrations) {
 			registrations.put(subscriber, registration);
@@ -210,24 +210,25 @@ public class EventObjectSupplier extends ExtendedObjectSupplier {
 		if (requestor == null)
 			return;
 		synchronized (registrations) {
-			Iterator<Entry<Subscriber, ServiceRegistration>> i = registrations.entrySet().iterator();
+			Iterator<Entry<Subscriber, ServiceRegistration<EventHandler>>> i = registrations.entrySet().iterator();
 			while (i.hasNext()) {
-				Entry<Subscriber, ServiceRegistration> entry = i.next();
+				Entry<Subscriber, ServiceRegistration<EventHandler>> entry = i.next();
 				Subscriber key = entry.getKey();
 				if (!requestor.equals(key.getRequestor()))
 					continue;
-				ServiceRegistration registration = entry.getValue();
+				ServiceRegistration<EventHandler> registration = entry.getValue();
 				registration.unregister();
 				i.remove();
 			}
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	@PreDestroy
 	public void dispose() {
 		ServiceRegistration[] array;
 		synchronized (registrations) {
-			Collection<ServiceRegistration> values = registrations.values();
+			Collection<ServiceRegistration<EventHandler>> values = registrations.values();
 			array = values.toArray(new ServiceRegistration[values.size()]);
 			registrations.clear();
 		}