mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Merge branch 'master' of git.labs.intellij.net:idea/community
This commit is contained in:
Evgeny Pasynkov
+17
-30
@@ -1,27 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.debugger.impl.GenericDebuggerParametersRunnerConfigurable">
|
||||
<grid id="a1cd4" binding="myPanel" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="a1cd4" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" 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="53" y="171" width="441" height="78"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
|
||||
<xy x="53" y="171" width="441" height="92"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<grid id="86bed" binding="myShMemPanel" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="86bed" binding="myShMemPanel" layout-manager="GridLayoutManager" row-count="1" 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="0" y="29" width="275" height="22"/>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="9f41f" class="javax.swing.JLabel">
|
||||
<constraints>
|
||||
<xy x="0" y="3" width="138" height="16"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem.address"/>
|
||||
@@ -29,8 +26,7 @@
|
||||
</component>
|
||||
<component id="af504" class="javax.swing.JTextField" binding="myAddressField">
|
||||
<constraints>
|
||||
<xy x="148" y="0" width="127" height="22"/>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="1">
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
</grid>
|
||||
</constraints>
|
||||
@@ -40,19 +36,17 @@
|
||||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<grid id="c2b5" binding="myPortPanel" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="c2b5" binding="myPortPanel" layout-manager="GridLayoutManager" row-count="1" 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="0" y="56" width="275" height="22"/>
|
||||
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
|
||||
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="6e48a" class="javax.swing.JLabel">
|
||||
<constraints>
|
||||
<xy x="0" y="3" width="29" height="16"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.port"/>
|
||||
@@ -60,8 +54,7 @@
|
||||
</component>
|
||||
<component id="5ffe7" class="javax.swing.JTextField" binding="myPortField">
|
||||
<constraints>
|
||||
<xy x="39" y="0" width="236" height="22"/>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="1">
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
</grid>
|
||||
</constraints>
|
||||
@@ -73,26 +66,23 @@
|
||||
</grid>
|
||||
<component id="aad8d" class="javax.swing.JButton" binding="myDebuggerSettings">
|
||||
<constraints>
|
||||
<xy x="285" y="40" width="156" height="26"/>
|
||||
<grid row="1" column="1" row-span="2" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1"/>
|
||||
<grid row="1" column="1" row-span="2" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/DebuggerBundle" key="button.debugger.settings"/>
|
||||
</properties>
|
||||
</component>
|
||||
<grid id="b10c7" binding="myTransportPanel" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="b10c7" binding="myTransportPanel" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<xy x="0" y="0" width="441" height="24"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="63d09" class="javax.swing.JLabel">
|
||||
<constraints>
|
||||
<xy x="0" y="4" width="62" height="16"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.transport"/>
|
||||
@@ -100,8 +90,7 @@
|
||||
</component>
|
||||
<component id="f3bb4" class="javax.swing.JRadioButton" binding="mySocketTransport">
|
||||
<constraints>
|
||||
<xy x="72" y="0" width="64" height="24"/>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<selected value="true"/>
|
||||
@@ -110,8 +99,7 @@
|
||||
</component>
|
||||
<component id="3bb61" class="javax.swing.JRadioButton" binding="myShmemTransport">
|
||||
<constraints>
|
||||
<xy x="146" y="0" width="116" height="24"/>
|
||||
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
|
||||
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem"/>
|
||||
@@ -119,8 +107,7 @@
|
||||
</component>
|
||||
<hspacer id="b3e0f">
|
||||
<constraints>
|
||||
<xy x="262" y="6" width="179" height="11"/>
|
||||
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1"/>
|
||||
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
</hspacer>
|
||||
</children>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.ConfigurationSettingsEditor.RunnersEditorComponent" stored-main-component-binding="myWholePanel">
|
||||
<grid id="4be0c" binding="myRunnersPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="4be0c" binding="myRunnersPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<xy x="151" y="101" width="295" height="128"/>
|
||||
@@ -10,8 +10,8 @@
|
||||
<children>
|
||||
<scrollpane id="baa95" class="com.intellij.ui.components.JBScrollPane">
|
||||
<constraints>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="120" height="-1"/>
|
||||
<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">
|
||||
<preferred-size width="-1" height="50"/>
|
||||
</grid>
|
||||
</constraints>
|
||||
<properties/>
|
||||
@@ -28,7 +28,7 @@
|
||||
<xy id="56f2e" binding="myRunnerPanel" layout-manager="XYLayout" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.openapi.util.JDOMExternalizable;
|
||||
import com.intellij.openapi.util.Pair;
|
||||
import com.intellij.ui.ColoredListCellRenderer;
|
||||
import com.intellij.ui.IdeBorderFactory;
|
||||
import com.intellij.ui.ListScrollingUtil;
|
||||
import com.intellij.ui.SimpleTextAttributes;
|
||||
import com.intellij.util.containers.Convertor;
|
||||
@@ -145,7 +146,9 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor<RunnerAndConfi
|
||||
if (wrappedRunEditor != null && wrappedConfigEditor != null) {
|
||||
JPanel panel = new JPanel(new BorderLayout());
|
||||
panel.add(wrappedConfigEditor.getComponent(), BorderLayout.CENTER);
|
||||
panel.add(wrappedRunEditor.getComponent(), BorderLayout.SOUTH);
|
||||
JComponent wrappedRunEditorComponent = wrappedRunEditor.getComponent();
|
||||
wrappedRunEditorComponent.setBorder(IdeBorderFactory.createEmptyBorder(3, 0, 0, 0));
|
||||
panel.add(wrappedRunEditorComponent, BorderLayout.SOUTH);
|
||||
return panel;
|
||||
}
|
||||
|
||||
|
||||
+1
-9
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.ConfigurationSettingsEditorWrapper">
|
||||
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="5" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<xy x="124" y="274" width="276" height="150"/>
|
||||
@@ -28,14 +28,6 @@
|
||||
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="before.launch.panel.title"/>
|
||||
<children/>
|
||||
</grid>
|
||||
<component id="c7b94" class="javax.swing.JCheckBox" binding="myCbStoreProjectConfiguration">
|
||||
<constraints>
|
||||
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/ExecutionBundle" key="run.configuration.store.place.option"/>
|
||||
</properties>
|
||||
</component>
|
||||
<vspacer id="6092a">
|
||||
<constraints>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="0" indent="0" use-parent-layout="false">
|
||||
|
||||
-22
@@ -32,8 +32,6 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@@ -45,14 +43,11 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
|
||||
implements BeforeRunStepsPanel.StepsBeforeRunListener {
|
||||
public static DataKey<ConfigurationSettingsEditorWrapper> CONFIGURATION_EDITOR_KEY = DataKey.create("ConfigurationSettingsEditor");
|
||||
private JPanel myComponentPlace;
|
||||
private JCheckBox myCbStoreProjectConfiguration;
|
||||
private JPanel myWholePanel;
|
||||
|
||||
private JPanel myBeforeLaunchContainer;
|
||||
private BeforeRunStepsPanel myBeforeRunStepsPanel;
|
||||
|
||||
private boolean myStoreProjectConfiguration;
|
||||
|
||||
private final ConfigurationSettingsEditor myEditor;
|
||||
|
||||
public ConfigurationSettingsEditorWrapper(final RunnerAndConfigurationSettings settings) {
|
||||
@@ -65,21 +60,9 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
|
||||
|
||||
private void doReset(RunnerAndConfigurationSettings settings) {
|
||||
final RunConfiguration runConfiguration = settings.getConfiguration();
|
||||
final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(runConfiguration.getProject());
|
||||
|
||||
myBeforeRunStepsPanel.doReset(settings);
|
||||
myBeforeLaunchContainer.setVisible(!(runConfiguration instanceof UnknownRunConfiguration));
|
||||
|
||||
myStoreProjectConfiguration = runManager.isConfigurationShared(settings);
|
||||
myCbStoreProjectConfiguration.setEnabled(!(runConfiguration instanceof UnknownRunConfiguration));
|
||||
myCbStoreProjectConfiguration.setSelected(myStoreProjectConfiguration);
|
||||
myCbStoreProjectConfiguration.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
myStoreProjectConfiguration = myCbStoreProjectConfiguration.isSelected();
|
||||
}
|
||||
});
|
||||
|
||||
myCbStoreProjectConfiguration.setVisible(!settings.isTemplate());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -113,7 +96,6 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
|
||||
final RunConfiguration runConfiguration = settings.getConfiguration();
|
||||
final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(runConfiguration.getProject());
|
||||
runManager.setBeforeRunTasks(runConfiguration, myBeforeRunStepsPanel.getTasks(true), false);
|
||||
runManager.shareConfiguration(runConfiguration, myStoreProjectConfiguration);
|
||||
RunnerAndConfigurationSettings runManagerSettings = runManager.getSettings(runConfiguration);
|
||||
if (runManagerSettings != null) {
|
||||
runManagerSettings.setEditBeforeRun(myBeforeRunStepsPanel.needEditBeforeRun());
|
||||
@@ -128,10 +110,6 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
|
||||
return Collections.unmodifiableList(myBeforeRunStepsPanel.getTasks(true));
|
||||
}
|
||||
|
||||
public boolean isStoreProjectConfiguration() {
|
||||
return myStoreProjectConfiguration;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fireStepsBeforeRunChanged() {
|
||||
fireEditorStateChanged();
|
||||
|
||||
@@ -1227,7 +1227,7 @@ class RunConfigurable extends BaseConfigurable {
|
||||
myConfigurable = configurable;
|
||||
mySettings = (RunnerAndConfigurationSettings)myConfigurable.getSettings();
|
||||
final ConfigurationSettingsEditorWrapper editorWrapper = (ConfigurationSettingsEditorWrapper)myConfigurable.getEditor();
|
||||
myShared = editorWrapper.isStoreProjectConfiguration();
|
||||
myShared = configurable.isStoreProjectConfiguration();
|
||||
myStepsBeforeLaunch = editorWrapper.getStepsBeforeLaunch();
|
||||
}
|
||||
|
||||
|
||||
+21
-14
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.SingleConfigurationConfigurable.MyValidatableComponent">
|
||||
<grid id="cae26" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="cae26" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<xy x="13" y="24" width="615" height="174"/>
|
||||
<xy x="13" y="24" width="427" height="174"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
@@ -11,7 +11,7 @@
|
||||
<grid id="cd390" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="5" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
|
||||
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
@@ -46,14 +46,14 @@
|
||||
<xy id="49cf" binding="myComponentPlace" layout-manager="XYLayout" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children/>
|
||||
</xy>
|
||||
<grid id="bb10e" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="5" bottom="0" right="0"/>
|
||||
<grid id="bb10e" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="5" bottom="3" right="0"/>
|
||||
<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"/>
|
||||
</constraints>
|
||||
@@ -71,20 +71,27 @@
|
||||
</component>
|
||||
<component id="4f1db" class="javax.swing.JTextField" binding="myNameText">
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="100" height="-1"/>
|
||||
</grid>
|
||||
</constraints>
|
||||
<properties/>
|
||||
</component>
|
||||
<component id="53321" class="javax.swing.JCheckBox" binding="myCbStoreProjectConfiguration">
|
||||
<constraints>
|
||||
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text resource-bundle="messages/ExecutionBundle" key="run.configuration.store.place.option"/>
|
||||
</properties>
|
||||
</component>
|
||||
<hspacer id="e4047">
|
||||
<constraints>
|
||||
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
</hspacer>
|
||||
</children>
|
||||
</grid>
|
||||
<component id="c89fa" class="javax.swing.JSeparator">
|
||||
<constraints>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
</form>
|
||||
|
||||
+34
-10
@@ -49,18 +49,17 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
private MyValidatableComponent myComponent;
|
||||
private final String myDisplayName;
|
||||
private final String myHelpTopic;
|
||||
private final Icon myIcon;
|
||||
private final boolean myBrokenConfiguration;
|
||||
private boolean myStoreProjectConfiguration;
|
||||
|
||||
|
||||
private SingleConfigurationConfigurable(RunnerAndConfigurationSettings settings, @Nullable Executor executor) {
|
||||
super(new ConfigurationSettingsEditorWrapper(settings), settings);
|
||||
myExecutor = executor;
|
||||
|
||||
final Config configuration = (Config)getSettings().getConfiguration();
|
||||
final Config configuration = getConfiguration();
|
||||
myDisplayName = getSettings().getName();
|
||||
myHelpTopic = "reference.dialogs.rundebug." + configuration.getType().getId();
|
||||
myIcon = configuration.getType().getIcon();
|
||||
|
||||
myBrokenConfiguration = configuration instanceof UnknownRunConfiguration;
|
||||
|
||||
@@ -87,6 +86,9 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
|
||||
public void apply() throws ConfigurationException {
|
||||
RunnerAndConfigurationSettings settings = getSettings();
|
||||
RunConfiguration runConfiguration = settings.getConfiguration();
|
||||
final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(runConfiguration.getProject());
|
||||
runManager.shareConfiguration(runConfiguration, myStoreProjectConfiguration);
|
||||
settings.setName(getNameText());
|
||||
super.apply();
|
||||
RunManagerImpl.getInstanceImpl(getConfiguration().getProject()).fireRunConfigurationChanged(settings);
|
||||
@@ -94,20 +96,24 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
|
||||
public void reset() {
|
||||
RunnerAndConfigurationSettings configuration = getSettings();
|
||||
if (configuration != null) {
|
||||
setNameText(configuration.getName());
|
||||
}
|
||||
setNameText(configuration.getName());
|
||||
super.reset();
|
||||
if (myComponent == null) {
|
||||
myComponent = new MyValidatableComponent();
|
||||
}
|
||||
myComponent.doReset(configuration);
|
||||
}
|
||||
|
||||
public final JComponent createComponent() {
|
||||
if (myComponent == null) {
|
||||
myComponent = new MyValidatableComponent();
|
||||
myComponent.myNameText.setEnabled(!myBrokenConfiguration);
|
||||
}
|
||||
myComponent.myNameText.setEnabled(!myBrokenConfiguration);
|
||||
return myComponent.getWholePanel();
|
||||
}
|
||||
|
||||
public boolean isStoreProjectConfiguration() {
|
||||
return myStoreProjectConfiguration;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private ValidationResult getValidationResult() {
|
||||
if (!myValidationResultValid) {
|
||||
myLastValidationResult = null;
|
||||
@@ -212,6 +218,8 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
private JLabel myWarningLabel;
|
||||
private JButton myFixButton;
|
||||
private JSeparator mySeparator;
|
||||
private JCheckBox myCbStoreProjectConfiguration;
|
||||
|
||||
private Runnable myQuickFix = null;
|
||||
|
||||
public MyValidatableComponent() {
|
||||
@@ -247,6 +255,21 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
settingAnchor();
|
||||
}
|
||||
|
||||
private void doReset(RunnerAndConfigurationSettings settings) {
|
||||
final RunConfiguration runConfiguration = settings.getConfiguration();
|
||||
final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(runConfiguration.getProject());
|
||||
myStoreProjectConfiguration = runManager.isConfigurationShared(settings);
|
||||
myCbStoreProjectConfiguration.setEnabled(!(runConfiguration instanceof UnknownRunConfiguration));
|
||||
myCbStoreProjectConfiguration.setSelected(myStoreProjectConfiguration);
|
||||
myCbStoreProjectConfiguration.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
myStoreProjectConfiguration = myCbStoreProjectConfiguration.isSelected();
|
||||
}
|
||||
});
|
||||
|
||||
myCbStoreProjectConfiguration.setVisible(!settings.isTemplate());
|
||||
}
|
||||
|
||||
private void settingAnchor() {
|
||||
}
|
||||
|
||||
@@ -258,6 +281,7 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
|
||||
return getEditor().getComponent();
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public ValidationResult getValidationResult() {
|
||||
return SingleConfigurationConfigurable.this.getValidationResult();
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ coverage.tab.title=Code Coverage
|
||||
show.swing.inspector=&Enable capturing form snapshots
|
||||
show.swing.inspector.disabled=&Enable capturing form snapshots (requires JRE 5.0 or higher)
|
||||
before.run.property.make=Make
|
||||
run.configuration.store.place.option=&Share configuration
|
||||
run.configuration.store.place.option=&Share
|
||||
run.configuration.default.type.description=configuration
|
||||
|
||||
#GeneralCommandLine
|
||||
|
||||
Reference in New Issue
Block a user