Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
0fd996e8
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,发现更多精彩内容 >>
提交
0fd996e8
编写于
6月 21, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Connect/disconnect jobs redesigned
上级
09a7a1a5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
30 deletion
+34
-30
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/ConnectJob.java
...r.core/src/org/jkiss/dbeaver/runtime/jobs/ConnectJob.java
+3
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/DisconnectJob.java
...ore/src/org/jkiss/dbeaver/runtime/jobs/DisconnectJob.java
+12
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
...eaver/ui/actions/datasource/DataSourceConnectHandler.java
+9
-14
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceDisconnectHandler.java
...er/ui/actions/datasource/DataSourceDisconnectHandler.java
+10
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/ConnectJob.java
浏览文件 @
0fd996e8
...
...
@@ -30,7 +30,9 @@ import org.jkiss.dbeaver.runtime.AbstractJob;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
/**
* Connect job
* Connect job.
* Always returns OK status.
* To get real status use getConectStatus.
*/
public
class
ConnectJob
extends
EventProcessorJob
{
...
...
@@ -77,11 +79,6 @@ public class ConnectJob extends EventProcessorJob
}
catch
(
Throwable
ex
)
{
connectStatus
=
RuntimeUtils
.
makeExceptionStatus
(
ex
);
// UIUtils.showErrorDialog(
// null,
// NLS.bind(CoreMessages.runtime_jobs_connect_status_error, container.getName()),
// null,
// ex);
}
return
Status
.
OK_STATUS
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/DisconnectJob.java
浏览文件 @
0fd996e8
...
...
@@ -24,13 +24,16 @@ import org.jkiss.dbeaver.core.CoreMessages;
import
org.jkiss.dbeaver.model.DBPConnectionEventType
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.
ui.UI
Utils
;
import
org.jkiss.dbeaver.
runtime.Runtime
Utils
;
/**
* Disconnect job
* Disconnect job.
* Always returns OK status.
* To get real status use getConectStatus.
*/
public
class
DisconnectJob
extends
EventProcessorJob
{
private
IStatus
connectStatus
;
public
DisconnectJob
(
DataSourceDescriptor
container
)
{
...
...
@@ -38,6 +41,10 @@ public class DisconnectJob extends EventProcessorJob
setUser
(
true
);
}
public
IStatus
getConnectStatus
()
{
return
connectStatus
;
}
@Override
protected
IStatus
run
(
DBRProgressMonitor
monitor
)
{
...
...
@@ -47,14 +54,10 @@ public class DisconnectJob extends EventProcessorJob
container
.
disconnect
(
monitor
);
processEvents
(
DBPConnectionEventType
.
AFTER_DISCONNECT
);
}
connectStatus
=
Status
.
OK_STATUS
;
}
catch
(
Exception
ex
)
{
UIUtils
.
showErrorDialog
(
null
,
NLS
.
bind
(
CoreMessages
.
runtime_jobs_disconnect_error
,
container
.
getName
()),
null
,
ex
);
catch
(
Throwable
ex
)
{
connectStatus
=
RuntimeUtils
.
makeExceptionStatus
(
ex
);
}
return
Status
.
OK_STATUS
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
浏览文件 @
0fd996e8
...
...
@@ -81,7 +81,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
@Override
public
void
done
(
IJobChangeEvent
event
)
{
if
(
event
.
getResult
().
isOK
())
{
IStatus
result
=
connectJob
.
getConnectStatus
();
if
(
result
.
isOK
())
{
if
(!
dataSourceDescriptor
.
isSavePassword
())
{
// Rest password back to null
// TODO: to be correct we need to reset password info.
...
...
@@ -93,13 +94,18 @@ public class DataSourceConnectHandler extends DataSourceHandler
}
}
if
(
onFinish
!=
null
)
{
onFinish
.
onProcessFinish
(
event
.
getResult
());
onFinish
.
onProcessFinish
(
result
);
}
else
if
(!
result
.
isOK
())
{
UIUtils
.
showErrorDialog
(
null
,
connectJob
.
getName
(),
null
,
//NLS.bind(CoreMessages.runtime_jobs_connect_status_error, dataSourceContainer.getName()),
result
);
}
}
};
if
(
monitor
!=
null
)
{
connectJob
.
runSync
(
monitor
);
final
IStatus
result
=
connectJob
.
getConnectStatus
();
jobChangeAdapter
.
done
(
new
IJobChangeEvent
()
{
@Override
public
long
getDelay
()
{
...
...
@@ -116,17 +122,6 @@ public class DataSourceConnectHandler extends DataSourceHandler
return
connectJob
.
getConnectStatus
();
}
});
if
(!
result
.
isOK
())
{
if
(
onFinish
!=
null
)
{
onFinish
.
onProcessFinish
(
result
);
}
else
{
UIUtils
.
showErrorDialog
(
null
,
connectJob
.
getName
(),
null
,
//NLS.bind(CoreMessages.runtime_jobs_connect_status_error, dataSourceContainer.getName()),
result
);
}
}
}
else
{
connectJob
.
addJobChangeListener
(
jobChangeAdapter
);
// Schedule in UI because connect may be initiated during application startup
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceDisconnectHandler.java
浏览文件 @
0fd996e8
...
...
@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.ui.actions.datasource;
import
org.eclipse.core.commands.ExecutionEvent
;
import
org.eclipse.core.commands.ExecutionException
;
import
org.eclipse.core.runtime.IStatus
;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
...
...
@@ -26,6 +27,7 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.runtime.jobs.DisconnectJob
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.actions.DataSourceHandler
;
import
org.jkiss.utils.ArrayUtils
;
...
...
@@ -48,13 +50,20 @@ public class DataSourceDisconnectHandler extends DataSourceHandler
// Already connecting/disconnecting - just return
return
;
}
DisconnectJob
disconnectJob
=
new
DisconnectJob
(
dataSourceDescriptor
);
final
DisconnectJob
disconnectJob
=
new
DisconnectJob
(
dataSourceDescriptor
);
disconnectJob
.
addJobChangeListener
(
new
JobChangeAdapter
()
{
@Override
public
void
done
(
IJobChangeEvent
event
)
{
IStatus
result
=
disconnectJob
.
getConnectStatus
();
if
(
onFinish
!=
null
)
{
onFinish
.
run
();
}
else
if
(!
result
.
isOK
())
{
UIUtils
.
showErrorDialog
(
null
,
disconnectJob
.
getName
(),
null
,
result
);
}
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录