new RunContentDescriptor(myConsoleView, myProcessHandler, panel, constructConsoleTitle(myConsoleTitle));
// tool bar actions
- final AnAction[] actions = fillToolBarActions(toolbarActions, defaultExecutor, contentDescriptor);
+ final List<AnAction> actions = fillToolBarActions(toolbarActions, defaultExecutor, contentDescriptor);
registerActionShortcuts(actions, getLanguageConsole().getConsoleEditor().getComponent());
registerActionShortcuts(actions, panel);
panel.updateUI();
protected abstract OSProcessHandler createProcessHandler(final Process process, final String commandLine);
- public static void registerActionShortcuts(final AnAction[] actions, final JComponent component) {
+ public static void registerActionShortcuts(final List<AnAction> actions, final JComponent component) {
for (AnAction action : actions) {
if (action.getShortcutSet() != null) {
action.registerCustomShortcutSet(action.getShortcutSet(), component);
}
}
- protected AnAction[] fillToolBarActions(final DefaultActionGroup toolbarActions,
- final Executor defaultExecutor,
- final RunContentDescriptor contentDescriptor) {
+ protected List<AnAction> fillToolBarActions(final DefaultActionGroup toolbarActions,
+ final Executor defaultExecutor,
+ final RunContentDescriptor contentDescriptor) {
List<AnAction> actionList = Lists.newArrayList();
// Help
actionList.add(CommonActionsManager.getInstance().createHelpAction("interactive_console"));
- AnAction[] actions = actionList.toArray(new AnAction[actionList.size()]);
+ toolbarActions.addAll(actionList);
- toolbarActions.addAll(actions);
-
- return actions;
+ return actionList;
}
protected AnAction createCloseAction(final Executor defaultExecutor, final RunContentDescriptor myDescriptor) {
}
public static AnAction createConsoleExecAction(final LanguageConsoleImpl languageConsole,
- final ProcessHandler processHandler,
- final ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+ final ProcessHandler processHandler,
+ final ConsoleExecuteActionHandler consoleExecuteActionHandler) {
return new ConsoleExecuteAction(languageConsole, processHandler, consoleExecuteActionHandler);
}