From b89822ace42170f8297ec4b6d397cfe56474eb72 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sat, 24 Apr 2021 14:15:03 +0300
Subject: [PATCH] #12061 Menu contributions refactoring and cleanup

---
 plugins/org.jkiss.dbeaver.core/plugin.xml     | 65 +++++--------------
 plugins/org.jkiss.dbeaver.debug.ui/plugin.xml |  4 +-
 .../plugin.xml                                |  4 +-
 .../org.jkiss.dbeaver.team.git.ui/plugin.xml  | 41 +++---------
 .../org.jkiss.dbeaver.ui.dashboard/plugin.xml |  4 +-
 .../plugin.xml                                |  6 +-
 6 files changed, 30 insertions(+), 94 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index 4c7ad7070d..bdc38927ad 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -197,9 +197,7 @@
             </with>
         </definition>
         <definition id="org.jkiss.dbeaver.core.ui.toolbar.general.visible">
-            <with variable="activeWorkbenchWindow.activePerspective">
-                <reference definitionId="DBeaverPerspectiveActive"/>
-            </with>
+            <reference definitionId="DBeaverPerspectiveActive"/>
         </definition>
         <definition id="org.jkiss.dbeaver.core.ui.editor.transactional">
             <with variable="activeEditor">
@@ -490,11 +488,7 @@
         <!-- Database menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?before=window">
             <menu id="dataSourceMenu" label="%menu.database">
-                <visibleWhen>
-                    <with variable="activeWorkbenchWindow.activePerspective">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </with>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
 
                 <separator name="driverGroup" visible="true"/>
                 <command commandId="org.jkiss.dbeaver.core.new.connection"/>
@@ -587,46 +581,11 @@
             </toolbar>
 
             <toolbar id="dbeaver-edit" label="%toolbar.dbeaver-edit.label">
-                <command commandId="org.eclipse.ui.file.save">
-                    <visibleWhen>
-                        <and>
-                            <test property="org.jkiss.dbeaver.core.ui.toolbarVisible" value="dbeaver-edit"/>
-                            <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-                        </and>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.eclipse.ui.file.revert" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/file/reset.png">
-                    <visibleWhen>
-                        <and>
-                            <test property="org.jkiss.dbeaver.core.ui.toolbarVisible" value="dbeaver-edit"/>
-                            <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-                        </and>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.eclipse.ui.edit.undo">
-                    <visibleWhen>
-                        <and>
-                            <test property="org.jkiss.dbeaver.core.ui.toolbarVisible" value="dbeaver-edit"/>
-                            <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-                        </and>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.eclipse.ui.edit.redo">
-                    <visibleWhen>
-                        <and>
-                            <test property="org.jkiss.dbeaver.core.ui.toolbarVisible" value="dbeaver-edit"/>
-                            <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-                        </and>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.eclipse.ui.file.refresh">
-                    <visibleWhen>
-                        <and>
-                            <test property="org.jkiss.dbeaver.core.ui.toolbarVisible" value="dbeaver-edit"/>
-                            <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-                        </and>
-                    </visibleWhen>
-                </command>
+                <command commandId="org.eclipse.ui.file.save"/>
+                <command commandId="org.eclipse.ui.file.revert" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/file/reset.png"/>
+                <command commandId="org.eclipse.ui.edit.undo"/>
+                <command commandId="org.eclipse.ui.edit.redo"/>
+                <command commandId="org.eclipse.ui.file.refresh"/>
             </toolbar>
 
             <toolbar id="dbeaver-connection-selector" label="%toolbar.dbeaver-datasource-selector.label">
@@ -1225,4 +1184,14 @@
         </perspective>
     </extension>
 
+    <extension point="org.eclipse.ui.perspectiveExtensions">
+        <perspectiveExtension targetID="org.jkiss.dbeaver.core.perspective">
+            <hiddenToolBarItem id="org.eclipse.ui.file.save"/>
+            <hiddenToolBarItem id="org.eclipse.ui.file.revert"/>
+            <hiddenToolBarItem id="org.eclipse.ui.file.undo"/>
+            <hiddenToolBarItem id="org.eclipse.ui.file.redo"/>
+            <hiddenToolBarItem id="org.eclipse.ui.file.refresh"/>
+        </perspectiveExtension>
+    </extension>
+
 </plugin>
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
index d0cb07dbf2..76ba7fb0fa 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
@@ -126,9 +126,7 @@
             <command commandId="org.jkiss.dbeaver.debug.ui.command.debugConfigurationMenu" id="org.jkiss.dbeaver.debug.ui.menu.pulldown"
                      label="%commands.command.debugConfigurations.name"
                      tooltip="%commands.command.debugConfigurations.description" style="pulldown">
-                <visibleWhen>
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
         </menuContribution>
 
diff --git a/plugins/org.jkiss.dbeaver.tasks.ui.view/plugin.xml b/plugins/org.jkiss.dbeaver.tasks.ui.view/plugin.xml
index 76f3138722..28c4242b2a 100644
--- a/plugins/org.jkiss.dbeaver.tasks.ui.view/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.tasks.ui.view/plugin.xml
@@ -143,9 +143,7 @@
             <command commandId="org.eclipse.ui.views.showView" icon="icons/task_list.png" label="%view.tasks.title" style="pulldown" id="org.jkiss.dbeaver.menu.tasks">
                 <parameter name="org.eclipse.ui.views.showView.viewId" value="org.jkiss.dbeaver.tasks"/>
 
-                <visibleWhen checkEnabled="true">
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
         </menuContribution>
 
diff --git a/plugins/org.jkiss.dbeaver.team.git.ui/plugin.xml b/plugins/org.jkiss.dbeaver.team.git.ui/plugin.xml
index b9e17c23f9..655140652c 100644
--- a/plugins/org.jkiss.dbeaver.team.git.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.team.git.ui/plugin.xml
@@ -61,27 +61,12 @@
         <menuContribution locationURI="menu:file?before=properties">
             <separator name="git" visible="true"/>
             <menu id="org.jkiss.dbeaver.team.git.menu" label="Git" mnemonic="M">
-                <command commandId="org.jkiss.dbeaver.git.commands.update" mnemonic="L">
-                    <visibleWhen checkEnabled="true">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.git.commands.commit" mnemonic="C">
-                    <visibleWhen checkEnabled="true">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </visibleWhen>
-                </command>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                <command commandId="org.jkiss.dbeaver.git.commands.update" mnemonic="L"/>
+                <command commandId="org.jkiss.dbeaver.git.commands.commit" mnemonic="C"/>
                 <separator name="projects" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.git.commands.share" mnemonic="G">
-                    <visibleWhen checkEnabled="true">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.git.commands.projectFromGit" mnemonic="G">
-                    <visibleWhen checkEnabled="true">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </visibleWhen>
-                </command>
+                <command commandId="org.jkiss.dbeaver.git.commands.share" mnemonic="G"/>
+                <command commandId="org.jkiss.dbeaver.git.commands.projectFromGit" mnemonic="G"/>
                 <separator name="view" visible="true"/>
                 <command commandId="org.jkiss.dbeaver.core.view.toggle" style="toggle"><parameter name="viewId" value="org.eclipse.egit.ui.RepositoriesView"/></command>
             </menu>
@@ -89,20 +74,14 @@
 
         <menuContribution locationURI="menu:org.jkiss.dbeaver.menu.git">
             <command commandId="org.jkiss.dbeaver.git.commands.update" mnemonic="L">
-                <visibleWhen checkEnabled="true">
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
             <command commandId="org.jkiss.dbeaver.git.commands.commit" mnemonic="C">
-                <visibleWhen checkEnabled="true">
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
             <separator name="share" visible="true"/>
             <command commandId="org.jkiss.dbeaver.git.commands.share" mnemonic="G">
-                <visibleWhen checkEnabled="true">
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
             <separator name="view" visible="true"/>
             <command commandId="org.jkiss.dbeaver.core.view.toggle" style="toggle"><parameter name="viewId" value="org.eclipse.egit.ui.RepositoriesView"/></command>
@@ -111,9 +90,7 @@
         <menuContribution allPopups="false" locationURI="toolbar:dbeaver-tools?after=additions">
             <separator name="git" visible="false"/>
             <command commandId="org.jkiss.dbeaver.git.commands.showHistory" icon="icons/clone.png" label="Git" style="pulldown" id="org.jkiss.dbeaver.menu.git">
-                <visibleWhen>
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
         </menuContribution>
 
diff --git a/plugins/org.jkiss.dbeaver.ui.dashboard/plugin.xml b/plugins/org.jkiss.dbeaver.ui.dashboard/plugin.xml
index 60be1a267f..0e48db2109 100644
--- a/plugins/org.jkiss.dbeaver.ui.dashboard/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.dashboard/plugin.xml
@@ -67,9 +67,7 @@
         <menuContribution allPopups="false" locationURI="toolbar:dbeaver-tools?after=additions">
             <separator name="dashboard" visible="true"/>
             <command commandId="org.jkiss.dbeaver.ui.dashboard.open">
-                <visibleWhen>
-                    <reference definitionId="DBeaverPerspectiveActive"/>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
             </command>
         </menuContribution>
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
index 3336ea5f79..15dced0f2b 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
@@ -738,11 +738,7 @@
         <!-- SQL editor menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="SQLEditorMenu" label="%menu.sqleditor">
-                <visibleWhen>
-                    <with variable="activeWorkbenchWindow.activePerspective">
-                        <reference definitionId="DBeaverPerspectiveActive"/>
-                    </with>
-                </visibleWhen>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
 
                 <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
                 <command commandId="org.jkiss.dbeaver.core.sql.editor.recent"/>
-- 
GitLab