diff options
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/Activator.java | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java (renamed from bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/provisional/p2/updatechecker/UpdateChecker.java) | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java index e367b38da..f28fef01e 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java @@ -11,13 +11,10 @@ package org.eclipse.equinox.internal.p2.ui.sdk.scheduler; import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus; -import org.eclipse.equinox.internal.provisional.p2.updatechecker.IUpdateChecker; -import org.eclipse.equinox.internal.provisional.p2.updatechecker.UpdateChecker; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; import org.osgi.service.packageadmin.PackageAdmin; /** @@ -32,7 +29,6 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin { private AutomaticUpdateScheduler scheduler; private AutomaticUpdater updater; - private ServiceRegistration registrationChecker; public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui.sdk.scheduler"; //$NON-NLS-1$ @@ -87,8 +83,6 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin { getBundle("org.eclipse.equinox.frameworkadmin.equinox").start(Bundle.START_TRANSIENT); //$NON-NLS-1$ getBundle("org.eclipse.equinox.simpleconfigurator.manipulator").start(Bundle.START_TRANSIENT); //$NON-NLS-1$ getBundle("org.eclipse.equinox.p2.updatechecker").start(Bundle.START_TRANSIENT); //$NON-NLS-1$ - - registrationChecker = context.registerService(IUpdateChecker.SERVICE_NAME, new UpdateChecker(), null); } public void stop(BundleContext bundleContext) throws Exception { @@ -100,8 +94,6 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin { updater.shutdown(); updater = null; } - registrationChecker.unregister(); - registrationChecker = null; packageAdmin = null; packageAdminRef = null; plugin = null; diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/Activator.java b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/Activator.java index afbdf8f1d..d6a6e1fe4 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/Activator.java +++ b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/Activator.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.updatechecker; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; +import org.eclipse.equinox.internal.provisional.p2.updatechecker.IUpdateChecker; +import org.osgi.framework.*; /** * Activator class that registers the update checker service. @@ -19,6 +19,7 @@ import org.osgi.framework.BundleContext; public class Activator implements BundleActivator { public static final String ID = "org.eclipse.equinox.p2.updatechecker"; //$NON-NLS-1$ private static BundleContext context; + private ServiceRegistration registrationChecker; public static BundleContext getContext() { return context; @@ -26,9 +27,10 @@ public class Activator implements BundleActivator { public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; + registrationChecker = context.registerService(IUpdateChecker.SERVICE_NAME, new UpdateChecker(), null); } public void stop(BundleContext bundleContext) throws Exception { - Activator.context = null; + registrationChecker.unregister(); } } diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/provisional/p2/updatechecker/UpdateChecker.java b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java index 75169c7f6..60413a152 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/provisional/p2/updatechecker/UpdateChecker.java +++ b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/internal/p2/updatechecker/UpdateChecker.java @@ -8,7 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.updatechecker; +package org.eclipse.equinox.internal.p2.updatechecker; + +import org.eclipse.equinox.internal.provisional.p2.updatechecker.*; import java.net.URI; import java.text.SimpleDateFormat; @@ -16,7 +18,6 @@ import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.*; -import org.eclipse.equinox.internal.p2.updatechecker.Activator; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager; import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; |