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

CreateJavaLibraryDialog* -> CreateLibraryDialog*

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-23 15:02:02 +04:00
parent d588b62981
commit a21d979186
6 changed files with 11 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
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription; import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription;
import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider; 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.project.ProjectStructureUtil;
import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;
import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.PathUtil;
@@ -95,7 +95,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
String copyLibIntoPath = null; String copyLibIntoPath = null;
if (nonConfiguredModules.size() > 1 || showPathPanelForJava) { if (nonConfiguredModules.size() > 1 || showPathPanelForJava) {
CreateJavaLibraryDialogWithModules dialog = new CreateJavaLibraryDialogWithModules( CreateLibraryDialogWithModules dialog = new CreateLibraryDialogWithModules(
project, nonConfiguredModules, defaultPath, showPathPanelForJava, project, nonConfiguredModules, defaultPath, showPathPanelForJava,
JavaRuntimeLibraryDescription.DIALOG_TITLE, JavaRuntimeLibraryDescription.DIALOG_TITLE,
JavaRuntimeLibraryDescription.DIALOG_CAPTION); JavaRuntimeLibraryDescription.DIALOG_CAPTION);
idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java
+2 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator; 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 org.jetbrains.jet.plugin.framework.ui.FileUIUtils;
import javax.swing.*; import javax.swing.*;
@@ -110,7 +110,7 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe
} }
} }
else { else {
CreateJavaLibraryDialog dialog =new CreateJavaLibraryDialog(defaultPathToJarFile, DIALOG_TITLE, DIALOG_CAPTION); CreateLibraryDialog dialog =new CreateLibraryDialog(defaultPathToJarFile, DIALOG_TITLE, DIALOG_CAPTION);
dialog.show(); dialog.show();
if (!dialog.isOK()) return null; if (!dialog.isOK()) return null;
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java → idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java
+2 -2
View File
@@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.framework.ui;
import org.jetbrains.annotations.NotNull; 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); super(null, defaultPath, title, caption);
updateComponents(); updateComponents();
} }
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.form → idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java → idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java
+2 -2
View File
@@ -28,7 +28,7 @@ import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
public abstract class CreateJavaLibraryDialogBase extends DialogWrapper { public abstract class CreateLibraryDialogBase extends DialogWrapper {
protected JPanel contentPane; protected JPanel contentPane;
protected JLabel compilerTextLabel; protected JLabel compilerTextLabel;
protected JPanel chooseModulesPanelPlace; protected JPanel chooseModulesPanelPlace;
@@ -37,7 +37,7 @@ public abstract class CreateJavaLibraryDialogBase extends DialogWrapper {
protected final ChooseLibraryPathPanel pathPanel; protected final ChooseLibraryPathPanel pathPanel;
public CreateJavaLibraryDialogBase( public CreateLibraryDialogBase(
@Nullable Project project, @Nullable Project project,
@NotNull String defaultPath, @NotNull String defaultPath,
@NotNull String title, @NotNull String title,
idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java → idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java
+2 -2
View File
@@ -23,11 +23,11 @@ import org.jetbrains.annotations.NotNull;
import java.awt.*; import java.awt.*;
import java.util.List; import java.util.List;
public class CreateJavaLibraryDialogWithModules extends CreateJavaLibraryDialogBase { public class CreateLibraryDialogWithModules extends CreateLibraryDialogBase {
private final ChooseModulePanel chooseModulePanel; private final ChooseModulePanel chooseModulePanel;
public CreateJavaLibraryDialogWithModules( public CreateLibraryDialogWithModules(
@NotNull Project project, @NotNull Project project,
@NotNull List<Module> modules, @NotNull List<Module> modules,
@NotNull String defaultPath, @NotNull String defaultPath,