azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: refactoring create Kotlin Java Library Dialog

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-23 13:20:07 +04:00
parent 61e9cbec66
commit d588b62981
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java
+3 -1
View File
@@ -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();
idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java
+3 -1
View File
@@ -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<LibraryKind> 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;
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java
+2 -2
View File
@@ -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();
}
}
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java
+5 -3
View File
@@ -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() {
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java
+4 -4
View File
@@ -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<Module> 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);