2.2.0 config

SQL editor toolbar now contributed from config

plugins/org.jkiss.dbeaver.core.application/plugin.xml

@@ -89,9 +89,6 @@
             <command commandId="org.eclipse.ui.file.import"/>
             <command commandId="org.eclipse.ui.file.export"/>
 
-            <separator name="settings" visible="true"/>
-            <command commandId="org.eclipse.ui.window.preferences"/>
-
             <separator name="exit" visible="true"/>
             <command commandId="org.eclipse.ui.file.exit"/>
         </menuContribution>
@@ -99,15 +96,22 @@
         <!-- Window menu -->
 
         <menuContribution allPopups="false" locationURI="menu:window?before=additions">
+            <separator name="perspective" visible="true"/>
+            <command commandId="org.eclipse.ui.window.customizePerspective"/>
+            <command commandId="org.eclipse.ui.window.resetPerspective"/>
             <separator name="tabs" visible="true"/>
-            <command commandId="org.eclipse.ui.navigate.nextTab"/>
-            <command commandId="org.eclipse.ui.navigate.previousTab"/>
-            <command commandId="org.eclipse.ui.navigate.nextSubTab"/>
-            <command commandId="org.eclipse.ui.navigate.previousSubTab"/>
-            <separator name="editors" visible="true"/>
-            <command commandId="org.eclipse.ui.window.nextEditor"/>
-            <command commandId="org.eclipse.ui.window.previousEditor"/>
-            <command commandId="org.eclipse.ui.window.switchToEditor"/>
+            <menu label="Navigation">
+                <command commandId="org.eclipse.ui.navigate.nextTab"/>
+                <command commandId="org.eclipse.ui.navigate.previousTab"/>
+                <command commandId="org.eclipse.ui.navigate.nextSubTab"/>
+                <command commandId="org.eclipse.ui.navigate.previousSubTab"/>
+                <separator name="editors" visible="true"/>
+                <command commandId="org.eclipse.ui.window.nextEditor"/>
+                <command commandId="org.eclipse.ui.window.previousEditor"/>
+                <command commandId="org.eclipse.ui.window.switchToEditor"/>
+            </menu>
+            <separator name="settings" visible="true"/>
+            <command commandId="org.eclipse.ui.window.preferences"/>
         </menuContribution>
 
     </extension>

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -1518,6 +1518,17 @@
             </menu>
         </menuContribution>
 
+        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext">
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"/>
+            <separator name="adv" visible="true"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.analyse"/>
+            <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.validate"/>
+        </menuContribution>
+
         <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext">
             <separator name="files" visible="true"/>
             <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"/>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorContributor.java

@@ -161,15 +161,6 @@ public class SQLEditorContributor extends BasicTextEditorActionContributor
     {
         if (!isNestedEditor()) {
             super.contributeToToolBar(manager);
-
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_EXECUTE_STATEMENT));
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_EXECUTE_STATEMENT_NEW));
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_EXECUTE_SCRIPT));
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_EXECUTE_SCRIPT_NEW));
-            manager.add(new Separator());
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_EXPLAIN_PLAN));
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_ANALYSE_STATEMENT));
-            manager.add(ActionUtils.makeCommandContribution(getPage().getWorkbenchWindow(), ICommandIds.CMD_VALIDATE_STATEMENT));
         }
     }
 

product/pad/dbeaver-product.xml

@@ -49,7 +49,7 @@
         <version>
             <number>2.2.0</number>
             <type>stable</type>
-            <date>08.05.2013</date>
+            <date>11.05.2013</date>
 
             <release-notes>
                 -

product/pad/dbeaver_pad.xml

@@ -40,7 +40,7 @@
     <Program_Name>DBeaver</Program_Name>
     <Program_Version>2.2.0</Program_Version>
     <Program_Release_Month>05</Program_Release_Month>
-    <Program_Release_Day>08</Program_Release_Day>
+    <Program_Release_Day>11</Program_Release_Day>
     <Program_Release_Year>2013</Program_Release_Year>
     <Program_Cost_Dollars>0</Program_Cost_Dollars>
     <Program_Type>Freeware</Program_Type>
@@ -51,7 +51,7 @@
     <Program_Change_Info>
         -
     </Program_Change_Info>
-    <Program_System_Requirements>Java 1.6 or higher</Program_System_Requirements>
+    <Program_System_Requirements></Program_System_Requirements>
     <Program_Category_Class>Development::Other</Program_Category_Class>
     <Expire_Info>
       <Has_Expire_Info>N</Has_Expire_Info>
@@ -60,7 +60,7 @@
     <Limitations>none</Limitations>
     <Awards></Awards>
     <Program_Specific_Category></Program_Specific_Category>
-    <Includes_JAVA_VM></Includes_JAVA_VM>
+    <Includes_JAVA_VM>1.6</Includes_JAVA_VM>
   </Program_Info>
   <Web_Info>
     <Application_URLs>