From 51bb44ce4517586446dffc9548d0518c896f1269 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 18 Jun 2014 19:20:11 +0400 Subject: [PATCH] store sdk in remote project settings --- .../python/newProject/PythonBaseProjectGenerator.java | 9 ++++++--- .../jetbrains/python/remote/RemoteProjectSettings.java | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java b/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java index b97767138ade..a862956c7cea 100644 --- a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java +++ b/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java @@ -8,6 +8,9 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.platform.DirectoryProjectGenerator; +import com.intellij.remote.RemoteSdkCredentials; +import com.jetbrains.python.remote.PythonRemoteInterpreterManager; +import com.jetbrains.python.remote.RemoteProjectSettings; import icons.PythonIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -50,13 +53,13 @@ public class PythonBaseProjectGenerator extends PythonProjectGenerator implement @Override public void generateProject(@NotNull final Project project, @NotNull VirtualFile baseDir, final Object settings, @NotNull final Module module) { - /*if (settings instanceof RemoteProjectSettings) { + if (settings instanceof RemoteProjectSettings) { PythonRemoteInterpreterManager manager = PythonRemoteInterpreterManager.getInstance(); assert manager != null; manager.createDeployment(project, baseDir, (RemoteProjectSettings)settings, - (RemoteSdkCredentials)myProjectAction.getSdk().getSdkAdditionalData()); + (RemoteSdkCredentials)((RemoteProjectSettings)settings).getSdk().getSdkAdditionalData()); } - else */if (settings instanceof PyNewProjectSettings) { + else if (settings instanceof PyNewProjectSettings) { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { diff --git a/python/src/com/jetbrains/python/remote/RemoteProjectSettings.java b/python/src/com/jetbrains/python/remote/RemoteProjectSettings.java index 424ea52bbff6..80d8697e6311 100644 --- a/python/src/com/jetbrains/python/remote/RemoteProjectSettings.java +++ b/python/src/com/jetbrains/python/remote/RemoteProjectSettings.java @@ -15,10 +15,12 @@ */ package com.jetbrains.python.remote; +import com.jetbrains.python.newProject.PyNewProjectSettings; + /** * @author traff */ -public class RemoteProjectSettings { +public class RemoteProjectSettings extends PyNewProjectSettings { private String myDeploymentName; private String myRemoteRoot;