From ad650d188d05baff8a007499977cfb43097c76db Mon Sep 17 00:00:00 2001
From: Evgeny Fradkin <Eugene.Fradkin@gmail.com>
Date: Tue, 27 Mar 2018 19:32:44 +0300
Subject: [PATCH] #3219 Move the Mock Data menu item back to the Tools menu.

---
 plugins/org.jkiss.dbeaver.core/plugin.xml     |  2 --
 .../org.jkiss.dbeaver.ext.mockdata/plugin.xml | 25 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index bcfec47aba..793885efa1 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -2150,8 +2150,6 @@
                 <visibleWhen checkEnabled="true"/>
             </command>
 
-            <separator name="generate" visible="false"/>
-
             <menu label="%menu.database.sql.generate" icon="icons/misc/sql.png">
                 <visibleWhen>
                     <with variable="activePart">
diff --git a/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml b/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml
index b5386d3a20..083b542bdf 100644
--- a/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml
@@ -5,19 +5,18 @@
 
     <extension-point id="org.jkiss.dbeaver.mockGenerator" name="Mock data generator" schema="schema/org.jkiss.dbeaver.mockGenerator.exsd"/>
 
-    <extension point="org.eclipse.ui.handlers">
-        <handler commandId="org.jkiss.dbeaver.ext.mockdata.button" class="org.jkiss.dbeaver.ext.mockdata.handlers.MockDataHandler" />
-
-        <handler commandId="org.jkiss.dbeaver.ext.mockdata.forSelection" class="org.jkiss.dbeaver.ext.mockdata.handlers.MockDataHandler">
-            <enabledWhen>
-                <with variable="selection">
-                    <count value="+"/>
-                    <iterate operator="and">
-                        <adapt type="org.jkiss.dbeaver.model.struct.DBSDataContainer"/>
-                    </iterate>
-                </with>
-            </enabledWhen>
-        </handler>
+    <extension point="org.jkiss.dbeaver.tools">
+        <tools>
+            <tool
+                    class="org.jkiss.dbeaver.ext.mockdata.MockDataGenerateTool"
+                    description="Mock Data"
+                    id="org.jkiss.dbeaver.ext.mockdata.MockDataGenerateTool"
+                    label="Generate Mock Data"
+                    singleton="false">
+
+                <objectType name="org.jkiss.dbeaver.model.struct.DBSDataManipulator" forceCheck="true"/>
+            </tool>
+        </tools>
     </extension>
 
     <extension point="org.eclipse.ui.commands">
-- 
GitLab