From a21d979186528d26eeff663ba509c4ddd2b71bda Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 23 Oct 2014 15:02:02 +0400 Subject: [PATCH] CreateJavaLibraryDialog* -> CreateLibraryDialog* --- .../plugin/configuration/KotlinJavaModuleConfigurator.java | 4 ++-- .../jet/plugin/framework/JavaRuntimeLibraryDescription.java | 4 ++-- ...{CreateJavaLibraryDialog.java => CreateLibraryDialog.java} | 4 ++-- ...avaLibraryDialogBase.form => CreateLibraryDialogBase.form} | 2 +- ...avaLibraryDialogBase.java => CreateLibraryDialogBase.java} | 4 ++-- ...ogWithModules.java => CreateLibraryDialogWithModules.java} | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename idea/src/org/jetbrains/jet/plugin/framework/ui/{CreateJavaLibraryDialog.java => CreateLibraryDialog.java} (80%) rename idea/src/org/jetbrains/jet/plugin/framework/ui/{CreateJavaLibraryDialogBase.form => CreateLibraryDialogBase.form} (96%) rename idea/src/org/jetbrains/jet/plugin/framework/ui/{CreateJavaLibraryDialogBase.java => CreateLibraryDialogBase.java} (95%) rename idea/src/org/jetbrains/jet/plugin/framework/ui/{CreateJavaLibraryDialogWithModules.java => CreateLibraryDialogWithModules.java} (92%) diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java index 1b60f85a5d7..fc8b51691e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java @@ -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); diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java index 7ffb27629dd..189bd0a6814 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java @@ -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; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java similarity index 80% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java rename to idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java index b3a76bc6f29..f2e0f97b5ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java @@ -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(); } diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.form b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.form rename to idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form index d92bc8f5466..12520525a3a 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.form +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form @@ -1,5 +1,5 @@ -
+ diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java rename to idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java index fe2f955a623..add70321682 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogBase.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java @@ -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, diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java rename to idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java index 03e43638023..3a8085883fe 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialogWithModules.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java @@ -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 modules, @NotNull String defaultPath,