diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java index 694597e93d24..4506e0846910 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java @@ -53,6 +53,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.idea.maven.model.MavenConstants; import org.jetbrains.idea.maven.utils.MavenMergingUpdateQueue; +import org.jetbrains.idea.maven.utils.MavenProgressIndicator; import org.jetbrains.idea.maven.utils.MavenUtil; import java.io.File; @@ -237,27 +238,28 @@ public class MavenProjectsManagerWatcher { public synchronized void addManagedFilesWithProfiles(List files, List explicitProfiles) { myProjectsTree.addManagedFilesWithProfiles(files, explicitProfiles); - scheduleUpdateAll(); + scheduleUpdateAll(false, true); } @TestOnly public synchronized void resetManagedFilesAndProfilesInTests(List files, List explicitProfiles) { myProjectsTree.resetManagedFilesAndProfiles(files, explicitProfiles); - scheduleUpdateAll(); + scheduleUpdateAll(false, true); } public synchronized void removeManagedFiles(List files) { myProjectsTree.removeManagedFiles(files); - scheduleUpdateAll(); + scheduleUpdateAll(false, true); } public synchronized void setExplicitProfiles(Collection profiles) { myProjectsTree.setExplicitProfiles(profiles); - scheduleUpdateAll(); - } - private void scheduleUpdateAll() { - scheduleUpdateAll(false, true); + if(myManager.getImportingSettings().isImportAutomatically()) { + scheduleUpdateAll(false, true); + } else { + myProjectsTree.updateAll(false, myGeneralSettings, new MavenProgressIndicator()); + } } public void scheduleUpdateAll(boolean force, final boolean forceImportAndResolve) {