diff options
5 files changed, 10 insertions, 14 deletions
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/project/IBundleProjectService.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/project/IBundleProjectService.java index 45caa14293..faca684b88 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/project/IBundleProjectService.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/project/IBundleProjectService.java @@ -16,23 +16,19 @@ package org.eclipse.pde.core.project; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.ServiceCaller; import org.eclipse.osgi.service.resolver.VersionRange; -import org.osgi.framework.BundleContext; import org.osgi.framework.Version; /** * Service used to create and configure bundle project descriptions. * <p> - * An instance of this service can be obtained from a {@link BundleContext} as + * An instance of this service can be obtained from a {@link ServiceCaller} as * follows * </p> * * <pre> - * BundleContext context = ... - * ServiceReference<IBundleContextService> ref = context.getServiceReference(IBundleContextService.class); - * IBundleContextService service = context.getService(ref); - * ... - * context.ungetService(ref); + * ServiceCaller.callOnce(getClass(), IBundleContextService.class, (service) -> ...); * </pre> * * @since 3.6 diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/target/LoadTargetDefinitionJob.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/target/LoadTargetDefinitionJob.java index 651316a379..1bacd6d7c9 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/target/LoadTargetDefinitionJob.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/core/target/LoadTargetDefinitionJob.java @@ -101,7 +101,7 @@ public class LoadTargetDefinitionJob extends WorkspaceJob { fTarget = target; if (target == null) { fNone = true; - ITargetPlatformService service = PDECore.getDefault().acquireService(ITargetPlatformService.class); + ITargetPlatformService service = TargetPlatformService.getDefault(); fTarget = service.newTarget(); } } diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java index 2236fb01af..4e80e7ae1c 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java @@ -229,7 +229,7 @@ public class P2TargetUtils { public static List<String> cleanOrphanedTargetDefinitionProfiles() throws CoreException { List<String> list = new ArrayList<>(); IProfileRegistry registry = getProfileRegistry(); - ITargetPlatformService tps = PDECore.getDefault().acquireService(ITargetPlatformService.class); + ITargetPlatformService tps = TargetPlatformService.getDefault(); if (registry != null && tps != null) { IProfile[] profiles = registry.getProfiles(); for (IProfile profile : profiles) { diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java index 17d6aa61d5..144632dd81 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java @@ -31,6 +31,7 @@ import org.eclipse.jface.text.FindReplaceDocumentAdapterContentProposalProvider; import org.eclipse.jface.window.Window; import org.eclipse.pde.core.target.ITargetPlatformService; import org.eclipse.pde.internal.core.*; +import org.eclipse.pde.internal.core.target.TargetPlatformService; import org.eclipse.pde.internal.launching.ILaunchingPreferenceConstants; import org.eclipse.pde.internal.launching.PDELaunchingPlugin; import org.eclipse.pde.internal.ui.*; @@ -318,10 +319,8 @@ public class MainPreferencePage extends PreferencePage implements IWorkbenchPref store.setValue(IPreferenceConstants.ADD_TO_JAVA_SEARCH, synchJavaSearch); try { if (synchJavaSearch) { - ITargetPlatformService service = PDECore.getDefault().acquireService(ITargetPlatformService.class); - if (service != null) { - AddToJavaSearchJob.synchWithTarget(service.getWorkspaceTargetDefinition()); - } + ITargetPlatformService service = TargetPlatformService.getDefault(); + AddToJavaSearchJob.synchWithTarget(service.getWorkspaceTargetDefinition()); } else { AddToJavaSearchJob.clearAll(); } diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java index 1cabd8f196..0bb6a36062 100644 --- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java +++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/ShowSampleAction.java @@ -43,6 +43,7 @@ import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.intro.IIntroSite; import org.eclipse.ui.intro.config.*; import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; public class ShowSampleAction extends Action implements IIntroAction { @@ -240,7 +241,7 @@ public class ShowSampleAction extends Action implements IIntroAction { * Apply the profile changes to the currently running configuration. */ void applyConfiguration() throws CoreException { - BundleContext context = PDEPlugin.getDefault().getBundle().getBundleContext(); + BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext(); ServiceReference<Configurator> reference = context.getServiceReference(Configurator.class); Configurator configurator = context.getService(reference); try { |