From dc110b376aa3d6117f4b8a76899d7593469baee3 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 12 May 2017 13:34:33 +0200 Subject: [PATCH] =?UTF-8?q?rename=20to=20configurationBeans=20to=20make=20?= =?UTF-8?q?code=20more=20clear=20=E2=80=94=20it=20is=20not=20`stable`,=20a?= =?UTF-8?q?ctually=20it=20contains=20temporary=20rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intellij/execution/impl/RunConfigurable.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index 9eecd697ec32..16d8f99e6602 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -689,7 +689,7 @@ class RunConfigurable extends BaseConfigurable { private void applyByType(@NotNull DefaultMutableTreeNode typeNode, @NotNull ConfigurationType type, @Nullable RunnerAndConfigurationSettings selectedSettings, @NotNull Set toDeleteSettings) throws ConfigurationException { int indexToMove = -1; - final List stableConfigurations = new ArrayList<>(); + final List configurationBeans = new ArrayList<>(); final Set names = new THashSet<>(); List 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)); } }