From e44772633713cfdd951428f544b6baca95180663 Mon Sep 17 00:00:00 2001
From: Ed Merks
Date: Tue, 17 Jan 2012 15:58:11 +0100
Subject: [368320] Eliminate changes preventing a 3.5 base

---
 .../eclipse/emf/example/databinding/project/ui/rcp/Activator.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java
index 2f4ce4df5..b912d7af8 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java
+++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java
@@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener
   // The shared instance
   private static Activator plugin;
 
-  private ServiceTracker<?, ?> tracker;
+  private ServiceTracker tracker;
 
   private IModelLoadingService loadingService;
 
@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener
     this.context = context;
     plugin = this;
 
-    tracker = new ServiceTracker<Object, Object>(context, IModelLoadingService.class.getName(), null);
+    tracker = new ServiceTracker(context, IModelLoadingService.class.getName(), null);
     tracker.open();
 
     loadingService = (IModelLoadingService)tracker.getService();
@@ -119,7 +119,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener
 
   public void serviceChanged(ServiceEvent event)
   {
-    ServiceReference<?> sr = event.getServiceReference();
+    ServiceReference sr = event.getServiceReference();
     switch (event.getType())
     {
       case ServiceEvent.REGISTERED: {
-- 
cgit v1.2.3