Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2010-03-05 17:32:23 -0500
committerJohn Arthorne2010-03-05 17:32:23 -0500
commit9fe7fc7078564daa547dc308fff7bc5ee15d4eaa (patch)
treec0df702c26b00d50a3e9397f9b07855c3af11845 /bundles/org.eclipse.equinox.p2.artifact.repository
parent6681d1baf3a6f5152768995ecca95e2238cbadd4 (diff)
downloadrt.equinox.p2-9fe7fc7078564daa547dc308fff7bc5ee15d4eaa.tar.gz
rt.equinox.p2-9fe7fc7078564daa547dc308fff7bc5ee15d4eaa.tar.xz
rt.equinox.p2-9fe7fc7078564daa547dc308fff7bc5ee15d4eaa.zip
Bug 293340 - [api][repository] Review of the repository package
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository')
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java18
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java26
2 files changed, 22 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
index d3aba9d0f..a1de069d8 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
@@ -147,7 +147,7 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
}
private boolean isLocal() {
- return "file".equalsIgnoreCase(location.getScheme()); //$NON-NLS-1$
+ return "file".equalsIgnoreCase(getLocation().getScheme()); //$NON-NLS-1$
}
public boolean isModifiable() {
@@ -159,7 +159,7 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
}
private void addChild(URI childURI, boolean save) {
- URI absolute = URIUtil.makeAbsolute(childURI, location);
+ URI absolute = URIUtil.makeAbsolute(childURI, getLocation());
if (childrenURIs.contains(childURI) || childrenURIs.contains(absolute))
return;
childrenURIs.add(childURI);
@@ -193,7 +193,7 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
boolean removed = childrenURIs.remove(childURI);
// if the child wasn't there make sure and try the other permutation
// (absolute/relative) to see if it really is in the list.
- URI other = childURI.isAbsolute() ? URIUtil.makeRelative(childURI, location) : URIUtil.makeAbsolute(childURI, location);
+ URI other = childURI.isAbsolute() ? URIUtil.makeRelative(childURI, getLocation()) : URIUtil.makeAbsolute(childURI, getLocation());
if (!removed)
childrenURIs.remove(other);
@@ -222,7 +222,7 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
public List<URI> getChildren() {
List<URI> result = new ArrayList<URI>();
for (URI uri : childrenURIs)
- result.add(URIUtil.makeAbsolute(uri, location));
+ result.add(URIUtil.makeAbsolute(uri, getLocation()));
return result;
}
@@ -408,12 +408,12 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
return;
if (!isModifiable())
return;
- boolean compress = "true".equalsIgnoreCase(properties.get(PROP_COMPRESSED)); //$NON-NLS-1$
+ boolean compress = "true".equalsIgnoreCase(getProperty(PROP_COMPRESSED)); //$NON-NLS-1$
OutputStream os = null;
try {
- URI actualLocation = getActualLocation(location, false);
+ URI actualLocation = getActualLocation(getLocation(), false);
File artifactsFile = URIUtil.toFile(actualLocation);
- File jarFile = URIUtil.toFile(getActualLocation(location, true));
+ File jarFile = URIUtil.toFile(getActualLocation(getLocation(), true));
if (!compress) {
if (jarFile.exists()) {
jarFile.delete();
@@ -439,13 +439,13 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()));
new CompositeRepositoryIO().write(toState(), os, PI_REPOSITORY_TYPE);
} catch (IOException e) {
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, location), e));
+ LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, getLocation()), e));
}
}
private IArtifactRepository load(URI repoURI) throws ProvisionException {
// make sure we are dealing with an absolute location
- repoURI = URIUtil.makeAbsolute(repoURI, location);
+ repoURI = URIUtil.makeAbsolute(repoURI, getLocation());
boolean loaded = getManager().contains(repoURI);
IArtifactRepository repo = getManager().loadRepository(repoURI, null);
if (!loaded) {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index 91faff8f4..929c9c4b1 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -419,7 +419,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
if (descriptor.getProcessingSteps().length == 0) {
descriptor.setProperty(ARTIFACT_UUID, null);
IArtifactKey key = descriptor.getArtifactKey();
- URI result = mapper.map(location, key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
+ URI result = mapper.map(getLocation(), key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
if (result != null) {
if (isFolderBased(descriptor) && URIUtil.lastSegment(result).endsWith(JAR_EXTENSION)) {
return URIUtil.removeFileExtension(result);
@@ -661,7 +661,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
*/
private URI getLocationForPackedButFlatArtifacts(IArtifactDescriptor descriptor) {
IArtifactKey key = descriptor.getArtifactKey();
- return mapper.map(location, key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
+ return mapper.map(getLocation(), key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
}
public synchronized URI getLocation(IArtifactDescriptor descriptor) {
@@ -690,7 +690,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
// if the descriptor is complete then use the mapping rules...
if (descriptor.getProcessingSteps().length == 0) {
IArtifactKey key = descriptor.getArtifactKey();
- URI result = mapper.map(location, key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
+ URI result = mapper.map(getLocation(), key.getClassifier(), key.getId(), key.getVersion().toString(), descriptor.getProperty(IArtifactDescriptor.FORMAT));
if (result != null) {
if (isFolderBased(descriptor) && URIUtil.lastSegment(result).endsWith(JAR_EXTENSION))
return URIUtil.removeFileExtension(result);
@@ -801,7 +801,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
// use this method to setup any transient fields etc after the object has been restored from a stream
public synchronized void initializeAfterLoad(URI repoLocation) {
- this.location = repoLocation;
+ setLocation(repoLocation);
blobStore = new BlobStore(getBlobStoreLocation(repoLocation), 128);
initializeMapper();
for (SimpleArtifactDescriptor desc : artifactDescriptors)
@@ -816,7 +816,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
private boolean isFolderBased(IArtifactDescriptor descriptor) {
// This is called from createInternalDescriptor, so if we aren't a
// SimpleArtifactDescriptor then just check the descriptor properties instead
- // of creating the interla descriptor.
+ // of creating the internal descriptor.
SimpleArtifactDescriptor internalDescriptor = null;
if (descriptor instanceof SimpleArtifactDescriptor)
internalDescriptor = (SimpleArtifactDescriptor) descriptor;
@@ -833,7 +833,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
}
private boolean isLocal() {
- return "file".equalsIgnoreCase(location.getScheme()); //$NON-NLS-1$
+ return "file".equalsIgnoreCase(getLocation().getScheme()); //$NON-NLS-1$
}
public boolean isModifiable() {
@@ -842,7 +842,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
public OutputStream processDestination(ProcessingStepHandler handler, IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
destination = addPostSteps(handler, descriptor, destination, monitor);
- destination = handler.createAndLink(agent, descriptor.getProcessingSteps(), descriptor, destination, monitor);
+ destination = handler.createAndLink(getProvisioningAgent(), descriptor.getProcessingSteps(), descriptor, destination, monitor);
destination = addPreSteps(handler, descriptor, destination, monitor);
return destination;
}
@@ -914,7 +914,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
public void save() {
if (disableSave)
return;
- boolean compress = "true".equalsIgnoreCase(properties.get(PROP_COMPRESSED)); //$NON-NLS-1$
+ boolean compress = "true".equalsIgnoreCase(getProperty(PROP_COMPRESSED)); //$NON-NLS-1$
save(compress);
}
@@ -923,9 +923,9 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
OutputStream os = null;
try {
try {
- URI actualLocation = getActualLocation(location, false);
+ URI actualLocation = getActualLocation(getLocation(), false);
File artifactsFile = URIUtil.toFile(actualLocation);
- File jarFile = URIUtil.toFile(getActualLocation(location, true));
+ File jarFile = URIUtil.toFile(getActualLocation(getLocation(), true));
if (!compress) {
if (jarFile.exists()) {
jarFile.delete();
@@ -948,7 +948,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
os = jOs;
}
super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()));
- new SimpleArtifactRepositoryIO(agent).write(this, os);
+ new SimpleArtifactRepositoryIO(getProvisioningAgent()).write(this, os);
} catch (IOException e) {
// TODO proper exception handling
e.printStackTrace();
@@ -977,7 +977,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
}
save();
//force repository manager to reload this repository because it caches properties
- ArtifactRepositoryManager manager = (ArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.SERVICE_NAME);
+ ArtifactRepositoryManager manager = (ArtifactRepositoryManager) getProvisioningAgent().getService(IArtifactRepositoryManager.SERVICE_NAME);
if (manager.removeRepository(getLocation()))
manager.addRepository(this);
return oldValue;
@@ -988,7 +988,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
}
public String toString() {
- return location.toString();
+ return getLocation().toString();
}
public IQueryable<IArtifactDescriptor> descriptorQueryable() {

Back to the top