Attachment 98959 Details for Bug 221727 – Suggested fix

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

[patch] Suggested fix

patch.txt (text/plain), 6.45 KB, created by John Arthorne

on 2008-05-06 17:23:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2008-05-06 17:23:23 EDT

Size: 6.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.extensionlocation
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java,v
>retrieving revision 1.7
>diff -u -r1.7 ExtensionLocationMetadataRepositoryFactory.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java	2 May 2008 20:11:00 -0000	1.7
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java	6 May 2008 21:22:17 -0000
>@@ -63,7 +63,7 @@
> 			IMetadataRepository repository = new SimpleMetadataRepositoryFactory().load(repoLocation, null);
> 			return new ExtensionLocationMetadataRepository(location, repository, monitor);
> 		} catch (ProvisionException e) {
>-			return create(location, location.toExternalForm(), ExtensionLocationMetadataRepository.TYPE, null);
>+			return create(location, Activator.getRepositoryName(location), ExtensionLocationMetadataRepository.TYPE, null);
> 		}
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java,v
>retrieving revision 1.2
>diff -u -r1.2 Activator.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java	9 Apr 2008 20:53:30 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java	6 May 2008 21:22:17 -0000
>@@ -1,5 +1,8 @@
> package org.eclipse.equinox.internal.p2.extensionlocation;
> 
>+import java.io.File;
>+import java.net.URL;
>+import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
> import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
> import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
>@@ -60,4 +63,11 @@
> 		return Util.getBundlePoolRepository(profile);
> 	}
> 
>+	/**
>+	 * Returns a reasonable human-readable repository name for the given location.
>+	 */
>+	public static String getRepositoryName(URL location) {
>+		File file = URLUtil.toFile(location);
>+		return file == null ? location.toExternalForm() : file.getAbsolutePath();
>+	}
> }
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java,v
>retrieving revision 1.14
>diff -u -r1.14 ExtensionLocationMetadataRepository.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java	6 May 2008 20:05:37 -0000	1.14
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java	6 May 2008 21:22:17 -0000
>@@ -52,7 +52,7 @@
> 	 * given location and specified nested repo.
> 	 */
> 	public ExtensionLocationMetadataRepository(URL location, IMetadataRepository repository, IProgressMonitor monitor) throws ProvisionException {
>-		super("Extension: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$
>+		super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null);
> 		this.metadataRepository = repository;
> 
> 		File base = getBaseDirectory(location);
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java,v
>retrieving revision 1.9
>diff -u -r1.9 ExtensionLocationArtifactRepository.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java	6 May 2008 20:05:37 -0000	1.9
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java	6 May 2008 21:22:17 -0000
>@@ -49,11 +49,11 @@
> 	}
> 
> 	/*
>-	 * Constuctor for the class. Return a new extension location repository based on 
>+	 * Constructor for the class. Return a new extension location repository based on 
> 	 * the given url and nested repository.
> 	 */
> 	public ExtensionLocationArtifactRepository(URL location, IFileArtifactRepository repository, IProgressMonitor monitor) throws ProvisionException {
>-		super("Extension: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$
>+		super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null);
> 		this.artifactRepository = repository;
> 
> 		File base = getBaseDirectory(location);
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 ExtensionLocationArtifactRepositoryFactory.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java	1 May 2008 15:25:45 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java	6 May 2008 21:22:17 -0000
>@@ -64,7 +64,7 @@
> 			IFileArtifactRepository repo = (IFileArtifactRepository) new SimpleArtifactRepositoryFactory().load(repoLocation, null);
> 			return new ExtensionLocationArtifactRepository(location, repo, monitor);
> 		} catch (ProvisionException e) {
>-			return create(location, "Extension location repository: " + location.toExternalForm(), ExtensionLocationArtifactRepository.TYPE, null);
>+			return create(location, Activator.getRepositoryName(location), ExtensionLocationArtifactRepository.TYPE, null);
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 221727: 98959 | 98965 | 98967