From ae5b32ca43605f11452974b23183ee99a34e46dd Mon Sep 17 00:00:00 2001 From: Valentina Kiryushkina Date: Wed, 7 Oct 2015 17:09:24 +0300 Subject: [PATCH] Pass project sdk to PythonProjectGenerator#beforeProjectGenerated --- .../python/newProject/actions/PyCharmNewProjectStep.java | 5 +++-- .../jetbrains/python/newProject/PythonProjectGenerator.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java index 12708c653a09..6d58c5a60684 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java @@ -81,8 +81,9 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa if (base == null) return; final DirectoryProjectGenerator generator = base.getProjectGenerator(); final NullableConsumer callback = new GenerateProjectCallback(); - if (generator instanceof PythonProjectGenerator) { - final BooleanFunction beforeProjectGenerated = ((PythonProjectGenerator)generator).beforeProjectGenerated(); + if (generator instanceof PythonProjectGenerator && base instanceof ProjectSpecificSettingsStep) { + final BooleanFunction beforeProjectGenerated = ((PythonProjectGenerator)generator). + beforeProjectGenerated(((ProjectSpecificSettingsStep)base).getSdk()); if (beforeProjectGenerated != null) { final boolean result = beforeProjectGenerated.fun((PythonProjectGenerator)generator); if (result) { diff --git a/python/openapi/src/com/jetbrains/python/newProject/PythonProjectGenerator.java b/python/openapi/src/com/jetbrains/python/newProject/PythonProjectGenerator.java index f06176d5f007..a56503df72ac 100644 --- a/python/openapi/src/com/jetbrains/python/newProject/PythonProjectGenerator.java +++ b/python/openapi/src/com/jetbrains/python/newProject/PythonProjectGenerator.java @@ -65,7 +65,7 @@ public abstract class PythonProjectGenerator { } @Nullable - public BooleanFunction beforeProjectGenerated() { + public BooleanFunction beforeProjectGenerated(@NotNull final Sdk sdk) { return null; } }