Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2012-01-17 14:58:11 +0000
committerEd Merks2012-01-17 14:58:11 +0000
commite44772633713cfdd951428f544b6baca95180663 (patch)
tree5f5d91195a0bd3e8372525e481dc7e265c10b3e7 /examples
parentbb7e880f798da96e59f1d3d8ce8ecb1de34f123d (diff)
downloadorg.eclipse.emf-e44772633713cfdd951428f544b6baca95180663.tar.gz
org.eclipse.emf-e44772633713cfdd951428f544b6baca95180663.tar.xz
org.eclipse.emf-e44772633713cfdd951428f544b6baca95180663.zip
[368320] Eliminate changes preventing a 3.5 base
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java6
1 files changed, 3 insertions, 3 deletions
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: {

Back to the top