Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
a4f0fb17
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,发现更多精彩内容 >>
提交
a4f0fb17
编写于
12月 26, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Column resize save fix. Filter dialog fix (value sorting).
Former-commit-id:
4d4d0e60
上级
f3582163
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
7 deletion
+10
-7
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
...org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
+2
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/FilterValueEditDialog.java
.../dbeaver/ui/controls/resultset/FilterValueEditDialog.java
+7
-6
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDLabelValuePair.java
...l/src/org/jkiss/dbeaver/model/data/DBDLabelValuePair.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
浏览文件 @
a4f0fb17
...
...
@@ -258,6 +258,7 @@ public class ViewerColumnController {
@Override
public
void
controlResized
(
ControlEvent
e
)
{
columnInfo
.
width
=
column
.
getWidth
();
saveColumnConfig
();
}
@Override
...
...
@@ -283,6 +284,7 @@ public class ViewerColumnController {
@Override
public
void
controlResized
(
ControlEvent
e
)
{
columnInfo
.
width
=
column
.
getWidth
();
saveColumnConfig
();
}
@Override
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/FilterValueEditDialog.java
浏览文件 @
a4f0fb17
...
...
@@ -87,7 +87,7 @@ class FilterValueEditDialog extends BaseDialog {
private
Text
textControl
;
private
CheckboxTableViewer
table
;
private
String
filterPattern
;
private
KeyLoad
L
ob
loadJob
;
private
KeyLoad
J
ob
loadJob
;
public
FilterValueEditDialog
(
@NotNull
ResultSetViewer
viewer
,
@NotNull
DBDAttributeBinding
attr
,
@NotNull
ResultSetRow
[]
rows
,
@NotNull
DBCLogicalOperator
operator
)
{
super
(
viewer
.
getControl
().
getShell
(),
"Edit value"
,
null
);
...
...
@@ -256,7 +256,7 @@ class FilterValueEditDialog extends BaseDialog {
}
private
void
loadConstraintEnum
(
final
DBSEntityReferrer
refConstraint
)
{
loadJob
=
new
KeyLoad
L
ob
(
"Load constraint '"
+
refConstraint
.
getName
()
+
"' values"
)
{
loadJob
=
new
KeyLoad
J
ob
(
"Load constraint '"
+
refConstraint
.
getName
()
+
"' values"
)
{
@Override
protected
Collection
<
DBDLabelValuePair
>
readEnumeration
(
DBCSession
session
)
throws
DBException
{
final
DBSEntityAttribute
tableColumn
=
attr
.
getEntityAttribute
();
...
...
@@ -296,7 +296,7 @@ class FilterValueEditDialog extends BaseDialog {
private
void
loadAttributeEnum
(
final
DBSAttributeEnumerable
attributeEnumerable
)
{
table
.
getTable
().
getColumn
(
1
).
setText
(
"Count"
);
loadJob
=
new
KeyLoad
L
ob
(
"Load '"
+
attr
.
getName
()
+
"' values"
)
{
loadJob
=
new
KeyLoad
J
ob
(
"Load '"
+
attr
.
getName
()
+
"' values"
)
{
@Override
protected
Collection
<
DBDLabelValuePair
>
readEnumeration
(
DBCSession
session
)
throws
DBException
{
return
attributeEnumerable
.
getValueEnumeration
(
session
,
filterPattern
,
MAX_MULTI_VALUES
);
...
...
@@ -313,7 +313,7 @@ class FilterValueEditDialog extends BaseDialog {
// Get all values from actual RSV data
boolean
hasNulls
=
false
;
java
.
util
.
Map
<
Object
,
DBDLabelValuePair
>
rowData
=
new
Tree
Map
<>();
java
.
util
.
Map
<
Object
,
DBDLabelValuePair
>
rowData
=
new
Hash
Map
<>();
for
(
DBDLabelValuePair
pair
:
values
)
{
final
DBDLabelValuePair
oldLabel
=
rowData
.
get
(
pair
.
getValue
());
if
(
oldLabel
!=
null
)
{
...
...
@@ -341,6 +341,7 @@ class FilterValueEditDialog extends BaseDialog {
}
java
.
util
.
List
<
DBDLabelValuePair
>
sortedList
=
new
ArrayList
<>(
rowData
.
values
());
Collections
.
sort
(
sortedList
);
if
(
pattern
!=
null
)
{
for
(
Iterator
<
DBDLabelValuePair
>
iter
=
sortedList
.
iterator
();
iter
.
hasNext
();
)
{
final
DBDLabelValuePair
valuePair
=
iter
.
next
();
...
...
@@ -440,8 +441,8 @@ class FilterValueEditDialog extends BaseDialog {
return
value
;
}
private
abstract
class
KeyLoad
L
ob
extends
AbstractJob
{
protected
KeyLoad
L
ob
(
String
name
)
{
private
abstract
class
KeyLoad
J
ob
extends
AbstractJob
{
protected
KeyLoad
J
ob
(
String
name
)
{
super
(
name
);
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDLabelValuePair.java
浏览文件 @
a4f0fb17
...
...
@@ -57,7 +57,7 @@ public class DBDLabelValuePair implements Comparable {
if
(
lvp
.
value
==
null
)
{
return
1
;
}
if
(
value
instanceof
Comparable
&&
lvp
.
value
instanceof
Comparable
)
{
if
(
value
instanceof
Comparable
&&
value
.
getClass
()
==
lvp
.
value
.
getClass
()
)
{
return
((
Comparable
)
value
).
compareTo
(
lvp
.
value
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录