From 3c49308506f53fd8ea74a0a03551eb88aa53e893 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Sun, 3 Aug 2014 20:43:36 +0200
Subject: [PATCH] Remove redundant open terminal action - there is Terminal
 Tool Window now.

---
 .../terminal/resources/META-INF/terminal.xml  |  8 ---
 .../terminal/LocalTerminalDirectRunner.java   |  6 +++
 .../terminal/OpenLocalTerminalAction.java     | 53 -------------------
 .../plugins/terminal/TerminalView.java        |  4 +-
 4 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java

diff --git a/plugins/terminal/resources/META-INF/terminal.xml b/plugins/terminal/resources/META-INF/terminal.xml
index 11a18e18d81f..e85297f2b715 100644
--- a/plugins/terminal/resources/META-INF/terminal.xml
+++ b/plugins/terminal/resources/META-INF/terminal.xml
@@ -1,12 +1,4 @@
 <idea-plugin version="2">
-  <actions>
-    <action id="org.jetbrains.plugins.terminal.OpenLocalTerminalAction"
-            class="org.jetbrains.plugins.terminal.OpenLocalTerminalAction"
-            text="Open Terminal..." description="Open terminal locally">
-      <add-to-group group-id="ToolsMenu" anchor="last"/>
-    </action>
-  </actions>
-
   <extensions defaultExtensionNs="com.intellij">
     <toolWindow id="Terminal" anchor="bottom" icon="TerminalIcons.OpenTerminal_13x13"
                 factoryClass="org.jetbrains.plugins.terminal.TerminalToolWindowFactory" secondary="false"/>
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 65d2f38756a0..f67f84412a02 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -16,6 +16,7 @@ import com.jediterm.pty.PtyProcessTtyConnector;
 import com.jediterm.terminal.TtyConnector;
 import com.pty4j.PtyProcess;
 import com.pty4j.util.PtyUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -63,6 +64,11 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     return null;
   }
 
+  @NotNull
+  public static LocalTerminalDirectRunner createTerminalRunner(Project project) {
+    return new LocalTerminalDirectRunner(project);
+  }
+
   @Override
   protected PtyProcess createProcess(@Nullable String directory) throws ExecutionException {
     Map<String, String> envs = new HashMap<String, String>(System.getenv());
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
deleted file mode 100644
index 4d93dd9fc46e..000000000000
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jetbrains.plugins.terminal;
-
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.openapi.wm.ToolWindowManager;
-import icons.TerminalIcons;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author traff
- */
-public class OpenLocalTerminalAction extends AnAction implements DumbAware {
-  public OpenLocalTerminalAction() {
-    super("Open Terminal...", null, TerminalIcons.OpenTerminal);
-  }
-
-  @Override
-  public void update(final AnActionEvent e) {
-    e.getPresentation().setVisible(true);
-    e.getPresentation().setEnabled(true);
-  }
-
-  public void actionPerformed(final AnActionEvent e) {
-    runLocalTerminal(e);
-  }
-
-  public void runLocalTerminal(AnActionEvent event) {
-    final Project project = event.getData(CommonDataKeys.PROJECT);
-    runLocalTerminal(project);
-  }
-
-  public static void runLocalTerminal(final Project project) {
-    ToolWindow terminal = ToolWindowManager.getInstance(project).getToolWindow("Terminal");
-    if (terminal.isActive()) {
-      TerminalView.getInstance(project).openLocalSession(project, terminal);
-    }
-    terminal.activate(new Runnable() {
-      @Override
-      public void run() {
-
-      }
-    }, true);
-  }
-
-  @NotNull
-  public static LocalTerminalDirectRunner createTerminalRunner(Project project) {
-    return new LocalTerminalDirectRunner(project);
-  }
-}
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
index 14b992a7c143..5ed9d65ce321 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
@@ -54,7 +54,7 @@ public class TerminalView {
 
 
   public void initTerminal(final ToolWindow toolWindow) {
-    LocalTerminalDirectRunner terminalRunner = OpenLocalTerminalAction.createTerminalRunner(myProject);
+    LocalTerminalDirectRunner terminalRunner = LocalTerminalDirectRunner.createTerminalRunner(myProject);
 
     toolWindow.setToHideOnEmptyContent(true);
 
@@ -162,7 +162,7 @@ public class TerminalView {
   }
 
   public void openLocalSession(Project project, ToolWindow terminal) {
-    LocalTerminalDirectRunner terminalRunner = OpenLocalTerminalAction.createTerminalRunner(project);
+    LocalTerminalDirectRunner terminalRunner = LocalTerminalDirectRunner.createTerminalRunner(project);
     openSession(terminal, terminalRunner);
   }