Attachment 126479 Details for Bug 239493 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

bug239493.patch (text/plain), 15.11 KB, created by Darin Wright

on 2009-02-23 12:05:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2009-02-23 12:05:39 EST

Size: 15.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.44
>diff -u -r1.44 MANIFEST.MF
>--- META-INF/MANIFEST.MF	10 Feb 2009 15:42:18 -0000	1.44
>+++ META-INF/MANIFEST.MF	23 Feb 2009 17:03:12 -0000
>@@ -1,65 +1,65 @@
>-Manifest-Version: 1.0
>-Bundle-ManifestVersion: 2
>-Bundle-Name: %name
>-Bundle-SymbolicName: org.eclipse.pde.core; singleton:=true
>-Bundle-Version: 3.5.0.qualifier
>-Bundle-Activator: org.eclipse.pde.internal.core.PDECore
>-Bundle-Vendor: %provider-name
>-Bundle-Localization: plugin
>-Export-Package: 
>- org.eclipse.pde.core,
>- org.eclipse.pde.core.build,
>- org.eclipse.pde.core.plugin,
>- org.eclipse.pde.internal.core;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.runtime",
>- org.eclipse.pde.internal.core.build;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.builders;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.bundle;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.content;x-internal:=true,
>- org.eclipse.pde.internal.core.converter;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.exports;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.feature;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.ibundle;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.ifeature;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.iproduct;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.ischema;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.isite;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.itarget;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.natures;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.plugin;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.product;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.schema;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.search;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.site;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.target;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.target.impl;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.target.provisional;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.text;
>-  x-friends:="org.eclipse.pde.ui,
>-   org.eclipse.pde.ds.core,
>-   org.eclipse.pde.ua.core,
>-   org.eclipse.pde.ds.ui,
>-   org.eclipse.pde.ua.ui",
>- org.eclipse.pde.internal.core.text.build;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.text.bundle;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.text.plugin;x-friends:="org.eclipse.pde.ui",
>- org.eclipse.pde.internal.core.util;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.ua.ui",
>- org.eclipse.pde.internal.core.variables;x-internal:=true
>-Require-Bundle: 
>- org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.team.core;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.text;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
>- org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",
>- org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
>- org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)"
>-Eclipse-LazyStart: true
>-Bundle-RequiredExecutionEnvironment: J2SE-1.4
>-Import-Package: com.ibm.icu.util
>-Bundle-ActivationPolicy: lazy
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: %name
>+Bundle-SymbolicName: org.eclipse.pde.core; singleton:=true
>+Bundle-Version: 3.5.0.qualifier
>+Bundle-Activator: org.eclipse.pde.internal.core.PDECore
>+Bundle-Vendor: %provider-name
>+Bundle-Localization: plugin
>+Export-Package: 
>+ org.eclipse.pde.core,
>+ org.eclipse.pde.core.build,
>+ org.eclipse.pde.core.plugin,
>+ org.eclipse.pde.internal.core;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.runtime",
>+ org.eclipse.pde.internal.core.build;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.builders;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.bundle;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.content;x-internal:=true,
>+ org.eclipse.pde.internal.core.converter;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.exports;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.feature;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.ibundle;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.ifeature;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.iproduct;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.ischema;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.isite;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.itarget;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.natures;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.plugin;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.product;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.schema;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.search;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.site;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.target;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.target.impl;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.target.provisional;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.api.tools.ui",
>+ org.eclipse.pde.internal.core.text;
>+  x-friends:="org.eclipse.pde.ui,
>+   org.eclipse.pde.ds.core,
>+   org.eclipse.pde.ua.core,
>+   org.eclipse.pde.ds.ui,
>+   org.eclipse.pde.ua.ui",
>+ org.eclipse.pde.internal.core.text.build;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.text.bundle;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.text.plugin;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.util;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.ua.ui",
>+ org.eclipse.pde.internal.core.variables;x-internal:=true
>+Require-Bundle: 
>+ org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
>+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.team.core;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)",
>+ org.eclipse.text;bundle-version="[3.1.0,4.0.0)",
>+ org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
>+ org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
>+ org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
>+ org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)"
>+Eclipse-LazyStart: true
>+Bundle-RequiredExecutionEnvironment: J2SE-1.4
>+Import-Package: com.ibm.icu.util
>+Bundle-ActivationPolicy: lazy
>#P org.eclipse.pde.api.tools.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.15
>diff -u -r1.15 MANIFEST.MF
>--- META-INF/MANIFEST.MF	26 Jan 2009 20:43:47 -0000	1.15
>+++ META-INF/MANIFEST.MF	23 Feb 2009 17:03:14 -0000
>@@ -22,7 +22,8 @@
>  org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
>  org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
>  org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
>- org.eclipse.core.expressions;bundle-version="3.4.100"
>+ org.eclipse.core.expressions;bundle-version="3.4.100",
>+ org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)"
> Bundle-RequiredExecutionEnvironment: J2SE-1.4
> Bundle-Activator: org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin
> Export-Package: org.eclipse.pde.api.tools.ui.internal;x-friends:="org.eclipse.pde.api.tools.tests",
>Index: src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiBaselineWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiBaselineWizardPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 ApiBaselineWizardPage.java
>--- src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiBaselineWizardPage.java	3 Feb 2009 01:11:14 -0000	1.6
>+++ src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiBaselineWizardPage.java	23 Feb 2009 17:03:14 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.SubMonitor;
> import org.eclipse.core.runtime.SubProgressMonitor;
>+import org.eclipse.core.runtime.URIUtil;
> import org.eclipse.jdt.launching.JavaRuntime;
> import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
> import org.eclipse.jface.dialogs.Dialog;
>@@ -55,6 +56,10 @@
> import org.eclipse.pde.api.tools.ui.internal.IApiToolsHelpContextIds;
> import org.eclipse.pde.api.tools.ui.internal.SWTFactory;
> import org.eclipse.pde.api.tools.ui.internal.preferences.ApiBaselinePreferencePage;
>+import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
>+import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
>+import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
>+import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>@@ -172,27 +177,57 @@
> 			monitor.beginTask(WizardMessages.ApiProfileWizardPage_0, 10);
> 			Path path = new Path(location);
> 			File plugins = path.append("plugins").toFile(); //$NON-NLS-1$
>-			if (!plugins.exists() || !plugins.isDirectory()) {
>-				plugins = path.toFile();
>-			}
>-			File[] files = scanLocation(plugins);
>+			ITargetPlatformService service = (ITargetPlatformService) ApiUIPlugin.getDefault().acquireService(ITargetPlatformService.class.getName());
>+			IBundleContainer container = service.newProfileContainer(path.toOSString(), null);
>+			// treat as an installation, if that fails, try plug-ins directory
>+			ITargetDefinition definition = service.newTarget();
>+			SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
>+			container.resolve(definition, subMonitor);
>+			subMonitor.done();
> 			monitor.worked(1);
>-			fProfile = ApiModelFactory.newApiBaseline(name);
>-			SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 8);
>-			subMonitor.beginTask(IApiToolsConstants.EMPTY_STRING, files.length); 
>+			IResolvedBundle[] bundles = container.getBundles();
> 			List components = new ArrayList();
>-			for (int i = 0; i < files.length; i++) {
>-				try {
>-					IApiComponent component = ApiModelFactory.newApiComponent(fProfile, files[i].getPath());
>-					if (component != null) {
>-						components.add(component);
>+			fProfile = ApiModelFactory.newApiBaseline(name);
>+			if (bundles.length > 0) {
>+				// an installation
>+				subMonitor = new SubProgressMonitor(monitor, 8);
>+				subMonitor.beginTask(IApiToolsConstants.EMPTY_STRING, bundles.length); 
>+				for (int i = 0; i < bundles.length; i++) {
>+					try {
>+						if (!bundles[i].isSourceBundle()) {
>+							IApiComponent component = ApiModelFactory.newApiComponent(fProfile, URIUtil.toFile(bundles[i].getBundleInfo().getLocation()).getAbsolutePath());
>+							if (component != null) {
>+								components.add(component);
>+							}
>+						}
>+					} catch (CoreException e) {
>+						throw new InvocationTargetException(e);
> 					}
>-				} catch (CoreException e) {
>-					throw new InvocationTargetException(e);
>+					subMonitor.worked(1);
>+				}
>+				subMonitor.done();
>+			} else {
>+				// scan directory
>+				if (!plugins.exists() || !plugins.isDirectory()) {
>+					plugins = path.toFile();
>+				}
>+				File[] files = scanLocation(plugins);
>+				monitor.worked(1);
>+				subMonitor = new SubProgressMonitor(monitor, 7);
>+				subMonitor.beginTask(IApiToolsConstants.EMPTY_STRING, files.length); 
>+				for (int i = 0; i < files.length; i++) {
>+					try {
>+						IApiComponent component = ApiModelFactory.newApiComponent(fProfile, files[i].getPath());
>+						if (component != null) {
>+							components.add(component);
>+						}
>+					} catch (CoreException e) {
>+						throw new InvocationTargetException(e);
>+					}
>+					subMonitor.worked(1);
> 				}
>-				subMonitor.worked(1);
>+				subMonitor.done();
> 			}
>-			subMonitor.done();
> 			try {
> 				fProfile.addApiComponents((IApiComponent[]) components.toArray(new IApiComponent[components.size()]));
> 			} catch (CoreException e) {
>Index: src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java,v
>retrieving revision 1.12
>diff -u -r1.12 ApiUIPlugin.java
>--- src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java	19 Jan 2009 23:20:38 -0000	1.12
>+++ src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java	23 Feb 2009 17:03:14 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.Bundle;
> import org.osgi.framework.BundleContext;
>+import org.osgi.framework.ServiceReference;
> 
> /**
>  * API tooling UI plug-in class.
>@@ -72,6 +73,11 @@
> 	private static Map fCompositeImages = new HashMap();
> 	
> 	/**
>+	 * This bundle's OSGi context
>+	 */
>+	private BundleContext fBundleContext = null;
>+	
>+	/**
> 	 * Constructor
> 	 */
> 	public ApiUIPlugin() {
>@@ -273,8 +279,28 @@
> 			image.dispose();
> 		}
> 		fCompositeImages.clear();
>+		fBundleContext = null;
> 		super.stop(context);
> 	}
> 	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
>+	 */
>+	public void start(BundleContext context) throws Exception {
>+		fBundleContext = context;
>+		super.start(context);
>+	}
> 	
>+	/**
>+	 * Returns a service with the specified name or <code>null</code> if none.
>+	 * 
>+	 * @param serviceName name of service
>+	 * @return service object or <code>null</code> if none
>+	 */
>+	public Object acquireService(String serviceName) {
>+		ServiceReference reference = fBundleContext.getServiceReference(serviceName);
>+		if (reference == null)
>+			return null;
>+		return fBundleContext.getService(reference);
>+	}
> }

Actions: View | Diff

Attachments on bug 239493: 126479