diff options
| author | Pascal Rapicault | 2008-02-25 22:13:20 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2008-02-25 22:13:20 +0000 |
| commit | 99b2bd24c7ae7a8e2cbbeded90d3383dcefda8a8 (patch) | |
| tree | 8a87c3cd5358f867a65dc223cc0678fcadc09b33 /bundles/org.eclipse.equinox.p2.artifact.optimizers | |
| parent | ac034c613f2b94cd9998984fba6773a3b7d54a62 (diff) | |
| download | rt.equinox.p2-99b2bd24c7ae7a8e2cbbeded90d3383dcefda8a8.tar.gz rt.equinox.p2-99b2bd24c7ae7a8e2cbbeded90d3383dcefda8a8.tar.xz rt.equinox.p2-99b2bd24c7ae7a8e2cbbeded90d3383dcefda8a8.zip | |
Remove namespace from the artifact key
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.optimizers')
2 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java index ff7f5e60b..d0c273822 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java @@ -16,17 +16,16 @@ import org.osgi.framework.Version; public class VersionlessArtifactKey extends ArtifactKey { - public VersionlessArtifactKey(String namespace, String classifier, String id) { - super(namespace, classifier, id, Version.emptyVersion); + public VersionlessArtifactKey(String classifier, String id) { + super(classifier, id, Version.emptyVersion); } public VersionlessArtifactKey(IArtifactKey base) { - super(base.getNamespace(), base.getClassifier(), base.getId(), Version.emptyVersion); + super(base.getClassifier(), base.getId(), Version.emptyVersion); } public int hashCode() { int hash = getId().hashCode(); - hash = 17 * hash + getNamespace().hashCode(); hash = 17 * hash + getClassifier().hashCode(); return hash; } @@ -35,6 +34,6 @@ public class VersionlessArtifactKey extends ArtifactKey { if (!(obj instanceof IArtifactKey)) return false; IArtifactKey ak = (IArtifactKey) obj; - return ak.getId().equals(getId()) && ak.getNamespace().equals(getNamespace()) && ak.getClassifier().equals(getClassifier()); + return ak.getId().equals(getId()) && ak.getClassifier().equals(getClassifier()); } }
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java index baa8a28cd..d7b6dd4b5 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java @@ -104,7 +104,7 @@ public class Optimizer { } private IArtifactKey getVersionlessKey(IArtifactKey key) { - return new ArtifactKey(key.getNamespace(), key.getClassifier(), key.getId(), Version.emptyVersion); + return new ArtifactKey(key.getClassifier(), key.getId(), Version.emptyVersion); } /** |