diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java')
| -rw-r--r-- | plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java index 0bf342fcdcfa..13b58ca94b12 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java @@ -29,6 +29,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.project.MavenProjectsManager; import java.util.Collection; @@ -76,9 +77,9 @@ public class MavenConfigurationProducer extends RuntimeConfigurationProducer { VirtualFile f = ((PsiFile)l.getPsiElement()).getVirtualFile(); List<String> goals = ((MavenGoalLocation)l).getGoals(); - Collection<String> profiles = MavenProjectsManager.getInstance(l.getProject()).getExplicitProfiles(); + MavenExplicitProfiles profiles = MavenProjectsManager.getInstance(l.getProject()).getExplicitProfiles(); - return new MavenRunnerParameters(true, f.getParent().getPath(), goals, profiles); + return new MavenRunnerParameters(true, f.getParent().getPath(), goals, profiles.getEnabledProfiles(), profiles.getDisabledProfiles()); } public int compareTo(Object o) { |