MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-144574 Compound run configurations: change list with checkboxes to list with plus button

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2015-09-02 16:06:25 +03:00
parent df54fcec7c
commit 769857af80
1 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+35 -20
View File
@@ -303,7 +303,9 @@ class RunConfigurable extends BaseConfigurable {
myTree.requestFocusInWindow();
final RunnerAndConfigurationSettings settings = manager.getSelectedConfiguration();
if (settings != null) {
selectConfiguration(settings.getConfiguration());
if (selectConfiguration(settings.getConfiguration())) {
return;
}
}
else {
mySelectedConfigurable = null;
@@ -316,7 +318,7 @@ class RunConfigurable extends BaseConfigurable {
((DefaultTreeModel)myTree.getModel()).reload();
}
private void selectConfiguration(@NotNull RunConfiguration configuration) {
private boolean selectConfiguration(@NotNull RunConfiguration configuration) {
final Enumeration enumeration = myRoot.breadthFirstEnumeration();
while (enumeration.hasMoreElements()) {
final DefaultMutableTreeNode node = (DefaultMutableTreeNode)enumeration.nextElement();
@@ -327,10 +329,11 @@ class RunConfigurable extends BaseConfigurable {
if (Comparing.strEqual(runnerAndConfigurationSettings.getConfiguration().getType().getId(), configurationType.getId()) &&
Comparing.strEqual(runnerAndConfigurationSettings.getConfiguration().getName(), configuration.getName())) {
TreeUtil.selectInTree(node, true, myTree);
return;
return true;
}
}
}
return false;
}
private void showTemplateConfigurable(ConfigurationFactory factory) {
@@ -613,7 +616,19 @@ class RunConfigurable extends BaseConfigurable {
myAdditionalSettings.add(Pair.create(configurable, configurable.createComponent()));
}
myWholePanel = new DataContextPanel(new BorderLayout());
myWholePanel = new JPanel(new BorderLayout());
DataManager.registerDataProvider(myWholePanel, new DataProvider() {
@Nullable
@Override
public Object getData(@NonNls String dataId) {
return RunConfigurationSelector.KEY.getName().equals(dataId) ? new RunConfigurationSelector() {
@Override
public void select(@NotNull RunConfiguration configuration) {
selectConfiguration(configuration);
}
} : null;
}
});
mySplitter.setFirstComponent(createLeftPanel());
mySplitter.setSecondComponent(myRightPanel);
@@ -2078,20 +2093,20 @@ class RunConfigurable extends BaseConfigurable {
}
}
private class DataContextPanel extends JPanel implements DataProvider {
public DataContextPanel(LayoutManager layout) {
super(layout);
}
@Nullable
@Override
public Object getData(@NonNls String dataId) {
return RunConfigurationSelector.KEY.getName().equals(dataId) ? new RunConfigurationSelector() {
@Override
public void select(@NotNull RunConfiguration configuration) {
selectConfiguration(configuration);
}
} : null;
}
}
//private class DataContextPanel extends JPanel implements DataProvider {
// public DataContextPanel(LayoutManager layout) {
// super(layout);
// }
//
// @Nullable
// @Override
// public Object getData(@NonNls String dataId) {
// return RunConfigurationSelector.KEY.getName().equals(dataId) ? new RunConfigurationSelector() {
// @Override
// public void select(@NotNull RunConfiguration configuration) {
// selectConfiguration(configuration);
// }
// } : null;
// }
//}
}