Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
c3a4b543
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,发现更多精彩内容 >>
提交
c3a4b543
编写于
10月 07, 2017
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#2269 Current row restore after refresh fix
上级
ca8e5343
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
3 deletion
+10
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
.../dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
+5
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+5
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataReceiver.java
浏览文件 @
c3a4b543
...
...
@@ -48,6 +48,7 @@ class ResultSetDataReceiver implements DBDDataReceiver {
private
Map
<
DBCAttributeMetaData
,
List
<
String
>>
attrErrors
=
new
HashMap
<>();
// All (unique) errors happened during fetch
private
List
<
Throwable
>
errorList
=
new
ArrayList
<>();
private
int
focusRow
;
ResultSetDataReceiver
(
ResultSetViewer
resultSetViewer
)
{
...
...
@@ -154,7 +155,7 @@ class ResultSetDataReceiver implements DBDDataReceiver {
// Push data into viewer
if
(!
nextSegmentRead
)
{
resultSetViewer
.
updatePresentation
(
resultSet
);
resultSetViewer
.
setData
(
tmpRows
);
resultSetViewer
.
setData
(
tmpRows
,
focusRow
);
resultSetViewer
.
getActivePresentation
().
refreshData
(
true
,
false
,
!
resultSetViewer
.
getModel
().
isMetadataChanged
());
}
else
{
resultSetViewer
.
appendData
(
tmpRows
);
...
...
@@ -176,4 +177,7 @@ class ResultSetDataReceiver implements DBDDataReceiver {
rows
=
new
ArrayList
<>();
}
public
void
setFocusRow
(
int
focusRow
)
{
this
.
focusRow
=
focusRow
;
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
c3a4b543
...
...
@@ -1394,7 +1394,7 @@ public class ResultSetViewer extends Viewer
activePresentation
.
clearMetaData
();
}
void
setData
(
List
<
Object
[]>
rows
)
void
setData
(
List
<
Object
[]>
rows
,
int
focusRow
)
{
if
(
viewerPanel
.
isDisposed
())
{
return
;
...
...
@@ -1402,6 +1402,9 @@ public class ResultSetViewer extends Viewer
this
.
curRow
=
null
;
this
.
model
.
setData
(
rows
);
this
.
curRow
=
(
this
.
model
.
getRowCount
()
>
0
?
this
.
model
.
getRow
(
0
)
:
null
);
if
(
focusRow
>
0
&&
focusRow
<
model
.
getRowCount
())
{
this
.
curRow
=
model
.
getRow
(
focusRow
);
}
{
...
...
@@ -2434,6 +2437,7 @@ public class ResultSetViewer extends Viewer
progressControl
=
(
Composite
)
activePresentation
.
getControl
();
}
final
Object
presentationState
=
savePresentationState
();
dataReceiver
.
setFocusRow
(
focusRow
);
dataPumpJob
=
new
ResultSetJobDataRead
(
dataContainer
,
useDataFilter
,
...
...
@@ -2484,7 +2488,6 @@ public class ResultSetViewer extends Viewer
if
(!
metadataChanged
&&
focusRow
>=
0
&&
focusRow
<
model
.
getRowCount
()
&&
model
.
getVisibleAttributeCount
()
>
0
)
{
// Seems to be refresh
// Restore original position
curRow
=
model
.
getRow
(
focusRow
);
restorePresentationState
(
presentationState
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录