Attachment 160644 Details for Bug 195729 – moves the API to internal.provisional

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

[patch] moves the API to internal.provisional

bundle-importers-provisional.patch (text/plain), 42.77 KB, created by Darin Wright

on 2010-03-02 11:54:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-03-02 11:54:24 EST

Size: 42.77 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.56
>diff -u -r1.56 MANIFEST.MF
>--- META-INF/MANIFEST.MF	1 Mar 2010 21:04:39 -0000	1.56
>+++ META-INF/MANIFEST.MF	2 Mar 2010 16:53:13 -0000
>@@ -9,7 +9,6 @@
> Export-Package: 
> org.eclipse.pde.core,
> org.eclipse.pde.core.build,
>- org.eclipse.pde.core.importing,
> org.eclipse.pde.core.plugin,
> org.eclipse.pde.core.project,
> org.eclipse.pde.internal.core;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.runtime,org.eclipse.pde.launching",
>@@ -23,6 +22,7 @@
> 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.importing;x-friends:="org.eclipse.pde.ui",
>+ org.eclipse.pde.internal.core.importing.provisional;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",
>Index: schema/bundleImporters.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/schema/bundleImporters.exsd,v
>retrieving revision 1.1
>diff -u -r1.1 bundleImporters.exsd
>--- schema/bundleImporters.exsd	1 Mar 2010 21:04:39 -0000	1.1
>+++ schema/bundleImporters.exsd	2 Mar 2010 16:53:13 -0000
>@@ -6,14 +6,17 @@
> <meta.schema plugin="org.eclipse.pde.core" id="bundleImporters" name="Bundle Importers"/>
> </appInfo>
> <documentation>
>- A bundle importer is capable of creating a project in the workspace based on specific entries contained in a bundle manifest. An importer can register for one or more bundle headers, identified by name. By default, a bundle importer is registered for the &apos;Eclipse-SourceReferences&apos; header.
>+ &lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This extension point has been added as part of a work in progress. There is no guarantee that this API will work or that it will remain the same in future releases. Please do not use this API without consulting with the PDE team.
>+&lt;p&gt;
>+A bundle importer is capable of creating a project in the workspace based on specific entries contained in a bundle manifest. An importer can register for one or more bundle headers, identified by name. By default, a bundle importer is registered for the &apos;Eclipse-SourceReferences&apos; header.
>+&lt;/p&gt;
> </documentation>
> </annotation>
> 
> <element name="extension">
> <annotation>
> <appInfo>
>- <meta.element />
>+ <meta.element internal="true" />
> </appInfo>
> </annotation>
> <complexType>
>@@ -52,10 +55,10 @@
> <attribute name="class" type="string" use="required">
> <annotation>
> <documentation>
>- Fully qualified name of a Java class providing an implementation of &lt;code&gt;org.eclipse.pde.core.importing.IBundleImporterDelegate&lt;/code&gt; for this handler.
>+ Fully qualified name of a Java class providing an implementation of &lt;code&gt;org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate&lt;/code&gt; for this handler.
> </documentation>
> <appInfo>
>- <meta.attribute kind="java" basedOn=":org.eclipse.pde.core.importing.IBundleImporterDelegate"/>
>+ <meta.attribute kind="java" basedOn=":org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate"/>
> </appInfo>
> </annotation>
> </attribute>
>@@ -123,7 +126,7 @@
> <meta.section type="apiinfo"/>
> </appInfo>
> <documentation>
>- Value of a importer&apos;s &lt;b&gt;class&lt;/b&gt; attribute must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.pde.core.importing.IBundleImporterDelegate&lt;/b&gt;.
>+ Value of a importer&apos;s &lt;b&gt;class&lt;/b&gt; attribute must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate&lt;/b&gt;.
> </documentation>
> </annotation>
> 
>Index: src/org/eclipse/pde/core/importing/BundleImportDescription.java
>===================================================================
>RCS file: src/org/eclipse/pde/core/importing/BundleImportDescription.java
>diff -N src/org/eclipse/pde/core/importing/BundleImportDescription.java
>--- src/org/eclipse/pde/core/importing/BundleImportDescription.java	1 Mar 2010 21:04:39 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,107 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2010 IBM Corporation and others.
>- * 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.pde.core.importing;
>-
>-import java.util.HashMap;
>-import java.util.Map;
>-
>-/**
>- * Describes how a bundle import will be executed. A bundle importer delegate
>- * creates bundle import descriptions when it validates bundle manifests for
>- * importing. When asked to import bundles, it is passed back the instances
>- * of bundle import descriptions is created. However, the target project
>- * may have been modified and properties may have been modified.
>- * 
>- * Clients may instantiate this class. Clients may subclass this class to
>- * implement model specific behavior and include model specific data in import
>- * descriptions.
>- * 
>- * @since 3.6
>- */
>-public class BundleImportDescription {
>-
>-	private String project;
>-	private Map manifest;
>-	private Map properties;
>-
>-	/**
>-	 * Constructs a bundle import description with given project and manifest.
>-	 * 
>-	 * @param project the project the bundle should be imported into which may
>-	 * or may not exist
>-	 * @param manifest bundle manifest headers and values
>-	 */
>-	public BundleImportDescription(String project, Map manifest) {
>-		this.project = project;
>-		this.manifest = manifest;
>-	}
>-
>-	/**
>-	 * Sets or removes a client property.
>-	 * 
>-	 * @param key property key
>-	 * @param value property value or <code>null</code> to remove the property
>-	 */
>-	public synchronized void setProperty(String key, Object value) {
>-		if (properties == null) {
>-			properties = new HashMap();
>-		}
>-		if (value == null) {
>-			properties.remove(key);
>-		} else {
>-			properties.put(key, value);
>-		}
>-
>-	}
>-
>-	/**
>-	 * Returns the specified client property, or <code>null</code> if none.
>-	 * 
>-	 * @param key property key
>-	 * @return property value or <code>null</code>
>-	 */
>-	public synchronized Object getProperty(String key) {
>-		if (properties == null) {
>-			return null;
>-		}
>-		return properties.get(key);
>-	}
>-
>-	/**
>-	 * Returns the project name the bundle will be imported into. The project
>-	 * may or may not exist before the import. However, when the import operation
>-	 * beings, the project will not exist.
>-	 * 
>-	 * @return target project
>-	 */
>-	public synchronized String getProject() {
>-		return project;
>-	}
>-
>-	/**
>-	 * Returns the manifest of the bundle to be imported.
>-	 * 
>-	 * @return bundle manifest keys and values
>-	 */
>-	public Map getManifest() {
>-		return manifest;
>-	}
>-
>-	/**
>-	 * Sets the project name that is the target of the import operation.
>-	 * 
>-	 * @param project target project
>-	 */
>-	public synchronized void setProject(String project) {
>-		this.project = project;
>-	}
>-
>-}
>Index: src/org/eclipse/pde/core/importing/IBundleImporterDelegate.java
>===================================================================
>RCS file: src/org/eclipse/pde/core/importing/IBundleImporterDelegate.java
>diff -N src/org/eclipse/pde/core/importing/IBundleImporterDelegate.java
>--- src/org/eclipse/pde/core/importing/IBundleImporterDelegate.java	2 Mar 2010 14:40:01 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2010 IBM Corporation and others.
>- * 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.pde.core.importing;
>-
>-import java.util.Map;
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-
>-/**
>- * A bundle importer delegate is contributed by a bundle importer extension and is capable
>- * of importing projects into the workspace from a repository based on bundle manifest entries.
>- * 
>- * Following is an example extension:
>- * <pre>
>- * &lt;extension point=&quot;org.eclipse.pde.core.bundleImporters&quot;&gt;
>- * &lt;importer
>- * id=&quot;com.example.ExampleIdentifier&quot;
>- * class=&quot;com.example.ExampleBundleImporterDelegate&quot;&gt;
>- * &lt;/importer&gt;
>- * &lt;/extension&gt;
>- * </pre>
>- * 
>- * 
>- * Clients contributing bundle importer extensions are intended to implement this interface.
>- * 
>- * @since 3.6
>- * @noextend This interface is not intended to be extended by clients.
>- */
>-public interface IBundleImporterDelegate {
>-
>-	/**
>-	 * Returns an array of objects describing how each given bundle (manifest headers and values)
>-	 * can be imported into a workspace project. A <code>null</code> entry in the returned array
>-	 * indicates the corresponding bundle cannot be imported by this delegate.
>-	 * 
>-	 * @param manifests array of maps containing manifest headers and values of the associated bundles
>-	 * @return array of bundle import descriptions that may contain <code>null</code> entries
>-	 */
>-	public BundleImportDescription[] validateImport(Map[] manifests);
>-
>-	/**
>-	 * Imports bundles into the workspace creating a project for each import description.
>-	 * Reports progress to the given monitor, if not <code>null</code>.
>-	 * 
>-	 * @param descriptions description of bundles to import
>-	 * @param monitor progress monitor or <code>null</code>
>-	 * @return collection of projects created in the workspace or <code>null</code> if none
>-	 * @throws CoreException if unable to import projects
>-	 */
>-	public IProject[] performImport(BundleImportDescription[] descriptions, IProgressMonitor monitor) throws CoreException;
>-}
>Index: src/org/eclipse/pde/core/importing/package.html
>===================================================================
>RCS file: src/org/eclipse/pde/core/importing/package.html
>diff -N src/org/eclipse/pde/core/importing/package.html
>--- src/org/eclipse/pde/core/importing/package.html	2 Mar 2010 00:52:12 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,23 +0,0 @@
>-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
>-<html>
>-<head>
>- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>- <meta name="Author" content="IBM">
>- <title>Package-level Javadoc</title>
>-</head>
>-<body>
>-Application programming interfaces for importing projects into the workspace.
>-<h2>
>-Package Specification</h2>
>-
>-Provides support for importing projects into the workspace from a repository. 
>-
>-
>-A bundle manifest may contain information identifying source code for the bundle
>-or a project in a repository associated with the bundle. Clients may contribute
>-implementations of <code>org.eclipse.pde.core.importing.IBundleImporterDelegate</code>
>-to the <code>org.eclipse.pde.core.bundleImporters</code> extension point to participate
>-in the import of bundles into workspace projects based on bundle manifests.
>-
>-</body>
>-</html>
>Index: src/org/eclipse/pde/internal/core/importing/BundleImporterExtension.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/importing/BundleImporterExtension.java,v
>retrieving revision 1.1
>diff -u -r1.1 BundleImporterExtension.java
>--- src/org/eclipse/pde/internal/core/importing/BundleImporterExtension.java	1 Mar 2010 21:04:39 -0000	1.1
>+++ src/org/eclipse/pde/internal/core/importing/BundleImporterExtension.java	2 Mar 2010 16:53:13 -0000
>@@ -13,8 +13,9 @@
> import java.util.Map;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.*;
>-import org.eclipse.pde.core.importing.*;
> import org.eclipse.pde.internal.core.PDECore;
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+import org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate;
> 
> /**
> * A bundle importer extension.
>Index: src/org/eclipse/pde/internal/core/importing/CvsBundleImportDescription.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/importing/CvsBundleImportDescription.java,v
>retrieving revision 1.1
>diff -u -r1.1 CvsBundleImportDescription.java
>--- src/org/eclipse/pde/internal/core/importing/CvsBundleImportDescription.java	1 Mar 2010 21:04:39 -0000	1.1
>+++ src/org/eclipse/pde/internal/core/importing/CvsBundleImportDescription.java	2 Mar 2010 16:53:13 -0000
>@@ -10,8 +10,9 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.core.importing;
> 
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import java.util.Map;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> 
> /**
> * Describes a bundle to be imported by CVS.
>Index: src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java,v
>retrieving revision 1.1
>diff -u -r1.1 CvsBundleImporterDelegate.java
>--- src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java	1 Mar 2010 21:04:39 -0000	1.1
>+++ src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java	2 Mar 2010 16:53:13 -0000
>@@ -10,12 +10,13 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.core.importing;
> 
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+import org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate;
>+
> import java.util.*;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.*;
> import org.eclipse.osgi.util.ManifestElement;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
>-import org.eclipse.pde.core.importing.IBundleImporterDelegate;
> import org.eclipse.pde.internal.core.ICoreConstants;
> import org.eclipse.pde.internal.core.PDECore;
> import org.eclipse.team.core.*;
>Index: src/org/eclipse/pde/internal/core/importing/IBundleImporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/importing/IBundleImporter.java,v
>retrieving revision 1.1
>diff -u -r1.1 IBundleImporter.java
>--- src/org/eclipse/pde/internal/core/importing/IBundleImporter.java	2 Mar 2010 00:37:42 -0000	1.1
>+++ src/org/eclipse/pde/internal/core/importing/IBundleImporter.java	2 Mar 2010 16:53:13 -0000
>@@ -10,7 +10,7 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.core.importing;
> 
>-import org.eclipse.pde.core.importing.IBundleImporterDelegate;
>+import org.eclipse.pde.internal.core.importing.provisional.IBundleImporterDelegate;
> 
> /**
> * A bundle importer represents an instance of a bundle importer extension.
>Index: src/org/eclipse/pde/internal/core/importing/provisional/BundleImportDescription.java
>===================================================================
>RCS file: src/org/eclipse/pde/internal/core/importing/provisional/BundleImportDescription.java
>diff -N src/org/eclipse/pde/internal/core/importing/provisional/BundleImportDescription.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/pde/internal/core/importing/provisional/BundleImportDescription.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,113 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.core.importing.provisional;
>+
>+import java.util.HashMap;
>+import java.util.Map;
>+
>+/**
>+ * Describes how a bundle import will be executed. A bundle importer delegate
>+ * creates bundle import descriptions when it validates bundle manifests for
>+ * importing. When asked to import bundles, it is passed back the instances
>+ * of bundle import descriptions is created. However, the target project
>+ * may have been modified and properties may have been modified.
>+ * 
>+ * Clients may instantiate this class. Clients may subclass this class to
>+ * implement model specific behavior and include model specific data in import
>+ * descriptions.
>+ * 
>+ * 
>+ * EXPERIMENTAL. This class has been added as
>+ * part of a work in progress. There is no guarantee that this API will
>+ * work or that it will remain the same. Please do not use this API without
>+ * consulting with the PDE team.
>+ * 
>+ * @since 3.6
>+ */
>+public class BundleImportDescription {
>+
>+	private String project;
>+	private Map manifest;
>+	private Map properties;
>+
>+	/**
>+	 * Constructs a bundle import description with given project and manifest.
>+	 * 
>+	 * @param project the project the bundle should be imported into which may
>+	 * or may not exist
>+	 * @param manifest bundle manifest headers and values
>+	 */
>+	public BundleImportDescription(String project, Map manifest) {
>+		this.project = project;
>+		this.manifest = manifest;
>+	}
>+
>+	/**
>+	 * Sets or removes a client property.
>+	 * 
>+	 * @param key property key
>+	 * @param value property value or <code>null</code> to remove the property
>+	 */
>+	public synchronized void setProperty(String key, Object value) {
>+		if (properties == null) {
>+			properties = new HashMap();
>+		}
>+		if (value == null) {
>+			properties.remove(key);
>+		} else {
>+			properties.put(key, value);
>+		}
>+
>+	}
>+
>+	/**
>+	 * Returns the specified client property, or <code>null</code> if none.
>+	 * 
>+	 * @param key property key
>+	 * @return property value or <code>null</code>
>+	 */
>+	public synchronized Object getProperty(String key) {
>+		if (properties == null) {
>+			return null;
>+		}
>+		return properties.get(key);
>+	}
>+
>+	/**
>+	 * Returns the project name the bundle will be imported into. The project
>+	 * may or may not exist before the import. However, when the import operation
>+	 * beings, the project will not exist.
>+	 * 
>+	 * @return target project
>+	 */
>+	public synchronized String getProject() {
>+		return project;
>+	}
>+
>+	/**
>+	 * Returns the manifest of the bundle to be imported.
>+	 * 
>+	 * @return bundle manifest keys and values
>+	 */
>+	public Map getManifest() {
>+		return manifest;
>+	}
>+
>+	/**
>+	 * Sets the project name that is the target of the import operation.
>+	 * 
>+	 * @param project target project
>+	 */
>+	public synchronized void setProject(String project) {
>+		this.project = project;
>+	}
>+
>+}
>Index: src/org/eclipse/pde/internal/core/importing/provisional/IBundleImporterDelegate.java
>===================================================================
>RCS file: src/org/eclipse/pde/internal/core/importing/provisional/IBundleImporterDelegate.java
>diff -N src/org/eclipse/pde/internal/core/importing/provisional/IBundleImporterDelegate.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/pde/internal/core/importing/provisional/IBundleImporterDelegate.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,66 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.core.importing.provisional;
>+
>+import java.util.Map;
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+
>+/**
>+ * A bundle importer delegate is contributed by a bundle importer extension and is capable
>+ * of importing projects into the workspace from a repository based on bundle manifest entries.
>+ * 
>+ * Following is an example extension:
>+ * <pre>
>+ * &lt;extension point=&quot;org.eclipse.pde.core.bundleImporters&quot;&gt;
>+ * &lt;importer
>+ * id=&quot;com.example.ExampleIdentifier&quot;
>+ * class=&quot;com.example.ExampleBundleImporterDelegate&quot;&gt;
>+ * &lt;/importer&gt;
>+ * &lt;/extension&gt;
>+ * </pre>
>+ * 
>+ * 
>+ * Clients contributing bundle importer extensions are intended to implement this interface.
>+ * 
>+ * 
>+ * EXPERIMENTAL. This interface has been added as
>+ * part of a work in progress. There is no guarantee that this API will
>+ * work or that it will remain the same. Please do not use this API without
>+ * consulting with the PDE team.
>+ * 
>+ * @since 3.6
>+ * @noextend This interface is not intended to be extended by clients.
>+ */
>+public interface IBundleImporterDelegate {
>+
>+	/**
>+	 * Returns an array of objects describing how each given bundle (manifest headers and values)
>+	 * can be imported into a workspace project. A <code>null</code> entry in the returned array
>+	 * indicates the corresponding bundle cannot be imported by this delegate.
>+	 * 
>+	 * @param manifests array of maps containing manifest headers and values of the associated bundles
>+	 * @return array of bundle import descriptions that may contain <code>null</code> entries
>+	 */
>+	public BundleImportDescription[] validateImport(Map[] manifests);
>+
>+	/**
>+	 * Imports bundles into the workspace creating a project for each import description.
>+	 * Reports progress to the given monitor, if not <code>null</code>.
>+	 * 
>+	 * @param descriptions description of bundles to import
>+	 * @param monitor progress monitor or <code>null</code>
>+	 * @return collection of projects created in the workspace or <code>null</code> if none
>+	 * @throws CoreException if unable to import projects
>+	 */
>+	public IProject[] performImport(BundleImportDescription[] descriptions, IProgressMonitor monitor) throws CoreException;
>+}
>Index: src/org/eclipse/pde/internal/core/importing/provisional/package.html
>===================================================================
>RCS file: src/org/eclipse/pde/internal/core/importing/provisional/package.html
>diff -N src/org/eclipse/pde/internal/core/importing/provisional/package.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/pde/internal/core/importing/provisional/package.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
>+<html>
>+<head>
>+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+ <meta name="Author" content="IBM">
>+ <title>Package-level Javadoc</title>
>+</head>
>+<body>
>+Application programming interfaces for importing projects into the workspace.
>+<h2>
>+Package Specification</h2>
>+
>+Provides support for importing projects into the workspace from a repository. 
>+
>+
>+A bundle manifest may contain information identifying source code for the bundle
>+or a project in a repository associated with the bundle. Clients may contribute
>+implementations of <code>org.eclipse.pde.core.importing.IBundleImporterDelegate</code>
>+to the <code>org.eclipse.pde.core.bundleImporters</code> extension point to participate
>+in the import of bundles into workspace projects based on bundle manifests.
>+
>+</body>
>+</html>
>Index: src/org/eclipse/pde/internal/core/project/BundleProjectService.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java,v
>retrieving revision 1.3
>diff -u -r1.3 BundleProjectService.java
>--- src/org/eclipse/pde/internal/core/project/BundleProjectService.java	2 Mar 2010 00:37:42 -0000	1.3
>+++ src/org/eclipse/pde/internal/core/project/BundleProjectService.java	2 Mar 2010 16:53:15 -0000
>@@ -10,11 +10,12 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.core.project;
> 
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import org.eclipse.pde.internal.core.importing.IBundleImporter;
> 
> import org.eclipse.pde.internal.core.importing.BundleImporterExtension;
> 
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> 
> import java.io.*;
> import java.util.*;
>#P org.eclipse.pde.doc.user
>Index: pdeOptions.txt
>===================================================================
>RCS file: /cvsroot/eclipse/pde/doc/org.eclipse.pde.doc.user/pdeOptions.txt,v
>retrieving revision 1.46
>diff -u -r1.46 pdeOptions.txt
>--- pdeOptions.txt	2 Mar 2010 01:14:23 -0000	1.46
>+++ pdeOptions.txt	2 Mar 2010 16:53:16 -0000
>@@ -73,7 +73,6 @@
> org.eclipse.pde.build
> org.eclipse.pde.core
> org.eclipse.pde.core.build
>-org.eclipse.pde.core.importing
> org.eclipse.pde.core.plugin
> org.eclipse.pde.core.project
> org.eclipse.pde.ui
>Index: topics_Reference.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/doc/org.eclipse.pde.doc.user/topics_Reference.xml,v
>retrieving revision 1.27
>diff -u -r1.27 topics_Reference.xml
>--- topics_Reference.xml	2 Mar 2010 01:14:23 -0000	1.27
>+++ topics_Reference.xml	2 Mar 2010 16:53:16 -0000
>@@ -278,8 +278,6 @@
> </topic>
> <topic href="reference/api/org/eclipse/pde/core/build/package-summary.html" label="org.eclipse.pde.core.build">
> </topic>
>- <topic href="reference/api/org/eclipse/pde/core/importing/package-summary.html" label="org.eclipse.pde.core.importing">
>- </topic>
> <topic href="reference/api/org/eclipse/pde/core/plugin/package-summary.html" label="org.eclipse.pde.core.plugin">
> </topic>
> <topic href="reference/api/org/eclipse/pde/core/project/package-summary.html" label="org.eclipse.pde.core.project">
>#P org.eclipse.pde.ui
>Index: .settings/org.eclipse.jdt.ui.prefs
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.ui.prefs,v
>retrieving revision 1.2
>diff -u -r1.2 org.eclipse.jdt.ui.prefs
>--- .settings/org.eclipse.jdt.ui.prefs	3 Jan 2008 02:25:12 -0000	1.2
>+++ .settings/org.eclipse.jdt.ui.prefs	2 Mar 2010 16:53:17 -0000
>@@ -1,11 +1,11 @@
>-#Sun Dec 23 21:49:35 CST 2007
>+#Sun Feb 28 21:27:07 CST 2010
> eclipse.preferences.version=1
> editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
> formatter_profile=_core
> formatter_settings_version=11
> org.eclipse.jdt.ui.ignorelowercasenames=true
> org.eclipse.jdt.ui.importorder=;
>-org.eclipse.jdt.ui.ondemandthreshold=3
>+org.eclipse.jdt.ui.ondemandthreshold=12
> org.eclipse.jdt.ui.staticondemandthreshold=99
> sp_cleanup.add_default_serial_version_id=true
> sp_cleanup.add_generated_serial_version_id=false
>Index: schema/bundleImportPages.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/schema/bundleImportPages.exsd,v
>retrieving revision 1.1
>diff -u -r1.1 bundleImportPages.exsd
>--- schema/bundleImportPages.exsd	1 Mar 2010 21:05:01 -0000	1.1
>+++ schema/bundleImportPages.exsd	2 Mar 2010 16:53:17 -0000
>@@ -3,17 +3,20 @@
> <schema targetNamespace="org.eclipse.pde.ui" xmlns="http://www.w3.org/2001/XMLSchema">
> <annotation>
> <appInfo>
>- <meta.schema plugin="org.eclipse.pde.ui" id="bundleImportPages" name="%expoint.bundleImportPages.name"/>
>+ <meta.schema plugin="org.eclipse.pde.ui" id="bundleImportPages" name="Bundle Import Pages"/>
> </appInfo>
> <documentation>
>- A bundle import page provides a wizard page that can be used in the Plug-in import wizard to configure settings for bundles to be imported by a &lt;code&gt;org.eclipse.pde.core.bundleImporters&lt;/code&gt; extension.
>+ &lt;strong&gt;EXPERIMENTAL&lt;/strong&gt;. This extension point has been added as part of a work in progress. There is no guarantee that this API will work or that it will remain the same in future releases. Please do not use this API without consulting with the PDE team.
>+&lt;p&gt;
>+A bundle import page provides a wizard page that can be used in the Plug-in import wizard to configure settings for bundles to be imported by a &lt;code&gt;org.eclipse.pde.core.bundleImporters&lt;/code&gt; extension.
>+&lt;/p&gt;
> </documentation>
> </annotation>
> 
> <element name="extension">
> <annotation>
> <appInfo>
>- <meta.element />
>+ <meta.element internal="true" />
> </appInfo>
> </annotation>
> <complexType>
>@@ -59,10 +62,10 @@
> <attribute name="class" type="string" use="required">
> <annotation>
> <documentation>
>- Fully qualified name of a Java class providing an implementation of &lt;code&gt;org.eclipse.pde.ui.IBundeImportWizardPage&lt;/code&gt;.
>+ Fully qualified name of a Java class providing an implementation of &lt;code&gt;org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage&lt;/code&gt;.
> </documentation>
> <appInfo>
>- <meta.attribute kind="java" basedOn=":org.eclipse.pde.ui.IBundeImportWizardPage"/>
>+ <meta.attribute kind="java" basedOn=":org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage"/>
> </appInfo>
> </annotation>
> </attribute>
>@@ -114,7 +117,7 @@
> <meta.section type="apiinfo"/>
> </appInfo>
> <documentation>
>- Value of a page&apos;s &lt;b&gt;class&lt;/b&gt; attribute must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.pde.ui.IBundeImportWizardPage&lt;/b&gt;.
>+ Value of a page&apos;s &lt;b&gt;class&lt;/b&gt; attribute must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage&lt;/b&gt;.
> </documentation>
> </annotation>
> 
>Index: src/org/eclipse/pde/internal/ui/provisional/IBundeImportWizardPage.java
>===================================================================
>RCS file: src/org/eclipse/pde/internal/ui/provisional/IBundeImportWizardPage.java
>diff -N src/org/eclipse/pde/internal/ui/provisional/IBundeImportWizardPage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/pde/internal/ui/provisional/IBundeImportWizardPage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,58 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.ui.provisional;
>+
>+import org.eclipse.jface.wizard.IWizardPage;
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
>+/**
>+ * A wizard page contributed by a <code>org.eclipse.pde.ui.bundleImportPages</code>
>+ * extension.
>+ * 
>+ * EXPERIMENTAL. This interface has been added as
>+ * part of a work in progress. There is no guarantee that this API will
>+ * work or that it will remain the same. Please do not use this API without
>+ * consulting with the PDE team.
>+ * 
>+ * @since 3.6
>+ */
>+public interface IBundeImportWizardPage extends IWizardPage {
>+	/**
>+	 * Called when the import wizard is closed by selecting 
>+	 * the finish button.
>+	 * Implementers may store the page result (new/changed bundle
>+	 * import descriptions in getSelection) here.
>+	 * 
>+	 * @return if the operation was successful. The wizard will only close
>+	 * when <code>true</code> is returned.
>+	 */
>+	public boolean finish();
>+
>+	/**
>+	 * Returns the bundle import descriptions edited or created on the page 
>+	 * after the wizard has closed.
>+	 * Returns bundle import descriptions initially set using 
>+	 * <code>setSelection</code>if the wizard has not been 
>+	 * closed yet.
>+	 * 
>+	 * @return the bundle import descriptions edited or created on the page.
>+	 */
>+	public BundleImportDescription[] getSelection();
>+
>+	/**
>+	 * Sets the bundle import descriptions to be edited on the page.
>+	 * The passed descriptions can be edited and should be 
>+	 * returned in getSelection().
>+	 * 
>+	 * @param descriptions the bundle import descriptions edited on the page.
>+	 */
>+	public void setSelection(BundleImportDescription[] descriptions);
>+}
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 CVSBundleImportPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java	2 Mar 2010 04:17:52 -0000	1.3
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java	2 Mar 2010 16:53:17 -0000
>@@ -10,6 +10,10 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.imports;
> 
>+import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
>+
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.viewers.ArrayContentProvider;
> import org.eclipse.jface.viewers.ILabelProvider;
>@@ -19,11 +23,9 @@
> import org.eclipse.jface.viewers.ViewerCell;
> import org.eclipse.jface.viewers.ViewerComparator;
> import org.eclipse.jface.wizard.WizardPage;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> import org.eclipse.pde.internal.core.importing.CvsBundleImportDescription;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.SWTFactory;
>-import org.eclipse.pde.ui.IBundeImportWizardPage;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java,v
>retrieving revision 1.140
>diff -u -r1.140 PluginImportOperation.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java	2 Mar 2010 00:37:50 -0000	1.140
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java	2 Mar 2010 16:53:17 -0000
>@@ -10,6 +10,8 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.imports;
> 
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import org.eclipse.pde.internal.core.importing.IBundleImporter;
> 
> import java.io.File;
>@@ -55,7 +57,6 @@
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.pde.core.build.IBuild;
> import org.eclipse.pde.core.build.IBuildEntry;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> import org.eclipse.pde.core.plugin.IPluginBase;
> import org.eclipse.pde.core.plugin.IPluginLibrary;
> import org.eclipse.pde.core.plugin.IPluginModelBase;
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java,v
>retrieving revision 1.75
>diff -u -r1.75 PluginImportWizardFirstPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java	2 Mar 2010 00:37:50 -0000	1.75
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java	2 Mar 2010 16:53:18 -0000
>@@ -10,6 +10,10 @@
> *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.imports;
> 
>+import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
>+
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import org.eclipse.pde.internal.core.importing.IBundleImporter;
> 
> import java.io.File;
>@@ -44,7 +48,6 @@
> import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.jface.wizard.Wizard;
> import org.eclipse.jface.wizard.WizardPage;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> import org.eclipse.pde.core.plugin.IPluginBase;
> import org.eclipse.pde.core.plugin.IPluginModelBase;
> import org.eclipse.pde.core.plugin.PluginRegistry;
>@@ -67,7 +70,6 @@
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.SWTFactory;
> import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;
>-import org.eclipse.pde.ui.IBundeImportWizardPage;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.BusyIndicator;
> import org.eclipse.swt.events.ModifyEvent;
>Index: src/org/eclipse/pde/ui/IBundeImportWizardPage.java
>===================================================================
>RCS file: src/org/eclipse/pde/ui/IBundeImportWizardPage.java
>diff -N src/org/eclipse/pde/ui/IBundeImportWizardPage.java
>--- src/org/eclipse/pde/ui/IBundeImportWizardPage.java	1 Mar 2010 21:04:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,54 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2010 IBM Corporation and others.
>- * 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.pde.ui;
>-
>-import org.eclipse.jface.wizard.IWizardPage;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
>-
>-/**
>- * A wizard page contributed by a <code>org.eclipse.pde.ui.bundleImportPages</code>
>- * extension.
>- * 
>- * @since 3.6
>- *
>- */
>-public interface IBundeImportWizardPage extends IWizardPage {
>-	/**
>-	 * Called when the import wizard is closed by selecting 
>-	 * the finish button.
>-	 * Implementers may store the page result (new/changed bundle
>-	 * import descriptions in getSelection) here.
>-	 * 
>-	 * @return if the operation was successful. The wizard will only close
>-	 * when <code>true</code> is returned.
>-	 */
>-	public boolean finish();
>-
>-	/**
>-	 * Returns the bundle import descriptions edited or created on the page 
>-	 * after the wizard has closed.
>-	 * Returns bundle import descriptions initially set using 
>-	 * <code>setSelection</code>if the wizard has not been 
>-	 * closed yet.
>-	 * 
>-	 * @return the bundle import descriptions edited or created on the page.
>-	 */
>-	public BundleImportDescription[] getSelection();
>-
>-	/**
>-	 * Sets the bundle import descriptions to be edited on the page.
>-	 * The passed descriptions can be edited and should be 
>-	 * returned in getSelection().
>-	 * 
>-	 * @param descriptions the bundle import descriptions edited on the page.
>-	 */
>-	public void setSelection(BundleImportDescription[] descriptions);
>-}
>#P org.eclipse.pde.ui.tests
>Index: src/org/eclipse/pde/ui/tests/project/BundleImporterTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/BundleImporterTests.java,v
>retrieving revision 1.2
>diff -u -r1.2 BundleImporterTests.java
>--- src/org/eclipse/pde/ui/tests/project/BundleImporterTests.java	2 Mar 2010 00:37:56 -0000	1.2
>+++ src/org/eclipse/pde/ui/tests/project/BundleImporterTests.java	2 Mar 2010 16:53:19 -0000
>@@ -10,13 +10,14 @@
> *******************************************************************************/
> package org.eclipse.pde.ui.tests.project;
> 
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>+
> import org.eclipse.pde.internal.core.importing.IBundleImporter;
> 
> import java.util.HashMap;
> import java.util.Map;
> import junit.framework.*;
> import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.pde.core.importing.BundleImportDescription;
> import org.eclipse.pde.internal.core.ICoreConstants;
> import org.eclipse.pde.internal.core.importing.CvsBundleImportDescription;
> import org.eclipse.pde.internal.core.project.BundleProjectService;

Actions: View | Diff

Attachments on bug 195729: 73261 | 160522 | 160533 | 160644 | 160671 | 165142 | 165144