Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
f194e6b1
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
f194e6b1
编写于
9月 23, 2020
作者:
S
ShadelessFox
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#8033 Rename variable 'type' to 'connectionType'
Former-commit-id:
02ddce04
上级
feb241bd
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
11 addition
and
11 deletion
+11
-11
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
...org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
+1
-1
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java
...ls/transfer/ui/pages/stream/StreamConsumerPageOutput.java
+4
-4
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
...dbeaver/tools/transfer/stream/StreamTransferConsumer.java
+2
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
.../dbeaver/model/connection/DBPConnectionConfiguration.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java
.../dbeaver/model/connection/DataSourceVariableResolver.java
+1
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+2
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnections.java
浏览文件 @
f194e6b1
...
...
@@ -49,7 +49,7 @@ public class PrefPageConnections extends TargetPrefPage
DBPConnectionConfiguration
.
VARIABLE_USER
,
DBPConnectionConfiguration
.
VARIABLE_PASSWORD
,
DBPConnectionConfiguration
.
VARIABLE_URL
,
DBPConnectionConfiguration
.
VARIABLE_TYPE
,
DBPConnectionConfiguration
.
VARIABLE_
CONN_
TYPE
,
DBConstants
.
VAR_CONTEXT_NAME
,
DBConstants
.
VAR_CONTEXT_ID
,
...
...
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java
浏览文件 @
f194e6b1
...
...
@@ -103,7 +103,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
StreamTransferConsumer
.
VARIABLE_DATE
,
StreamTransferConsumer
.
VARIABLE_INDEX
,
StreamTransferConsumer
.
VARIABLE_PROJECT
,
StreamTransferConsumer
.
VARIABLE_TYPE
);
StreamTransferConsumer
.
VARIABLE_
CONN_
TYPE
);
fileNameText
.
setLayoutData
(
gd
);
fileNameText
.
addModifyListener
(
e
->
{
settings
.
setOutputFilePattern
(
fileNameText
.
getText
());
...
...
@@ -120,7 +120,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TIMESTAMP
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_DATE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_INDEX
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TYPE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_
CONN_
TYPE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_PROJECT
)));
{
...
...
@@ -221,7 +221,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
StreamTransferConsumer
.
VARIABLE_TIMESTAMP
,
StreamTransferConsumer
.
VARIABLE_DATE
,
StreamTransferConsumer
.
VARIABLE_PROJECT
,
StreamTransferConsumer
.
VARIABLE_TYPE
);
StreamTransferConsumer
.
VARIABLE_
CONN_
TYPE
);
ContentAssistUtils
.
installContentProposal
(
execProcessText
,
new
SmartTextContentAdapter
(),
...
...
@@ -230,7 +230,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TIMESTAMP
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_DATE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_PROJECT
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TYPE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_
CONN_
TYPE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_FILE
)));
showFinalMessageCheckbox
=
UIUtils
.
createCheckbox
(
resultsSettings
,
DTUIMessages
.
stream_consumer_page_output_label_show_finish_message
,
null
,
getWizard
().
getSettings
().
isShowFinalMessage
(),
4
);
...
...
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
浏览文件 @
f194e6b1
...
...
@@ -79,7 +79,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
public
static
final
String
VARIABLE_INDEX
=
"index"
;
public
static
final
String
VARIABLE_DATE
=
"date"
;
public
static
final
String
VARIABLE_PROJECT
=
"project"
;
public
static
final
String
VARIABLE_
TYPE
=
"t
ype"
;
public
static
final
String
VARIABLE_
CONN_TYPE
=
"connectionT
ype"
;
public
static
final
String
VARIABLE_FILE
=
"file"
;
public
static
final
int
OUT_FILE_BUFFER_SIZE
=
100000
;
...
...
@@ -539,7 +539,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
}
case
VARIABLE_FILE:
return
targetFile
==
null
?
""
:
targetFile
.
getAbsolutePath
();
case
VARIABLE_TYPE:
case
VARIABLE_
CONN_
TYPE:
if
(
dataContainer
==
null
)
{
return
null
;
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
浏览文件 @
f194e6b1
...
...
@@ -45,7 +45,7 @@ public class DBPConnectionConfiguration implements DBPObject {
public
static
final
String
VARIABLE_USER
=
"user"
;
public
static
final
String
VARIABLE_PASSWORD
=
"password"
;
public
static
final
String
VARIABLE_URL
=
"url"
;
public
static
final
String
VARIABLE_
TYPE
=
"t
ype"
;
public
static
final
String
VARIABLE_
CONN_TYPE
=
"connectionT
ype"
;
public
static
final
String
VAR_PROJECT_PATH
=
"project.path"
;
public
static
final
String
VAR_PROJECT_NAME
=
"project.name"
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DataSourceVariableResolver.java
浏览文件 @
f194e6b1
...
...
@@ -45,7 +45,7 @@ public class DataSourceVariableResolver extends SystemVariablesResolver {
return
configuration
.
getUserPassword
();
case
DBPConnectionConfiguration
.
VARIABLE_URL
:
return
configuration
.
getUrl
();
case
DBPConnectionConfiguration
.
VARIABLE_TYPE
:
case
DBPConnectionConfiguration
.
VARIABLE_
CONN_
TYPE
:
return
configuration
.
getConnectionType
().
getName
();
case
DBPConnectionConfiguration
.
VAR_PROJECT_PATH
:
return
dataSourceContainer
==
null
?
null
:
dataSourceContainer
.
getProject
().
getEclipseProject
().
getLocation
().
toOSString
();
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
f194e6b1
...
...
@@ -89,7 +89,7 @@ public class DataSourceDescriptor
{
DBPConnectionConfiguration
.
VARIABLE_USER
,
"database user name"
},
{
DBPConnectionConfiguration
.
VARIABLE_PASSWORD
,
"database password (plain)"
},
{
DBPConnectionConfiguration
.
VARIABLE_URL
,
"connection URL"
},
{
DBPConnectionConfiguration
.
VARIABLE_TYPE
,
"connection type"
},
{
DBPConnectionConfiguration
.
VARIABLE_
CONN_
TYPE
,
"connection type"
},
{
DBPConnectionConfiguration
.
VAR_PROJECT_PATH
,
"project path"
},
{
DBPConnectionConfiguration
.
VAR_PROJECT_NAME
,
"project name"
},
...
...
@@ -1397,7 +1397,7 @@ public class DataSourceDescriptor
case
DBPConnectionConfiguration
.
VARIABLE_USER
:
return
configuration
.
getUserName
();
case
DBPConnectionConfiguration
.
VARIABLE_PASSWORD
:
return
configuration
.
getUserPassword
();
case
DBPConnectionConfiguration
.
VARIABLE_URL
:
return
configuration
.
getUrl
();
case
DBPConnectionConfiguration
.
VARIABLE_TYPE
:
return
configuration
.
getConnectionType
().
getName
();
case
DBPConnectionConfiguration
.
VARIABLE_
CONN_
TYPE
:
return
configuration
.
getConnectionType
().
getName
();
default
:
return
SystemVariablesResolver
.
INSTANCE
.
get
(
name
);
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录