Attachment 160671 Details for Bug 195729 – Use the last part of the url, rather than the bundle name, for the default project

[patch] Use the last part of the url, rather than the bundle name, for the default project

import.patch (text/plain), 2.22 KB, created by Alex Blewitt

on 2010-03-02 14:49:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Blewitt

Created: 2010-03-02 14:49:12 EST

Size: 2.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>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.2
>diff -u -r1.2 CvsBundleImporterDelegate.java
>--- src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java	2 Mar 2010 16:56:13 -0000	1.2
>+++ src/org/eclipse/pde/internal/core/importing/CvsBundleImporterDelegate.java	2 Mar 2010 19:43:03 -0000
>@@ -10,18 +10,16 @@
>  *******************************************************************************/
> 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.internal.core.ICoreConstants;
> 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;
> import org.eclipse.team.core.*;
> import org.osgi.framework.BundleException;
>-import org.osgi.framework.Constants;
> 
> /**
>  * Handles SCM CVS headers of the following form. Tag and project name can be specified
>@@ -79,11 +77,9 @@
> 								String tag = element.getAttribute(ATTR_TAG);
> 								String project = element.getAttribute(ATTR_PROJECT);
> 								if (project == null) {
>-									String bsn = (String) manifests[i].get(Constants.BUNDLE_SYMBOLICNAME);
>-									if (bsn != null) {
>-										ManifestElement[] bsnElement = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, bsn);
>-										project = bsnElement[0].getValue();
>-									}
>+									String[] paths = url.split("/"); //$NON-NLS-1$
>+									if (paths != null && paths.length > 0)
>+										project = paths[paths.length - 1];
> 								}
> 								results[i] = createImportDescription(url, manifest, tag, project);
> 							}

Actions: View | Diff

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