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

Use new JRE chooser in Kotlin script run configuration

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-01-03 15:38:43 +01:00
parent ebc9c217c1
commit da678a4be2
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.form
+1 -1
View File
@@ -19,7 +19,7 @@
</constraints> </constraints>
<properties/> <properties/>
</component> </component>
<component id="b06d8" class="com.intellij.execution.ui.AlternativeJREPanel" binding="alternativeJREPanel"> <component id="c4ccd" class="com.intellij.execution.ui.JrePathEditor" binding="jrePathEditor">
<constraints> <constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/> <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.java
+11 -20
View File
@@ -1,23 +1,13 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* * that can be found in the license/LICENSE.txt file.
* 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.kotlin.idea.run.script.standalone; package org.jetbrains.kotlin.idea.run.script.standalone;
import com.intellij.execution.ui.AlternativeJREPanel;
import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.execution.ui.DefaultJreSelector;
import com.intellij.execution.ui.JrePathEditor;
import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.ConfigurationException;
@@ -38,14 +28,15 @@ import javax.swing.*;
public class KotlinStandaloneScriptRunConfigurationEditor extends SettingsEditor<KotlinStandaloneScriptRunConfiguration> implements PanelWithAnchor { public class KotlinStandaloneScriptRunConfigurationEditor extends SettingsEditor<KotlinStandaloneScriptRunConfiguration> implements PanelWithAnchor {
private JPanel mainPanel; private JPanel mainPanel;
private CommonJavaParametersPanel commonProgramParameters; private CommonJavaParametersPanel commonProgramParameters;
private AlternativeJREPanel alternativeJREPanel; private JrePathEditor jrePathEditor;
private TextFieldWithBrowseButton chooseScriptFileTextField; private TextFieldWithBrowseButton chooseScriptFileTextField;
private LabeledComponent<TextFieldWithBrowseButton> chooseScriptFileComponent; private LabeledComponent<TextFieldWithBrowseButton> chooseScriptFileComponent;
private JComponent anchor; private JComponent anchor;
public KotlinStandaloneScriptRunConfigurationEditor(Project project) { public KotlinStandaloneScriptRunConfigurationEditor(Project project) {
initChooseFileField(project); initChooseFileField(project);
anchor = UIUtil.mergeComponentsWithAnchor(chooseScriptFileComponent, commonProgramParameters, alternativeJREPanel); jrePathEditor.setDefaultJreSelector(DefaultJreSelector.projectSdk(project));
anchor = UIUtil.mergeComponentsWithAnchor(chooseScriptFileComponent, commonProgramParameters, jrePathEditor);
} }
void initChooseFileField(Project project) { void initChooseFileField(Project project) {
@@ -66,14 +57,14 @@ public class KotlinStandaloneScriptRunConfigurationEditor extends SettingsEditor
commonProgramParameters.reset(configuration); commonProgramParameters.reset(configuration);
String path = configuration.filePath; String path = configuration.filePath;
chooseScriptFileTextField.setText(path != null ? path : ""); chooseScriptFileTextField.setText(path != null ? path : "");
alternativeJREPanel.init(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled()); jrePathEditor.setPathOrName(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
} }
@Override @Override
protected void applyEditorTo(KotlinStandaloneScriptRunConfiguration configuration) throws ConfigurationException { protected void applyEditorTo(KotlinStandaloneScriptRunConfiguration configuration) throws ConfigurationException {
commonProgramParameters.applyTo(configuration); commonProgramParameters.applyTo(configuration);
configuration.setAlternativeJrePath(alternativeJREPanel.getPath()); configuration.setAlternativeJrePath(jrePathEditor.getJrePathOrName());
configuration.setAlternativeJrePathEnabled(alternativeJREPanel.isPathEnabled()); configuration.setAlternativeJrePathEnabled(jrePathEditor.isAlternativeJreSelected());
configuration.filePath = chooseScriptFileTextField.getText(); configuration.filePath = chooseScriptFileTextField.getText();
} }
@@ -92,7 +83,7 @@ public class KotlinStandaloneScriptRunConfigurationEditor extends SettingsEditor
public void setAnchor(JComponent anchor) { public void setAnchor(JComponent anchor) {
this.anchor = anchor; this.anchor = anchor;
commonProgramParameters.setAnchor(anchor); commonProgramParameters.setAnchor(anchor);
alternativeJREPanel.setAnchor(anchor); jrePathEditor.setAnchor(anchor);
chooseScriptFileComponent.setAnchor(anchor); chooseScriptFileComponent.setAnchor(anchor);
} }