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, 14 insertions, 8 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 c5ac93cd6d7b..a0882e7c87fd 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 @@ -49,7 +49,7 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ } public void customizeForResolve(MavenConsole console, MavenProgressIndicator indicator) { - setCustomization(console, indicator, null, false); + setCustomization(console, indicator, null, false, false); perform(new Retriable<Object>() { @Override public Object execute() throws RemoteException { @@ -59,8 +59,8 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ }); } - public void customizeForResolve(MavenWorkspaceMap workspaceMap, MavenConsole console, MavenProgressIndicator indicator) { - setCustomization(console, indicator, workspaceMap, false); + public void customizeForResolve(MavenWorkspaceMap workspaceMap, MavenConsole console, MavenProgressIndicator indicator, boolean alwaysUpdateSnapshot) { + setCustomization(console, indicator, workspaceMap, false, alwaysUpdateSnapshot); perform(new Retriable<Object>() { @Override public Object execute() throws RemoteException { @@ -73,7 +73,7 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ public void customizeForStrictResolve(MavenWorkspaceMap workspaceMap, MavenConsole console, MavenProgressIndicator indicator) { - setCustomization(console, indicator, workspaceMap, true); + setCustomization(console, indicator, workspaceMap, true, false); perform(new Retriable<Object>() { @Override public Object execute() throws RemoteException { @@ -87,7 +87,8 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ getOrCreateWrappee().customize(myCustomization.workspaceMap, myCustomization.failOnUnresolvedDependency, myCustomization.console, - myCustomization.indicator); + myCustomization.indicator, + myCustomization.alwaysUpdateSnapshot); } @NotNull @@ -243,12 +244,14 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ private synchronized void setCustomization(MavenConsole console, MavenProgressIndicator indicator, MavenWorkspaceMap workspaceMap, - boolean failOnUnresolvedDependency) { + boolean failOnUnresolvedDependency, + boolean alwaysUpdateSnapshot) { resetCustomization(); myCustomization = new Customization(MavenServerManager.wrapAndExport(console), MavenServerManager.wrapAndExport(indicator), workspaceMap, - failOnUnresolvedDependency); + failOnUnresolvedDependency, + alwaysUpdateSnapshot); } private synchronized void resetCustomization() { @@ -276,15 +279,18 @@ public abstract class MavenEmbedderWrapper extends RemoteObjectWrapper<MavenServ private final MavenWorkspaceMap workspaceMap; private final boolean failOnUnresolvedDependency; + private final boolean alwaysUpdateSnapshot; private Customization(MavenServerConsole console, MavenServerProgressIndicator indicator, MavenWorkspaceMap workspaceMap, - boolean failOnUnresolvedDependency) { + boolean failOnUnresolvedDependency, + boolean alwaysUpdateSnapshot) { this.console = console; this.indicator = indicator; this.workspaceMap = workspaceMap; this.failOnUnresolvedDependency = failOnUnresolvedDependency; + this.alwaysUpdateSnapshot = alwaysUpdateSnapshot; } } } |