Mock Data menu item is added to the resultset context menu

plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml

@@ -6,9 +6,11 @@
     <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.resultset.button" class="org.jkiss.dbeaver.ext.mockdata.handlers.ResultSetMockDataHandler" />
 
-        <handler commandId="org.jkiss.dbeaver.ext.mockdata.forSelection" class="org.jkiss.dbeaver.ext.mockdata.handlers.MockDataHandler">
+        <handler commandId="org.jkiss.dbeaver.ext.mockdata.resultset.mockdata" class="org.jkiss.dbeaver.ext.mockdata.handlers.ResultSetMockDataHandler" />
+
+        <handler commandId="org.jkiss.dbeaver.ext.mockdata.forSelection" class="org.jkiss.dbeaver.ext.mockdata.handlers.ResultSetMockDataHandler">
             <enabledWhen>
                 <with variable="selection">
                     <count value="+"/>
@@ -35,19 +37,20 @@
     </extension>
 
     <extension point="org.eclipse.ui.commands">
-        <command id="org.jkiss.dbeaver.ext.mockdata.button" name="Generate Mock Data" description="Mock Data Generator"/>
+        <command id="org.jkiss.dbeaver.ext.mockdata.resultset.button" name="Generate Mock Data" description="Mock Data Generator"/>
         <command id="org.jkiss.dbeaver.ext.mockdata.forSelection" name="Generate Mock Data" description="Mock Data Generator"/>
+        <command id="org.jkiss.dbeaver.ext.mockdata.resultset.mockdata" name="Generate Mock Data" description="Mock Data Generator" categoryId="org.jkiss.dbeaver.core.rs"/>
     </extension>
 
     <extension point="org.eclipse.ui.commandImages">
-        <image commandId="org.jkiss.dbeaver.ext.mockdata.button" icon="icons/mock_data.png"/>
+        <image commandId="org.jkiss.dbeaver.ext.mockdata.resultset.button" icon="icons/mock_data.png"/>
         <image commandId="org.jkiss.dbeaver.ext.mockdata.forSelection" icon="icons/mock_data.png"/>
     </extension>
 
     <extension point="org.eclipse.ui.menus">
         <!-- Results viewer status bar additions -->
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.ui.controls.resultset.status?after=additions">
-            <command commandId="org.jkiss.dbeaver.ext.mockdata.button"/>
+            <command commandId="org.jkiss.dbeaver.ext.mockdata.resultset.button"/>
         </menuContribution>
 
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?before=generate">
@@ -57,6 +60,10 @@
                 <visibleWhen checkEnabled="true"/>
             </command>
         </menuContribution>
+
+        <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=results_export">
+            <command commandId="org.jkiss.dbeaver.ext.mockdata.resultset.mockdata"/>
+        </menuContribution>
     </extension>
 
     <extension point="org.jkiss.dbeaver.mockGenerator">

plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/handlers/MockDataHandler.java → plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/handlers/ResultSetMockDataHandler.java

@@ -34,18 +34,18 @@ import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MockDataHandler extends AbstractHandler {
+public class ResultSetMockDataHandler extends AbstractHandler {
 
-    private static final Log log = Log.getLog(MockDataHandler.class);
+    private static final Log log = Log.getLog(ResultSetMockDataHandler.class);
 
-    public MockDataHandler() {
+    public ResultSetMockDataHandler() {
     }
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
 
         List<DBSObject> selectedObjects;
-        if (event.getCommand().getId().endsWith("button")) {
+        if (event.getCommand().getId().contains("resultset")) {
             IResultSetController resultSet = ResultSetCommandHandler.getActiveResultSet(HandlerUtil.getActivePart(event));
             if (resultSet == null) {
                 DBeaverUI.getInstance().showError("Mock Data", "No active results viewer");