diff options
Diffstat (limited to 'plugins/maven/maven-server-api/src/org/jetbrains/idea')
-rw-r--r-- | plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java | 24 | ||||
-rw-r--r-- | plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenWorkspaceMap.java | 17 |
2 files changed, 29 insertions, 12 deletions
diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java index 8b9a31793075..dc53a84acdff 100644 --- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java +++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java @@ -98,6 +98,16 @@ public class MavenPlugin implements Serializable { return null; } + public Element getExecutionConfiguration(@NotNull String executionId) { + for (MavenPlugin.Execution each : getExecutions()) { + if (executionId.equals(each.getExecutionId())) { + return each.getConfigurationElement(); + } + } + + return null; + } + public String getDisplayString() { StringBuilder builder = new StringBuilder(); @@ -146,10 +156,16 @@ public class MavenPlugin implements Serializable { public static class Execution implements Serializable { private final List<String> myGoals; private final Element myConfiguration; + private final String myExecutionId; - public Execution(List<String> goals, Element configuration) { + public Execution(String executionId, List<String> goals, Element configuration) { myGoals = goals; myConfiguration = configuration; + myExecutionId = executionId; + } + + public String getExecutionId() { + return myExecutionId; } public List<String> getGoals() { @@ -169,6 +185,7 @@ public class MavenPlugin implements Serializable { Execution that = (Execution)o; if (myGoals != null ? !myGoals.equals(that.myGoals) : that.myGoals != null) return false; + if (myExecutionId != null ? !myExecutionId.equals(that.myExecutionId) : that.myExecutionId != null) return false; if (!JDOMUtil.areElementsEqual(myConfiguration, that.myConfiguration)) return false; return true; @@ -177,7 +194,10 @@ public class MavenPlugin implements Serializable { @Override public int hashCode() { int result = myGoals != null ? myGoals.hashCode() : 0; - result = 31 * result + (myConfiguration != null ? JDOMUtil.getTreeHash(myConfiguration) : 0); + if (myExecutionId != null) { + result = 31 * result + myExecutionId.hashCode(); + } + return result; } } diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenWorkspaceMap.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenWorkspaceMap.java index 68c8770e3c5c..51126b126c57 100644 --- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenWorkspaceMap.java +++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenWorkspaceMap.java @@ -15,18 +15,15 @@ */ package org.jetbrains.idea.maven.model; -import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; import java.io.Serializable; -import java.util.Arrays; -import java.util.List; -import java.util.Set; +import java.util.*; public class MavenWorkspaceMap implements Serializable { - private final THashMap<MavenId, Data> myMapping = new THashMap<MavenId, Data>(); + private final Map<MavenId, Data> myMapping = new HashMap<MavenId, Data>(); public void register(@NotNull MavenId id, @NotNull File file) { register(id, file, null); @@ -54,15 +51,15 @@ public class MavenWorkspaceMap implements Serializable { return myMapping.keySet(); } - private static List<MavenId> getAllIDs(MavenId id) { + private static MavenId[] getAllIDs(MavenId id) { String version = id.getVersion(); if (version != null && version.contains("SNAPSHOT")) { - return Arrays.asList(id, new MavenId(id.getGroupId(), id.getArtifactId(), "LATEST")); + return new MavenId[]{id, new MavenId(id.getGroupId(), id.getArtifactId(), "LATEST")}; } else { - return Arrays.asList(id, - new MavenId(id.getGroupId(), id.getArtifactId(), "LATEST"), - new MavenId(id.getGroupId(), id.getArtifactId(), "RELEASE")); + return new MavenId[]{id, + new MavenId(id.getGroupId(), id.getArtifactId(), "LATEST"), + new MavenId(id.getGroupId(), id.getArtifactId(), "RELEASE")}; } } |