Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
85d32ea3
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,发现更多精彩内容 >>
提交
85d32ea3
编写于
12月 29, 2017
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#2705 Shwo confirmation on changed node refresh
上级
db39eb99
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
66 addition
and
35 deletion
+66
-35
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
...aver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
+36
-35
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerRefresh.java
...dbeaver/ui/actions/navigator/NavigatorHandlerRefresh.java
+30
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
浏览文件 @
85d32ea3
...
@@ -139,12 +139,6 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
...
@@ -139,12 +139,6 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
openConnectionEditor
(
workbenchWindow
,
dataSourceContainer
);
openConnectionEditor
(
workbenchWindow
,
dataSourceContainer
);
return
null
;
return
null
;
}
}
/*
if (!selectedNode.isPersisted()) {
log.debug("Node '" + selectedNode.getNodeName() + "' s not persisted. Open not possible.");
return null;
}
*/
try
{
try
{
String
defaultFolderId
=
null
;
String
defaultFolderId
=
null
;
if
(
selectedNode
instanceof
DBNDatabaseFolder
&&
!(
selectedNode
.
getParentNode
()
instanceof
DBNDatabaseFolder
)
&&
selectedNode
.
getParentNode
()
instanceof
DBNDatabaseNode
)
{
if
(
selectedNode
instanceof
DBNDatabaseFolder
&&
!(
selectedNode
.
getParentNode
()
instanceof
DBNDatabaseFolder
)
&&
selectedNode
.
getParentNode
()
instanceof
DBNDatabaseNode
)
{
...
@@ -152,24 +146,8 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
...
@@ -152,24 +146,8 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
selectedNode
=
selectedNode
.
getParentNode
();
selectedNode
=
selectedNode
.
getParentNode
();
}
}
DatabaseEditorInputFactory
.
setLookupEditor
(
true
);
IEditorPart
editor
=
findEntityEditor
(
workbenchWindow
,
selectedNode
);
try
{
if
(
editor
!=
null
)
{
for
(
IEditorReference
ref
:
workbenchWindow
.
getActivePage
().
getEditorReferences
())
{
IEditorInput
editorInput
;
try
{
editorInput
=
ref
.
getEditorInput
();
}
catch
(
Throwable
e
)
{
continue
;
}
if
(
editorInput
instanceof
INavigatorEditorInput
)
{
boolean
matches
;
if
(
editorInput
instanceof
DatabaseLazyEditorInput
)
{
matches
=
selectedNode
.
getNodeItemPath
().
equals
(((
DatabaseLazyEditorInput
)
editorInput
).
getNodePath
());
}
else
{
matches
=
((
INavigatorEditorInput
)
editorInput
).
getNavigatorNode
()
==
selectedNode
;
}
if
(
matches
)
{
final
IEditorPart
editor
=
ref
.
getEditor
(
true
);
if
(
editor
instanceof
ITabbedFolderContainer
&&
defaultFolderId
!=
null
)
{
if
(
editor
instanceof
ITabbedFolderContainer
&&
defaultFolderId
!=
null
)
{
// Activate default folder
// Activate default folder
((
ITabbedFolderContainer
)
editor
).
switchFolder
(
defaultFolderId
);
((
ITabbedFolderContainer
)
editor
).
switchFolder
(
defaultFolderId
);
...
@@ -177,12 +155,6 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
...
@@ -177,12 +155,6 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
workbenchWindow
.
getActivePage
().
activate
(
editor
);
workbenchWindow
.
getActivePage
().
activate
(
editor
);
return
editor
;
return
editor
;
}
}
}
}
}
finally
{
DatabaseEditorInputFactory
.
setLookupEditor
(
false
);
}
if
(
selectedNode
instanceof
DBNDatabaseObject
)
{
if
(
selectedNode
instanceof
DBNDatabaseObject
)
{
DBNDatabaseObject
objectNode
=
(
DBNDatabaseObject
)
selectedNode
;
DBNDatabaseObject
objectNode
=
(
DBNDatabaseObject
)
selectedNode
;
...
@@ -222,6 +194,35 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
...
@@ -222,6 +194,35 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
}
}
}
}
public
static
IEditorPart
findEntityEditor
(
IWorkbenchWindow
workbenchWindow
,
DBNNode
node
)
{
DatabaseEditorInputFactory
.
setLookupEditor
(
true
);
try
{
for
(
IEditorReference
ref
:
workbenchWindow
.
getActivePage
().
getEditorReferences
())
{
IEditorInput
editorInput
;
try
{
editorInput
=
ref
.
getEditorInput
();
}
catch
(
Throwable
e
)
{
continue
;
}
if
(
editorInput
instanceof
INavigatorEditorInput
)
{
boolean
matches
;
if
(
editorInput
instanceof
DatabaseLazyEditorInput
)
{
matches
=
node
.
getNodeItemPath
().
equals
(((
DatabaseLazyEditorInput
)
editorInput
).
getNodePath
());
}
else
{
matches
=
((
INavigatorEditorInput
)
editorInput
).
getNavigatorNode
()
==
node
;
}
if
(
matches
)
{
return
ref
.
getEditor
(
true
);
}
}
}
}
finally
{
DatabaseEditorInputFactory
.
setLookupEditor
(
false
);
}
return
null
;
}
private
static
void
refreshDatabaseNode
(
@NotNull
DBNDatabaseNode
selectedNode
)
throws
InvocationTargetException
,
InterruptedException
{
private
static
void
refreshDatabaseNode
(
@NotNull
DBNDatabaseNode
selectedNode
)
throws
InvocationTargetException
,
InterruptedException
{
final
DBNDatabaseNode
nodeToRefresh
=
selectedNode
;
final
DBNDatabaseNode
nodeToRefresh
=
selectedNode
;
DBeaverUI
.
runInProgressService
(
new
DBRRunnableWithProgress
()
{
DBeaverUI
.
runInProgressService
(
new
DBRRunnableWithProgress
()
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerRefresh.java
浏览文件 @
85d32ea3
...
@@ -24,12 +24,16 @@ import org.eclipse.core.runtime.Status;
...
@@ -24,12 +24,16 @@ import org.eclipse.core.runtime.Status;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.jface.viewers.ISelection
;
import
org.eclipse.jface.viewers.ISelection
;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.ui.IEditorPart
;
import
org.eclipse.ui.IEditorPart
;
import
org.eclipse.ui.IWorkbenchPart
;
import
org.eclipse.ui.IWorkbenchPart
;
import
org.eclipse.ui.handlers.HandlerUtil
;
import
org.eclipse.ui.handlers.HandlerUtil
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNEvent
;
import
org.jkiss.dbeaver.model.navigator.DBNEvent
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
...
@@ -37,8 +41,13 @@ import org.jkiss.dbeaver.model.runtime.AbstractJob;
...
@@ -37,8 +41,13 @@ import org.jkiss.dbeaver.model.runtime.AbstractJob;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.runtime.ui.DBUserInterface
;
import
org.jkiss.dbeaver.runtime.ui.DBUserInterface
;
import
org.jkiss.dbeaver.ui.IRefreshablePart
;
import
org.jkiss.dbeaver.ui.IRefreshablePart
;
import
org.jkiss.dbeaver.ui.UIConfirmation
;
import
org.jkiss.dbeaver.ui.UITask
;
import
org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog
;
import
org.jkiss.dbeaver.ui.editors.EditorUtils
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.navigator.INavigatorModelView
;
import
org.jkiss.dbeaver.ui.navigator.INavigatorModelView
;
import
org.jkiss.dbeaver.ui.navigator.NavigatorUtils
;
import
java.util.*
;
import
java.util.*
;
...
@@ -133,6 +142,27 @@ public class NavigatorHandlerRefresh extends AbstractHandler {
...
@@ -133,6 +142,27 @@ public class NavigatorHandlerRefresh extends AbstractHandler {
continue
;
continue
;
}
}
}
}
// Check for dirty editor (some local changes) and ask for confirmation
if
(
node
instanceof
DBNDatabaseFolder
&&
!(
node
.
getParentNode
()
instanceof
DBNDatabaseFolder
)
&&
node
.
getParentNode
()
instanceof
DBNDatabaseNode
)
{
// USe parent if this node is a folder
node
=
node
.
getParentNode
();
}
IEditorPart
nodeEditor
=
NavigatorHandlerObjectOpen
.
findEntityEditor
(
DBeaverUI
.
getActiveWorkbenchWindow
(),
node
);
if
(
nodeEditor
!=
null
&&
nodeEditor
.
isDirty
())
{
if
(!
new
UIConfirmation
()
{
@Override
protected
Boolean
runTask
()
{
return
ConfirmationDialog
.
showConfirmDialog
(
null
,
DBeaverPreferences
.
CONFIRM_ENTITY_REVERT
,
ConfirmationDialog
.
QUESTION
,
nodeEditor
.
getTitle
())
==
IDialogConstants
.
YES_ID
;
}
}.
execute
())
{
continue
;
}
}
setName
(
"Refresh '"
+
node
.
getNodeName
()
+
"'..."
);
setName
(
"Refresh '"
+
node
.
getNodeName
()
+
"'..."
);
try
{
try
{
DBNNode
refreshed
=
node
.
refreshNode
(
monitor
,
DBNEvent
.
FORCE_REFRESH
);
DBNNode
refreshed
=
node
.
refreshNode
(
monitor
,
DBNEvent
.
FORCE_REFRESH
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录