From 60960bbfae6506fd1b96749d32c7ddf1286e5446 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 20 Dec 2017 22:22:19 +0300
Subject: [PATCH] Filters menu shortcut fix

Former-commit-id: c469ee64d897eee3ecfc25eddec8d439450db9d2
---
 .../dbeaver/ui/controls/resultset/ResultSetViewer.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
index 5ed39a6f14..076cf810d0 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
@@ -1678,15 +1678,11 @@ public class ResultSetViewer extends Viewer
             // Filters and View
             manager.add(new Separator());
             {
-                String filtersShortcut = ActionUtils.findCommandDescription(ResultSetCommandHandler.CMD_FILTER_MENU, getSite(), true);
-                String menuName = CoreMessages.controls_resultset_viewer_action_order_filter;
-                if (!CommonUtils.isEmpty(filtersShortcut)) {
-                    menuName += " (" + filtersShortcut + ")";
-                }
                 MenuManager filtersMenu = new MenuManager(
-                    menuName,
+                    CoreMessages.controls_resultset_viewer_action_order_filter,
                     DBeaverIcons.getImageDescriptor(UIIcon.FILTER),
                     "filters"); //$NON-NLS-1$
+                filtersMenu.setActionDefinitionId(ResultSetCommandHandler.CMD_FILTER_MENU);
                 filtersMenu.setRemoveAllWhenShown(true);
                 filtersMenu.addMenuListener(manager1 -> fillFiltersMenu(attr, manager1));
                 manager.add(filtersMenu);
-- 
GitLab