diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java')
-rw-r--r-- | plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java index 397447c44393..aff34a18217a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenDataKeys.java @@ -18,16 +18,18 @@ package org.jetbrains.idea.maven.utils; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.openapi.actionSystem.DataKey; import org.jetbrains.idea.maven.model.MavenArtifact; +import org.jetbrains.idea.maven.model.MavenProfileKind; import javax.swing.*; import java.util.Collection; import java.util.List; +import java.util.Map; public class MavenDataKeys { public static final DataKey<List<String>> MAVEN_GOALS = DataKey.create("MAVEN_GOALS"); public static final DataKey<RunnerAndConfigurationSettings> RUN_CONFIGURATION = DataKey.create("MAVEN_RUN_CONFIGURATION"); - public static final DataKey<List<String>> MAVEN_PROFILES = DataKey.create("MAVEN_PROFILES"); + public static final DataKey<Map<String, MavenProfileKind>> MAVEN_PROFILES = DataKey.create("MAVEN_PROFILES"); public static final DataKey<Collection<MavenArtifact>> MAVEN_DEPENDENCIES = DataKey.create("MAVEN_DEPENDENCIES"); public static final DataKey<JTree> MAVEN_PROJECTS_TREE = DataKey.create("MAVEN_PROJECTS_TREE"); |