From ad301c145bef3f24b2a696e50d7344963aa7b86b Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Wed, 14 Sep 2016 00:54:38 +0300 Subject: [PATCH] PY-20733: Useless lambda removed * Swing dialog uses event pumping and does not need spaghetti code. Direct code should be used instead --- .../python/newProject/PythonProjectGenerator.java | 7 ++----- .../python/remote/PythonRemoteInterpreterManager.java | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/python/src/com/jetbrains/python/newProject/PythonProjectGenerator.java b/python/src/com/jetbrains/python/newProject/PythonProjectGenerator.java index 6b514a450eed..9d5013de012b 100644 --- a/python/src/com/jetbrains/python/newProject/PythonProjectGenerator.java +++ b/python/src/com/jetbrains/python/newProject/PythonProjectGenerator.java @@ -61,17 +61,14 @@ public abstract class PythonProjectGenerator imp @Nullable final T settings, @NotNull final Module module) { /*Instead of this method overwrite ``configureProject``*/ - final Runnable configureProject = () -> configureProject(project, baseDir, settings, module); // If we deal with remote project -- use remote manager to configure it final PythonRemoteInterpreterManager remoteManager = PythonRemoteInterpreterManager.getInstance(); final Sdk sdk = (settings != null ? settings.getSdk() : null); if (remoteManager != null && PythonSdkType.isRemote(sdk)) { - remoteManager.prepareRemoteSettingsIfNeeded(module, sdk, configureProject); - } - else { - configureProject.run(); + remoteManager.prepareRemoteSettingsIfNeeded(module, sdk); } + configureProject(project, baseDir, settings, module); } /** diff --git a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java index 5954116ab85a..19d78edaf2d4 100644 --- a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java +++ b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java @@ -138,12 +138,9 @@ public abstract class PythonRemoteInterpreterManager { /** * Prepares project (i.e. sets appropriate mappings) if sdk is remote. * Do not call this method if sdk is not remote: id does nothing - * - * @param callAfterCheck what to call after configuration completes (runs on AWT) */ public abstract void prepareRemoteSettingsIfNeeded(@NotNull final Module module, - @NotNull final Sdk sdk, - @NotNull final Runnable callAfterCheck); + @NotNull final Sdk sdk); public abstract void copyFromRemote(Sdk sdk, @NotNull Project project, RemoteSdkCredentials data,