Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
1526f8b9
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,发现更多精彩内容 >>
提交
1526f8b9
编写于
7月 17, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
migration dialog text fixed
上级
b78e1a28
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
7 deletion
+24
-7
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverSettingsImporter.java
...iss/dbeaver/core/application/DBeaverSettingsImporter.java
+14
-7
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
...eaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
+10
-0
未找到文件。
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverSettingsImporter.java
浏览文件 @
1526f8b9
...
...
@@ -88,6 +88,8 @@ class DBeaverSettingsImporter {
String
oldVersion
=
workspaceProps
.
getProperty
(
DBeaverApplication
.
VERSION_PROP_PRODUCT_VERSION
);
if
(
oldVersion
==
null
)
{
oldVersion
=
"3.x"
;
}
else
{
oldVersion
=
GeneralUtils
.
getPlainVersion
(
oldVersion
);
}
oldWorkspacePath
=
oldDir
;
oldDriversFolder
=
new
File
(
...
...
@@ -118,10 +120,14 @@ class DBeaverSettingsImporter {
iconLabel
.
setLayoutData
(
new
GridData
(
GridData
.
VERTICAL_ALIGN_BEGINNING
));
Label
confirmLabel
=
new
Label
(
infoGroup
,
SWT
.
NONE
);
//confirmLabel.setImage(JFaceResources.getImage(org.eclipse.jface.dialogs.Dialog.DLG_IMG_MESSAGE_INFO));
confirmLabel
.
setText
(
"Previous version ("
+
GeneralUtils
.
getProductName
()
+
" "
+
oldVersion
+
") settings were found:\n"
+
oldDir
.
getAbsolutePath
()
+
"\n"
+
"Do you want to import these settings? (Recommended).\n\n"
+
"Make sure previous version of "
+
GeneralUtils
.
getProductName
()
+
" isn't running"
);
confirmLabel
.
setText
(
"\n"
+
GeneralUtils
.
getProductTitle
()
+
" uses new configuration format.\n\n"
+
// "Previous version (" + GeneralUtils.getProductName() + " " + oldVersion + ") settings were found.\n" +
// oldDir.getAbsolutePath() + "\n" +
"Do you want to migrate existing settings (version "
+
oldVersion
+
")?\n\n"
// "Make sure previous version of " + GeneralUtils.getProductName() + " isn't running"
);
confirmLabel
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
}
...
...
@@ -130,10 +136,10 @@ class DBeaverSettingsImporter {
buttonsPanel
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
buttonsPanel
.
setLayout
(
new
GridLayout
(
2
,
true
));
final
Button
migrateButton
=
new
Button
(
buttonsPanel
,
SWT
.
PUSH
);
migrateButton
.
setText
(
"
Import workspace
"
);
migrateButton
.
setText
(
"
Migrate (Recommended)
"
);
final
Button
skipButton
=
new
Button
(
buttonsPanel
,
SWT
.
PUSH
);
skipButton
.
setText
(
"
Skip
"
);
skipButton
.
setText
(
"
Do not migrate
"
);
migrateButton
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
migrateButton
.
addSelectionListener
(
new
SelectionAdapter
()
{
...
...
@@ -147,6 +153,7 @@ class DBeaverSettingsImporter {
migrateWorkspace
(
oldDir
,
newDir
);
}
});
windowShell
.
setDefaultButton
(
migrateButton
);
skipButton
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
skipButton
.
addSelectionListener
(
new
SelectionAdapter
()
{
...
...
@@ -154,7 +161,7 @@ class DBeaverSettingsImporter {
public
void
widgetSelected
(
SelectionEvent
e
)
{
MessageBox
messageBox
=
new
MessageBox
(
windowShell
,
SWT
.
ICON_WARNING
|
SWT
.
YES
|
SWT
.
NO
);
messageBox
.
setText
(
"Skip workspace migration"
);
messageBox
.
setMessage
(
"
Skipping workspace migration you will lose all previous workspace data
.\n\nAre you sure?"
);
messageBox
.
setMessage
(
"
You will lose all previous configurations and scripts
.\n\nAre you sure?"
);
int
response
=
messageBox
.
open
();
if
(
response
==
SWT
.
YES
)
{
shellResult
=
SWT
.
IGNORE
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
浏览文件 @
1526f8b9
...
...
@@ -304,6 +304,16 @@ public class GeneralUtils {
return
product
.
getDefiningBundle
().
getVersion
();
}
@NotNull
public
static
String
getPlainVersion
(
String
versionStr
)
{
try
{
Version
version
=
new
Version
(
versionStr
);
return
version
.
getMajor
()
+
"."
+
version
.
getMinor
()
+
"."
+
version
.
getMicro
();
}
catch
(
Exception
e
)
{
return
versionStr
;
}
}
@NotNull
public
static
String
getPlainVersion
()
{
Version
version
=
getProductVersion
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录