Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
438587ae
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,发现更多精彩内容 >>
提交
438587ae
编写于
6月 22, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1652 ERD error handling
Former-commit-id:
3e356946
上级
ace349e3
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
20 addition
and
2 deletion
+20
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
...e/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+1
-1
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
...d/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
+15
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
438587ae
...
...
@@ -817,6 +817,10 @@ public class SQLEditor extends SQLEditorBase implements
return
resultsSash
.
getMaximizedControl
()
!=
null
;
}
public
SQLEditorPresentation
getExtraPresentation
()
{
return
extraPresentation
;
}
public
SQLEditorPresentation
.
ActivationType
getExtraPresentationState
()
{
if
(
extraPresentation
==
null
)
{
return
SQLEditorPresentation
.
ActivationType
.
HIDDEN
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
浏览文件 @
438587ae
...
...
@@ -578,7 +578,7 @@ public abstract class SQLEditorBase extends BaseTextEditor implements IErrorVisu
}
@Nullable
p
rotected
SQLScriptElement
extractActiveQuery
()
p
ublic
SQLScriptElement
extractActiveQuery
()
{
SQLScriptElement
element
;
ITextSelection
selection
=
(
ITextSelection
)
getSelectionProvider
().
getSelection
();
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
浏览文件 @
438587ae
...
...
@@ -138,6 +138,8 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
private
IPropertyChangeListener
configPropertyListener
;
private
PaletteRoot
paletteRoot
;
private
String
errorMessage
;
/**
* No-arg constructor
*/
...
...
@@ -180,6 +182,8 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
progressControl
=
new
ProgressControl
(
parent
,
SWT
.
SHEET
);
progressControl
.
setShowDivider
(
true
);
contentContainer
=
progressControl
.
createContentContainer
();
}
else
{
isLoaded
=
true
;
}
super
.
createPartControl
(
contentContainer
);
...
...
@@ -362,6 +366,13 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
{
GraphicalViewer
viewer
=
createViewer
(
parent
);
viewer
.
getControl
().
addPaintListener
(
e
->
{
if
(!
CommonUtils
.
isEmpty
(
errorMessage
))
{
e
.
gc
.
setForeground
(
viewer
.
getControl
().
getForeground
());
UIUtils
.
drawMessageOverControl
(
viewer
.
getControl
(),
e
,
errorMessage
,
0
);
}
});
// hook the viewer into the EditDomain
setGraphicalViewer
(
viewer
);
...
...
@@ -581,7 +592,6 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
// the marquee selection tool
controls
.
add
(
new
MarqueeToolEntry
());
if
(!
isReadOnly
())
{
// separator
PaletteSeparator
separator
=
new
PaletteSeparator
(
"tools"
);
...
...
@@ -804,6 +814,10 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
return
progressControl
!=
null
&&
progressControl
.
performSearch
(
searchType
);
}
public
void
setErrorMessage
(
String
errorMessage
)
{
this
.
errorMessage
=
errorMessage
;
}
protected
abstract
void
loadDiagram
(
boolean
refreshMetadata
);
private
class
ChangeAttributePresentationAction
extends
Action
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录