diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.form b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.form
deleted file mode 100644
index 5afdfab82c4..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.form
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.java
deleted file mode 100644
index f00710f2ad5..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseCompilerSourcePanel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.framework.ui;
-
-import org.jetbrains.jet.plugin.JetPluginUtil;
-
-import javax.swing.*;
-
-public class ChooseCompilerSourcePanel {
- private JPanel contentPane;
- private JLabel bundledPluginVersion;
-
- public ChooseCompilerSourcePanel() {
- bundledPluginVersion.setText(bundledPluginVersion.getText() + " - " + JetPluginUtil.getPluginVersion());
- }
-
- public JPanel getContentPane() {
- return contentPane;
- }
-}
diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.form b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.form
index 09fc39dced4..e6284803204 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.form
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.form
@@ -40,14 +40,14 @@
-
+
-
+
-
-
-
-
+
+
+
+
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 05682e39055..d5642a2245f 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaLibraryDialog.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.plugin.JetPluginUtil;
import javax.swing.*;
import java.awt.*;
@@ -33,7 +34,7 @@ public class CreateJavaLibraryDialog extends DialogWrapper {
private JPanel contentPane;
private JCheckBox copyLibraryCheckbox;
private JPanel copyIntoPanelPlace;
- private JPanel compilerSourcePanelPlace;
+ private JLabel compilerTextLabel;
public CreateJavaLibraryDialog(@Nullable Project project, @NotNull String title, VirtualFile contextDirectory) {
super(project);
@@ -42,8 +43,7 @@ public class CreateJavaLibraryDialog extends DialogWrapper {
init();
- ChooseCompilerSourcePanel compilerSourcePanel = new ChooseCompilerSourcePanel();
- compilerSourcePanelPlace.add(compilerSourcePanel.getContentPane(), BorderLayout.CENTER, 0);
+ compilerTextLabel.setText(compilerTextLabel.getText() + " - " + JetPluginUtil.getPluginVersion());
copyIntoPanel = new CopyIntoPanel(project, FileUIUtils.createRelativePath(project, contextDirectory, "lib"));
copyIntoPanel.addValidityListener(new ValidityListener() {
diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.form b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.form
index 4e73c304538..571603b46b8 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.form
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.form
@@ -57,14 +57,14 @@
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.java
index 2b66f3cae17..568cf100e11 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateJavaScriptLibraryDialog.java
@@ -5,6 +5,7 @@ import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.plugin.JetPluginUtil;
import javax.swing.*;
import java.awt.*;
@@ -18,9 +19,9 @@ public class CreateJavaScriptLibraryDialog extends DialogWrapper {
private JPanel contentPane;
private JCheckBox copyLibraryCheckbox;
private JCheckBox copyJSRuntimeCheckbox;
- private JPanel compilerSourcePanelPlace;
private JPanel copyJSIntoPanelPlace;
private JPanel copyHeadersIntoPanelPlace;
+ private JLabel compilerTextLabel;
public CreateJavaScriptLibraryDialog(@Nullable Project project, @NotNull String title, VirtualFile contextDirectory) {
super(project);
@@ -29,8 +30,7 @@ public class CreateJavaScriptLibraryDialog extends DialogWrapper {
init();
- ChooseCompilerSourcePanel compilerSourcePanel = new ChooseCompilerSourcePanel();
- compilerSourcePanelPlace.add(compilerSourcePanel.getContentPane(), BorderLayout.CENTER);
+ compilerTextLabel.setText(compilerTextLabel.getText() + " - " + JetPluginUtil.getPluginVersion());
copyJSIntoPanel = new CopyIntoPanel(project, FileUIUtils.createRelativePath(project, contextDirectory, "script"), "&Script directory:");
copyJSIntoPanel.addValidityListener(new ValidityListener() {