Use children of 'Choose run configuration' popup and Run action group in the

same way

+ adjust run Choose run configuration popup title
This commit is contained in:
Alexander Zolotov
2017-02-14 21:44:45 +03:00
parent 3ae454222f
commit f7c2d3b4b0
2 changed files with 10 additions and 5 deletions
@@ -70,9 +70,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup {
for (final ConfigurationFromContext fromContext : producers) {
final ConfigurationType configurationType = fromContext.getConfigurationType();
final RunConfiguration configuration = fromContext.getConfiguration();
final String actionName = configuration instanceof LocatableConfiguration
? StringUtil.unquoteString(suggestRunActionName((LocatableConfiguration)configuration))
: configurationType.getDisplayName();
final String actionName = childActionName(configurationType, configuration);
final AnAction anAction = new AnAction(actionName, configurationType.getDisplayName(), configuration.getIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
@@ -140,7 +138,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup {
@Override
@NotNull
public String getTextFor(final ConfigurationFromContext producer) {
return StringUtil.notNullize(producer.getConfiguration().getName(), producer.getConfigurationType().getDisplayName());
return childActionName(producer.getConfigurationType(), producer.getConfiguration());
}
@Override
@@ -220,6 +218,13 @@ public abstract class BaseRunConfigurationAction extends ActionGroup {
return ProgramRunnerUtil.shortenName(configuration.getName(), 0);
}
@NotNull
private static String childActionName(ConfigurationType configurationType, RunConfiguration configuration) {
return configuration instanceof LocatableConfiguration
? StringUtil.unquoteString(suggestRunActionName((LocatableConfiguration)configuration))
: configurationType.getDisplayName();
}
protected abstract void updatePresentation(Presentation presentation, @NotNull String actionText, ConfigurationContext context);
}
@@ -332,7 +332,7 @@ environment.variables.system.dialog.title=System Environment
environment.variables.component.title=&Environment variables
down.the.stack.trace=Down the stack trace
up.the.stack.trace=Up the stack trace
configuration.action.chooser.title=Choose configuration type to run
configuration.action.chooser.title=Choose configuration to run
env.vars.checkbox.title=&Include parent environment variables
env.vars.show.system=Show