Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
7eb6b1b4
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,发现更多精彩内容 >>
提交
7eb6b1b4
编写于
8月 13, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6490 DS drag-n-drop fix. Also project refresh fix (ds list reload)
Former-commit-id:
465313fd
上级
7c4b3511
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
44 addition
and
19 deletion
+44
-19
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
...g/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
+6
-15
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
...l/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
+2
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProject.java
...del/src/org/jkiss/dbeaver/model/navigator/DBNProject.java
+6
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
...rg/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
+17
-3
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+8
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
...ry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
+5
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
浏览文件 @
7eb6b1b4
...
...
@@ -106,14 +106,11 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
dataSource
.
setName
(
newName
);
registry
.
addDataSource
(
dataSource
);
}
else
{
UIUtils
.
asyncExec
(
new
Runnable
()
{
@Override
public
void
run
()
{
CreateConnectionDialog
dialog
=
new
CreateConnectionDialog
(
UIUtils
.
getActiveWorkbenchWindow
(),
new
NewConnectionWizard
());
dialog
.
open
();
}
UIUtils
.
asyncExec
(()
->
{
CreateConnectionDialog
dialog
=
new
CreateConnectionDialog
(
UIUtils
.
getActiveWorkbenchWindow
(),
new
NewConnectionWizard
());
dialog
.
open
();
});
}
return
null
;
...
...
@@ -122,13 +119,7 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
@Override
public
void
deleteObject
(
DBECommandContext
commandContext
,
final
DataSourceDescriptor
object
,
Map
<
String
,
Object
>
options
)
{
Runnable
remover
=
new
Runnable
()
{
@Override
public
void
run
()
{
object
.
getRegistry
().
removeDataSource
(
object
);
}
};
Runnable
remover
=
()
->
object
.
getRegistry
().
removeDataSource
(
object
);
if
(
object
.
isConnected
())
{
DataSourceHandler
.
disconnectDataSource
(
object
,
remover
);
}
else
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
浏览文件 @
7eb6b1b4
...
...
@@ -208,4 +208,6 @@ public interface DBPDataSourceContainer extends DBSObject, DBDPreferences, DBPNa
GeneralUtils
.
IVariableResolver
getVariablesResolver
();
DBPDataSourceContainer
createCopy
(
DBPDataSourceRegistry
forRegistry
);
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProject.java
浏览文件 @
7eb6b1b4
...
...
@@ -156,6 +156,12 @@ public class DBNProject extends DBNResource {
return
super
.
addImplicitMembers
(
members
);
}
@Override
public
DBNNode
refreshNode
(
DBRProgressMonitor
monitor
,
Object
source
)
throws
DBException
{
project
.
getDataSourceRegistry
().
refreshConfig
();
return
super
.
refreshNode
(
monitor
,
source
);
}
public
DBNResource
findResource
(
IResource
resource
)
{
List
<
IResource
>
path
=
new
ArrayList
<>();
for
(
IResource
parent
=
resource
;
!(
parent
instanceof
IProject
);
parent
=
parent
.
getParent
())
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
浏览文件 @
7eb6b1b4
...
...
@@ -171,13 +171,27 @@ public class DBNProjectDatabases extends DBNNode implements DBNContainer, DBPEve
@Override
public
void
dropNodes
(
Collection
<
DBNNode
>
nodes
)
throws
DBException
{
Set
<
DBPDataSourceRegistry
>
registryToRefresh
=
new
LinkedHashSet
<>();
for
(
DBNNode
node
:
nodes
)
{
if
(
node
instanceof
DBNDataSource
)
{
DBPDataSourceContainer
dsContainer
=
((
DBNDataSource
)
node
).
getDataSourceContainer
();
dsContainer
.
getRegistry
().
removeDataSource
(
dsContainer
);
dataSourceRegistry
.
addDataSource
(
dsContainer
);
DBPDataSourceContainer
oldContainer
=
((
DBNDataSource
)
node
).
getDataSourceContainer
();
if
(
oldContainer
.
getRegistry
()
==
dataSourceRegistry
)
{
// the same registry
continue
;
}
DBPDataSourceContainer
newContainer
=
oldContainer
.
createCopy
(
dataSourceRegistry
);
oldContainer
.
getRegistry
().
removeDataSource
(
oldContainer
);
dataSourceRegistry
.
addDataSource
(
newContainer
);
registryToRefresh
.
add
(
oldContainer
.
getRegistry
());
registryToRefresh
.
add
(
dataSourceRegistry
);
}
}
for
(
DBPDataSourceRegistry
registy
:
registryToRefresh
)
{
registy
.
flushConfig
();
}
}
public
void
refreshChildren
()
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
7eb6b1b4
...
...
@@ -195,7 +195,7 @@ public class DataSourceDescriptor
public
DataSourceDescriptor
(
@NotNull
DataSourceDescriptor
source
,
@NotNull
DBPDataSourceRegistry
registry
)
{
this
.
registry
=
registry
;
this
.
origin
=
source
.
origin
;
this
.
origin
=
((
DataSourceRegistry
)
registry
).
getDefaultOrigin
()
;
this
.
id
=
source
.
id
;
this
.
name
=
source
.
name
;
this
.
description
=
source
.
description
;
...
...
@@ -1429,6 +1429,13 @@ public class DataSourceDescriptor
};
}
@Override
public
DBPDataSourceContainer
createCopy
(
DBPDataSourceRegistry
forRegistry
)
{
DataSourceDescriptor
copy
=
new
DataSourceDescriptor
(
this
,
forRegistry
);
copy
.
setId
(
DataSourceDescriptor
.
generateNewId
(
copy
.
getDriver
()));
return
copy
;
}
public
static
boolean
askForPassword
(
@NotNull
final
DataSourceDescriptor
dataSourceContainer
,
@Nullable
final
DBWHandlerConfiguration
networkHandler
,
final
boolean
passwordOnly
)
{
final
String
prompt
=
networkHandler
!=
null
?
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @
7eb6b1b4
...
...
@@ -786,6 +786,11 @@ public class DataSourceRegistry implements DBPDataSourceRegistry {
return
project
;
}
@Override
public
String
toString
()
{
return
project
.
getName
()
+
" ("
+
getClass
().
getSimpleName
()
+
")"
;
}
static
class
ParseResults
{
Set
<
DataSourceDescriptor
>
updatedDataSources
=
new
LinkedHashSet
<>();
Set
<
DataSourceDescriptor
>
addedDataSources
=
new
LinkedHashSet
<>();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录