From 5beaaf1f5c1bedacac4dd7dbc18c9ae9dda84221 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 13 Jan 2021 00:15:32 +0300 Subject: [PATCH] migrate to DataKey#is API GitOrigin-RevId: ffe2d4447882433f279754b590915e90a5cc311e --- .../typeMigration/ui/MigrationPanel.java | 7 +++---- .../openapi/command/undo/UndoTestCase.java | 4 ++-- .../documentation/DocumentationComponent.java | 2 +- .../intellij/notification/Notification.java | 2 +- .../com/intellij/ui/tabs/impl/JBTabsImpl.java | 2 +- .../actionSystem/impl/SimpleDataContext.java | 2 +- .../openapi/wm/impl/ProjectFrameHelper.java | 2 +- .../ide/bookmarks/BookmarkManagerTest.java | 2 +- .../fileEditor/NonProjectFileAccessTest.java | 4 ++-- .../impl/CodeInsightTestFixtureImpl.java | 2 +- .../items/actions/XDebuggerPinToTopAction.kt | 4 ++-- .../mvc/projectView/MvcProjectViewPane.java | 20 +++++++++---------- 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java index 0f9e8eb2f0a0..319846a7c812 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java @@ -59,8 +59,7 @@ import java.util.HashSet; import java.util.Set; public final class MigrationPanel extends JPanel implements Disposable { - @NonNls private static final String MIGRATION_USAGES = "migration.usages"; - private static final DataKey MIGRATION_USAGES_KEYS = DataKey.create(MIGRATION_USAGES); + private static final DataKey MIGRATION_USAGES_KEY = DataKey.create("migration.usages"); private final PsiElement[] myInitialRoots; private final TypeMigrationLabeler myLabeler; @@ -283,7 +282,7 @@ public final class MigrationPanel extends JPanel implements Disposable { return selectedNodes.length == 1 && selectedNodes[0].getUserObject() instanceof MigrationNode ? ((MigrationNode)selectedNodes[0].getUserObject()).getInfo().getElement() : null; } - if (MIGRATION_USAGES.equals(dataId)) { + if (MIGRATION_USAGES_KEY.is(dataId)) { DefaultMutableTreeNode[] selectedNodes = getSelectedNodes(DefaultMutableTreeNode.class, null); final Set usageInfos = new HashSet<>(); for (DefaultMutableTreeNode selectedNode : selectedNodes) { @@ -353,7 +352,7 @@ public final class MigrationPanel extends JPanel implements Disposable { } private TypeMigrationUsageInfo @Nullable [] getUsages(AnActionEvent context) { - return context.getData(MIGRATION_USAGES_KEYS); + return context.getData(MIGRATION_USAGES_KEY); } @Override diff --git a/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java b/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java index 223115f2eaf6..ed64cd503c0b 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java +++ b/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java @@ -132,8 +132,8 @@ public abstract class UndoTestCase extends JavaCodeInsightTestCase { private DataContext createDataContextFor(final Editor editor) { return dataId -> { - if (dataId.equals(CommonDataKeys.EDITOR.getName())) return editor; - if (dataId.equals(CommonDataKeys.PROJECT.getName())) return getProject(); + if (CommonDataKeys.EDITOR.is(dataId)) return editor; + if (CommonDataKeys.PROJECT.is(dataId)) return getProject(); return null; }; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java index e9ac8c79d2f0..036f5520359a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java @@ -592,7 +592,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr @Override public Object getData(@NotNull @NonNls String dataId) { - if (DocumentationManager.SELECTED_QUICK_DOC_TEXT.getName().equals(dataId)) { + if (DocumentationManager.SELECTED_QUICK_DOC_TEXT.is(dataId)) { // Javadocs often contain   symbols (non-breakable white space). We don't want to copy them as is and replace // with raw white spaces. See IDEA-86633 for more details. String selectedText = myEditorPane.getSelectedText(); diff --git a/platform/platform-api/src/com/intellij/notification/Notification.java b/platform/platform-api/src/com/intellij/notification/Notification.java index 0909028b30d7..8eb7a3f27af3 100644 --- a/platform/platform-api/src/com/intellij/notification/Notification.java +++ b/platform/platform-api/src/com/intellij/notification/Notification.java @@ -281,7 +281,7 @@ public class Notification { } public static void setDataProvider(@NotNull Notification notification, @NotNull JComponent component) { - DataManager.registerDataProvider(component, dataId -> KEY.getName().equals(dataId) ? notification : null); + DataManager.registerDataProvider(component, dataId -> KEY.is(dataId) ? notification : null); } @NotNull diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index 7ec1f795f5b5..9d95d85781be 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -2781,7 +2781,7 @@ public class JBTabsImpl extends JComponent if (value != null) return value; } - if (QuickActionProvider.KEY.getName().equals(dataId)) { + if (QuickActionProvider.KEY.is(dataId)) { return this; } if (MorePopupAware.KEY.is(dataId)) { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/SimpleDataContext.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/SimpleDataContext.java index f58a1b320c81..1d3a9896596b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/SimpleDataContext.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/SimpleDataContext.java @@ -26,7 +26,7 @@ public final class SimpleDataContext implements DataContext { public Object getData(@NotNull String dataId) { Object result = getDataFromSelfOrParent(dataId); - if (result == null && PlatformDataKeys.CONTEXT_COMPONENT.getName().equals(dataId)) { + if (result == null && PlatformDataKeys.CONTEXT_COMPONENT.is(dataId)) { result = IdeFocusManager.getGlobalInstance().getFocusOwner(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectFrameHelper.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectFrameHelper.java index 0d96dd3b32ec..7217cc9b45e0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectFrameHelper.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectFrameHelper.java @@ -344,7 +344,7 @@ public class ProjectFrameHelper implements IdeFrameEx, AccessibleContextAccessor } } - if (IdeFrame.KEY.getName().equals(dataId)) { + if (IdeFrame.KEY.is(dataId)) { return this; } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java index 49a95987222c..0b1cd74904da 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java @@ -219,7 +219,7 @@ public class BookmarkManagerTest extends AbstractEditorTest { @Override public Object getData(@NotNull String dataId) { - if (dataId.equals(OpenFileDescriptor.NAVIGATE_IN_EDITOR.getName())) { + if (OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { return getEditor(); } return super.getData(dataId); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java index e483364e69ab..216c0f9f805a 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java @@ -412,8 +412,8 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase { private DataContext createDataContextFor(final Editor editor) { return dataId -> { - if (dataId.equals(CommonDataKeys.EDITOR.getName())) return editor; - if (dataId.equals(CommonDataKeys.PROJECT.getName())) return getProject(); + if (CommonDataKeys.EDITOR.is(dataId)) return editor; + if (CommonDataKeys.PROJECT.is(dataId)) return getProject(); return null; }; } diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index d462c0abb13c..f9e8c7e0ba03 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -813,7 +813,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override public void renameElementAtCaretUsingHandler(@NotNull final String newName) { final DataContext editorContext = ((EditorEx)myEditor).getDataContext(); - final DataContext context = dataId -> PsiElementRenameHandler.DEFAULT_NAME.getName().equals(dataId) + final DataContext context = dataId -> PsiElementRenameHandler.DEFAULT_NAME.is(dataId) ? newName : editorContext.getData(dataId); final RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(context); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/pinned/items/actions/XDebuggerPinToTopAction.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/pinned/items/actions/XDebuggerPinToTopAction.kt index 2ce29e79544a..ccacbe461918 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/pinned/items/actions/XDebuggerPinToTopAction.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/pinned/items/actions/XDebuggerPinToTopAction.kt @@ -23,10 +23,10 @@ class XDebuggerPinToTopAction : XDebuggerTreeActionBase() { Presentation(), object : DataContext { override fun getData(dataId: String): Any? { - if (dataId == XDebuggerTree.XDEBUGGER_TREE_KEY.name) { + if (XDebuggerTree.XDEBUGGER_TREE_KEY.`is`(dataId)) { return node.tree } - if (dataId == CommonDataKeys.PROJECT.name) { + if (CommonDataKeys.PROJECT.`is`(dataId)) { return node.tree.project } return null diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java index a9a35074608f..cad4f215e73c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java @@ -233,43 +233,43 @@ public class MvcProjectViewPane extends AbstractProjectViewPSIPane implements Id @Override public Object getData(@NotNull String dataId) { - if (CommonDataKeys.PSI_ELEMENT.getName().equals(dataId)) { + if (CommonDataKeys.PSI_ELEMENT.is(dataId)) { final PsiElement[] elements = getSelectedPSIElements(); return elements.length == 1 ? elements[0] : null; } - if (LangDataKeys.PSI_ELEMENT_ARRAY.getName().equals(dataId)) { + if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) { return getSelectedPSIElements(); } - if (LangDataKeys.MODULE_CONTEXT.getName().equals(dataId)) { + if (LangDataKeys.MODULE_CONTEXT.is(dataId)) { final Object element = getSelectedElement(); if (element instanceof Module) { return element; } return null; } - if (LangDataKeys.MODULE_CONTEXT_ARRAY.getName().equals(dataId)) { + if (LangDataKeys.MODULE_CONTEXT_ARRAY.is(dataId)) { final List moduleList = ContainerUtil.findAll(getSelectedElements(), Module.class); if (!moduleList.isEmpty()) { return moduleList.toArray(Module.EMPTY_ARRAY); } return null; } - if (dataId.equals(LangDataKeys.IDE_VIEW.getName())) { + if (LangDataKeys.IDE_VIEW.is(dataId)) { return this; } - if (dataId.equals(PlatformDataKeys.HELP_ID.getName())) { + if (PlatformDataKeys.HELP_ID.is(dataId)) { return "reference.toolwindows." + StringUtil.toLowerCase(myId); } - if (PlatformDataKeys.CUT_PROVIDER.getName().equals(dataId)) { + if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) { return myCopyPasteDelegator.getCutProvider(); } - if (PlatformDataKeys.COPY_PROVIDER.getName().equals(dataId)) { + if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) { return myCopyPasteDelegator.getCopyProvider(); } - if (PlatformDataKeys.PASTE_PROVIDER.getName().equals(dataId)) { + if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) { return myCopyPasteDelegator.getPasteProvider(); } - if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.getName().equals(dataId)) { + if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) { for (final Object element : getSelectedElements()) { if (element instanceof Module) { return myDeleteModuleProvider;