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

fixed showing 'Convert Project' dialog when opening a project in old format (IDEA-157691)

Browse Source
This commit is contained in:
nik
2016-06-23 16:03:30 +03:00
parent 9d1b98f640
commit 687ee936bb
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+37 -33
View File
@@ -384,19 +384,31 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
}
@Override
public Project loadAndOpenProject(@NotNull final String filePath) throws IOException {
Project project = myProgressManager.run(new Task.WithResult<Project, IOException>(null, ProjectBundle.message("project.load.progress"), true) {
@Override
protected Project compute(@NotNull ProgressIndicator indicator) throws IOException {
final Project project = convertAndLoadProject(filePath);
if (project == null) {
return null;
public Project loadAndOpenProject(@NotNull final String originalFilePath) throws IOException {
final String filePath = toCanonicalName(originalFilePath);
final ConversionResult conversionResult = ConversionService.getInstance().convert(filePath);
Project project;
if (conversionResult.openingIsCanceled()) {
project = null;
}
else {
project = myProgressManager.run(new Task.WithResult<Project, IOException>(null, ProjectBundle.message("project.load.progress"), true) {
@Override
protected Project compute(@NotNull ProgressIndicator indicator) throws IOException {
final Project project = loadProjectWithProgress(filePath);
if (project == null) {
return null;
}
if (!conversionResult.conversionNotNeeded()) {
StartupManager.getInstance(project).registerPostStartupActivity(() -> conversionResult.postStartupActivity(project));
}
openProject(project);
return project;
}
});
}
openProject(project);
return project;
}
});
if (project == null) {
WelcomeFrame.showIfNoProjectOpened();
return null;
@@ -423,20 +435,9 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
return null;
}
final Project project;
try {
project = loadProjectWithProgress(filePath);
if (project == null) return null;
}
catch (ProcessCanceledException e) {
return null;
}
catch (Throwable t) {
LOG.info(t);
throw new IOException(t);
}
final Project project = loadProjectWithProgress(filePath);
if (!conversionResult.conversionNotNeeded()) {
if (project != null && !conversionResult.conversionNotNeeded()) {
StartupManager.getInstance(project).registerPostStartupActivity(() -> conversionResult.postStartupActivity(project));
}
return project;
@@ -449,23 +450,26 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
* @return the project, or null if the user has cancelled opening the project.
*/
@Nullable
private Project loadProjectWithProgress(@NotNull final String filePath) {
final ProjectImpl project = createProject(null, toCanonicalName(filePath), false);
if (myProgressManager.getProgressIndicator() != null) {
initProject(project, null);
return project;
}
private Project loadProjectWithProgress(@NotNull String filePath) throws IOException {
try {
final ProjectImpl project = createProject(null, toCanonicalName(filePath), false);
if (myProgressManager.getProgressIndicator() != null) {
initProject(project, null);
return project;
}
myProgressManager.runProcessWithProgressSynchronously((ThrowableComputable<Object, RuntimeException>)() -> {
initProject(project, null);
return project;
}, ProjectBundle.message("project.load.progress"), canCancelProjectLoading(), project);
return project;
}
catch (ProcessCanceledException ignore) {
catch (ProcessCanceledException e) {
return null;
}
return project;
catch (Throwable t) {
LOG.info(t);
throw new IOException(t);
}
}
private static void notifyProjectOpenFailed() {