Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
b0eae09d
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,发现更多精彩内容 >>
提交
b0eae09d
编写于
8月 26, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eclipse 4.7 compatibility fix
上级
1ae76034
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
11 addition
and
7 deletion
+11
-7
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java
.../dbeaver/ui/navigator/database/DatabaseNavigatorTree.java
+4
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
...c/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
+2
-2
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/page/StreamConsumerPageOutput.java
.../tools/transfer/stream/page/StreamConsumerPageOutput.java
+5
-4
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java
浏览文件 @
b0eae09d
...
...
@@ -263,12 +263,15 @@ public class DatabaseNavigatorTree extends Composite implements INavigatorListen
UIUtils
.
runInProgressService
(
runnable
);
if
(
runnable
.
getResult
()
!=
null
)
{
showNode
(
runnable
.
getResult
());
// TODO: it is a bug in Eclipse.
treeViewer
.
expandToLevel
(
runnable
.
getResult
(),
1
);
/*
// TODO: it is a bug in Eclipse Photon.
try {
treeViewer.expandToLevel(runnable.getResult(), 1, true);
} catch (Throwable e) {
treeViewer.expandToLevel(runnable.getResult(), 1);
}
*/
}
}
catch
(
InvocationTargetException
e
)
{
log
.
error
(
"Can't expand node"
,
e
.
getTargetException
());
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
浏览文件 @
b0eae09d
...
...
@@ -125,11 +125,11 @@ public class PrefPageSQLEditor extends TargetPrefPage
UIUtils
.
installContentProposal
(
scriptTitlePattern
,
new
TextContentAdapter
(),
new
SimpleContentProposalProvider
(
new
SimpleContentProposalProvider
(
new
String
[]
{
GeneralUtils
.
variablePattern
(
SQLEditor
.
VAR_CONNECTION_NAME
),
GeneralUtils
.
variablePattern
(
SQLEditor
.
VAR_DRIVER_NAME
),
GeneralUtils
.
variablePattern
(
SQLEditor
.
VAR_FILE_NAME
),
GeneralUtils
.
variablePattern
(
SQLEditor
.
VAR_FILE_EXT
)));
GeneralUtils
.
variablePattern
(
SQLEditor
.
VAR_FILE_EXT
)
}
));
UIUtils
.
setContentProposalToolTip
(
scriptTitlePattern
,
"Output file name patterns"
,
SQLEditor
.
VAR_CONNECTION_NAME
,
SQLEditor
.
VAR_DRIVER_NAME
,
SQLEditor
.
VAR_FILE_NAME
,
SQLEditor
.
VAR_FILE_EXT
);
}
...
...
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/page/StreamConsumerPageOutput.java
浏览文件 @
b0eae09d
...
...
@@ -106,14 +106,15 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
UIUtils
.
installContentProposal
(
fileNameText
,
new
TextContentAdapter
(),
new
SimpleContentProposalProvider
(
new
SimpleContentProposalProvider
(
new
String
[]
{
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_DATASOURCE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_CATALOG
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_SCHEMA
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TABLE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TIMESTAMP
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_DATE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_PROJECT
)));
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_PROJECT
)
}));
{
UIUtils
.
createControlLabel
(
generalSettings
,
DTMessages
.
data_transfer_wizard_output_label_encoding
);
...
...
@@ -185,12 +186,12 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
UIUtils
.
installContentProposal
(
execProcessText
,
new
TextContentAdapter
(),
new
SimpleContentProposalProvider
(
new
SimpleContentProposalProvider
(
new
String
[]
{
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TABLE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_TIMESTAMP
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_DATE
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_PROJECT
),
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_FILE
)));
GeneralUtils
.
variablePattern
(
StreamTransferConsumer
.
VARIABLE_FILE
)
}
));
showFinalMessageCheckbox
=
UIUtils
.
createCheckbox
(
resultsSettings
,
"Show finish message"
,
null
,
getWizard
().
getSettings
().
isShowFinalMessage
(),
4
);
showFinalMessageCheckbox
.
addSelectionListener
(
new
SelectionAdapter
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录