Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
2e3ccb10
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,发现更多精彩内容 >>
提交
2e3ccb10
编写于
11月 17, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI confirmations fix (invalid thread access)
上级
8d11c456
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
3 deletion
+11
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
....jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
+7
-1
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
...b2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
+1
-1
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
.../org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/transformers/URLAttributeTransformer.java
...model/impl/data/transformers/URLAttributeTransformer.java
+2
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
浏览文件 @
2e3ccb10
...
...
@@ -431,12 +431,18 @@ public class UIUtils {
DBeaverUI
.
syncExec
(
runnable
);
}
public
static
boolean
confirmAction
(
final
String
title
,
final
String
question
)
{
return
confirmAction
(
null
,
title
,
question
);
}
public
static
boolean
confirmAction
(
final
Shell
shell
,
final
String
title
,
final
String
question
)
{
return
new
UIConfirmation
()
{
@Override
public
Boolean
runTask
()
{
MessageBox
messageBox
=
new
MessageBox
(
shell
,
SWT
.
ICON_WARNING
|
SWT
.
YES
|
SWT
.
NO
);
Shell
activeShell
=
shell
!=
null
?
shell
:
DBeaverUI
.
getActiveWorkbenchShell
();
MessageBox
messageBox
=
new
MessageBox
(
activeShell
,
SWT
.
ICON_WARNING
|
SWT
.
YES
|
SWT
.
NO
);
messageBox
.
setMessage
(
question
);
messageBox
.
setText
(
title
);
int
response
=
messageBox
.
open
();
...
...
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
浏览文件 @
2e3ccb10
...
...
@@ -480,7 +480,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
// No valid explain tables found, propose to create them in current authId
String
msg
=
String
.
format
(
DB2Messages
.
dialog_explain_ask_to_create
,
sessionUserSchema
);
if
(!
UIUtils
.
confirmAction
(
DB
eaverUI
.
getActiveWorkbenchShell
(),
DB
2Messages
.
dialog_explain_no_tables
,
msg
))
{
if
(!
UIUtils
.
confirmAction
(
DB2Messages
.
dialog_explain_no_tables
,
msg
))
{
return
null
;
}
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @
2e3ccb10
...
...
@@ -40,6 +40,7 @@ import org.jkiss.dbeaver.model.sql.SQLConstants;
import
org.jkiss.dbeaver.model.sql.SQLDialect
;
import
org.jkiss.dbeaver.model.sql.SQLState
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.ui.UIConfirmation
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -517,7 +518,6 @@ public class OracleDataSource extends JDBCDataSource
final
String
newPlanTableName
=
candidateNames
[
0
];
// Plan table not found - try to create new one
if
(!
UIUtils
.
confirmAction
(
DBeaverUI
.
getActiveWorkbenchShell
(),
"Oracle PLAN_TABLE missing"
,
"PLAN_TABLE not found in current user's session. "
+
"Do you want DBeaver to create new PLAN_TABLE ("
+
newPlanTableName
+
")?"
))
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/transformers/URLAttributeTransformer.java
浏览文件 @
2e3ccb10
...
...
@@ -45,6 +45,8 @@ public class URLAttributeTransformer implements DBDAttributeTransformer {
private
static
final
Log
log
=
Log
.
getLog
(
URLAttributeTransformer
.
class
);
private
static
final
String
PROP_PATTERN
=
"pattern"
;
private
static
final
String
PROP_VIEW_INLINE
=
"view.inline"
;
private
static
final
String
PROP_VIEW_PANEL
=
"view.panel"
;
public
static
final
String
URL_TYPE_NAME
=
"URL.Preview"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录