MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

maven: canceling index update on project close

Browse Source
This commit is contained in:
Anton Makeev
2010-11-10 12:15:00 +03:00
parent ca13c5c5e0
commit 93f6b2ae5c
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java
+21 -3
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.progress.BackgroundTaskQueue;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
@@ -259,7 +260,7 @@ public class MavenIndicesManager {
}
try {
getIndicesObject().updateOrRepair(each, fullUpdate, fullUpdate ? getMavenSettings(projectOrNull) : null, indicator);
getIndicesObject().updateOrRepair(each, fullUpdate, fullUpdate ? getMavenSettings(projectOrNull, indicator) : null, indicator);
if (projectOrNull != null) MavenRehighlighter.rehighlight(projectOrNull);
}
finally {
@@ -276,8 +277,25 @@ public class MavenIndicesManager {
}
}
private MavenGeneralSettings getMavenSettings(Project project) {
return MavenProjectsManager.getInstance(project).getGeneralSettings();
private MavenGeneralSettings getMavenSettings(@NotNull final Project project, @NotNull MavenProgressIndicator indicator)
throws MavenProcessCanceledException {
MavenGeneralSettings settings;
settings = ApplicationManager.getApplication().runReadAction(new Computable<MavenGeneralSettings>() {
@Override
public MavenGeneralSettings compute() {
if (project.isDisposed()) return null;
return MavenProjectsManager.getInstance(project).getGeneralSettings();
}
});
if (settings == null) {
// project was closed
indicator.cancel();
indicator.checkCanceled();
}
return settings;
}
public IndexUpdatingState getUpdatingState(MavenIndex index) {