Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
f7a528b7
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,发现更多精彩内容 >>
提交
f7a528b7
编写于
5月 15, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Navigator contexts activation fix
Former-commit-id:
8ff981c7
上级
d401491e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
12 deletion
+15
-12
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/WorkbenchContextListener.java
.../src/org/jkiss/dbeaver/core/WorkbenchContextListener.java
+10
-10
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
...kiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
+5
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/WorkbenchContextListener.java
浏览文件 @
f7a528b7
...
...
@@ -50,7 +50,7 @@ class WorkbenchContextListener implements IWindowListener, IPageListener, IPartL
private
static
final
String
RESULTS_CONTEXT_ID
=
"org.jkiss.dbeaver.ui.context.resultset"
;
private
static
final
String
PERSPECTIVE_CONTEXT_ID
=
"org.jkiss.dbeaver.ui.perspective"
;
private
IContextActivation
activationNavigator
;
//
private IContextActivation activationNavigator;
private
IContextActivation
activationSQL
;
private
IContextActivation
activationResults
;
private
CommandExecutionListener
commandExecutionListener
;
...
...
@@ -198,11 +198,11 @@ class WorkbenchContextListener implements IWindowListener, IPageListener, IPartL
if
(
part
instanceof
INavigatorModelView
)
{
// We check for instanceof (do not use adapter) because otherwise it become active
// for all entity editor and clashes with SQL editor and other complex stuff.
if
(
activationNavigator
!=
null
)
{
//log.debug("Double activation of navigator context");
contextService
.
deactivateContext
(
activationNavigator
);
}
activationNavigator
=
contextService
.
activateContext
(
INavigatorModelView
.
NAVIGATOR_CONTEXT_ID
);
//
if (activationNavigator != null) {
//
//log.debug("Double activation of navigator context");
//
contextService.deactivateContext(activationNavigator);
//
}
//
activationNavigator = contextService.activateContext(INavigatorModelView.NAVIGATOR_CONTEXT_ID);
}
if
(
part
instanceof
SQLEditorBase
||
part
.
getAdapter
(
SQLEditorBase
.
class
)
!=
null
)
{
if
(
activationSQL
!=
null
)
{
...
...
@@ -241,10 +241,10 @@ class WorkbenchContextListener implements IWindowListener, IPageListener, IPartL
}
try
{
contextService
.
deferUpdates
(
true
);
if
(
activationNavigator
!=
null
&&
part
instanceof
INavigatorModelView
)
{
contextService
.
deactivateContext
(
activationNavigator
);
activationNavigator
=
null
;
}
//
if (activationNavigator != null && part instanceof INavigatorModelView) {
//
contextService.deactivateContext(activationNavigator);
//
activationNavigator = null;
//
}
if
(
activationSQL
!=
null
)
{
contextService
.
deactivateContext
(
activationSQL
);
activationSQL
=
null
;
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
浏览文件 @
f7a528b7
...
...
@@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.TreeViewer;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.ui.IEditorPart
;
import
org.eclipse.ui.contexts.IContextService
;
import
org.eclipse.ui.part.ViewPart
;
import
org.eclipse.ui.views.properties.IPropertySheetPage
;
import
org.jkiss.code.NotNull
;
...
...
@@ -104,8 +105,10 @@ public abstract class NavigatorViewBase extends ViewPart implements INavigatorMo
this
.
tree
=
createNavigatorTree
(
parent
,
getRootNode
());
getViewSite
().
setSelectionProvider
(
tree
.
getViewer
());
EditorUtils
.
trackControlContext
(
getSite
(),
this
.
tree
.
getViewer
().
getControl
(),
INavigatorModelView
.
NAVIGATOR_CONTEXT_ID
);
EditorUtils
.
trackControlContext
(
getSite
(),
this
.
tree
.
getViewer
().
getControl
(),
INavigatorModelView
.
NAVIGATOR_VIEW_CONTEXT_ID
);
getSite
().
getService
(
IContextService
.
class
).
activateContext
(
INavigatorModelView
.
NAVIGATOR_CONTEXT_ID
);
getSite
().
getService
(
IContextService
.
class
).
activateContext
(
INavigatorModelView
.
NAVIGATOR_VIEW_CONTEXT_ID
);
// EditorUtils.trackControlContext(getSite(), this.tree.getViewer().getControl(), INavigatorModelView.NAVIGATOR_CONTEXT_ID);
// EditorUtils.trackControlContext(getSite(), this.tree.getViewer().getControl(), INavigatorModelView.NAVIGATOR_VIEW_CONTEXT_ID);
}
private
DatabaseNavigatorTree
createNavigatorTree
(
Composite
parent
,
DBNNode
rootNode
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录