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

invoke conversion in EDT

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-09-23 16:16:09 +04:00
parent 0cfa18f8a8
commit 96835396c2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+10 -5
View File
@@ -517,10 +517,15 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
@Nullable
public Project convertAndLoadProject(String filePath, Ref<Boolean> cancelled) throws IOException {
final ConversionResult conversionResult;
final Ref<ConversionResult> conversionResult = new Ref<ConversionResult>();
final String fp = canonicalize(filePath);
conversionResult = ConversionService.getInstance().convert(fp);
if (conversionResult.openingIsCanceled()) {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
conversionResult.set(ConversionService.getInstance().convert(fp));
}
});
if (conversionResult.get().openingIsCanceled()) {
cancelled.set(true);
return null;
}
@@ -528,10 +533,10 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
final Project project = loadProjectWithProgress(filePath, new Ref<Boolean>());
if (project == null) return null;
if (!conversionResult.conversionNotNeeded()) {
if (!conversionResult.get().conversionNotNeeded()) {
StartupManager.getInstance(project).registerPostStartupActivity(new Runnable() {
public void run() {
conversionResult.postStartupActivity(project);
conversionResult.get().postStartupActivity(project);
}
});
}