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

suppress project loading cancellation if in NonCancellableSection

Browse Source
This commit is contained in:
Gregory.Shrago
2014-04-24 22:54:57 +04:00
parent 25e6148c5a
commit 2b99821715
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+8 -6
View File
@@ -37,10 +37,7 @@ import com.intellij.openapi.components.impl.stores.StorageUtil;
import com.intellij.openapi.components.impl.stores.XmlElementStorage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.progress.*;
import com.intellij.openapi.progress.util.ProgressWindow;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
@@ -447,7 +444,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
}
});
}
}, ProjectBundle.message("project.load.progress"), true, project);
}, ProjectBundle.message("project.load.progress"), canCancelProjectLoading(), project);
if (!ok) {
closeProject(project, false, false, true);
@@ -472,6 +469,11 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
return true;
}
private static boolean canCancelProjectLoading() {
ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator();
return !(indicator instanceof NonCancelableSection);
}
private void cacheOpenProjects() {
myOpenProjectsArrayCache = myOpenProjects.toArray(new Project[myOpenProjects.size()]);
}
@@ -580,7 +582,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
initProject(project, null);
return project;
}
}, ProjectBundle.message("project.load.progress"), true, project);
}, ProjectBundle.message("project.load.progress"), canCancelProjectLoading(), project);
}
catch (StateStorageException e) {
throw new IOException(e);