Attachment #98959 for bug #221727

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

Lines 63-69 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepositoryFactory.java (-1 / +1 lines)
63	IMetadataRepository repository = new SimpleMetadataRepositoryFactory().load(repoLocation, null);	63	IMetadataRepository repository = new SimpleMetadataRepositoryFactory().load(repoLocation, null);
64	return new ExtensionLocationMetadataRepository(location, repository, monitor);	64	return new ExtensionLocationMetadataRepository(location, repository, monitor);
65	} catch (ProvisionException e) {	65	} catch (ProvisionException e) {
66	return create(location, location.toExternalForm(), ExtensionLocationMetadataRepository.TYPE, null);	66	return create(location, Activator.getRepositoryName(location), ExtensionLocationMetadataRepository.TYPE, null);
67	}	67	}
68	}	68	}
69		69

Lines 1-5 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java (+10 lines)
1	package org.eclipse.equinox.internal.p2.extensionlocation;	1	package org.eclipse.equinox.internal.p2.extensionlocation;
2		2
		3	import java.io.File;
		4	import java.net.URL;
		5	import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
3	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;	6	import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
4	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;	7	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
5	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	8	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 60-63 Link Here
60	return Util.getBundlePoolRepository(profile);	63	return Util.getBundlePoolRepository(profile);
61	}	64	}
62		65
		66	/**
		67	* Returns a reasonable human-readable repository name for the given location.
		68	*/
		69	public static String getRepositoryName(URL location) {
		70	File file = URLUtil.toFile(location);
		71	return file == null ? location.toExternalForm() : file.getAbsolutePath();
		72	}
63	}	73	}

Lines 52-58 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java (-1 / +1 lines)
52	* given location and specified nested repo.	52	* given location and specified nested repo.
53	*/	53	*/
54	public ExtensionLocationMetadataRepository(URL location, IMetadataRepository repository, IProgressMonitor monitor) throws ProvisionException {	54	public ExtensionLocationMetadataRepository(URL location, IMetadataRepository repository, IProgressMonitor monitor) throws ProvisionException {
55	super("Extension: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$	55	super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null);
56	this.metadataRepository = repository;	56	this.metadataRepository = repository;
57		57
58	File base = getBaseDirectory(location);	58	File base = getBaseDirectory(location);

Lines 49-59 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java (-2 / +2 lines)
49	}	49	}
50		50
51	/*	51	/*
52	* Constuctor for the class. Return a new extension location repository based on	52	* Constructor for the class. Return a new extension location repository based on
53	* the given url and nested repository.	53	* the given url and nested repository.
54	*/	54	*/
55	public ExtensionLocationArtifactRepository(URL location, IFileArtifactRepository repository, IProgressMonitor monitor) throws ProvisionException {	55	public ExtensionLocationArtifactRepository(URL location, IFileArtifactRepository repository, IProgressMonitor monitor) throws ProvisionException {
56	super("Extension: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$	56	super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null);
57	this.artifactRepository = repository;	57	this.artifactRepository = repository;
58		58
59	File base = getBaseDirectory(location);	59	File base = getBaseDirectory(location);

Lines 64-70 Link Here

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepositoryFactory.java (-1 / +1 lines)
64	IFileArtifactRepository repo = (IFileArtifactRepository) new SimpleArtifactRepositoryFactory().load(repoLocation, null);	64	IFileArtifactRepository repo = (IFileArtifactRepository) new SimpleArtifactRepositoryFactory().load(repoLocation, null);
65	return new ExtensionLocationArtifactRepository(location, repo, monitor);	65	return new ExtensionLocationArtifactRepository(location, repo, monitor);
66	} catch (ProvisionException e) {	66	} catch (ProvisionException e) {
67	return create(location, "Extension location repository: " + location.toExternalForm(), ExtensionLocationArtifactRepository.TYPE, null);	67	return create(location, Activator.getRepositoryName(location), ExtensionLocationArtifactRepository.TYPE, null);
68	}	68	}
69	}	69	}
70		70

Return to bug 221727