Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
39151c9e
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,发现更多精彩内容 >>
提交
39151c9e
编写于
8月 13, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Database navigator context added (avoid keybindings conflicts)
Former-commit-id:
2b21d041
上级
0e9f69fc
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
2 deletion
+23
-2
plugins/org.jkiss.dbeaver.core/plugin.xml
plugins/org.jkiss.dbeaver.core/plugin.xml
+7
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
...src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/FolderEditor.java
...src/org/jkiss/dbeaver/ui/editors/entity/FolderEditor.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
...re/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
+9
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
...kiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
+1
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/plugin.xml
浏览文件 @
39151c9e
...
...
@@ -638,6 +638,7 @@
</handler>
<handler
commandId=
"org.jkiss.dbeaver.core.object.open"
class=
"org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectOpen"
>
<activeWhen><reference
definitionId=
"org.jkiss.dbeaver.core.ui.navigator.part"
/></activeWhen>
<enabledWhen>
<with
variable=
"selection"
>
<count
value=
"+"
/>
...
...
@@ -1679,7 +1680,7 @@
<key
commandId=
"org.jkiss.dbeaver.core.navigator.bookmark.add"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+D"
/>
<key
commandId=
"org.jkiss.dbeaver.core.object.create"
contextId=
"org.eclipse.ui.contexts.window"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"NUMPAD_ADD"
/>
<key
commandId=
"org.jkiss.dbeaver.core.object.goto"
contextId=
"org.eclipse.ui.contexts.window"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+SHIFT+D"
/>
<key
commandId=
"org.jkiss.dbeaver.core.object.open"
contextId=
"org.
eclipse.ui.contexts.window
"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"F4"
/>
<key
commandId=
"org.jkiss.dbeaver.core.object.open"
contextId=
"org.
jkiss.dbeaver.ui.context.navigator
"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"F4"
/>
<!-- SQL Editor -->
<key
commandId=
"org.jkiss.dbeaver.core.sql.editor.open"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+L"
/>
...
...
@@ -1750,7 +1751,11 @@
</extension>
<extension
point=
"org.eclipse.ui.contexts"
>
<context
id=
"org.jkiss.dbeaver.core.navigationContext"
name=
"Navigation context"
/>
<context
id=
"org.jkiss.dbeaver.ui.context.navigator"
parentId=
"org.eclipse.ui.contexts.window"
name=
"Database navigator context"
description=
"Database navigator context"
/>
<context
id=
"org.jkiss.dbeaver.ui.editors.sql"
name=
"SQL Editor Context"
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
浏览文件 @
39151c9e
...
...
@@ -64,6 +64,7 @@ import org.jkiss.dbeaver.ui.editors.DatabaseEditorInput;
import
org.jkiss.dbeaver.ui.editors.ErrorEditorInput
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.MultiPageDatabaseEditor
;
import
org.jkiss.dbeaver.ui.navigator.NavigatorUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.lang.reflect.InvocationTargetException
;
...
...
@@ -365,6 +366,8 @@ public class EntityEditor extends MultiPageDatabaseEditor
@Override
protected
void
createPages
()
{
NavigatorUtils
.
setNavigatorContext
(
getSite
());
if
(
getEditorInput
()
instanceof
ErrorEditorInput
)
{
ErrorEditorInput
errorInput
=
(
ErrorEditorInput
)
getEditorInput
();
try
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/FolderEditor.java
浏览文件 @
39151c9e
...
...
@@ -27,6 +27,7 @@ import org.jkiss.dbeaver.ui.ISearchContextProvider;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl
;
import
org.jkiss.dbeaver.ui.editors.SinglePageDatabaseEditor
;
import
org.jkiss.dbeaver.ui.navigator.NavigatorUtils
;
/**
* FolderEditor
...
...
@@ -40,6 +41,8 @@ public class FolderEditor extends SinglePageDatabaseEditor<FolderEditorInput> im
@Override
public
void
createPartControl
(
Composite
parent
)
{
NavigatorUtils
.
setNavigatorContext
(
getSite
());
itemControl
=
new
ItemListControl
(
parent
,
SWT
.
NONE
,
this
.
getSite
(),
getEditorInput
().
getNavigatorNode
(),
null
);
itemControl
.
createProgressPanel
();
itemControl
.
loadData
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
浏览文件 @
39151c9e
...
...
@@ -33,6 +33,7 @@ import org.eclipse.ui.IWorkbenchActionConstants;
import
org.eclipse.ui.IWorkbenchCommandConstants
;
import
org.eclipse.ui.IWorkbenchPartSite
;
import
org.eclipse.ui.IWorkbenchSite
;
import
org.eclipse.ui.contexts.IContextService
;
import
org.eclipse.ui.dialogs.PreferencesUtil
;
import
org.eclipse.ui.menus.UIElement
;
import
org.eclipse.ui.part.IPageSite
;
...
...
@@ -60,6 +61,7 @@ import java.util.*;
public
class
NavigatorUtils
{
public
static
final
String
MB_NAVIGATOR_ADDITIONS
=
"navigator_additions"
;
public
static
final
String
NAVIGATOR_CONTEXT_ID
=
"org.jkiss.dbeaver.ui.context.navigator"
;
public
static
DBNNode
getSelectedNode
(
ISelectionProvider
selectionProvider
)
{
...
...
@@ -424,4 +426,11 @@ public class NavigatorUtils {
return
false
;
}
public
static
void
setNavigatorContext
(
IWorkbenchPartSite
site
)
{
IContextService
contextService
=
site
.
getService
(
IContextService
.
class
);
if
(
contextService
!=
null
)
{
contextService
.
activateContext
(
NAVIGATOR_CONTEXT_ID
);
}
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
浏览文件 @
39151c9e
...
...
@@ -82,6 +82,7 @@ public abstract class NavigatorViewBase extends ViewPart implements INavigatorMo
@Override
public
void
createPartControl
(
Composite
parent
)
{
NavigatorUtils
.
setNavigatorContext
(
getSite
());
this
.
tree
=
createNavigatorTree
(
parent
,
getRootNode
());
getViewSite
().
setSelectionProvider
(
tree
.
getViewer
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录