From ea9bcc53d7f850a09aa1e842745f83db10b1e95b Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Mon, 3 Dec 2012 19:14:39 +0400 Subject: [PATCH] IDEA-93516 Bookmarks dialog: Usability Problems --- .../bookmarks/actions/EditBookmarkDescriptionAction.java | 5 +++-- .../ide/bookmarks/actions/MoveBookmarkDownAction.java | 2 +- .../ide/bookmarks/actions/MoveBookmarkUpAction.java | 2 +- .../src/com/intellij/ui/popup/util/DetailController.java | 7 ++++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java index 086ad5fc70c6..5e1e97d45f37 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java @@ -62,8 +62,9 @@ class EditBookmarkDescriptionAction extends DumbAwareAction { return true; } }); - - BookmarkManager.getInstance(myProject).setDescription(b, description); + if (description != null) { + BookmarkManager.getInstance(myProject).setDescription(b, description); + } myPopup.setUiVisible(true); final JComponent content = myPopup.getContent(); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java index 4c02f20b2931..df4beb9872fa 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java @@ -35,7 +35,7 @@ class MoveBookmarkDownAction extends DumbAwareAction { super("Down", "Move current bookmark down", AllIcons.Actions.NextOccurence); myProject = project; myList = list; - registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta DOWN" : "control DOWN")), list); + registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta DOWN" : "alt DOWN")), list); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java index f9079e82aafb..912233a86f50 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java @@ -34,7 +34,7 @@ class MoveBookmarkUpAction extends DumbAwareAction { super("Up", "Move current bookmark up", AllIcons.Actions.PreviousOccurence); myProject = project; myList = list; - registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta UP" : "control UP")), list); + registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta UP" : "alt UP")), list); } @Override diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/DetailController.java b/platform/lang-impl/src/com/intellij/ui/popup/util/DetailController.java index de7e6c22aa1a..6c3841a52100 100644 --- a/platform/lang-impl/src/com/intellij/ui/popup/util/DetailController.java +++ b/platform/lang-impl/src/com/intellij/ui/popup/util/DetailController.java @@ -81,7 +81,12 @@ public class DetailController implements TreeSelectionListener, ListSelectionLis } public void selectionChanged() { - doUpdateDetailView(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + doUpdateDetailView(); + } + }); } public void setTree(final JTree tree) {