From d588b62981b07b20629a2095fba52ef6f5486719 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 23 Oct 2014 13:20:07 +0400 Subject: [PATCH] Minor: refactoring create Kotlin Java Library Dialog --- .../configuration/KotlinJavaModuleConfigurator.java | 4 +++- .../plugin/framework/JavaRuntimeLibraryDescription.java | 4 +++- .../jet/plugin/framework/ui/CreateJavaLibraryDialog.java | 4 ++-- .../plugin/framework/ui/CreateJavaLibraryDialogBase.java | 8 +++++--- .../framework/ui/CreateJavaLibraryDialogWithModules.java | 8 ++++---- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java index 2525d82781d..1b60f85a5d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java @@ -96,7 +96,9 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator if (nonConfiguredModules.size() > 1 || showPathPanelForJava) { CreateJavaLibraryDialogWithModules dialog = new CreateJavaLibraryDialogWithModules( - project, nonConfiguredModules, defaultPath, showPathPanelForJava); + project, nonConfiguredModules, defaultPath, showPathPanelForJava, + JavaRuntimeLibraryDescription.DIALOG_TITLE, + JavaRuntimeLibraryDescription.DIALOG_CAPTION); if (!ApplicationManager.getApplication().isUnitTestMode()) { dialog.show(); diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java index 1a9193c8376..7ffb27629dd 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java @@ -43,6 +43,8 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe public static final String LIBRARY_NAME = "KotlinJavaRuntime"; public static final String JAVA_RUNTIME_LIBRARY_CREATION = "Java Runtime Library Creation"; + public static final String DIALOG_TITLE = "Create Kotlin Java Runtime Library"; + public static final String DIALOG_CAPTION = "Kotlin Java Runtime Library"; public static final Set SUITABLE_LIBRARY_KINDS = Sets.newHashSet(KOTLIN_JAVA_RUNTIME_KIND); private static final String DEFAULT_LIB_DIR_NAME = "lib"; @@ -108,7 +110,7 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe } } else { - CreateJavaLibraryDialog dialog = new CreateJavaLibraryDialog(defaultPathToJarFile); + CreateJavaLibraryDialog dialog =new CreateJavaLibraryDialog(defaultPathToJarFile, DIALOG_TITLE, DIALOG_CAPTION); dialog.show(); if (!dialog.isOK()) return null; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java index d1d795387e0..b3a76bc6f29 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; public class CreateJavaLibraryDialog extends CreateJavaLibraryDialogBase { - public CreateJavaLibraryDialog(@NotNull String defaultPath) { - super(null, defaultPath); + public CreateJavaLibraryDialog(@NotNull String defaultPath, @NotNull String title, @NotNull String caption) { + super(null, defaultPath, title, caption); updateComponents(); } } diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java index 66c4cc882eb..fe2f955a623 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java @@ -39,11 +39,13 @@ public abstract class CreateJavaLibraryDialogBase extends DialogWrapper { public CreateJavaLibraryDialogBase( @Nullable Project project, - @NotNull String defaultPath + @NotNull String defaultPath, + @NotNull String title, + @NotNull String caption ) { super(project); - setTitle("Create Kotlin Java Runtime Library"); + setTitle(title); init(); @@ -64,7 +66,7 @@ public abstract class CreateJavaLibraryDialogBase extends DialogWrapper { }); chooseLibraryPathPlace.add(pathPanel.getContentPane(), BorderLayout.CENTER); - modulesSeparator.setCaption("Kotlin Java Runtime Library"); + modulesSeparator.setCaption(caption); } protected void updateComponents() { diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java index 137220edd50..03e43638023 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java @@ -19,9 +19,7 @@ package org.jetbrains.jet.plugin.framework.ui; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.awt.*; import java.util.List; @@ -33,9 +31,11 @@ public class CreateJavaLibraryDialogWithModules extends CreateJavaLibraryDialogB @NotNull Project project, @NotNull List modules, @NotNull String defaultPath, - boolean showPathPanel + boolean showPathPanel, + @NotNull String title, + @NotNull String caption ) { - super(project, defaultPath); + super(project, defaultPath, title, caption); chooseModulePanel = new ChooseModulePanel(project, modules); chooseModulesPanelPlace.add(chooseModulePanel.getContentPane(), BorderLayout.CENTER);