Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hallgren2010-02-21 20:10:11 -0500
committerThomas Hallgren2010-02-21 20:10:11 -0500
commit8aa5a700fd1df2f75541c1329747668a0eb1716e (patch)
tree85a71b311400712ede104e6ebc524662633f745f /bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse
parent9dc753efb1afeb1c6778b8338f01c80919e8b143 (diff)
downloadrt.equinox.p2-8aa5a700fd1df2f75541c1329747668a0eb1716e.tar.gz
rt.equinox.p2-8aa5a700fd1df2f75541c1329747668a0eb1716e.tar.xz
rt.equinox.p2-8aa5a700fd1df2f75541c1329747668a0eb1716e.zip
302201 : Unify the two query approaches used in p2, step 3.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse')
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ArtifactDescription.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ArtifactDescription.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ArtifactDescription.java
index 09d09b7e2..ed430728d 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ArtifactDescription.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ArtifactDescription.java
@@ -1,6 +1,7 @@
package org.eclipse.equinox.p2.internal.repository.tools.tasks;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.tools.ant.types.DataType;
import org.apache.tools.ant.types.Parameter;
import org.eclipse.equinox.p2.metadata.*;
@@ -13,7 +14,7 @@ public class ArtifactDescription extends DataType {
private String id = null;
private String version = null;
private String range = null;
- private Properties properties = null;
+ private Map<String, String> properties = null;
public void setClassifier(String classifier) {
this.classifier = classifier;
@@ -33,7 +34,7 @@ public class ArtifactDescription extends DataType {
public void addConfiguredProperty(Parameter property) {
if (properties == null)
- properties = new Properties();
+ properties = new HashMap<String, String>();
properties.put(property.getName(), property.getValue());
}
@@ -69,9 +70,6 @@ public class ArtifactDescription extends DataType {
Version keyVersion = Version.parseVersion(version);
keyRange = new VersionRange(keyVersion, true, keyVersion, true);
}
-
- ArtifactDescriptorQuery query = new ArtifactDescriptorQuery(id, keyRange, null);
- query.setProperties(properties);
- return query;
+ return new ArtifactDescriptorQuery(id, keyRange, null, properties);
}
}

Back to the top