Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
ea3af376
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,发现更多精彩内容 >>
提交
ea3af376
编写于
9月 17, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Formatter profiles cache removed
Former-commit-id:
30981766
上级
960e9d63
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
46 deletion
+23
-46
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataFormatterProfile.java
.../src/org/jkiss/dbeaver/registry/DataFormatterProfile.java
+23
-32
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDataFormat.java
.../org/jkiss/dbeaver/ui/preferences/PrefPageDataFormat.java
+0
-14
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataFormatterProfile.java
浏览文件 @
ea3af376
...
...
@@ -45,15 +45,12 @@ public class DataFormatterProfile implements DBDDataFormatterProfile, DBPPrefere
private
DBPPreferenceStore
store
;
private
String
name
;
private
Locale
locale
;
private
Map
<
String
,
Map
<
Object
,
Object
>>
properties
=
new
HashMap
<
String
,
Map
<
Object
,
Object
>>();
DataFormatterProfile
(
String
profileName
,
DBPPreferenceStore
store
)
{
this
.
name
=
profileName
;
this
.
store
=
store
;
loadProfile
();
//store.addPropertyChangeListener(this);
}
private
void
loadProfile
()
...
...
@@ -72,21 +69,6 @@ public class DataFormatterProfile implements DBDDataFormatterProfile, DBPPrefere
this
.
locale
=
new
Locale
(
language
,
country
,
variant
);
}
}
properties
.
clear
();
for
(
DataFormatterDescriptor
formatter
:
DataFormatterRegistry
.
getInstance
().
getDataFormatters
())
{
Map
<
Object
,
Object
>
defaultProperties
=
formatter
.
getSample
().
getDefaultProperties
(
locale
);
Map
<
Object
,
Object
>
formatterProps
=
new
HashMap
<
Object
,
Object
>();
for
(
DBPPropertyDescriptor
prop
:
formatter
.
getProperties
())
{
Object
defaultValue
=
defaultProperties
.
get
(
prop
.
getId
());
Object
propValue
=
PrefUtils
.
getPreferenceValue
(
store
,
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
(),
prop
.
getDataType
());
if
(
propValue
!=
null
&&
!
CommonUtils
.
equalObjects
(
defaultValue
,
propValue
))
{
formatterProps
.
put
(
prop
.
getId
(),
propValue
);
}
}
properties
.
put
(
formatter
.
getId
(),
formatterProps
);
}
}
@Override
...
...
@@ -96,17 +78,6 @@ public class DataFormatterProfile implements DBDDataFormatterProfile, DBPPrefere
store
.
setValue
(
PROP_COUNTRY
,
locale
.
getCountry
());
store
.
setValue
(
PROP_VARIANT
,
locale
.
getVariant
());
for
(
DataFormatterDescriptor
formatter
:
DataFormatterRegistry
.
getInstance
().
getDataFormatters
())
{
Map
<
Object
,
Object
>
formatterProps
=
properties
.
get
(
formatter
.
getId
());
for
(
DBPPropertyDescriptor
prop
:
formatter
.
getProperties
())
{
Object
propValue
=
formatterProps
==
null
?
null
:
formatterProps
.
get
(
prop
.
getId
());
if
(
propValue
!=
null
)
{
PrefUtils
.
setPreferenceValue
(
store
,
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
(),
propValue
);
}
else
{
store
.
setToDefault
(
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
());
}
}
}
PrefUtils
.
savePreferenceStore
(
store
);
}
...
...
@@ -143,13 +114,33 @@ public class DataFormatterProfile implements DBDDataFormatterProfile, DBPPrefere
@Override
public
Map
<
Object
,
Object
>
getFormatterProperties
(
String
typeId
)
{
return
properties
.
get
(
typeId
);
DataFormatterDescriptor
formatter
=
DataFormatterRegistry
.
getInstance
().
getDataFormatter
(
typeId
);
Map
<
Object
,
Object
>
defaultProperties
=
formatter
.
getSample
().
getDefaultProperties
(
locale
);
Map
<
Object
,
Object
>
formatterProps
=
new
HashMap
<
Object
,
Object
>();
for
(
DBPPropertyDescriptor
prop
:
formatter
.
getProperties
())
{
Object
defaultValue
=
defaultProperties
.
get
(
prop
.
getId
());
Object
propValue
=
PrefUtils
.
getPreferenceValue
(
store
,
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
(),
prop
.
getDataType
());
if
(
propValue
!=
null
&&
!
CommonUtils
.
equalObjects
(
defaultValue
,
propValue
))
{
formatterProps
.
put
(
prop
.
getId
(),
propValue
);
}
}
return
formatterProps
;
}
@Override
public
void
setFormatterProperties
(
String
typeId
,
Map
<
Object
,
Object
>
propertie
s
)
public
void
setFormatterProperties
(
String
typeId
,
Map
<
Object
,
Object
>
formatterProp
s
)
{
this
.
properties
.
put
(
typeId
,
new
HashMap
<
Object
,
Object
>(
properties
));
DataFormatterDescriptor
formatter
=
DataFormatterRegistry
.
getInstance
().
getDataFormatter
(
typeId
);
for
(
DBPPropertyDescriptor
prop
:
formatter
.
getProperties
())
{
Object
propValue
=
formatterProps
==
null
?
null
:
formatterProps
.
get
(
prop
.
getId
());
if
(
propValue
!=
null
)
{
PrefUtils
.
setPreferenceValue
(
store
,
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
(),
propValue
);
}
else
{
store
.
setToDefault
(
DATAFORMAT_TYPE_PREFIX
+
formatter
.
getId
()
+
"."
+
prop
.
getId
());
}
}
}
@Override
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDataFormat.java
浏览文件 @
ea3af376
...
...
@@ -364,20 +364,6 @@ public class PrefPageDataFormat extends TargetPrefPage
}
catch
(
Exception
e
)
{
log
.
warn
(
e
);
}
// Update all derived profiles
if
(
formatterProfile
==
DataFormatterRegistry
.
getInstance
().
getGlobalProfile
())
{
for
(
DBDDataFormatterProfile
profile
:
DataFormatterRegistry
.
getInstance
().
getCustomProfiles
())
{
profile
.
reset
();
}
for
(
IProject
project
:
DBeaverCore
.
getInstance
().
getLiveProjects
())
{
if
(
project
.
isOpen
())
{
DataSourceRegistry
dsRegistry
=
DBeaverCore
.
getInstance
().
getProjectRegistry
().
getDataSourceRegistry
(
project
);
for
(
DataSourceDescriptor
ds
:
dsRegistry
.
getDataSources
())
{
ds
.
getDataFormatterProfile
().
reset
();
}
}
}
}
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录