From 9ae9bdd3aae66f425ee50402cd1bf65dbf0b35f6 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Fri, 21 Jul 2017 01:36:35 +0300 Subject: [PATCH] Rename method --- platform/lang-api/src/com/intellij/execution/Executor.java | 4 ++-- .../execution/actions/ChooseRunConfigurationPopup.java | 6 +++--- .../execution/actions/RunConfigurationsComboBoxAction.java | 6 +++--- .../src/com/intellij/coverage/CoverageExecutor.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/Executor.java b/platform/lang-api/src/com/intellij/execution/Executor.java index 5a8eb8f26ba9..acf1ce88e6f5 100644 --- a/platform/lang-api/src/com/intellij/execution/Executor.java +++ b/platform/lang-api/src/com/intellij/execution/Executor.java @@ -89,13 +89,13 @@ public abstract class Executor { public abstract String getHelpId(); public String getStartActionText(String configurationName) { - return getStartActionText() + (StringUtil.isEmpty(configurationName) ? "" : " '" + getShortenName(configurationName) + "'"); + return getStartActionText() + (StringUtil.isEmpty(configurationName) ? "" : " '" + shortenNameIfNeed(configurationName) + "'"); } /** * Too long names don't fit into UI controls and has to be trimmed */ - public static String getShortenName(@NotNull String name) { + public static String shortenNameIfNeed(@NotNull String name) { return StringUtil.first(name, Registry.intValue("run.configuration.max.name.length", 40), true); } } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java index 0f8a8f31404e..f4fe4425abc3 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java @@ -353,7 +353,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { @Override public String getText() { - return Executor.getShortenName(getValue().getName()); + return Executor.shortenNameIfNeed(getValue().getName()); } @Override @@ -512,7 +512,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { } public String getName() { - return Executor.getShortenName(mySettings.getName()); + return Executor.shortenNameIfNeed(mySettings.getName()); } public Icon getIcon() { @@ -1071,7 +1071,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { @Override public String getText() { - return Executor.getShortenName(configuration.getName()); + return Executor.shortenNameIfNeed(configuration.getName()); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index ccc7cc0088e8..d839307c936c 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -81,7 +81,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @Nullable Project project, @NotNull Presentation presentation) { if (project != null && target != null && settings != null) { - String name = Executor.getShortenName(settings.getName()); + String name = Executor.shortenNameIfNeed(settings.getName()); if (target != DefaultExecutionTarget.INSTANCE) { name += " | " + target.getDisplayName(); } else { @@ -207,7 +207,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D disable(presentation); } else { - presentation.setText(ExecutionBundle.message("save.temporary.run.configuration.action.name", Executor.getShortenName(settings.getName()))); + presentation.setText(ExecutionBundle.message("save.temporary.run.configuration.action.name", Executor.shortenNameIfNeed(settings.getName()))); presentation.setDescription(presentation.getText()); presentation.setVisible(true); presentation.setEnabled(true); @@ -268,7 +268,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D public SelectConfigAction(final RunnerAndConfigurationSettings configuration, final Project project) { myConfiguration = configuration; myProject = project; - String name = Executor.getShortenName(configuration.getName()); + String name = Executor.shortenNameIfNeed(configuration.getName()); if (name.isEmpty()) { name = " "; } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java index 3761bee92958..bd44bd8fc73d 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java @@ -19,7 +19,7 @@ public class CoverageExecutor extends Executor { @Override public String getStartActionText(String configurationName) { - final String name = configurationName != null ? escapeMnemonicsInConfigurationName(getShortenName(configurationName)) : null; + final String name = configurationName != null ? escapeMnemonicsInConfigurationName(shortenNameIfNeed(configurationName)) : null; return "Run" + (StringUtil.isEmpty(name) ? "" : " '" + name + "'") + " with Co_verage"; }