From 4416d9e600e74de2ba2c57fddde3ca6da835c99a Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 14 Nov 2012 15:46:03 +0400 Subject: [PATCH] IDEA-93641 Favorites: "Edit" is always disabled (Edit -> Edit Note) (correction) --- .../FavoritesTreeViewPanel.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index 14836b7836b8..1eaed31682ad 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -260,14 +260,9 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { public ShortcutSet getShortcut() { return CustomShortcutSet.fromString("DELETE", "BACK_SPACE"); } - }).addExtraAction(new AnActionButton("Edit", AllIcons.Actions.Edit) { + }).setEditAction(new AnActionButtonRunnable() { @Override - public ShortcutSet getShortcut() { - return CommonShortcuts.getRename(); - } - - @Override - public void actionPerformed(AnActionEvent e) { + public void run(AnActionButton button) { final List nodes = getSelectedListsNodes(); if (nodes.size() == 1) { final FavoritesListProvider.Operation customEdit = myFavoritesManager.getCustomEdit(nodes.get(0).getName()); @@ -276,20 +271,22 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { } } } - + }).setEditActionUpdater(new AnActionButtonUpdater() { @Override - public boolean isEnabled() { + public boolean isEnabled(AnActionEvent e) { final List nodes = getSelectedListsNodes(); if (nodes.size() == 1) { final FavoritesListProvider.Operation customEdit = myFavoritesManager.getCustomEdit(nodes.get(0).getName()); if (customEdit != null && customEdit.willHandle(myTree)) { + e.getPresentation().setText(customEdit.getCustomName()); return true; } } return false; } - }).addExtraAction(new AnActionButton(exportToTextFileAction.getTemplatePresentation().getText(), - exportToTextFileAction.getTemplatePresentation().getIcon()) { + }) + .addExtraAction(new AnActionButton(exportToTextFileAction.getTemplatePresentation().getText(), + exportToTextFileAction.getTemplatePresentation().getIcon()) { @Override public void actionPerformed(AnActionEvent e) { exportToTextFileAction.actionPerformed(e);