Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
94ad866b
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
94ad866b
编写于
4月 11, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#4553 Datasource and schema dropdowns.
上级
ed0b04b3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
12 deletion
+40
-12
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/SelectActiveDataSourceHandler.java
.../ui/actions/datasource/SelectActiveDataSourceHandler.java
+40
-12
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/SelectActiveDataSourceHandler.java
浏览文件 @
94ad866b
...
...
@@ -20,10 +20,7 @@ import org.eclipse.core.commands.ExecutionEvent;
import
org.eclipse.core.commands.ExecutionException
;
import
org.eclipse.core.resources.IFile
;
import
org.eclipse.core.resources.IProject
;
import
org.eclipse.jface.action.Action
;
import
org.eclipse.jface.action.ActionContributionItem
;
import
org.eclipse.jface.action.IContributionItem
;
import
org.eclipse.jface.action.Separator
;
import
org.eclipse.jface.action.*
;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.swt.graphics.GC
;
import
org.eclipse.ui.IEditorPart
;
...
...
@@ -32,11 +29,9 @@ import org.eclipse.ui.commands.IElementUpdater;
import
org.eclipse.ui.handlers.HandlerUtil
;
import
org.eclipse.ui.menus.UIElement
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBIcon
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.DBPImage
;
import
org.jkiss.dbeaver.model.IDataSourceContainerProviderEx
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.app.DBPDataSourceRegistry
;
import
org.jkiss.dbeaver.model.connection.DBPDriver
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.registry.DataSourceRegistry
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
...
...
@@ -48,10 +43,7 @@ import org.jkiss.dbeaver.ui.editors.EditorUtils;
import
org.jkiss.dbeaver.ui.navigator.NavigatorUtils
;
import
org.jkiss.dbeaver.ui.navigator.dialogs.SelectDataSourceDialog
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
public
class
SelectActiveDataSourceHandler
extends
AbstractDataSourceHandler
implements
IElementUpdater
{
...
...
@@ -151,6 +143,23 @@ public class SelectActiveDataSourceHandler extends AbstractDataSourceHandler imp
List
<?
extends
DBPDataSourceContainer
>
dataSources
=
getAvailableDataSources
();
List
<?
extends
DBPDataSourceContainer
>
connectedDataSources
=
new
ArrayList
<>(
dataSources
);
connectedDataSources
.
removeIf
(
o
->
!
o
.
isConnected
());
dataSources
.
removeAll
(
connectedDataSources
);
List
<
DBPDataSourceContainer
>
singleDataSources
=
new
ArrayList
<>();
Map
<
DBPDriver
,
List
<
DBPDataSourceContainer
>>
driverMap
=
new
TreeMap
<>(
DBUtils
.
nameComparator
());
for
(
DBPDataSourceContainer
ds
:
dataSources
)
{
List
<
DBPDataSourceContainer
>
driverDS
=
driverMap
.
computeIfAbsent
(
ds
.
getDriver
(),
k
->
new
ArrayList
<>());
driverDS
.
add
(
ds
);
}
for
(
Iterator
<
Map
.
Entry
<
DBPDriver
,
List
<
DBPDataSourceContainer
>>>
driverIter
=
driverMap
.
entrySet
().
iterator
();
driverIter
.
hasNext
();
)
{
List
<
DBPDataSourceContainer
>
dsList
=
driverIter
.
next
().
getValue
();
if
(
dsList
.
size
()
==
1
)
{
singleDataSources
.
add
(
dsList
.
get
(
0
));
driverIter
.
remove
();
}
}
singleDataSources
.
sort
(
DBUtils
.
nameComparator
());
DBPDataSourceContainer
curDataSource
=
getDataSourceContainer
(
workbenchWindow
.
getActivePage
().
getActivePart
());
for
(
DBPDataSourceContainer
ds
:
connectedDataSources
)
{
DBNDatabaseNode
dsNode
=
NavigatorUtils
.
getNodeByObject
(
ds
);
...
...
@@ -159,6 +168,25 @@ public class SelectActiveDataSourceHandler extends AbstractDataSourceHandler imp
createDataSourceChangeAction
((
IDataSourceContainerProviderEx
)
activeEditor
,
curDataSource
,
ds
,
dsNode
)));
}
menuItems
.
add
(
new
Separator
());
for
(
Map
.
Entry
<
DBPDriver
,
List
<
DBPDataSourceContainer
>>
de
:
driverMap
.
entrySet
())
{
DBPDriver
driver
=
de
.
getKey
();
MenuManager
driverMenu
=
new
MenuManager
(
driver
.
getName
(),
DBeaverIcons
.
getImageDescriptor
(
driver
.
getIcon
()),
driver
.
getId
());
for
(
DBPDataSourceContainer
ds
:
de
.
getValue
())
{
driverMenu
.
add
(
createDataSourceChangeAction
(
(
IDataSourceContainerProviderEx
)
activeEditor
,
curDataSource
,
ds
,
null
));
}
menuItems
.
add
(
driverMenu
);
}
menuItems
.
add
(
new
Separator
());
for
(
DBPDataSourceContainer
ds
:
singleDataSources
)
{
menuItems
.
add
(
new
ActionContributionItem
(
createDataSourceChangeAction
((
IDataSourceContainerProviderEx
)
activeEditor
,
curDataSource
,
ds
,
NavigatorUtils
.
getNodeByObject
(
ds
))));
}
}
private
Action
createDataSourceChangeAction
(
IDataSourceContainerProviderEx
activeEditor
,
DBPDataSourceContainer
curDataSource
,
DBPDataSourceContainer
newDataSource
,
DBNDatabaseNode
dsNode
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录