Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
14e0c5c3
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
14e0c5c3
编写于
5月 15, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Object manager refactoring
Former-commit-id:
fda3a555
上级
2366e665
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
55 addition
and
15 deletion
+55
-15
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/edit/DBERegistry.java
...r.model/src/org/jkiss/dbeaver/model/edit/DBERegistry.java
+0
-4
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
...rg/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
+2
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/ObjectManagerDescriptor.java
...c/org/jkiss/dbeaver/registry/ObjectManagerDescriptor.java
+0
-0
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java
...src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java
+0
-10
plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
+4
-0
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorConfiguratorFactory.java
...ss/dbeaver/ui/navigator/NavigatorConfiguratorFactory.java
+49
-0
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/edit/DBERegistry.java
浏览文件 @
14e0c5c3
...
...
@@ -17,8 +17,6 @@
package
org.jkiss.dbeaver.model.edit
;
import
org.jkiss.dbeaver.model.DBPObject
;
/**
* Editors editor
*/
...
...
@@ -28,6 +26,4 @@ public interface DBERegistry {
<
T
>
T
getObjectManager
(
Class
<?>
objectClass
,
Class
<
T
>
managerType
);
DBEObjectConfigurator
<?,
?>
getObjectConfigurator
(
DBPObject
object
);
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
浏览文件 @
14e0c5c3
...
...
@@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.ArrayList
;
...
...
@@ -182,7 +183,7 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
}
protected
OBJECT_TYPE
configureObject
(
DBRProgressMonitor
monitor
,
CONTAINER_TYPE
parent
,
OBJECT_TYPE
object
)
{
DBEObjectConfigurator
<
CONTAINER_TYPE
,
OBJECT_TYPE
>
configurator
=
(
DBEObjectConfigurator
<
CONTAINER_TYPE
,
OBJECT_TYPE
>)
DBWorkbench
.
getPlatform
().
getEditorsRegistry
().
getObjectConfigurator
(
object
);
DBEObjectConfigurator
<
CONTAINER_TYPE
,
OBJECT_TYPE
>
configurator
=
GeneralUtils
.
adapt
(
object
,
DBEObjectConfigurator
.
class
);
if
(
configurator
!=
null
)
{
return
configurator
.
configureObject
(
monitor
,
parent
,
object
);
}
...
...
plugins/org.jkiss.dbeaver.
core
/src/org/jkiss/dbeaver/registry/ObjectManagerDescriptor.java
→
plugins/org.jkiss.dbeaver.
registry
/src/org/jkiss/dbeaver/registry/ObjectManagerDescriptor.java
浏览文件 @
14e0c5c3
文件已移动
plugins/org.jkiss.dbeaver.
core
/src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java
→
plugins/org.jkiss.dbeaver.
registry
/src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java
浏览文件 @
14e0c5c3
...
...
@@ -20,12 +20,8 @@ package org.jkiss.dbeaver.registry;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IExtensionRegistry
;
import
org.eclipse.core.runtime.Platform
;
import
org.jkiss.dbeaver.model.DBPObject
;
import
org.jkiss.dbeaver.model.edit.DBEObjectConfigurator
;
import
org.jkiss.dbeaver.model.edit.DBEObjectManager
;
import
org.jkiss.dbeaver.model.edit.DBERegistry
;
import
org.jkiss.dbeaver.ui.editors.entity.EntityConfiguratorDescriptor
;
import
org.jkiss.dbeaver.ui.editors.entity.EntityEditorsRegistry
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
...
...
@@ -112,10 +108,4 @@ public class ObjectManagerRegistry implements DBERegistry {
}
}
@Override
public
DBEObjectConfigurator
getObjectConfigurator
(
DBPObject
object
)
{
EntityConfiguratorDescriptor
configurator
=
EntityEditorsRegistry
.
getInstance
().
getEntityConfigurator
(
object
);
return
configurator
==
null
?
null
:
configurator
.
createConfigurator
();
}
}
plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
浏览文件 @
14e0c5c3
...
...
@@ -25,6 +25,10 @@
<adapter
type=
"org.eclipse.core.resources.IFolder"
/>
<adapter
type=
"org.eclipse.ui.model.IWorkbenchAdapter"
/>
</factory>
<factory
adaptableType=
"org.jkiss.dbeaver.model.struct.DBSObject"
class=
"org.jkiss.dbeaver.ui.navigator.NavigatorConfiguratorFactory"
>
<adapter
type=
"org.jkiss.dbeaver.model.edit.DBEObjectConfigurator"
/>
</factory>
</extension>
<extension
point=
"org.eclipse.ui.views"
>
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorConfiguratorFactory.java
0 → 100644
浏览文件 @
14e0c5c3
/*
* 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.navigator
;
import
org.eclipse.core.runtime.IAdapterFactory
;
import
org.jkiss.dbeaver.model.edit.DBEObjectConfigurator
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.ui.editors.entity.EntityConfiguratorDescriptor
;
import
org.jkiss.dbeaver.ui.editors.entity.EntityEditorsRegistry
;
/**
* Adapts objects to their UI configurators
*/
public
class
NavigatorConfiguratorFactory
implements
IAdapterFactory
{
private
static
final
Class
<?>[]
ADAPTER_LIST
=
{
DBEObjectConfigurator
.
class
};
@Override
public
<
T
>
T
getAdapter
(
Object
adaptableObject
,
Class
<
T
>
adapterType
)
{
if
(
adapterType
==
DBEObjectConfigurator
.
class
&&
adaptableObject
instanceof
DBSObject
)
{
EntityConfiguratorDescriptor
configurator
=
EntityEditorsRegistry
.
getInstance
().
getEntityConfigurator
((
DBSObject
)
adaptableObject
);
return
configurator
==
null
?
null
:
adapterType
.
cast
(
configurator
.
createConfigurator
());
}
return
null
;
}
@Override
public
Class
[]
getAdapterList
()
{
return
ADAPTER_LIST
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录