From 898f9e2c9dcc6dc96c4903294c5b078512d98df2 Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Fri, 12 Oct 2018 00:32:20 +0300 Subject: [PATCH] terminal: DumbAware MoveTerminalSessionToEditorAction and RenameTerminalSessionAction --- .../terminal/MoveTerminalSessionToEditorAction.kt | 3 ++- .../plugins/terminal/RenameTerminalSessionAction.kt | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/MoveTerminalSessionToEditorAction.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/MoveTerminalSessionToEditorAction.kt index ef3191b41070..edc372d4035e 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/MoveTerminalSessionToEditorAction.kt +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/MoveTerminalSessionToEditorAction.kt @@ -4,12 +4,13 @@ package org.jetbrains.plugins.terminal import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl +import com.intellij.openapi.project.DumbAware import com.intellij.openapi.wm.ToolWindow import com.intellij.ui.content.Content import com.intellij.ui.tabs.TabInfo import org.jetbrains.plugins.terminal.vfs.TerminalSessionVirtualFileImpl -class MoveTerminalSessionToEditorAction : TerminalSessionContextMenuActionBase() { +class MoveTerminalSessionToEditorAction : TerminalSessionContextMenuActionBase(), DumbAware { override fun actionPerformed(e: AnActionEvent, activeToolWindow: ToolWindow, selectedContent: Content?) { val tabInfo = TabInfo(selectedContent!!.component) .setText(selectedContent.displayName) diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/RenameTerminalSessionAction.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/RenameTerminalSessionAction.kt index 8f9d20272a17..01458d1b4134 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/RenameTerminalSessionAction.kt +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/RenameTerminalSessionAction.kt @@ -2,21 +2,15 @@ package org.jetbrains.plugins.terminal import com.intellij.openapi.actionSystem.AnActionEvent +import com.intellij.openapi.project.DumbAware import com.intellij.openapi.project.Project import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.ValidationInfo import com.intellij.openapi.wm.ToolWindow import com.intellij.ui.content.Content -import java.awt.FlowLayout -import java.awt.GridLayout import javax.swing.JComponent -import javax.swing.JLabel -import javax.swing.JPanel -import javax.swing.JTextField -import javax.swing.event.DocumentEvent -import javax.swing.event.DocumentListener -class RenameTerminalSessionAction : TerminalSessionContextMenuActionBase() { +class RenameTerminalSessionAction : TerminalSessionContextMenuActionBase(), DumbAware { override fun actionPerformed(e: AnActionEvent, activeToolWindow: ToolWindow, selectedContent: Content?) { val dialog = RenameTerminalSessionDialog(e.project!!, selectedContent!!.displayName) if (dialog.showAndGet()) {