Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
f3a0b135
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,发现更多精彩内容 >>
提交
f3a0b135
编写于
2月 13, 2017
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RSV filters dialog: do not refresh data if only attribute visibility was changed
上级
bcb097ec
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
5 deletion
+17
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/FilterSettingsDialog.java
...s/dbeaver/ui/controls/resultset/FilterSettingsDialog.java
+7
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeConstraint.java
.../org/jkiss/dbeaver/model/data/DBDAttributeConstraint.java
+7
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDDataFilter.java
...model/src/org/jkiss/dbeaver/model/data/DBDDataFilter.java
+2
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/FilterSettingsDialog.java
浏览文件 @
f3a0b135
...
...
@@ -445,9 +445,15 @@ class FilterSettingsDialog extends HelpEnabledDialog {
}
else
{
dataFilter
.
setWhere
(
null
);
}
boolean
filtersChanged
=
true
;
if
(
dataFilter
.
equalFilters
(
resultSetViewer
.
getModel
().
getDataFilter
(),
true
))
{
// Only attribute visibility was changed
filtersChanged
=
false
;
}
resultSetViewer
.
setDataFilter
(
dataFilter
,
true
);
// TODO: refresh data only if filter was changed
filtersChanged
);
super
.
okPressed
();
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
f3a0b135
...
...
@@ -1173,7 +1173,7 @@ public class ResultSetViewer extends Viewer
// Search in history
for
(
int
i
=
0
;
i
<
stateHistory
.
size
();
i
++)
{
HistoryStateItem
item
=
stateHistory
.
get
(
i
);
if
(
item
.
dataContainer
==
dataContainer
&&
item
.
filter
!=
null
&&
item
.
filter
.
equalFilters
(
dataFilter
))
{
if
(
item
.
dataContainer
==
dataContainer
&&
item
.
filter
!=
null
&&
item
.
filter
.
equalFilters
(
dataFilter
,
false
))
{
item
.
filter
=
dataFilter
;
// Update data filter - it may contain some orderings
curState
=
item
;
historyPosition
=
i
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeConstraint.java
浏览文件 @
f3a0b135
...
...
@@ -189,8 +189,14 @@ public class DBDAttributeConstraint {
this
.
visualPosition
=
originalVisualPosition
;
}
public
boolean
equalFilters
(
DBDAttributeConstraint
obj
)
public
boolean
equalFilters
(
DBDAttributeConstraint
obj
,
boolean
compareOrders
)
{
if
(
compareOrders
)
{
if
(
this
.
orderPosition
!=
obj
.
orderPosition
||
this
.
orderDescending
!=
obj
.
orderDescending
)
{
return
false
;
}
}
return
CommonUtils
.
equalObjects
(
this
.
attribute
,
obj
.
attribute
)
&&
CommonUtils
.
equalObjects
(
this
.
criteria
,
obj
.
criteria
)
&&
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDDataFilter.java
浏览文件 @
f3a0b135
...
...
@@ -251,7 +251,7 @@ public class DBDDataFilter {
* @param source object to compare to
* @return true if filters equals
*/
public
boolean
equalFilters
(
DBDDataFilter
source
)
public
boolean
equalFilters
(
DBDDataFilter
source
,
boolean
compareOrders
)
{
if
(
anyConstraint
!=
source
.
anyConstraint
)
{
return
false
;
...
...
@@ -260,7 +260,7 @@ public class DBDDataFilter {
return
false
;
}
for
(
int
i
=
0
;
i
<
source
.
constraints
.
size
();
i
++)
{
if
(!
constraints
.
get
(
i
).
equalFilters
(
source
.
constraints
.
get
(
i
)))
{
if
(!
constraints
.
get
(
i
).
equalFilters
(
source
.
constraints
.
get
(
i
)
,
compareOrders
))
{
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录