From cb1329b8f0bf9ac767c6ea8fcad27b43b52c7989 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Sun, 8 Nov 2020 15:13:35 +0300 Subject: [PATCH] RSV context menu fix Former-commit-id: 3a6492e494756590e3e2caceab7402e356dd3841 --- .../dbeaver/ui/controls/resultset/ResultSetViewer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index 62e41efb24..45c8dfba5f 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -2464,22 +2464,20 @@ public class ResultSetViewer extends Viewer final DBSDataContainer dataContainer = getDataContainer(); // Fill general menu - if (row != null && dataContainer != null && model.hasData()) { + if (dataContainer != null) { manager.add(ActionUtils.makeCommandContribution(site, ResultSetHandlerMain.CMD_EXPORT)); MenuManager openWithMenu = new MenuManager(ActionUtils.findCommandName(ResultSetHandlerOpenWith.CMD_OPEN_WITH)); openWithMenu.setRemoveAllWhenShown(true); openWithMenu.addMenuListener(manager1 -> ResultSetHandlerOpenWith.fillOpenWithMenu(ResultSetViewer.this, manager1)); manager.add(openWithMenu); - } - if (attr != null && row != null) { manager.add(new GroupMarker(NavigatorCommands.GROUP_TOOLS)); manager.add(new GroupMarker(MENU_GROUP_EXPORT)); } manager.add(new Separator(MENU_GROUP_ADDITIONS)); - if (dataContainer != null && model.hasData()) { + if (dataContainer != null) { manager.add(new Separator()); manager.add(ActionUtils.makeCommandContribution(site, IWorkbenchCommandConstants.FILE_REFRESH)); } -- GitLab