Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
181b39f4
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,发现更多精彩内容 >>
提交
181b39f4
编写于
7月 25, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Presentation selection model refactored.
Documents select/delete
上级
e2812368
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
53 deletion
+44
-53
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/AbstractPresentation.java
...s/dbeaver/ui/controls/resultset/AbstractPresentation.java
+36
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+8
-34
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
...ntrols/resultset/spreadsheet/SpreadsheetPresentation.java
+0
-18
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/AbstractPresentation.java
浏览文件 @
181b39f4
...
@@ -22,6 +22,7 @@ import org.eclipse.jface.action.IMenuListener;
...
@@ -22,6 +22,7 @@ import org.eclipse.jface.action.IMenuListener;
import
org.eclipse.jface.action.IMenuManager
;
import
org.eclipse.jface.action.IMenuManager
;
import
org.eclipse.jface.action.IToolBarManager
;
import
org.eclipse.jface.action.IToolBarManager
;
import
org.eclipse.jface.action.MenuManager
;
import
org.eclipse.jface.action.MenuManager
;
import
org.eclipse.jface.viewers.*
;
import
org.eclipse.swt.events.DisposeEvent
;
import
org.eclipse.swt.events.DisposeEvent
;
import
org.eclipse.swt.events.DisposeListener
;
import
org.eclipse.swt.events.DisposeListener
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Composite
;
...
@@ -31,14 +32,18 @@ import org.eclipse.ui.IWorkbenchPartSite;
...
@@ -31,14 +32,18 @@ import org.eclipse.ui.IWorkbenchPartSite;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
/**
* Abstract presentation.
* Abstract presentation.
*/
*/
public
abstract
class
AbstractPresentation
implements
IResultSetPresentation
{
public
abstract
class
AbstractPresentation
implements
IResultSetPresentation
,
ISelectionProvider
{
private
static
final
String
PRESENTATION_CONTROL_ID
=
"org.jkiss.dbeaver.ui.resultset.presentation"
;
private
static
final
String
PRESENTATION_CONTROL_ID
=
"org.jkiss.dbeaver.ui.resultset.presentation"
;
protected
IResultSetController
controller
;
protected
IResultSetController
controller
;
private
final
List
<
ISelectionChangedListener
>
selectionChangedListenerList
=
new
ArrayList
<
ISelectionChangedListener
>();
public
IResultSetController
getController
()
{
public
IResultSetController
getController
()
{
return
controller
;
return
controller
;
...
@@ -129,4 +134,34 @@ public abstract class AbstractPresentation implements IResultSetPresentation {
...
@@ -129,4 +134,34 @@ public abstract class AbstractPresentation implements IResultSetPresentation {
}
}
});
});
}
}
///////////////////////////////////////////////////////////////////////
// ISelectionProvider
protected
void
fireSelectionChanged
(
ISelection
selection
)
{
SelectionChangedEvent
event
=
new
SelectionChangedEvent
(
this
,
selection
);
for
(
ISelectionChangedListener
listener
:
selectionChangedListenerList
)
{
listener
.
selectionChanged
(
event
);
}
}
@Override
public
void
addSelectionChangedListener
(
ISelectionChangedListener
listener
)
{
selectionChangedListenerList
.
add
(
listener
);
}
@Override
public
void
removeSelectionChangedListener
(
ISelectionChangedListener
listener
)
{
selectionChangedListenerList
.
remove
(
listener
);
}
@Override
public
ISelection
getSelection
()
{
return
new
StructuredSelection
();
}
@Override
public
void
setSelection
(
ISelection
selection
)
{
}
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
181b39f4
...
@@ -28,6 +28,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
...
@@ -28,6 +28,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import
org.eclipse.jface.text.IFindReplaceTarget
;
import
org.eclipse.jface.text.IFindReplaceTarget
;
import
org.eclipse.jface.viewers.ISelection
;
import
org.eclipse.jface.viewers.ISelection
;
import
org.eclipse.jface.viewers.ISelectionProvider
;
import
org.eclipse.jface.viewers.ISelectionProvider
;
import
org.eclipse.jface.viewers.StructuredSelection
;
import
org.eclipse.jface.viewers.Viewer
;
import
org.eclipse.jface.viewers.Viewer
;
import
org.eclipse.osgi.util.NLS
;
import
org.eclipse.osgi.util.NLS
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.SWT
;
...
@@ -48,23 +49,23 @@ import org.jkiss.code.NotNull;
...
@@ -48,23 +49,23 @@ import org.jkiss.code.NotNull;
import
org.jkiss.code.Nullable
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.data.*
;
import
org.jkiss.dbeaver.model.data.*
;
import
org.jkiss.dbeaver.model.exec.*
;
import
org.jkiss.dbeaver.model.exec.*
;
import
org.jkiss.dbeaver.model.impl.local.StatResultSet
;
import
org.jkiss.dbeaver.model.impl.local.StatResultSet
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.virtual.DBVConstants
;
import
org.jkiss.dbeaver.model.virtual.DBVConstants
;
import
org.jkiss.dbeaver.model.virtual.DBVEntityConstraint
;
import
org.jkiss.dbeaver.model.virtual.DBVEntityConstraint
;
import
org.jkiss.dbeaver.runtime.RunnableWithResult
;
import
org.jkiss.dbeaver.runtime.RunnableWithResult
;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.tools.transfer.IDataTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.IDataTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer
;
import
org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard
;
import
org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard
;
...
@@ -1404,7 +1405,10 @@ public class ResultSetViewer extends Viewer
...
@@ -1404,7 +1405,10 @@ public class ResultSetViewer extends Viewer
public
IResultSetSelection
getSelection
()
public
IResultSetSelection
getSelection
()
{
{
if
(
activePresentation
instanceof
ISelectionProvider
)
{
if
(
activePresentation
instanceof
ISelectionProvider
)
{
return
(
IResultSetSelection
)
((
ISelectionProvider
)
activePresentation
).
getSelection
();
ISelection
selection
=
((
ISelectionProvider
)
activePresentation
).
getSelection
();
if
(
selection
instanceof
IResultSetSelection
)
{
return
(
IResultSetSelection
)
selection
;
}
}
}
return
new
EmptySelection
();
return
new
EmptySelection
();
}
}
...
@@ -1978,7 +1982,7 @@ public class ResultSetViewer extends Viewer
...
@@ -1978,7 +1982,7 @@ public class ResultSetViewer extends Viewer
}
}
}
}
private
class
EmptySelection
implements
IResultSetSelection
{
private
class
EmptySelection
extends
StructuredSelection
implements
IResultSetSelection
{
@Override
@Override
public
IResultSetController
getController
()
{
public
IResultSetController
getController
()
{
return
ResultSetViewer
.
this
;
return
ResultSetViewer
.
this
;
...
@@ -1988,36 +1992,6 @@ public class ResultSetViewer extends Viewer
...
@@ -1988,36 +1992,6 @@ public class ResultSetViewer extends Viewer
public
Collection
<
ResultSetRow
>
getSelectedRows
()
{
public
Collection
<
ResultSetRow
>
getSelectedRows
()
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
@Override
public
Object
getFirstElement
()
{
return
null
;
}
@Override
public
Iterator
iterator
()
{
return
Collections
.
emptyList
().
iterator
();
}
@Override
public
int
size
()
{
return
0
;
}
@Override
public
Object
[]
toArray
()
{
return
new
Object
[
0
];
}
@Override
public
List
toList
()
{
return
Collections
.
emptyList
();
}
@Override
public
boolean
isEmpty
()
{
return
false
;
}
}
}
private
class
ConfigAction
extends
Action
implements
IMenuCreator
{
private
class
ConfigAction
extends
Action
implements
IMenuCreator
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
浏览文件 @
181b39f4
...
@@ -126,7 +126,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
...
@@ -126,7 +126,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
private
final
Map
<
SpreadsheetValueController
,
IValueEditorStandalone
>
openEditors
=
new
HashMap
<
SpreadsheetValueController
,
IValueEditorStandalone
>();
private
final
Map
<
SpreadsheetValueController
,
IValueEditorStandalone
>
openEditors
=
new
HashMap
<
SpreadsheetValueController
,
IValueEditorStandalone
>();
private
SpreadsheetFindReplaceTarget
findReplaceTarget
;
private
SpreadsheetFindReplaceTarget
findReplaceTarget
;
private
final
List
<
ISelectionChangedListener
>
selectionChangedListenerList
=
new
ArrayList
<
ISelectionChangedListener
>();
// UI modifiers
// UI modifiers
private
IThemeManager
themeManager
;
private
IThemeManager
themeManager
;
...
@@ -1023,23 +1022,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
...
@@ -1023,23 +1022,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
fireSelectionChanged
(
selection
);
fireSelectionChanged
(
selection
);
}
}
private
void
fireSelectionChanged
(
ISelection
selection
)
{
SelectionChangedEvent
event
=
new
SelectionChangedEvent
(
this
,
selection
);
for
(
ISelectionChangedListener
listener
:
selectionChangedListenerList
)
{
listener
.
selectionChanged
(
event
);
}
}
@Override
public
void
addSelectionChangedListener
(
ISelectionChangedListener
listener
)
{
selectionChangedListenerList
.
add
(
listener
);
}
@Override
public
void
removeSelectionChangedListener
(
ISelectionChangedListener
listener
)
{
selectionChangedListenerList
.
remove
(
listener
);
}
private
class
SpreadsheetSelectionImpl
implements
IResultSetSelection
{
private
class
SpreadsheetSelectionImpl
implements
IResultSetSelection
{
@Nullable
@Nullable
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录