diff options
author | John Arthorne | 2010-10-04 16:59:44 +0000 |
---|---|---|
committer | John Arthorne | 2010-10-04 16:59:44 +0000 |
commit | fdfa6363a847d135212385970259283890243fd0 (patch) | |
tree | 36b2417d822242d54d84a3c63c36b010900b0f4d /bundles/org.eclipse.equinox.p2.console | |
parent | 66d60f2ea0d94f246c00f8dd827d6c64bb7b0a88 (diff) | |
download | rt.equinox.p2-fdfa6363a847d135212385970259283890243fd0.tar.gz rt.equinox.p2-fdfa6363a847d135212385970259283890243fd0.tar.xz rt.equinox.p2-fdfa6363a847d135212385970259283890243fd0.zip |
Fixed compiler warnings related to genericsv20101004
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.console')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java index 10304f9de..54bc79f44 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008, 2009, IBM Corporation and others. All rights reserved. This + * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved. This * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,15 +16,15 @@ import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; -public class Activator implements BundleActivator, ServiceTrackerCustomizer { +public class Activator implements BundleActivator, ServiceTrackerCustomizer<IProvisioningAgent, IProvisioningAgent> { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.equinox.p2.console"; //$NON-NLS-1$ private static final String PROVIDER_NAME = "org.eclipse.osgi.framework.console.CommandProvider"; //$NON-NLS-1$ private static BundleContext context; - private ServiceTracker agentTracker; + private ServiceTracker<IProvisioningAgent, IProvisioningAgent> agentTracker; private ProvCommandProvider provider; - private ServiceRegistration providerRegistration = null; + private ServiceRegistration<?> providerRegistration = null; public static BundleContext getContext() { return context; @@ -44,7 +44,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer { } if (registerCommands) { - agentTracker = new ServiceTracker(context, IProvisioningAgent.SERVICE_NAME, this); + agentTracker = new ServiceTracker<IProvisioningAgent, IProvisioningAgent>(context, IProvisioningAgent.class, this); agentTracker.open(); } } @@ -57,19 +57,19 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer { Activator.context = null; } - public Object addingService(ServiceReference reference) { + public IProvisioningAgent addingService(ServiceReference<IProvisioningAgent> reference) { BundleContext ctxt = Activator.getContext(); - IProvisioningAgent agent = (IProvisioningAgent) ctxt.getService(reference); + IProvisioningAgent agent = ctxt.getService(reference); provider = new ProvCommandProvider(ctxt.getProperty("eclipse.p2.profile"), agent); //$NON-NLS-1$ providerRegistration = ctxt.registerService(PROVIDER_NAME, provider, null); return agent; } - public void modifiedService(ServiceReference reference, Object service) { + public void modifiedService(ServiceReference<IProvisioningAgent> reference, IProvisioningAgent service) { // nothing } - public void removedService(ServiceReference reference, Object service) { + public void removedService(ServiceReference<IProvisioningAgent> reference, IProvisioningAgent service) { if (providerRegistration != null) providerRegistration.unregister(); providerRegistration = null; |