From 3e991eb8b217f95c6a024d2425abeb99a376310b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 18 Feb 2014 12:48:52 +0100
Subject: [PATCH] deprecate addCurrentToHistory, cleanup

---
 .../console/ConsoleExecuteAction.java         |  2 +-
 .../console/LanguageConsoleImpl.java          | 13 ++++++++++++
 .../actions/ToggleToolbarLayoutAction.java    | 20 ++++++++++---------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
index 9e2bcdd9a1a1..8215d497d36c 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
@@ -135,7 +135,7 @@ public class ConsoleExecuteAction extends DumbAwareAction {
     console.getCurrentEditor().getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset());
 
     if (addCurrentToHistory) {
-      console.addCurrentToHistory(range, false, preserveMarkup);
+      console.addCurrentToHistory(range, preserveMarkup);
     }
 
     if (clear) {
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index fed2716b32b1..dabce1b982e5 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -419,10 +419,23 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
     markupModel.addRangeHighlighter(offset, offset + text.length(), HighlighterLayer.SYNTAX, attributes, HighlighterTargetArea.EXACT_RANGE);
   }
 
+  @SuppressWarnings("UnusedDeclaration")
+  @Deprecated
+  /**
+   * @deprecated Use {@link LanguageConsoleBuilder},
+   * {@link LanguageConsoleBuilder#registerExecuteAction)} or
+   * {@link ConsoleExecuteAction#prepareRunExecuteAction)}
+   *
+   * to remove in IDEA 15
+   */
   public String addCurrentToHistory(@NotNull TextRange textRange, boolean erase, boolean preserveMarkup) {
     return addToHistoryInner(textRange, myConsoleEditor, erase, preserveMarkup);
   }
 
+  String addCurrentToHistory(@NotNull TextRange textRange, boolean preserveMarkup) {
+    return addToHistoryInner(textRange, myConsoleEditor, false, preserveMarkup);
+  }
+
   public String addToHistory(@NotNull TextRange textRange, @NotNull EditorEx editor, boolean preserveMarkup) {
     return addToHistoryInner(textRange, editor, false, preserveMarkup);
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/ToggleToolbarLayoutAction.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/ToggleToolbarLayoutAction.java
index c9ccade706fb..98e7d535c693 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/ToggleToolbarLayoutAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/ToggleToolbarLayoutAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,33 +19,35 @@ package com.intellij.execution.ui.layout.actions;
 import com.intellij.execution.ui.layout.impl.RunnerContentUi;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ToggleToolbarLayoutAction extends ToggleAction {
-
   @Override
   public void update(final AnActionEvent e) {
     if (getRunnerUi(e) == null) {
       e.getPresentation().setEnabled(false);
-    } else {
+    }
+    else {
       super.update(e);
     }
   }
 
   @Override
-  public boolean isSelected(final AnActionEvent e) {
-    final RunnerContentUi ui = getRunnerUi(e);
+  public boolean isSelected(@NotNull AnActionEvent e) {
+    RunnerContentUi ui = getRunnerUi(e);
     return ui != null && ui.isHorizontalToolbar();
   }
 
   @Override
-  public void setSelected(final AnActionEvent e, final boolean state) {
-    getRunnerUi(e).setHorizontalToolbar(state);
+  public void setSelected(@NotNull AnActionEvent e, boolean state) {
+    RunnerContentUi ui = getRunnerUi(e);
+    assert ui != null;
+    ui.setHorizontalToolbar(state);
   }
 
   @Nullable
-  public static RunnerContentUi getRunnerUi(final AnActionEvent e) {
+  public static RunnerContentUi getRunnerUi(@NotNull AnActionEvent e) {
     return RunnerContentUi.KEY.getData(e.getDataContext());
   }
-
 }