Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
061c3983
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,发现更多精彩内容 >>
提交
061c3983
编写于
5月 25, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use isolated execution contexts in SQL editor
Former-commit-id:
4925c926
上级
bdfd7d4d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
16 deletion
+21
-16
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
...jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
+0
-13
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
...c/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
+21
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
浏览文件 @
061c3983
...
...
@@ -54,8 +54,6 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
private
Button
editorFullName
;
private
Combo
doubleClickBehavior
;
private
Button
editorSeparateConnectionCheck
;
public
PrefPageDatabaseGeneral
()
{
super
();
...
...
@@ -108,12 +106,6 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
doubleClickBehavior
.
add
(
"Expand / Collapse"
,
NavigatorViewBase
.
DoubleClickBehavior
.
EXPAND
.
ordinal
());
}
{
Group
connectionsGroup
=
UIUtils
.
createControlGroup
(
composite
,
"Connections"
,
2
,
SWT
.
NONE
,
0
);
editorSeparateConnectionCheck
=
UIUtils
.
createCheckbox
(
connectionsGroup
,
"Open connection for each editor"
,
false
);
}
performDefaults
();
return
composite
;
...
...
@@ -133,8 +125,6 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
editorFullName
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
NAVIGATOR_EDITOR_FULL_NAME
));
doubleClickBehavior
.
select
(
NavigatorViewBase
.
DoubleClickBehavior
.
valueOf
(
store
.
getString
(
DBeaverPreferences
.
NAVIGATOR_CONNECTION_DOUBLE_CLICK
)).
ordinal
());
editorSeparateConnectionCheck
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
));
}
@Override
...
...
@@ -153,9 +143,6 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
store
.
setValue
(
DBeaverPreferences
.
NAVIGATOR_CONNECTION_DOUBLE_CLICK
,
CommonUtils
.
fromOrdinal
(
NavigatorViewBase
.
DoubleClickBehavior
.
class
,
doubleClickBehavior
.
getSelectionIndex
()).
name
());
store
.
setValue
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
,
editorSeparateConnectionCheck
.
getSelection
());
RuntimeUtils
.
savePreferenceStore
(
store
);
return
true
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
浏览文件 @
061c3983
...
...
@@ -46,6 +46,7 @@ public class PrefPageSQLEditor extends TargetPrefPage
{
public
static
final
String
PAGE_ID
=
"org.jkiss.dbeaver.preferences.main.sqleditor"
;
//$NON-NLS-1$
private
Button
editorSeparateConnectionCheck
;
private
Button
csAutoActivationCheck
;
private
Spinner
csAutoActivationDelaySpinner
;
private
Button
csAutoInsertCheck
;
...
...
@@ -68,6 +69,7 @@ public class PrefPageSQLEditor extends TargetPrefPage
{
AbstractPreferenceStore
store
=
dataSourceDescriptor
.
getPreferenceStore
();
return
store
.
contains
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
)
||
store
.
contains
(
DBeaverPreferences
.
SCRIPT_AUTO_FOLDERS
)
||
store
.
contains
(
DBeaverPreferences
.
SCRIPT_TITLE_PATTERN
)
||
store
.
contains
(
SQLPreferenceConstants
.
SQLEDITOR_CLOSE_SINGLE_QUOTES
)
||
...
...
@@ -90,11 +92,19 @@ public class PrefPageSQLEditor extends TargetPrefPage
Composite
composite2
=
UIUtils
.
createPlaceholder
(
composite
,
2
);
((
GridLayout
)
composite2
.
getLayout
()).
horizontalSpacing
=
5
;
composite2
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
{
Group
connectionsGroup
=
UIUtils
.
createControlGroup
(
composite2
,
"Connections"
,
2
,
GridData
.
FILL_HORIZONTAL
,
0
);
((
GridData
)
connectionsGroup
.
getLayoutData
()).
horizontalSpan
=
2
;
editorSeparateConnectionCheck
=
UIUtils
.
createCheckbox
(
connectionsGroup
,
"Open separate connection for each editor"
,
false
);
}
// Content assistant
{
Composite
assistGroup
=
UIUtils
.
createControlGroup
(
composite2
,
"Content assistant"
,
2
,
GridData
.
FILL_HORIZONTAL
,
0
);
assistGroup
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
|
GridData
.
VERTICAL_ALIGN_BEGINNING
));
((
GridData
)
assistGroup
.
getLayoutData
()).
horizont
alSpan
=
2
;
((
GridData
)
assistGroup
.
getLayoutData
()).
vertic
alSpan
=
2
;
csAutoActivationCheck
=
UIUtils
.
createLabelCheckbox
(
assistGroup
,
"Enable auto activation"
,
"Enables the content assistant's auto activation"
,
false
);
UIUtils
.
createControlLabel
(
assistGroup
,
"Auto activation delay"
);
...
...
@@ -127,7 +137,7 @@ public class PrefPageSQLEditor extends TargetPrefPage
final
RulerColumnDescriptor
descriptor
=
(
RulerColumnDescriptor
)
obj
;
if
(!
descriptor
.
isGlobal
())
continue
;
Button
checkbox
=
UIUtils
.
createCheckbox
(
rulersGroup
,
descriptor
.
getName
(),
false
);
Button
checkbox
=
UIUtils
.
create
Label
Checkbox
(
rulersGroup
,
descriptor
.
getName
(),
false
);
rulerChecks
.
put
(
descriptor
,
checkbox
);
}
}
...
...
@@ -155,12 +165,14 @@ public class PrefPageSQLEditor extends TargetPrefPage
for
(
int
i
=
0
;
i
<
vars
.
length
;
i
++)
{
legend
.
append
(
"\n\t- ${"
).
append
(
vars
[
i
]).
append
(
"}: "
).
append
(
explain
[
i
]);
}
scriptTitlePattern
.
setToolTipText
(
legend
.
toString
());
/*
Label legendLabel = new Label(scriptsGroup, SWT.NONE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
legendLabel.setLayoutData(gd);
legendLabel.setText(legend.toString());
*/
}
return
composite
;
}
...
...
@@ -169,6 +181,8 @@ public class PrefPageSQLEditor extends TargetPrefPage
protected
void
loadPreferences
(
IPreferenceStore
store
)
{
try
{
editorSeparateConnectionCheck
.
setSelection
(
store
.
getBoolean
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
));
csAutoActivationCheck
.
setSelection
(
store
.
getBoolean
(
SQLPreferenceConstants
.
ENABLE_AUTO_ACTIVATION
));
csAutoActivationDelaySpinner
.
setSelection
(
store
.
getInt
(
SQLPreferenceConstants
.
AUTO_ACTIVATION_DELAY
));
csAutoInsertCheck
.
setSelection
(
store
.
getBoolean
(
SQLPreferenceConstants
.
INSERT_SINGLE_PROPOSALS_AUTO
));
...
...
@@ -196,6 +210,8 @@ public class PrefPageSQLEditor extends TargetPrefPage
protected
void
savePreferences
(
IPreferenceStore
store
)
{
try
{
store
.
setValue
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
,
editorSeparateConnectionCheck
.
getSelection
());
store
.
setValue
(
SQLPreferenceConstants
.
ENABLE_AUTO_ACTIVATION
,
csAutoActivationCheck
.
getSelection
());
store
.
setValue
(
SQLPreferenceConstants
.
AUTO_ACTIVATION_DELAY
,
csAutoActivationDelaySpinner
.
getSelection
());
store
.
setValue
(
SQLPreferenceConstants
.
INSERT_SINGLE_PROPOSALS_AUTO
,
csAutoInsertCheck
.
getSelection
());
...
...
@@ -224,6 +240,8 @@ public class PrefPageSQLEditor extends TargetPrefPage
@Override
protected
void
clearPreferences
(
IPreferenceStore
store
)
{
store
.
setToDefault
(
DBeaverPreferences
.
EDITOR_SEPARATE_CONNECTION
);
store
.
setToDefault
(
SQLPreferenceConstants
.
ENABLE_AUTO_ACTIVATION
);
store
.
setToDefault
(
SQLPreferenceConstants
.
AUTO_ACTIVATION_DELAY
);
store
.
setToDefault
(
SQLPreferenceConstants
.
INSERT_SINGLE_PROPOSALS_AUTO
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录