MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant open terminal action - there is Terminal Tool Window now.

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-08-03 20:43:36 +02:00
parent 38cb84d7c0
commit 3c49308506
4 changed files with 8 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/resources/META-INF/terminal.xml
-8
View File
@@ -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"/>
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+6
View File
@@ -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());
plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
-53
View File
@@ -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);
}
}
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
+2 -2
View File
@@ -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);
}