Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
4589f90a
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,发现更多精彩内容 >>
提交
4589f90a
编写于
4月 08, 2018
作者:
E
Evgeny Fradkin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3220 Mock Data. Prevent set non-acceptable generator
上级
03e1303d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
6 deletion
+17
-6
plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/MockDataSettings.java
.../src/org/jkiss/dbeaver/ext/mockdata/MockDataSettings.java
+17
-5
plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
...s/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
+0
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/MockDataSettings.java
浏览文件 @
4589f90a
...
...
@@ -173,10 +173,14 @@ public class MockDataSettings {
VoidProgressMonitor
voidProgressMonitor
=
new
VoidProgressMonitor
();
IDialogSettings
tableSection
=
UIUtils
.
getSettingsSection
(
dialogSettings
,
entity
.
getName
());
for
(
Map
.
Entry
<
String
,
AttributeGeneratorProperties
>
entry
:
attributeGenerators
.
entrySet
())
{
// search the saved generator
String
attributeName
=
entry
.
getKey
();
IDialogSettings
attributeSection
=
UIUtils
.
getSettingsSection
(
tableSection
,
attributeName
);
String
savedGeneratorId
=
attributeSection
.
get
(
KEY_SELECTED_GENERATOR
);
AttributeGeneratorProperties
attrGeneratorProperties
=
entry
.
getValue
();
// set the saved generator
if
(
savedGeneratorId
!=
null
)
{
attrGeneratorProperties
.
setSelectedGeneratorId
(
savedGeneratorId
);
attrGeneratorProperties
.
setPresetId
(
attributeSection
.
get
(
KEY_PRESET_ID
));
...
...
@@ -195,7 +199,8 @@ public class MockDataSettings {
}
}
}
else
{
autoAssignGenerator
(
attrGeneratorProperties
);
// set the default generator
// set the default generator
autoAssignGenerator
(
attrGeneratorProperties
);
}
}
}
...
...
@@ -221,21 +226,28 @@ public class MockDataSettings {
// set the default generator
switch
(
attribute
.
getDataKind
())
{
case
BOOLEAN:
attrGeneratorProperties
.
setSelectedGeneratorId
(
MockGeneratorDescriptor
.
BOOLEAN_RANDOM_GENERATOR_ID
);
setSelectedGenerator
(
attrGeneratorProperties
,
MockGeneratorDescriptor
.
BOOLEAN_RANDOM_GENERATOR_ID
);
break
;
case
DATETIME:
attrGeneratorProperties
.
setSelectedGeneratorId
(
MockGeneratorDescriptor
.
DATETIME_RANDOM_GENERATOR_ID
);
setSelectedGenerator
(
attrGeneratorProperties
,
MockGeneratorDescriptor
.
DATETIME_RANDOM_GENERATOR_ID
);
break
;
case
NUMERIC:
attrGeneratorProperties
.
setSelectedGeneratorId
(
MockGeneratorDescriptor
.
NUMERIC_RANDOM_GENERATOR_ID
);
setSelectedGenerator
(
attrGeneratorProperties
,
MockGeneratorDescriptor
.
NUMERIC_RANDOM_GENERATOR_ID
);
break
;
case
STRING:
attrGeneratorProperties
.
setSelectedGeneratorId
(
MockGeneratorDescriptor
.
STRING_TEXT_GENERATOR_ID
);
setSelectedGenerator
(
attrGeneratorProperties
,
MockGeneratorDescriptor
.
STRING_TEXT_GENERATOR_ID
);
break
;
}
}
}
// prevents set non-acceptable generator
private
void
setSelectedGenerator
(
AttributeGeneratorProperties
attrGeneratorProperties
,
String
generatorId
)
{
if
(
attrGeneratorProperties
.
getGenerators
().
contains
(
generatorId
))
{
attrGeneratorProperties
.
setSelectedGeneratorId
(
generatorId
);
}
}
void
saveTo
(
IDialogSettings
dialogSettings
)
{
dialogSettings
.
put
(
PROP_REMOVE_OLD_DATA
,
removeOldData
);
dialogSettings
.
put
(
PROP_ROWS_NUMBER
,
rowsNumber
);
...
...
plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/model/MockGeneratorDescriptor.java
浏览文件 @
4589f90a
...
...
@@ -129,7 +129,6 @@ public class MockGeneratorDescriptor extends DataTypeAbstractDescriptor<MockValu
((
PropertyDescriptor
)
property
).
setDefaultValue
(
defaultValue
);
break
;
}
}
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录