diff options
Diffstat (limited to 'plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java')
-rw-r--r-- | plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java index a0882e7c87fd..006f4caeac3a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java @@ -93,22 +93,26 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ @NotNull public MavenServerExecutionResult resolveProject(@NotNull final VirtualFile file, - @NotNull final Collection<String> activeProfiles) throws MavenProcessCanceledException { + @NotNull final Collection<String> activeProfiles, + @NotNull final Collection<String> inactiveProfiles) + throws MavenProcessCanceledException { return perform(new RetriableCancelable<MavenServerExecutionResult>() { @Override public MavenServerExecutionResult execute() throws RemoteException, MavenServerProcessCanceledException { - return getOrCreateWrappee().resolveProject(new File(file.getPath()), activeProfiles); + return getOrCreateWrappee().resolveProject(new File(file.getPath()), activeProfiles, inactiveProfiles); } }); } @Nullable - public String evaluateEffectivePom(@NotNull final VirtualFile file, @NotNull final Collection<String> activeProfiles) - throws MavenProcessCanceledException { + public String evaluateEffectivePom(@NotNull final VirtualFile file, + @NotNull final Collection<String> activeProfiles, + @NotNull final Collection<String> inactiveProfiles) throws MavenProcessCanceledException { return perform(new RetriableCancelable<String>() { @Override public String execute() throws RemoteException, MavenServerProcessCanceledException { - return getOrCreateWrappee().evaluateEffectivePom(new File(file.getPath()), new ArrayList<String>(activeProfiles)); + return getOrCreateWrappee() + .evaluateEffectivePom(new File(file.getPath()), new ArrayList<String>(activeProfiles), new ArrayList<String>(inactiveProfiles)); } }); } @@ -165,14 +169,14 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ @NotNull public MavenServerExecutionResult execute(@NotNull final VirtualFile file, - @NotNull final Collection<String> activeProfiles, - @NotNull final List<String> goals) throws MavenProcessCanceledException { + @NotNull final Collection<String> activeProfiles, + @NotNull final Collection<String> inactiveProfiles, + @NotNull final List<String> goals) throws MavenProcessCanceledException { return perform(new RetriableCancelable<MavenServerExecutionResult>() { @Override public MavenServerExecutionResult execute() throws RemoteException, MavenServerProcessCanceledException { return getOrCreateWrappee() - .execute(new File(file.getPath()), activeProfiles, Collections.<String>emptyList(), goals, Collections.<String>emptyList(), false, - false); + .execute(new File(file.getPath()), activeProfiles, inactiveProfiles, goals, Collections.<String>emptyList(), false, false); } }); } |