Show dialog if more than one module should be configured or user should choose path to library

idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java

@@ -67,16 +67,21 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
 
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
+        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);
+            }
+        }
+    }
 
     @Override
     @NotNull

idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java

@@ -92,19 +92,25 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
 
         List<Module> nonConfiguredModules = ConfigureKotlinInProjectUtils.getNonConfiguredModules(project, this);
 
+        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);
+        }
+    }
 
     public static boolean isJsFilePresent(@NotNull String dir) {
         String runtimeJarFileName = dir + "/" + PathUtil.JS_LIB_JAR_NAME;