From c71d8dd467d102244302eaaff12f3a99689c99ca Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Tue, 3 Dec 2024 11:37:46 +0100 Subject: [PATCH] [execution] cleanup: reuse standard copy/paste actions in EnvVariablesTable instead of creating wrappers This simplifies code and also fixes problems with unresolved references to properties from ActionsBundle (ActionsBundle.properties is located in intellij.platform.resources.en module which isn't included in the dependencies of intellij.platform.lang). GitOrigin-RevId: 6697a67c5f670a70a9bad3ea484ef1ff2020c3ab --- .../execution/util/EnvVariablesTable.java | 40 ++----------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java index c6e9f428847b..4af113e4f7a4 100644 --- a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java +++ b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java @@ -2,15 +2,12 @@ package com.intellij.execution.util; import com.intellij.execution.ExecutionBundle; -import com.intellij.icons.AllIcons; import com.intellij.ide.CopyProvider; import com.intellij.ide.PasteProvider; -import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ide.CopyPasteManager; -import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.util.text.NaturalComparator; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.table.TableView; @@ -24,8 +21,8 @@ import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.StringSelection; -import java.util.List; import java.util.*; +import java.util.List; public class EnvVariablesTable extends ListTableWithButtons { private CopyPasteProviderPanel myPanel; @@ -287,39 +284,8 @@ public class EnvVariablesTable extends ListTableWithButtons @Override protected AnAction @NotNull [] createExtraToolbarActions() { - AnAction copyButton = new DumbAwareAction(ActionsBundle.message("action.EditorCopy.text"), null, AllIcons.Actions.Copy) { - @Override - public void actionPerformed(@NotNull AnActionEvent e) { - myPanel.performCopy(e.getDataContext()); - } - - @Override - public void update(@NotNull AnActionEvent e) { - e.getPresentation().setEnabled(myPanel.isCopyEnabled(DataContext.EMPTY_CONTEXT)); - } - - @Override - public @NotNull ActionUpdateThread getActionUpdateThread() { - return ActionUpdateThread.EDT; - } - }; - AnAction pasteButton = new DumbAwareAction(ActionsBundle.message("action.EditorPaste.text"), null, AllIcons.Actions.MenuPaste) { - @Override - public void actionPerformed(@NotNull AnActionEvent e) { - myPanel.performPaste(e.getDataContext()); - } - - @Override - public void update(@NotNull AnActionEvent e) { - e.getPresentation().setEnabled(myPanel.isPasteEnabled(DataContext.EMPTY_CONTEXT)); - e.getPresentation().setVisible(myPanel.isPastePossible(DataContext.EMPTY_CONTEXT)); - } - - @Override - public @NotNull ActionUpdateThread getActionUpdateThread() { - return ActionUpdateThread.EDT; - } - }; + AnAction copyButton = ActionManager.getInstance().getAction(IdeActions.ACTION_COPY); + AnAction pasteButton = ActionManager.getInstance().getAction(IdeActions.ACTION_PASTE); return new AnAction[]{copyButton, pasteButton}; }