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

correctly handle project opening cancellation (RUBY-9997)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-12-12 17:05:39 +01:00
parent e8e79717e1
commit f43d97fbac
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+15 -6
View File
@@ -453,7 +453,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
public Project loadAndOpenProject(@NotNull final String filePath) throws IOException {
final Project project = convertAndLoadProject(filePath, null);
final Project project = convertAndLoadProject(filePath);
if (project == null) {
showWelcomeScreenIfNoProjectOpened();
return null;
@@ -478,14 +478,17 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
}
}
}
/**
* Converts and loads the project at the specified path.
*
* @param filePath the path to open the project.
* @return the project, or null if the user has cancelled opening the project.
*/
@Nullable
public Project convertAndLoadProject(String filePath, @Nullable Ref<ConversionResult> conversionResultRef) throws IOException {
public Project convertAndLoadProject(String filePath) throws IOException {
final String fp = canonicalize(filePath);
final ConversionResult conversionResult = ConversionService.getInstance().convert(fp);
if (conversionResultRef != null) {
conversionResultRef.set(conversionResult);
}
if (conversionResult.openingIsCanceled()) {
return null;
}
@@ -503,6 +506,12 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
return project;
}
/**
* Opens the project at the specified path.
*
* @param filePath the path to open the project.
* @return the project, or null if the user has cancelled opening the project.
*/
@Nullable
private Project loadProjectWithProgress(final @NotNull String filePath) throws IOException {
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
+2 -5
View File
@@ -15,8 +15,6 @@
*/
package com.intellij.platform;
import com.intellij.conversion.ConversionResult;
import com.intellij.ide.GeneralSettings;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.openapi.diagnostic.Logger;
@@ -145,9 +143,8 @@ public class PlatformProjectOpenProcessor extends ProjectOpenProcessor {
processor.refreshProjectFiles(projectDir);
}
Ref<ConversionResult> conversionResultRef = new Ref<ConversionResult>();
project = ((ProjectManagerImpl) projectManager).convertAndLoadProject(baseDir.getPath(), conversionResultRef);
if (conversionResultRef.get().openingIsCanceled()) {
project = ((ProjectManagerImpl) projectManager).convertAndLoadProject(baseDir.getPath());
if (project == null) {
return null;
}
runConfigurators = false;