Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
390b37a9
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,发现更多精彩内容 >>
提交
390b37a9
编写于
5月 17, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Schema selector behavior change (show current object schema for entity editors)
Former-commit-id:
97828739
上级
dc96693f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
7 deletion
+50
-7
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/SelectActiveSchemaHandler.java
...aver/ui/actions/datasource/SelectActiveSchemaHandler.java
+46
-7
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
...src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
+4
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/SelectActiveSchemaHandler.java
浏览文件 @
390b37a9
...
...
@@ -24,7 +24,9 @@ import org.eclipse.jface.action.Action;
import
org.eclipse.jface.action.ActionContributionItem
;
import
org.eclipse.jface.action.IContributionItem
;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.ui.IEditorInput
;
import
org.eclipse.ui.IEditorPart
;
import
org.eclipse.ui.IPropertyListener
;
import
org.eclipse.ui.IWorkbenchWindow
;
import
org.eclipse.ui.commands.IElementUpdater
;
import
org.eclipse.ui.handlers.HandlerUtil
;
...
...
@@ -49,6 +51,9 @@ import org.jkiss.dbeaver.runtime.DBWorkbench;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler
;
import
org.jkiss.dbeaver.ui.editors.DatabaseLazyEditorInput
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.entity.EntityEditor
;
import
org.jkiss.dbeaver.ui.perspective.SelectDatabaseDialog
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.ArrayUtils
;
...
...
@@ -121,13 +126,47 @@ public class SelectActiveSchemaHandler extends AbstractDataSourceHandler impleme
DBPDataSourceContainer
dataSource
=
DataSourceToolbarUtils
.
getCurrentDataSource
(
workbenchWindow
);
if
(
dataSource
!=
null
&&
dataSource
.
isConnected
())
{
schemaName
=
"<no schema>"
;
DBSObject
[]
defObjects
=
getSelectedSchema
(
dataSource
);
if
(
defObjects
.
length
>
0
)
{
schemaIcon
=
DBIcon
.
TREE_SCHEMA
;
if
(
defObjects
.
length
==
1
)
{
schemaName
=
defObjects
[
0
].
getName
();
}
else
{
schemaName
=
defObjects
[
1
].
getName
()
+
"@"
+
defObjects
[
0
].
getName
();
IEditorInput
editorInput
=
activeEditor
.
getEditorInput
();
if
(
editorInput
instanceof
IDatabaseEditorInput
)
{
if
(
editorInput
instanceof
DatabaseLazyEditorInput
)
{
activeEditor
.
addPropertyListener
(
new
IPropertyListener
()
{
@Override
public
void
propertyChanged
(
Object
source
,
int
propId
)
{
if
(
EntityEditor
.
PROP_TITLE
==
propId
)
{
DataSourceToolbarUtils
.
updateCommandsUI
();
activeEditor
.
removePropertyListener
(
this
);
}
}
});
}
DBSObjectContainer
schemaObject
=
null
;
DBSObject
curObject
=
((
IDatabaseEditorInput
)
editorInput
).
getDatabaseObject
();
for
(
DBSObject
parent
=
curObject
;
parent
!=
null
;
parent
=
parent
.
getParentObject
())
{
if
(
parent
instanceof
DBSObjectContainer
)
{
schemaObject
=
(
DBSObjectContainer
)
parent
;
if
(
parent
.
getParentObject
()
instanceof
DBSObjectSelector
)
{
break
;
}
}
}
if
(
schemaObject
!=
null
)
{
DBSObject
schemaParent
=
schemaObject
.
getParentObject
();
if
(
schemaParent
instanceof
DBSObjectContainer
&&
!(
schemaParent
instanceof
DBPDataSource
))
{
schemaName
=
schemaObject
.
getName
()
+
"@"
+
schemaParent
.
getName
();
}
else
{
schemaName
=
schemaObject
.
getName
();
}
}
}
else
{
DBSObject
[]
defObjects
=
getSelectedSchema
(
dataSource
);
if
(
defObjects
.
length
>
0
)
{
schemaIcon
=
DBIcon
.
TREE_SCHEMA
;
if
(
defObjects
.
length
==
1
)
{
schemaName
=
defObjects
[
0
].
getName
();
}
else
{
schemaName
=
defObjects
[
1
].
getName
()
+
"@"
+
defObjects
[
0
].
getName
();
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
浏览文件 @
390b37a9
...
...
@@ -82,6 +82,9 @@ public class EntityEditor extends MultiPageDatabaseEditor
implements
IPropertyChangeReflector
,
IProgressControlProvider
,
ISaveablePart2
,
ITabbedFolderContainer
,
IDataSourceContainerProvider
,
IEntityEditorContext
{
public
static
final
String
ID
=
"org.jkiss.dbeaver.ui.editors.entity.EntityEditor"
;
//$NON-NLS-1$
// fired when editor is initialized with a database object (e.g. after lazy loading, navigation or history browsing).
public
static
final
int
PROP_OBJECT_INIT
=
0x212
;
private
static
final
Log
log
=
Log
.
getLog
(
EntityEditor
.
class
);
...
...
@@ -895,6 +898,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
@Override
public
void
recreateEditorControl
()
{
recreatePages
();
firePropertyChange
(
PROP_OBJECT_INIT
);
}
private
static
final
int
MAX_BREADCRUMBS_MENU_ITEM
=
300
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录