Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
821bf62d
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,发现更多精彩内容 >>
提交
821bf62d
编写于
8月 11, 2019
作者:
S
serge@jkiss.org
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6490 Connections copy-paste fix (use right project)
Former-commit-id:
0414fc5f
上级
0a97ad7f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
6 deletion
+18
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
...g/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
+3
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPProject.java
...ver.model/src/org/jkiss/dbeaver/model/app/DBPProject.java
+2
-1
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectCreateBase.java
...i/navigator/actions/NavigatorHandlerObjectCreateBase.java
+13
-5
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
浏览文件 @
821bf62d
...
...
@@ -21,6 +21,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
import
org.jkiss.dbeaver.model.DBPDataSourceFolder
;
import
org.jkiss.dbeaver.model.DBPObject
;
import
org.jkiss.dbeaver.model.app.DBPDataSourceRegistry
;
import
org.jkiss.dbeaver.model.app.DBPProject
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.edit.DBECommandContext
;
import
org.jkiss.dbeaver.model.edit.DBEObjectMaker
;
...
...
@@ -74,6 +75,8 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
DBPDataSourceFolder
folder
=
null
;
if
(
container
instanceof
DataSourceRegistry
)
{
registry
=
(
DBPDataSourceRegistry
)
container
;
}
else
if
(
container
instanceof
DBPProject
)
{
registry
=
((
DBPProject
)
container
).
getDataSourceRegistry
();
}
else
if
(
container
instanceof
DBPDataSourceFolder
)
{
folder
=
(
DBPDataSourceFolder
)
container
;
registry
=
folder
.
getDataSourceRegistry
();
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPProject.java
浏览文件 @
821bf62d
...
...
@@ -22,13 +22,14 @@ import org.eclipse.core.resources.IProject;
import
org.eclipse.core.resources.IResource
;
import
org.eclipse.equinox.security.storage.ISecurePreferences
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.DBPObject
;
import
java.io.File
;
/**
* DBPWorkspace
*/
public
interface
DBPProject
public
interface
DBPProject
extends
DBPObject
{
String
METADATA_FOLDER
=
".dbeaver"
;
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectCreateBase.java
浏览文件 @
821bf62d
...
...
@@ -30,10 +30,7 @@ import org.jkiss.dbeaver.model.DBPRefreshableObject;
import
org.jkiss.dbeaver.model.DBPScriptObject
;
import
org.jkiss.dbeaver.model.edit.DBEObjectMaker
;
import
org.jkiss.dbeaver.model.edit.DBEObjectManager
;
import
org.jkiss.dbeaver.model.navigator.DBNContainer
;
import
org.jkiss.dbeaver.model.navigator.DBNDataSource
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.navigator.*
;
import
org.jkiss.dbeaver.model.runtime.AbstractJob
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
...
...
@@ -85,7 +82,18 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
}
DBSObject
sourceObject
=
copyFrom
==
null
?
null
:
copyFrom
.
getObject
();
final
Object
parentObject
=
container
instanceof
DBNDatabaseNode
?
((
DBNDatabaseNode
)
container
).
getValueObject
()
:
null
;
final
Object
parentObject
;
if
(
container
instanceof
DBNDatabaseNode
)
{
parentObject
=
((
DBNDatabaseNode
)
container
).
getValueObject
();
}
else
if
(
container
instanceof
DBNProject
)
{
parentObject
=
((
DBNProject
)
container
).
getProject
();
}
else
if
(
container
instanceof
DBNProjectDatabases
)
{
parentObject
=
container
.
getOwnerProject
();
}
else
if
(
container
instanceof
DBNLocalFolder
)
{
parentObject
=
((
DBNLocalFolder
)
container
).
getFolder
();
}
else
{
parentObject
=
null
;
}
// Do not check for type - manager must do it. Potentially we can copy anything into anything.
// if (sourceObject != null && !childType.isAssignableFrom(sourceObject.getClass())) {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录