From cd93dd0bf906dd0a84739deb89aeefe8dd59e0e3 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 25 Apr 2021 19:34:59 +0300
Subject: [PATCH] Tools menu contributor fix

---
 .../dbeaver/tasks/ui/DataSourceToolsContributor.java      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/DataSourceToolsContributor.java b/plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/DataSourceToolsContributor.java
index bf81dd3e29..e7cd7dd11a 100644
--- a/plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/DataSourceToolsContributor.java
+++ b/plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/DataSourceToolsContributor.java
@@ -40,9 +40,7 @@ import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.actions.EmptyListAction;
 import org.jkiss.dbeaver.ui.actions.datasource.DataSourceMenuContributor;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;
-import org.jkiss.dbeaver.ui.navigator.INavigatorModelView;
 import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
-import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -63,8 +61,7 @@ public class DataSourceToolsContributor extends DataSourceMenuContributor
             return;
         }
         DBSObject selectedObject = null;
-        INavigatorModelView navigatorModelView = GeneralUtils.adapt(activePart, INavigatorModelView.class);
-        if (navigatorModelView != null) {
+        {
             final ISelectionProvider selectionProvider = activePart.getSite().getSelectionProvider();
             if (selectionProvider != null) {
                 ISelection selection = selectionProvider.getSelection();
@@ -75,7 +72,8 @@ public class DataSourceToolsContributor extends DataSourceMenuContributor
                     fillToolsMenu(menuItems, tools, selection);
                 }
             }
-        } else if (activePart instanceof IEditorPart) {
+        }
+        if (activePart instanceof IEditorPart) {
             IEditorInput editorInput = ((IEditorPart) activePart).getEditorInput();
             if (editorInput instanceof IDatabaseEditorInput) {
                 selectedObject = ((IDatabaseEditorInput) editorInput).getDatabaseObject();
-- 
GitLab