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 PY-11594 New Project: selected interpreter is not set as project interpreter when attaching project to already opened one

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-12-12 16:20:40 +04:00
parent 6d95991c01
commit 0008bb2c8a
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
-1
View File
@@ -17,7 +17,6 @@ package com.jetbrains.python.newProject;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
+14 -4
View File
@@ -16,10 +16,12 @@
package com.jetbrains.python.newProject;
import com.intellij.facet.ui.ValidationResult;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.DirectoryProjectGenerator;
@@ -172,21 +174,29 @@ public class PythonNewDirectoryProjectDialog extends NewDirectoryProjectDialog {
return manager.showRemoteProjectSettingsDialog(baseDir, (RemoteSdkData)getSdk().getSdkAdditionalData());
}
else {
return null;
return new PyNewProjectSettings();
}
}
@Override
public void generateProject(@NotNull Project project,
public void generateProject(@NotNull final Project project,
@NotNull VirtualFile baseDir,
Object settings,
@NotNull Module module) {
final Object settings,
@NotNull final Module module) {
if (settings instanceof RemoteProjectSettings) {
PythonRemoteInterpreterManager manager = PythonRemoteInterpreterManager.getInstance();
assert manager != null;
manager.createDeployment(project, baseDir, (RemoteProjectSettings)settings,
(RemoteSdkData)getSdk().getSdkAdditionalData());
}
else if (settings instanceof PyNewProjectSettings) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
ModuleRootModificationUtil.setModuleSdk(module, ((PyNewProjectSettings)settings).getSdk());
}
});
}
}
@NotNull