Merge remote-tracking branch 'origin/devel' into devel

Former-commit-id: d7d691f4

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties

@@ -63,10 +63,6 @@ command.org.jkiss.dbeaver.core.txn.log.description=Current transaction log (exec
 command.org.jkiss.dbeaver.core.txn.pending.name=Pending transactions
 command.org.jkiss.dbeaver.core.txn.pending.description=List of all pending transactions
 command.org.jkiss.dbeaver.core.transaction_mode.name=Transaction mode
-command.org.jkiss.dbeaver.core.select.connection.name=Active connection
-command.org.jkiss.dbeaver.core.select.connection.description=Database conection associated with current editor
-command.org.jkiss.dbeaver.core.select.schema.name=Active schema
-command.org.jkiss.dbeaver.core.select.schema.description=Database active schema
 
 command.org.jkiss.dbeaver.core.procedure.execute.name=Execute Stored Procedure
 command.org.jkiss.dbeaver.core.procedure.execute.description=Open new SQL console with execute stored procedure query

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

@@ -128,9 +128,6 @@
         <command id="org.jkiss.dbeaver.core.txn.log" name="%command.org.jkiss.dbeaver.core.txn.log.name" description="%command.org.jkiss.dbeaver.core.txn.log.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.txn.pending" name="%command.org.jkiss.dbeaver.core.txn.pending.name" description="%command.org.jkiss.dbeaver.core.txn.pending.description" categoryId="org.jkiss.dbeaver.core.database"/>
 
-        <command id="org.jkiss.dbeaver.core.select.connection" name="%command.org.jkiss.dbeaver.core.select.connection.name" description="%command.org.jkiss.dbeaver.core.select.connection.description" categoryId="org.jkiss.dbeaver.core.database"/>
-        <command id="org.jkiss.dbeaver.core.select.schema" name="%command.org.jkiss.dbeaver.core.select.schema.name" description="%command.org.jkiss.dbeaver.core.select.schema.description" categoryId="org.jkiss.dbeaver.core.database"/>
-
         <command id="org.jkiss.dbeaver.core.procedure.execute" name="%command.org.jkiss.dbeaver.core.procedure.execute.name" description="%command.org.jkiss.dbeaver.core.procedure.execute.description" categoryId="org.jkiss.dbeaver.core.database"/>
 
         <command id="org.jkiss.dbeaver.core.compare.objects" name="%command.org.jkiss.dbeaver.core.compare.objects.name" description="%command.org.jkiss.dbeaver.core.compare.objects.description" categoryId="org.jkiss.dbeaver.core.util"/>
@@ -163,8 +160,8 @@
         <image commandId="org.jkiss.dbeaver.core.rollback" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/rollback.png"/>
         <image commandId="org.jkiss.dbeaver.core.txn.log" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/txn_log.png"/>
 
-        <image commandId="org.jkiss.dbeaver.core.select.connection" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/database.png"/>
-        <image commandId="org.jkiss.dbeaver.core.select.schema" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/schema.png"/>
+        <image commandId="org.jkiss.dbeaver.ui.tools.select.connection" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/database.png"/>
+        <image commandId="org.jkiss.dbeaver.ui.tools.select.schema" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/schema.png"/>
 
         <image commandId="org.jkiss.dbeaver.core.qm.filter" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/filter.png"/>
         <image commandId="org.jkiss.dbeaver.core.qm.clear" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/erase.png"/>
@@ -351,23 +348,6 @@
             <enabledWhen><reference definitionId="org.jkiss.dbeaver.core.ui.editor.transactional"/></enabledWhen>
         </handler>
 
-        <handler commandId="org.jkiss.dbeaver.core.select.connection" class="org.jkiss.dbeaver.ui.actions.datasource.SelectActiveDataSourceHandler">
-            <enabledWhen>
-                <with variable="activeEditor">
-                    <instanceof value="org.jkiss.dbeaver.model.IDataSourceContainerProviderEx"/>
-                </with>
-            </enabledWhen>
-        </handler>
-        <handler commandId="org.jkiss.dbeaver.core.select.schema" class="org.jkiss.dbeaver.ui.actions.datasource.SelectActiveSchemaHandler">
-            <enabledWhen>
-                <with variable="activeEditor">
-                    <adapt type="org.jkiss.dbeaver.model.DBPContextProvider">
-                        <test property="org.jkiss.dbeaver.core.datasource.supportsTransactions" value="true"/>
-                    </adapt>
-                </with>
-            </enabledWhen>
-        </handler>
-
         <!-- Set default behaviour for standard widgets -->
         <handler commandId="org.eclipse.ui.edit.copy" class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy">
             <activeWhen><reference definitionId="org.jkiss.dbeaver.core.ui.inlineWidgetEditor"/></activeWhen>
@@ -477,18 +457,23 @@
                 </or>
             </activeWhen>
         </handler>
-        <handler commandId="org.jkiss.dbeaver.ui.tools.select.connection" class="org.jkiss.dbeaver.ui.perspective.SelectConnectionHandler">
-            <activeWhen>
+        <handler commandId="org.jkiss.dbeaver.ui.tools.select.connection" class="org.jkiss.dbeaver.ui.actions.datasource.SelectActiveDataSourceHandler">
+            <enabledWhen>
                 <with variable="activeEditor">
                     <instanceof value="org.jkiss.dbeaver.model.IDataSourceContainerProviderEx"/>
                 </with>
-            </activeWhen>
+            </enabledWhen>
         </handler>
-        <handler commandId="org.jkiss.dbeaver.ui.tools.select.schema" class="org.jkiss.dbeaver.ui.perspective.SelectSchemaHandler">
-            <activeWhen>
-                <reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/>
-            </activeWhen>
+        <handler commandId="org.jkiss.dbeaver.ui.tools.select.schema" class="org.jkiss.dbeaver.ui.actions.datasource.SelectActiveSchemaHandler">
+            <enabledWhen>
+                <with variable="activeEditor">
+                    <adapt type="org.jkiss.dbeaver.model.DBPContextProvider">
+                        <test property="org.jkiss.dbeaver.core.datasource.supportsTransactions" value="true"/>
+                    </adapt>
+                </with>
+            </enabledWhen>
         </handler>
+
         <handler commandId="org.jkiss.dbeaver.core.generate.uuid" class="org.jkiss.dbeaver.ui.actions.common.GenerateUUIDHandler">
             <with variable="activePart">
                 <or>
@@ -606,18 +591,6 @@
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
             </toolbar>
-            <!--toolbar id="dbeaver-datasource-selector" label="%toolbar.dbeaver-datasource-selector.label">
-                <control class="org.jkiss.dbeaver.ui.perspective.DataSourceManagementToolbar$ToolbarContribution">
-                    <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
-                </control>
-                <command
-                      commandId="org.jkiss.dbeaver.ui.editors.sql.sync.connection"
-                      id="org.jkiss.dbeaver.core.menu.sql.sync"
-                      style="pulldown">
-                    <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
-                </command>
-                <separator name="additions" visible="false"/>
-            </toolbar-->
 
             <toolbar id="dbeaver-edit" label="%toolbar.dbeaver-edit.label">
                 <command commandId="org.eclipse.ui.file.save">
@@ -664,14 +637,14 @@
 
             <toolbar id="dbeaver-connection-selector" label="%toolbar.dbeaver-datasource-selector.label">
                 <command
-                    commandId="org.jkiss.dbeaver.core.select.connection"
+                    commandId="org.jkiss.dbeaver.ui.tools.select.connection"
                     id="org.jkiss.dbeaver.core.menu.select.connection"
                     style="pulldown"
                     mode="FORCE_TEXT">
                     <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.datasource.editor"/></visibleWhen>
                 </command>
                 <command
-                    commandId="org.jkiss.dbeaver.core.select.schema"
+                    commandId="org.jkiss.dbeaver.ui.tools.select.schema"
                     id="org.jkiss.dbeaver.core.menu.select.schema"
                     style="pulldown"
                     mode="FORCE_TEXT">

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolbarUtils.java

@@ -70,8 +70,8 @@ public class DataSourceToolbarUtils
 
     public static void updateCommandsUI() {
         ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
-        commandService.refreshElements("org.jkiss.dbeaver.core.select.connection", null);
-        commandService.refreshElements("org.jkiss.dbeaver.core.select.schema", null);
+        commandService.refreshElements("org.jkiss.dbeaver.ui.tools.select.connection", null);
+        commandService.refreshElements("org.jkiss.dbeaver.ui.tools.select.schema", null);
         commandService.refreshElements("org.jkiss.dbeaver.ui.editors.sql.sync.connection", null);
     }
 }
\ No newline at end of file

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/SelectActiveDataSourceHandler.java

@@ -59,7 +59,7 @@ public class SelectActiveDataSourceHandler extends AbstractDataSourceHandler imp
         return null;
     }
 
-    private static void openDataSourceSelector(IWorkbenchWindow workbenchWindow, DBPDataSourceContainer dataSource) {
+    public static void openDataSourceSelector(IWorkbenchWindow workbenchWindow, DBPDataSourceContainer dataSource) {
         IProject activeProject = dataSource != null ? dataSource.getRegistry().getProject() : DBWorkbench.getPlatform().getProjectManager().getActiveProject();
 
         IEditorPart activeEditor = workbenchWindow.getActivePage().getActiveEditor();

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java

@@ -78,7 +78,9 @@ import java.util.*;
 
 /**
  * DataSource Toolbar
+ * Deprecated everything was moved to org.jkiss.dbeaver.ui.actions.datasource.*
  */
+@Deprecated
 public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEventListener, DBPPreferenceListener, INavigatorListener {
     private static final Log log = Log.getLog(DataSourceManagementToolbar.class);
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/SelectConnectionHandler.java

-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jkiss.dbeaver.ui.perspective;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.jkiss.dbeaver.model.IDataSourceContainerProviderEx;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
-import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
-
-public class SelectConnectionHandler extends AbstractDataSourceHandler
-{
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException
-    {
-        IEditorPart activeEditor = HandlerUtil.getActiveEditor(event);
-        if (activeEditor instanceof IDataSourceContainerProviderEx) {
-            DataSourceManagementToolbar.getInstance().showConnectionSelector();
-        }
-        return null;
-    }
-
-}
\ No newline at end of file

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/SelectSchemaHandler.java

-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jkiss.dbeaver.ui.perspective;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
-import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
-
-public class SelectSchemaHandler extends AbstractDataSourceHandler
-{
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException
-    {
-        DBCExecutionContext context = getExecutionContext(event, true);
-        if (context != null && context.isConnected()) {
-            DataSourceManagementToolbar.getInstance().showDatabaseSelector();
-        }
-        return null;
-    }
-
-}
\ No newline at end of file

plugins/org.jkiss.dbeaver.ui.dashboard/plugin.xml

@@ -53,17 +53,7 @@
         <!-- Dashboard handlers -->
 
         <handler commandId="org.jkiss.dbeaver.ui.dashboard.open" class="org.jkiss.dbeaver.ui.dashboard.view.HandlerDashboardOpen">
-            <enabledWhen>
-                <and>
-                    <with variable="selection">
-                        <count value="1"/>
-                        <iterate operator="and">
-                            <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
-                        </iterate>
-                    </with>
-                    <reference definitionId="org.jkiss.dbeaver.core.datasource.connected"/>
-                </and>
-            </enabledWhen>
+            <enabledWhen><reference definitionId="org.jkiss.dbeaver.core.datasource.connected"/></enabledWhen>
         </handler>
         <handler commandId="org.jkiss.dbeaver.ui.dashboard.configure" class="org.jkiss.dbeaver.ui.dashboard.view.HandlerDashboardConfiguration"/>
         <handler commandId="org.jkiss.dbeaver.ui.dashboard.reset" class="org.jkiss.dbeaver.ui.dashboard.view.HandlerDashboardReset"/>
@@ -91,6 +81,12 @@
             </command>
         </menuContribution>
 
+        <menuContribution allPopups="false" locationURI="menu:dataSourceMenu?after=tools">
+            <command commandId="org.jkiss.dbeaver.ui.dashboard.open">
+                <visibleWhen checkEnabled="true"/>
+            </command>
+        </menuContribution>
+
         <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.ui.dashboardView">
             <command commandId="org.jkiss.dbeaver.ui.dashboard.configure"/>
             <separator name="actions" visible="true"/>

plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/view/HandlerDashboardOpen.java

@@ -31,7 +31,7 @@ public class HandlerDashboardOpen extends AbstractDataSourceHandler {
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         IWorkbenchWindow workbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event);
-        DBPDataSourceContainer dataSourceContainer = getDataSourceContainer(event, false);
+        DBPDataSourceContainer dataSourceContainer = getDataSourceContainer(event, true);
         if (dataSourceContainer == null) {
             dataSourceContainer = getDataSourceContainer(event, true);
         }