Mock data menu contribution fix

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -1733,13 +1733,13 @@ public class ResultSetViewer extends Viewer
                         editMenu.add(ActionUtils.makeCommandContribution(site, ResultSetCommandHandler.CMD_ROW_ADD));
                         editMenu.add(ActionUtils.makeCommandContribution(site, ResultSetCommandHandler.CMD_ROW_COPY));
                         editMenu.add(ActionUtils.makeCommandContribution(site, ResultSetCommandHandler.CMD_ROW_DELETE));
-                        editMenu.add(new GroupMarker(MENU_GROUP_EDIT));
 
                         manager.add(editMenu);
                     }
                 }
             }
         }
+        manager.add(new GroupMarker(MENU_GROUP_EDIT));
 
         if (dataSource != null && attr != null && model.getVisibleAttributeCount() > 0 && !model.isUpdateInProgress()) {
             // Filters and View

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

@@ -59,17 +59,13 @@
             <command commandId="org.jkiss.dbeaver.ext.mockdata.resultset.mockdata"/>
         </menuContribution>
 
-        <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?before=generate">
+        <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=results_export">
             <command
                     commandId="org.jkiss.dbeaver.ext.mockdata.resultset.mockdata"
                     label="Generate Mock Data">
                 <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">