Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
e88d54ea
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,发现更多精彩内容 >>
提交
e88d54ea
编写于
8月 12, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3933 Connection wizard redesign
上级
14535c0d
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
554 addition
and
405 deletion
+554
-405
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
...dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
....core/src/org/jkiss/dbeaver/core/CoreResources.properties
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
...dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
.../dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
+19
-403
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
...r/ui/dialogs/connection/ConnectionPageInitialization.java
+499
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
...dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
...jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
+18
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
...s/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
...ss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
+3
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
浏览文件 @
e88d54ea
...
...
@@ -350,6 +350,9 @@ public class CoreMessages extends NLS {
public
static
String
dialog_connection_wizard_final_filter_link_not_supported_tooltip
;
public
static
String
dialog_connection_wizard_final_button_tunneling
;
public
static
String
dialog_connection_wizard_connection_init
;
public
static
String
dialog_connection_wizard_connection_init_description
;
public
static
String
dialog_connection_wizard_start_connection_monitor_close
;
public
static
String
dialog_connection_wizard_start_connection_monitor_start
;
public
static
String
dialog_connection_wizard_start_connection_monitor_subtask_test
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
浏览文件 @
e88d54ea
...
...
@@ -346,6 +346,10 @@ dialog_connection_wizard_final_label_isolation_level_tooltip = Default transacti
dialog_connection_wizard_final_label_keepalive
=
Keep-Alive
dialog_connection_wizard_final_label_keepalive_tooltip
=
Keep-alive interval (in seconds). Zero turns keep-alive off
dialog_connection_wizard_final_label_shell_command
=
Shell Commands
dialog_connection_wizard_connection_init
=
Initialization
dialog_connection_wizard_connection_init_description
=
Database connection initialization settings
dialog_connection_wizard_socksproxy_host
=
Host
dialog_connection_wizard_socksproxy_password
=
Password
dialog_connection_wizard_socksproxy_port
=
Port
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
浏览文件 @
e88d54ea
...
...
@@ -114,7 +114,7 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
infoLabel
.
setToolTipText
(
"You can use OS environment variables in connection parameters.\nUse ${variable} patterns."
);
}
if
(!
site
.
isNew
()
&&
!
site
.
getDriver
().
isEmbedded
())
{
if
(!
site
.
getDriver
().
isEmbedded
())
{
Link
netConfigLink
=
new
Link
(
placeholder
,
SWT
.
NONE
);
netConfigLink
.
setText
(
"<a>"
+
CoreMessages
.
dialog_connection_edit_wizard_conn_conf_network_link
+
"</a>"
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
浏览文件 @
e88d54ea
此差异已折叠。
点击以展开。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
0 → 100644
浏览文件 @
e88d54ea
此差异已折叠。
点击以展开。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
浏览文件 @
e88d54ea
...
...
@@ -356,6 +356,9 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
}
else
{
extraPages
=
ArrayUtils
.
concatArrays
(
extraPages
,
new
IDialogPage
[]
{
page
});
}
if
(
page
instanceof
IWizardPage
)
{
((
IWizardPage
)
page
).
setWizard
(
getWizard
());
}
}
@Override
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @
e88d54ea
...
...
@@ -22,6 +22,8 @@ import org.eclipse.core.runtime.Status;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.jface.dialogs.MessageDialog
;
import
org.eclipse.jface.operation.IRunnableWithProgress
;
import
org.eclipse.jface.util.IPropertyChangeListener
;
import
org.eclipse.jface.util.PropertyChangeEvent
;
import
org.eclipse.jface.wizard.IWizardPage
;
import
org.eclipse.jface.wizard.Wizard
;
import
org.eclipse.osgi.util.NLS
;
...
...
@@ -52,7 +54,9 @@ import org.jkiss.utils.CommonUtils;
import
java.lang.reflect.InvocationTargetException
;
import
java.sql.Connection
;
import
java.sql.DatabaseMetaData
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -60,10 +64,14 @@ import java.util.Map;
*/
public
abstract
class
ConnectionWizard
extends
Wizard
implements
INewWizard
{
public
static
final
String
PROP_CONNECTION_TYPE
=
"connection-type"
;
private
static
final
Log
log
=
Log
.
getLog
(
ConnectionWizard
.
class
);
// protected final IProject project;
private
final
Map
<
DriverDescriptor
,
DataSourceDescriptor
>
infoMap
=
new
HashMap
<>();
private
final
List
<
IPropertyChangeListener
>
propertyListeners
=
new
ArrayList
<>();
private
boolean
resized
=
false
;
protected
ConnectionWizard
()
...
...
@@ -278,4 +286,14 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
return
Status
.
OK_STATUS
;
}
}
public
void
addPropertyChangeListener
(
IPropertyChangeListener
listener
)
{
propertyListeners
.
add
(
listener
);
}
public
void
firePropertyChangeEvent
(
String
property
,
Object
oldValue
,
Object
newValue
)
{
for
(
IPropertyChangeListener
listener
:
propertyListeners
)
{
listener
.
propertyChange
(
new
PropertyChangeEvent
(
this
,
property
,
oldValue
,
newValue
));
}
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
浏览文件 @
e88d54ea
...
...
@@ -61,6 +61,7 @@ public class EditConnectionWizard extends ConnectionWizard
private
ConnectionPageSettings
pageSettings
;
private
ConnectionPageGeneral
pageGeneral
;
private
ConnectionPageNetwork
pageNetwork
;
private
ConnectionPageInitialization
pageInit
;
private
EditShellCommandsDialogPage
pageEvents
;
private
List
<
WizardPrefPage
>
prefPages
=
new
ArrayList
<>();
private
PrefPageConnections
pageClientSettings
;
...
...
@@ -127,6 +128,7 @@ public class EditConnectionWizard extends ConnectionWizard
if
(!
embedded
)
{
pageNetwork
=
new
ConnectionPageNetwork
(
this
);
}
pageInit
=
new
ConnectionPageInitialization
(
dataSource
);
pageEvents
=
new
EditShellCommandsDialogPage
(
dataSource
);
addPage
(
pageGeneral
);
...
...
@@ -134,6 +136,7 @@ public class EditConnectionWizard extends ConnectionWizard
if
(!
embedded
)
{
pageSettings
.
addSubPage
(
pageNetwork
);
}
pageSettings
.
addSubPage
(
pageInit
);
pageSettings
.
addSubPage
(
pageEvents
);
}
...
...
@@ -289,6 +292,7 @@ public class EditConnectionWizard extends ConnectionWizard
if
(
isPageActive
(
pageNetwork
))
{
pageNetwork
.
saveConfigurations
(
dataSource
);
}
pageInit
.
saveSettings
(
dataSource
);
pageEvents
.
saveConfigurations
(
dataSource
);
for
(
WizardPrefPage
prefPage
:
prefPages
)
{
savePageSettings
(
prefPage
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
浏览文件 @
e88d54ea
...
...
@@ -48,7 +48,7 @@ public class NewConnectionWizard extends ConnectionWizard
private
Map
<
DataSourceProviderDescriptor
,
ConnectionPageSettings
>
settingsPages
=
new
HashMap
<>();
private
ConnectionPageGeneral
pageGeneral
;
private
ConnectionPageNetwork
pageNetwork
;
private
ConnectionPageInitialization
pageInit
;
public
NewConnectionWizard
()
{
...
...
@@ -114,8 +114,10 @@ public class NewConnectionWizard extends ConnectionWizard
pageGeneral
=
new
ConnectionPageGeneral
(
this
);
pageNetwork
=
new
ConnectionPageNetwork
(
this
);
pageInit
=
new
ConnectionPageInitialization
();
addPage
(
pageGeneral
);
addPage
(
pageNetwork
);
addPage
(
pageInit
);
// Initial settings
if
(
selection
!=
null
&&
!
selection
.
isEmpty
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录