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

Update kotlin run configuration editor

Browse Source 
- Remove deprecated component for selecting JRE
- Update module selector
This commit is contained in:
Nikolay Krasko
2015-12-03 19:37:51 +03:00
parent 8683582c40
commit a19708693b
2 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+28 -17
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.run.JetRunConfigurationEditor">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="811" height="400"/>
@@ -8,40 +8,51 @@
<properties/>
<border type="none"/>
<children>
<vspacer id="f22cb">
<component id="50d08" class="com.intellij.openapi.ui.LabeledComponent" binding="mainClass" custom-create="true">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="-1" height="20"/>
</grid>
</constraints>
</vspacer>
<component id="d9fac" class="com.intellij.execution.ui.CommonJavaParametersPanel" binding="myCommonProgramParameters">
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="application.configuration.main.class.label"/>
</properties>
</component>
<component id="d9fac" class="com.intellij.execution.ui.CommonJavaParametersPanel" binding="commonProgramParameters">
<constraints>
<grid row="1" 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>
<properties/>
</component>
<component id="b06d8" class="com.intellij.execution.ui.AlternativeJREPanel" binding="alternativeJREPanel">
<vspacer id="f4215">
<constraints>
<grid row="3" 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="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
<preferred-size width="-1" height="10"/>
</grid>
</constraints>
<properties/>
</component>
<component id="a5106" class="com.intellij.openapi.ui.LabeledComponent" binding="mainClass" custom-create="true">
</vspacer>
<component id="c45d2" class="com.intellij.openapi.ui.LabeledComponent" binding="moduleChooser">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<componentClass value="com.intellij.application.options.ModulesComboBox"/>
<labelLocation value="West"/>
<text value="Main class"/>
<text resource-bundle="messages/ExecutionBundle" key="application.configuration.use.classpath.and.jdk.of.module.label"/>
</properties>
</component>
<grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
<component id="b06d8" class="com.intellij.execution.ui.JrePathEditor" binding="jrePathEditor">
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="4" 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>
<properties/>
<border type="none"/>
<children/>
</grid>
</component>
<vspacer id="f22cb">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+41 -40
View File
@@ -16,74 +16,81 @@
package org.jetbrains.kotlin.idea.run;
import com.intellij.execution.ui.AlternativeJREPanel;
import com.intellij.application.options.ModulesComboBox;
import com.intellij.execution.JavaExecutionUtil;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.execution.ui.ConfigurationModuleSelector;
import com.intellij.execution.ui.DefaultJreSelector;
import com.intellij.execution.ui.JrePathEditor;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.LabeledComponent;
import com.intellij.psi.PsiClass;
import com.intellij.ui.PanelWithAnchor;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> implements PanelWithAnchor {
private JPanel myMainPanel;
private JTextField myMainClassField;
private JPanel myModuleChooserHolder;
private CommonJavaParametersPanel myCommonProgramParameters;
private AlternativeJREPanel alternativeJREPanel;
private JPanel mainPanel;
private LabeledComponent<JTextField> mainClass;
private final ConfigurationModuleSelector myModuleSelector;
private CommonJavaParametersPanel commonProgramParameters;
private LabeledComponent<ModulesComboBox> moduleChooser;
private JrePathEditor jrePathEditor;
private final ConfigurationModuleSelector moduleSelector;
private JComponent anchor;
private final LabeledComponent<JComboBox> moduleChooser;
public JetRunConfigurationEditor(Project project) {
moduleChooser = LabeledComponent.create(new JComboBox(), "Use classpath of module:");
moduleChooser.setLabelLocation(BorderLayout.WEST);
myModuleChooserHolder.add(moduleChooser, BorderLayout.CENTER);
myModuleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
moduleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
jrePathEditor.setDefaultJreSelector(DefaultJreSelector.fromModuleDependencies(moduleChooser.getComponent(), false));
commonProgramParameters.setModuleContext(moduleSelector.getModule());
moduleChooser.getComponent().addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
commonProgramParameters.setModuleContext(moduleSelector.getModule());
}
});
anchor = UIUtil.mergeComponentsWithAnchor(mainClass, myCommonProgramParameters, alternativeJREPanel, moduleChooser);
}
@Override
protected void resetEditorFrom(JetRunConfiguration configuration) {
myCommonProgramParameters.reset(configuration);
myMainClassField.setText(configuration.getRunClass() == null ? null : configuration.getRunClass());
myModuleSelector.reset(configuration);
alternativeJREPanel.init(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
anchor = UIUtil.mergeComponentsWithAnchor(mainClass, commonProgramParameters, jrePathEditor, jrePathEditor, moduleChooser);
}
@Override
protected void applyEditorTo(JetRunConfiguration configuration) throws ConfigurationException {
myModuleSelector.applyTo(configuration);
myCommonProgramParameters.applyTo(configuration);
configuration.setRunClass(myMainClassField.getText());
configuration.setAlternativeJrePath(alternativeJREPanel.getPath());
configuration.setAlternativeJrePathEnabled(alternativeJREPanel.isPathEnabled());
commonProgramParameters.applyTo(configuration);
moduleSelector.applyTo(configuration);
String className = mainClass.getComponent().getText();
PsiClass aClass = moduleSelector.findClass(className);
configuration.setRunClass(aClass != null ? JavaExecutionUtil.getRuntimeQualifiedName(aClass) : className);
configuration.setAlternativeJrePath(jrePathEditor.getJrePathOrName());
configuration.setAlternativeJrePathEnabled(jrePathEditor.isAlternativeJreSelected());
}
@Override
protected void resetEditorFrom(JetRunConfiguration configuration) {
commonProgramParameters.reset(configuration);
moduleSelector.reset(configuration);
mainClass.getComponent().setText(configuration.MAIN_CLASS_NAME != null ? configuration.MAIN_CLASS_NAME.replaceAll("\\$", "\\.") : "");
jrePathEditor.setPathOrName(configuration.ALTERNATIVE_JRE_PATH, configuration.ALTERNATIVE_JRE_PATH_ENABLED);
}
@NotNull
@Override
protected JComponent createEditor() {
return myMainPanel;
return mainPanel;
}
@Override
protected void disposeEditor() {
private void createUIComponents() {
mainClass = new LabeledComponent<JTextField>();
JTextField myMainClassField = new JTextField();
mainClass.setComponent(myMainClassField);
}
@Override
@@ -95,14 +102,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
public void setAnchor(JComponent anchor) {
this.anchor = anchor;
mainClass.setAnchor(anchor);
myCommonProgramParameters.setAnchor(anchor);
alternativeJREPanel.setAnchor(anchor);
commonProgramParameters.setAnchor(anchor);
jrePathEditor.setAnchor(anchor);
moduleChooser.setAnchor(anchor);
}
private void createUIComponents() {
mainClass = new LabeledComponent<JTextField>();
myMainClassField = new JTextField();
mainClass.setComponent(myMainClassField);
}
}