CreateJavaLibraryDialog* -> CreateLibraryDialog*
This commit is contained in:
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription;
|
||||
import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider;
|
||||
import org.jetbrains.jet.plugin.framework.ui.CreateJavaLibraryDialogWithModules;
|
||||
import org.jetbrains.jet.plugin.framework.ui.CreateLibraryDialogWithModules;
|
||||
import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
|
||||
import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;
|
||||
import org.jetbrains.jet.utils.PathUtil;
|
||||
@@ -95,7 +95,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
|
||||
String copyLibIntoPath = null;
|
||||
|
||||
if (nonConfiguredModules.size() > 1 || showPathPanelForJava) {
|
||||
CreateJavaLibraryDialogWithModules dialog = new CreateJavaLibraryDialogWithModules(
|
||||
CreateLibraryDialogWithModules dialog = new CreateLibraryDialogWithModules(
|
||||
project, nonConfiguredModules, defaultPath, showPathPanelForJava,
|
||||
JavaRuntimeLibraryDescription.DIALOG_TITLE,
|
||||
JavaRuntimeLibraryDescription.DIALOG_CAPTION);
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
|
||||
import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator;
|
||||
import org.jetbrains.jet.plugin.framework.ui.CreateJavaLibraryDialog;
|
||||
import org.jetbrains.jet.plugin.framework.ui.CreateLibraryDialog;
|
||||
import org.jetbrains.jet.plugin.framework.ui.FileUIUtils;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -110,7 +110,7 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe
|
||||
}
|
||||
}
|
||||
else {
|
||||
CreateJavaLibraryDialog dialog =new CreateJavaLibraryDialog(defaultPathToJarFile, DIALOG_TITLE, DIALOG_CAPTION);
|
||||
CreateLibraryDialog dialog =new CreateLibraryDialog(defaultPathToJarFile, DIALOG_TITLE, DIALOG_CAPTION);
|
||||
dialog.show();
|
||||
|
||||
if (!dialog.isOK()) return null;
|
||||
|
||||
+2
-2
@@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.framework.ui;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class CreateJavaLibraryDialog extends CreateJavaLibraryDialogBase {
|
||||
public class CreateLibraryDialog extends CreateLibraryDialogBase {
|
||||
|
||||
public CreateJavaLibraryDialog(@NotNull String defaultPath, @NotNull String title, @NotNull String caption) {
|
||||
public CreateLibraryDialog(@NotNull String defaultPath, @NotNull String title, @NotNull String caption) {
|
||||
super(null, defaultPath, title, caption);
|
||||
updateComponents();
|
||||
}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.jet.plugin.framework.ui.CreateJavaLibraryDialogBase">
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.jet.plugin.framework.ui.CreateLibraryDialogBase">
|
||||
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
+2
-2
@@ -28,7 +28,7 @@ import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
public abstract class CreateJavaLibraryDialogBase extends DialogWrapper {
|
||||
public abstract class CreateLibraryDialogBase extends DialogWrapper {
|
||||
protected JPanel contentPane;
|
||||
protected JLabel compilerTextLabel;
|
||||
protected JPanel chooseModulesPanelPlace;
|
||||
@@ -37,7 +37,7 @@ public abstract class CreateJavaLibraryDialogBase extends DialogWrapper {
|
||||
|
||||
protected final ChooseLibraryPathPanel pathPanel;
|
||||
|
||||
public CreateJavaLibraryDialogBase(
|
||||
public CreateLibraryDialogBase(
|
||||
@Nullable Project project,
|
||||
@NotNull String defaultPath,
|
||||
@NotNull String title,
|
||||
+2
-2
@@ -23,11 +23,11 @@ import org.jetbrains.annotations.NotNull;
|
||||
import java.awt.*;
|
||||
import java.util.List;
|
||||
|
||||
public class CreateJavaLibraryDialogWithModules extends CreateJavaLibraryDialogBase {
|
||||
public class CreateLibraryDialogWithModules extends CreateLibraryDialogBase {
|
||||
|
||||
private final ChooseModulePanel chooseModulePanel;
|
||||
|
||||
public CreateJavaLibraryDialogWithModules(
|
||||
public CreateLibraryDialogWithModules(
|
||||
@NotNull Project project,
|
||||
@NotNull List<Module> modules,
|
||||
@NotNull String defaultPath,
|
||||
Reference in New Issue
Block a user