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

rename to configurationBeans to make code more clear — it is not stable, actually it contains temporary rc

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-05-12 15:55:56 +02:00
parent dd0064b600
commit dc110b376a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+7 -6
View File
@@ -689,7 +689,7 @@ class RunConfigurable extends BaseConfigurable {
private void applyByType(@NotNull DefaultMutableTreeNode typeNode, @NotNull ConfigurationType type, @Nullable RunnerAndConfigurationSettings selectedSettings, @NotNull Set<RunnerAndConfigurationSettings> toDeleteSettings) throws ConfigurationException {
int indexToMove = -1;
final List<RunConfigurationBean> stableConfigurations = new ArrayList<>();
final List<RunConfigurationBean> configurationBeans = new ArrayList<>();
final Set<String> names = new THashSet<>();
List<DefaultMutableTreeNode> configurationNodes = new ArrayList<>();
collectNodesRecursively(typeNode, configurationNodes, CONFIGURATION, TEMPORARY_CONFIGURATION);
@@ -706,8 +706,8 @@ class RunConfigurable extends BaseConfigurable {
else if (userObject instanceof RunnerAndConfigurationSettingsImpl) {
settings = (RunnerAndConfigurationSettings)userObject;
configurationBean = new RunConfigurationBean(settings, settings.isShared());
}
if (configurationBean != null) {
final SingleConfigurationConfigurable configurable = configurationBean.getConfigurable();
final String nameText = configurable != null ? configurable.getNameText() : configurationBean.getSettings().getName();
@@ -715,9 +715,9 @@ class RunConfigurable extends BaseConfigurable {
TreeUtil.selectNode(myTree, node);
throw new ConfigurationException(type.getDisplayName() + " with name \'" + nameText + "\' already exists");
}
stableConfigurations.add(configurationBean);
configurationBeans.add(configurationBean);
if (settings == selectedSettings) {
indexToMove = stableConfigurations.size()-1;
indexToMove = configurationBeans.size()-1;
}
}
}
@@ -735,8 +735,9 @@ class RunConfigurable extends BaseConfigurable {
throw new ConfigurationException("Folders name \'" + folderName + "\' is duplicated");
}
}
// try to apply all
for (RunConfigurationBean bean : stableConfigurations) {
for (RunConfigurationBean bean : configurationBeans) {
applyConfiguration(typeNode, bean.getConfigurable());
toDeleteSettings.remove(bean.getSettings());
}
@@ -747,7 +748,7 @@ class RunConfigurable extends BaseConfigurable {
shift = adjustOrder();
}
if (shift != 0 && indexToMove != -1) {
stableConfigurations.add(indexToMove-shift, stableConfigurations.remove(indexToMove));
configurationBeans.add(indexToMove-shift, configurationBeans.remove(indexToMove));
}
}