Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
867ee88d
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,发现更多精彩内容 >>
提交
867ee88d
编写于
4月 13, 2020
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bring back connection folder setting
上级
54073bd5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
14 deletion
+4
-14
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
.../dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
+4
-14
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
浏览文件 @
867ee88d
...
@@ -29,10 +29,7 @@ import org.eclipse.swt.layout.GridData;
...
@@ -29,10 +29,7 @@ import org.eclipse.swt.layout.GridData;
import
org.eclipse.swt.widgets.*
;
import
org.eclipse.swt.widgets.*
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.DBPDataSourceFolder
;
import
org.jkiss.dbeaver.model.DBPDataSourcePermission
;
import
org.jkiss.dbeaver.model.DBPDataSourceProvider
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionType
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionType
;
import
org.jkiss.dbeaver.model.navigator.DBNBrowseSettings
;
import
org.jkiss.dbeaver.model.navigator.DBNBrowseSettings
;
...
@@ -47,6 +44,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
...
@@ -47,6 +44,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
import
org.jkiss.dbeaver.ui.IHelpContextIds
;
import
org.jkiss.dbeaver.ui.IHelpContextIds
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.CSmartCombo
;
import
org.jkiss.dbeaver.ui.controls.CSmartCombo
;
import
org.jkiss.dbeaver.ui.internal.UINavigatorMessages
;
import
org.jkiss.dbeaver.ui.navigator.dialogs.EditObjectFilterDialog
;
import
org.jkiss.dbeaver.ui.navigator.dialogs.EditObjectFilterDialog
;
import
org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes
;
import
org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
...
@@ -79,7 +77,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -79,7 +77,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
private
Text
connectionNameText
;
private
Text
connectionNameText
;
private
CSmartCombo
<
DBPConnectionType
>
connectionTypeCombo
;
private
CSmartCombo
<
DBPConnectionType
>
connectionTypeCombo
;
private
Combo
navigatorSettingsCombo
;
private
Combo
navigatorSettingsCombo
;
//
private Combo connectionFolderCombo;
private
Combo
connectionFolderCombo
;
private
Text
descriptionText
;
private
Text
descriptionText
;
private
boolean
connectionNameChanged
=
false
;
private
boolean
connectionNameChanged
=
false
;
...
@@ -156,14 +154,12 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -156,14 +154,12 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
connectionTypeCombo
.
select
(
conConfig
.
getConnectionType
());
connectionTypeCombo
.
select
(
conConfig
.
getConnectionType
());
updateNavigatorSettingsPreset
();
updateNavigatorSettingsPreset
();
/*
dataSourceFolder
=
dataSourceDescriptor
.
getFolder
();
dataSourceFolder
=
dataSourceDescriptor
.
getFolder
();
if
(
dataSourceDescriptor
.
getFolder
()
==
null
)
{
if
(
dataSourceDescriptor
.
getFolder
()
==
null
)
{
connectionFolderCombo
.
select
(
0
);
connectionFolderCombo
.
select
(
0
);
}
else
{
}
else
{
connectionFolderCombo
.
select
(
connectionFolders
.
indexOf
(
dataSourceFolder
));
connectionFolderCombo
.
select
(
connectionFolders
.
indexOf
(
dataSourceFolder
));
}
}
*/
if
(
dataSourceDescriptor
.
getDescription
()
!=
null
)
{
if
(
dataSourceDescriptor
.
getDescription
()
!=
null
)
{
descriptionText
.
setText
(
dataSourceDescriptor
.
getDescription
());
descriptionText
.
setText
(
dataSourceDescriptor
.
getDescription
());
...
@@ -176,13 +172,11 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -176,13 +172,11 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
}
else
{
}
else
{
// Default settings
// Default settings
connectionTypeCombo
.
select
(
0
);
connectionTypeCombo
.
select
(
0
);
/*
if
(
dataSourceFolder
!=
null
)
{
if
(
dataSourceFolder
!=
null
)
{
connectionFolderCombo
.
select
(
connectionFolders
.
indexOf
(
dataSourceFolder
));
connectionFolderCombo
.
select
(
connectionFolders
.
indexOf
(
dataSourceFolder
));
}
else
{
}
else
{
connectionFolderCombo
.
select
(
0
);
connectionFolderCombo
.
select
(
0
);
}
}
*/
readOnlyConnection
.
setSelection
(
false
);
readOnlyConnection
.
setSelection
(
false
);
}
}
...
@@ -370,7 +364,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -370,7 +364,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
});
});
}
}
/*
{
{
UIUtils
.
createControlLabel
(
miscGroup
,
CoreMessages
.
dialog_connection_wizard_final_label_connection_folder
);
UIUtils
.
createControlLabel
(
miscGroup
,
CoreMessages
.
dialog_connection_wizard_final_label_connection_folder
);
...
@@ -386,7 +379,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -386,7 +379,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
}
}
});
});
}
}
*/
{
{
Label
descLabel
=
UIUtils
.
createControlLabel
(
miscGroup
,
CoreMessages
.
dialog_connection_wizard_description
);
Label
descLabel
=
UIUtils
.
createControlLabel
(
miscGroup
,
CoreMessages
.
dialog_connection_wizard_description
);
...
@@ -526,7 +518,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -526,7 +518,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
}
}
}
}
/*
private
void
loadConnectionFolders
()
private
void
loadConnectionFolders
()
{
{
connectionFolderCombo
.
removeAll
();
connectionFolderCombo
.
removeAll
();
...
@@ -550,7 +541,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -550,7 +541,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
loadConnectionFolder
(
level
+
1
,
child
);
loadConnectionFolder
(
level
+
1
,
child
);
}
}
}
}
*/
@Override
@Override
public
boolean
isPageComplete
()
public
boolean
isPageComplete
()
...
@@ -568,7 +558,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
...
@@ -568,7 +558,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
String
name
=
connectionNameChanged
?
connectionNameText
.
getText
()
:
generateConnectionName
(
getWizard
().
getPageSettings
());
String
name
=
connectionNameChanged
?
connectionNameText
.
getText
()
:
generateConnectionName
(
getWizard
().
getPageSettings
());
dataSource
.
setName
(
name
);
dataSource
.
setName
(
name
);
//
dataSource.setFolder(dataSourceFolder);
dataSource
.
setFolder
(
dataSourceFolder
);
if
(
connectionTypeCombo
.
getSelectionIndex
()
>=
0
)
{
if
(
connectionTypeCombo
.
getSelectionIndex
()
>=
0
)
{
confConfig
.
setConnectionType
(
connectionTypeCombo
.
getItem
(
connectionTypeCombo
.
getSelectionIndex
()));
confConfig
.
setConnectionType
(
connectionTypeCombo
.
getItem
(
connectionTypeCombo
.
getSelectionIndex
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录