Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
cf4c0c89
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,发现更多精彩内容 >>
提交
cf4c0c89
编写于
6月 01, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Copy column/row names command fix (do not show options for single element)
Former-commit-id:
25294055
上级
43ea2e01
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
34 addition
and
25 deletion
+34
-25
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetSelection.java
...ss/dbeaver/ui/controls/resultset/IResultSetSelection.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetCommandHandler.java
...beaver/ui/controls/resultset/ResultSetCommandHandler.java
+24
-14
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
...i/controls/resultset/plaintext/PlainTextPresentation.java
+3
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
...ntrols/resultset/spreadsheet/SpreadsheetPresentation.java
+2
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetSelection.java
浏览文件 @
cf4c0c89
...
...
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.data.DBDAttributeBinding
;
import
java.util.
Collection
;
import
java.util.
List
;
/**
* Result set selection
...
...
@@ -32,10 +32,10 @@ public interface IResultSetSelection extends IStructuredSelection {
IResultSetController
getController
();
@NotNull
Collection
<
DBDAttributeBinding
>
getSelectedAttributes
();
List
<
DBDAttributeBinding
>
getSelectedAttributes
();
@NotNull
Collection
<
ResultSetRow
>
getSelectedRows
();
List
<
ResultSetRow
>
getSelectedRows
();
DBDAttributeBinding
getElementAttribute
(
Object
element
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetCommandHandler.java
浏览文件 @
cf4c0c89
...
...
@@ -283,16 +283,22 @@ public class ResultSetCommandHandler extends AbstractHandler {
break
;
}
case
CMD_COPY_COLUMN_NAMES:
{
ResultSetCopySpecialHandler
.
CopyConfigDialog
configDialog
=
new
ResultSetCopySpecialHandler
.
CopyConfigDialog
(
activeShell
,
"CopyGridNamesOptionsDialog"
);
if
(
configDialog
.
open
()
!=
IDialogConstants
.
OK_ID
)
{
return
null
;
}
StringBuilder
buffer
=
new
StringBuilder
();
IResultSetSelection
selection
=
rsv
.
getSelection
();
Collection
<
DBDAttributeBinding
>
attrs
=
selection
.
isEmpty
()
?
rsv
.
getModel
().
getVisibleAttributes
()
:
selection
.
getSelectedAttributes
();
List
<
DBDAttributeBinding
>
attrs
=
selection
.
isEmpty
()
?
rsv
.
getModel
().
getVisibleAttributes
()
:
selection
.
getSelectedAttributes
();
ResultSetCopySettings
settings
=
new
ResultSetCopySettings
();
if
(
attrs
.
size
()
>
1
)
{
ResultSetCopySpecialHandler
.
CopyConfigDialog
configDialog
=
new
ResultSetCopySpecialHandler
.
CopyConfigDialog
(
activeShell
,
"CopyGridNamesOptionsDialog"
);
if
(
configDialog
.
open
()
!=
IDialogConstants
.
OK_ID
)
{
return
null
;
}
settings
=
configDialog
.
copySettings
;
}
for
(
DBDAttributeBinding
attr
:
attrs
)
{
if
(
buffer
.
length
()
>
0
)
{
buffer
.
append
(
configDialog
.
copyS
ettings
.
getColumnDelimiter
());
buffer
.
append
(
s
ettings
.
getColumnDelimiter
());
}
String
colName
=
attr
.
getLabel
();
if
(
CommonUtils
.
isEmpty
(
colName
))
{
...
...
@@ -300,20 +306,24 @@ public class ResultSetCommandHandler extends AbstractHandler {
}
buffer
.
append
(
colName
);
}
ResultSetUtils
.
copyToClipboard
(
buffer
.
toString
());
break
;
}
case
CMD_COPY_ROW_NAMES:
{
ResultSetCopySpecialHandler
.
CopyConfigDialog
configDialog
=
new
ResultSetCopySpecialHandler
.
CopyConfigDialog
(
activeShell
,
"CopyGridNamesOptionsDialog"
);
if
(
configDialog
.
open
()
!=
IDialogConstants
.
OK_ID
)
{
return
null
;
}
StringBuilder
buffer
=
new
StringBuilder
();
IResultSetSelection
selection
=
rsv
.
getSelection
();
for
(
ResultSetRow
row
:
selection
.
getSelectedRows
())
{
List
<
ResultSetRow
>
selectedRows
=
rsv
.
getSelection
().
getSelectedRows
();
ResultSetCopySettings
settings
=
new
ResultSetCopySettings
();
if
(
selectedRows
.
size
()
>
1
)
{
ResultSetCopySpecialHandler
.
CopyConfigDialog
configDialog
=
new
ResultSetCopySpecialHandler
.
CopyConfigDialog
(
activeShell
,
"CopyGridNamesOptionsDialog"
);
if
(
configDialog
.
open
()
!=
IDialogConstants
.
OK_ID
)
{
return
null
;
}
settings
=
configDialog
.
copySettings
;
}
for
(
ResultSetRow
row
:
selectedRows
)
{
if
(
buffer
.
length
()
>
0
)
{
buffer
.
append
(
configDialog
.
copyS
ettings
.
getRowDelimiter
());
buffer
.
append
(
s
ettings
.
getRowDelimiter
());
}
buffer
.
append
(
row
.
getVisualNumber
()
+
1
);
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
cf4c0c89
...
...
@@ -3249,13 +3249,13 @@ public class ResultSetViewer extends Viewer
@NotNull
@Override
public
Collection
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
public
List
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
return
Collections
.
emptyList
();
}
@NotNull
@Override
public
Collection
<
ResultSetRow
>
getSelectedRows
()
{
public
List
<
ResultSetRow
>
getSelectedRows
()
{
return
Collections
.
emptyList
();
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/plaintext/PlainTextPresentation.java
浏览文件 @
cf4c0c89
...
...
@@ -55,7 +55,6 @@ import org.jkiss.dbeaver.ui.controls.StyledTextFindReplaceTarget;
import
org.jkiss.dbeaver.ui.controls.resultset.*
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.List
;
...
...
@@ -612,16 +611,16 @@ public class PlainTextPresentation extends AbstractPresentation implements IAdap
@NotNull
@Override
public
Collection
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
public
List
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
if
(
curAttribute
==
null
)
{
return
Collections
.
emptyList
();
}
return
Collections
.
singleton
(
curAttribute
);
return
Collections
.
singleton
List
(
curAttribute
);
}
@NotNull
@Override
public
Collection
<
ResultSetRow
>
getSelectedRows
()
public
List
<
ResultSetRow
>
getSelectedRows
()
{
ResultSetRow
currentRow
=
controller
.
getCurrentRow
();
if
(
currentRow
==
null
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
浏览文件 @
cf4c0c89
...
...
@@ -1260,7 +1260,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
@NotNull
@Override
public
Collection
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
public
List
<
DBDAttributeBinding
>
getSelectedAttributes
()
{
if
(
controller
.
isRecordMode
())
{
Object
[]
elements
=
spreadsheet
.
getContentProvider
().
getElements
(
false
);
List
<
DBDAttributeBinding
>
attrs
=
new
ArrayList
<>();
...
...
@@ -1284,7 +1284,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
@NotNull
@Override
public
Collection
<
ResultSetRow
>
getSelectedRows
()
public
List
<
ResultSetRow
>
getSelectedRows
()
{
if
(
controller
.
isRecordMode
())
{
ResultSetRow
currentRow
=
controller
.
getCurrentRow
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录