Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
941114f5
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,发现更多精彩内容 >>
提交
941114f5
编写于
3月 02, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5378 Object editors open fix (Object input id uniqueness)
上级
c8cf30be
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
14 deletion
+45
-14
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolsContributor.java
...ver/ui/actions/datasource/DataSourceToolsContributor.java
+16
-9
plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/ObjectEditorInput.java
...rg/jkiss/dbeaver/ui/editors/object/ObjectEditorInput.java
+29
-5
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolsContributor.java
浏览文件 @
941114f5
...
...
@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.ISelectionProvider;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.ui.*
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseObject
;
import
org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode
;
import
org.jkiss.dbeaver.model.navigator.meta.DBXTreeObject
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
...
...
@@ -35,8 +36,8 @@ import org.jkiss.dbeaver.ui.DBeaverIcons;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.actions.common.EmptyListAction
;
import
org.jkiss.dbeaver.ui.actions.common.ExecuteToolHandler
;
import
org.jkiss.dbeaver.ui.editors.DatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.object.ObjectEditorInput
;
import
org.jkiss.dbeaver.ui.navigator.NavigatorUtils
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -84,13 +85,15 @@ public class DataSourceToolsContributor extends DataSourceMenuContributor
findObjectNodes
(
dsNode
.
getMeta
(),
navigatorObjectEditors
,
processedNodes
);
}
if
(!
navigatorObjectEditors
.
isEmpty
())
{
DBNDatabaseNode
objectNode
=
dsNode
;
// DBNDatabaseNode objectNode = NavigatorUtils.getNodeByObject(selectedObject);
// if (objectNode == null) {
// objectNode = dsNode;
// }
menuItems
.
add
(
new
Separator
());
for
(
DBXTreeObject
editorMeta
:
navigatorObjectEditors
)
{
//DBNDatabaseNode objectNode = dsNode;
DBNDatabaseNode
objectNode
=
NavigatorUtils
.
getNodeByObject
(
selectedObject
);
if
(
objectNode
==
null
)
{
objectNode
=
dsNode
;
}
menuItems
.
add
(
new
ActionContributionItem
(
new
OpenToolsEditorAction
(
activePage
,
objectNode
,
editorMeta
)));
}
}
...
...
@@ -189,12 +192,16 @@ public class DataSourceToolsContributor extends DataSourceMenuContributor
@Override
public
void
run
()
{
DatabaseEditorInput
<
DBNDatabaseNode
>
objectInput
=
new
DatabaseEditorInput
<
DBNDatabaseNode
>(
databaseNode
)
{
ObjectEditorInput
editorInput
;
if
(
databaseNode
instanceof
DBNDatabaseObject
)
{
editorInput
=
new
ObjectEditorInput
((
DBNDatabaseObject
)
databaseNode
);
}
else
{
editorInput
=
new
ObjectEditorInput
(
databaseNode
,
editorMeta
);
}
};
try
{
workbenchPage
.
openEditor
(
object
Input
,
editor
Input
,
editorMeta
.
getEditorId
());
}
catch
(
PartInitException
e
)
{
DBWorkbench
.
getPlatformUI
().
showError
(
"Editor open"
,
"Error opening tool editor '"
+
editorMeta
.
getEditorId
()
+
"'"
,
e
.
getStatus
());
...
...
plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/ObjectEditorInput.java
浏览文件 @
941114f5
...
...
@@ -17,36 +17,60 @@
package
org.jkiss.dbeaver.ui.editors.object
;
import
org.eclipse.jface.resource.ImageDescriptor
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseObject
;
import
org.jkiss.dbeaver.model.navigator.meta.DBXTreeObject
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.editors.DatabaseEditorInput
;
/**
* ObjectEditorInput
*/
public
class
ObjectEditorInput
extends
DatabaseEditorInput
<
DBNDatabase
Object
>
public
class
ObjectEditorInput
extends
DatabaseEditorInput
<
DBNDatabase
Node
>
{
public
ObjectEditorInput
(
DBNDatabaseObject
dbmNode
)
private
DBXTreeObject
editorMeta
;
public
ObjectEditorInput
(
@NotNull
DBNDatabaseObject
dbmNode
)
{
super
(
dbmNode
);
}
public
ObjectEditorInput
(
@NotNull
DBNDatabaseNode
dbmNode
,
@NotNull
DBXTreeObject
meta
)
{
super
(
dbmNode
);
this
.
editorMeta
=
meta
;
}
public
DBXTreeObject
getEditorMeta
()
{
if
(
editorMeta
!=
null
)
{
return
editorMeta
;
}
else
{
return
((
DBXTreeObject
)
getNavigatorNode
().
getMeta
());
}
}
@Override
public
ImageDescriptor
getImageDescriptor
()
{
DBNDatabase
Object
node
=
getNavigatorNode
();
DBNDatabase
Node
node
=
getNavigatorNode
();
// IEditorDescriptor editorDescriptor = node.getEditorDescriptor();
// if (editorDescriptor != null) {
// return editorDescriptor.getImageDescriptor();
// } else {
return
DBeaverIcons
.
getImageDescriptor
(
node
.
getNodeIconDefault
());
return
DBeaverIcons
.
getImageDescriptor
(
getEditorMeta
().
getDefaultIcon
());
// }
}
@Override
public
String
getToolTipText
()
{
return
get
NavigatorNode
().
get
Meta
().
getDescription
();
return
get
Editor
Meta
().
getDescription
();
}
@Override
public
boolean
equals
(
Object
obj
)
{
return
obj
instanceof
ObjectEditorInput
&&
super
.
equals
(
obj
)
&&
getEditorMeta
()
==
((
ObjectEditorInput
)
obj
).
getEditorMeta
();
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录