From 21534a5177f74f2cf02ae31687b8ef8cb5e9526a Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 29 Aug 2013 15:08:11 +0400
Subject: [PATCH] Show dialog if more than one module should be configured or
 user should choose path to library

---
 .../KotlinJavaModuleConfigurator.java         | 21 ++++++++------
 .../KotlinJsModuleConfigurator.java           | 28 +++++++++++--------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
index 92a6a1f58bd..bf6d86e2793 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
@@ -67,14 +67,19 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
 
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
-        CreateJavaLibraryDialogWithModules dialog =
-                new CreateJavaLibraryDialogWithModules(project, nonConfiguredModules, defaultPath, showPathPanelForJava);
-        dialog.show();
-
-        if (!dialog.isOK()) return;
-
-        for (Module module : dialog.getModulesToConfigure()) {
-            configureModuleWithLibrary(module, defaultPath, dialog.getCopyIntoPath());
+        if (nonConfiguredModules.size() > 1 || showPathPanelForJava) {
+            CreateJavaLibraryDialogWithModules dialog =
+                    new CreateJavaLibraryDialogWithModules(project, nonConfiguredModules, defaultPath, showPathPanelForJava);
+            dialog.show();
+            if (!dialog.isOK()) return;
+            for (Module module : dialog.getModulesToConfigure()) {
+                configureModuleWithLibrary(module, defaultPath, dialog.getCopyIntoPath());
+            }
+        }
+        else {
+            for (Module module : nonConfiguredModules) {
+                configureModuleWithLibrary(module, defaultPath, null);
+            }
         }
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
index 028cf50b832..3a7c5138a20 100644
--- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
+++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java
@@ -92,18 +92,24 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
 
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
-        CreateJavaScriptLibraryDialogWithModules dialog =
-                new CreateJavaScriptLibraryDialogWithModules(project, nonConfiguredModules,
-                                                  defaultPathToJar, defaultPathToJsFile,
-                                                  showPathToJarPanel, showPathToJsFilePanel);
-        dialog.show();
-
-        if (!dialog.isOK()) return;
-
-        for (Module module : dialog.getModulesToConfigure()) {
-            configureModuleWithLibrary(module, defaultPathToJar, dialog.getCopyLibraryIntoPath());
+        if (nonConfiguredModules.size() > 1 || showPathToJarPanel || showPathToJsFilePanel) {
+            CreateJavaScriptLibraryDialogWithModules dialog =
+                    new CreateJavaScriptLibraryDialogWithModules(project, nonConfiguredModules,
+                                                                 defaultPathToJar, defaultPathToJsFile,
+                                                                 showPathToJarPanel, showPathToJsFilePanel);
+            dialog.show();
+            if (!dialog.isOK()) return;
+            for (Module module : dialog.getModulesToConfigure()) {
+                configureModuleWithLibrary(module, defaultPathToJar, dialog.getCopyLibraryIntoPath());
+            }
+            configureModuleWithJsFile(defaultPathToJsFile, dialog.getCopyJsIntoPath());
+        }
+        else {
+            for (Module module : nonConfiguredModules) {
+                configureModuleWithLibrary(module, defaultPathToJar, null);
+            }
+            configureModuleWithJsFile(defaultPathToJsFile, null);
         }
-        configureModuleWithJsFile(defaultPathToJsFile, dialog.getCopyJsIntoPath());
     }
 
     public static boolean isJsFilePresent(@NotNull String dir) {