Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
e6304118
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,发现更多精彩内容 >>
提交
e6304118
编写于
8月 19, 2021
作者:
A
Anastasiya Volkova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dbeaver/dbeaver-ee#1040 drop tasks support added, now we can move tasks from folder to folder
上级
cb5175ae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
102 addition
and
4 deletion
+102
-4
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskRegistry.java
...try/src/org/jkiss/dbeaver/registry/task/TaskRegistry.java
+1
-1
plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
...rc/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
+101
-3
未找到文件。
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskRegistry.java
浏览文件 @
e6304118
...
...
@@ -179,7 +179,7 @@ public class TaskRegistry implements DBTTaskRegistry
}
}
void
notifyTaskFoldersListeners
(
DBTTaskFolderEvent
event
)
{
public
void
notifyTaskFoldersListeners
(
DBTTaskFolderEvent
event
)
{
DBTTaskListener
[]
listenersCopy
;
synchronized
(
taskListeners
)
{
listenersCopy
=
taskListeners
.
toArray
(
new
DBTTaskListener
[
0
]);
...
...
plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
浏览文件 @
e6304118
...
...
@@ -24,9 +24,7 @@ import org.eclipse.swt.SWT;
import
org.eclipse.swt.dnd.*
;
import
org.eclipse.swt.graphics.Color
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Tree
;
import
org.eclipse.swt.widgets.TreeItem
;
import
org.eclipse.swt.widgets.*
;
import
org.eclipse.ui.dialogs.PatternFilter
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.Log
;
...
...
@@ -53,6 +51,7 @@ import java.io.IOException;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.List
;
import
java.util.stream.Collectors
;
public
class
DatabaseTasksTree
{
...
...
@@ -793,5 +792,104 @@ public class DatabaseTasksTree {
}
}
});
DropTarget
dropTarget
=
new
DropTarget
(
viewer
.
getControl
(),
DND
.
DROP_MOVE
);
dropTarget
.
setTransfer
(
DatabaseTaskTransfer
.
getInstance
());
dropTarget
.
addDropListener
(
new
DropTargetListener
()
{
@Override
public
void
dragEnter
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
}
@Override
public
void
dragLeave
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
}
@Override
public
void
dragOperationChanged
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
}
@Override
public
void
dragOver
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
}
@Override
public
void
drop
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
if
(
event
.
detail
==
DND
.
DROP_MOVE
)
{
moveNodes
(
event
);
}
}
@Override
public
void
dropAccept
(
DropTargetEvent
event
)
{
handleDragEvent
(
event
);
}
private
void
handleDragEvent
(
DropTargetEvent
event
)
{
event
.
detail
=
isDropSupported
(
event
)
?
DND
.
DROP_MOVE
:
DND
.
DROP_NONE
;
event
.
feedback
=
DND
.
FEEDBACK_SELECT
;
}
private
boolean
isDropSupported
(
DropTargetEvent
event
)
{
if
(
DatabaseTaskTransfer
.
getInstance
().
isSupportedType
(
event
.
currentDataType
))
{
Object
curObject
;
if
(
event
.
item
instanceof
Item
)
{
curObject
=
event
.
item
.
getData
();
}
else
{
curObject
=
null
;
}
if
(
curObject
instanceof
DBTTask
||
curObject
instanceof
DBTTaskFolder
)
{
return
true
;
}
else
if
(
curObject
instanceof
AbstractTaskNode
)
{
return
((
AbstractTaskNode
)
curObject
).
taskFolder
!=
null
;
}
}
return
false
;
}
private
void
moveNodes
(
DropTargetEvent
event
)
{
Object
curObject
;
if
(
event
.
item
instanceof
Item
)
{
curObject
=
event
.
item
.
getData
();
}
else
{
// Do not drop tasks to empty spaces
return
;
}
if
(
curObject
instanceof
DBTTask
||
curObject
instanceof
DBTTaskFolder
||
curObject
instanceof
AbstractTaskNode
)
{
DBTTaskFolder
taskFolder
;
if
(
curObject
instanceof
DBTTask
)
{
taskFolder
=
((
DBTTask
)
curObject
).
getTaskFolder
();
}
else
if
(
curObject
instanceof
AbstractTaskNode
)
{
taskFolder
=
((
AbstractTaskNode
)
curObject
).
taskFolder
;
}
else
{
taskFolder
=
(
DBTTaskFolder
)
curObject
;
}
if
(
taskFolder
==
null
)
{
// We do not want unFolder this task/tasks
return
;
}
if
(
event
.
data
instanceof
DatabaseTaskTransfer
.
Data
)
{
List
<
DBTTask
>
tasksToDrop
=
((
DatabaseTaskTransfer
.
Data
)
event
.
data
).
getTasks
();
if
(!
CommonUtils
.
isEmpty
(
tasksToDrop
))
{
for
(
DBTTask
task
:
tasksToDrop
)
{
if
(
task
.
getProject
()
==
taskFolder
.
getProject
())
{
// Do not move tasks into another project
task
.
setTaskFolder
(
taskFolder
);
}
}
TaskRegistry
.
getInstance
().
notifyTaskFoldersListeners
(
new
DBTTaskFolderEvent
(
taskFolder
,
DBTTaskFolderEvent
.
Action
.
TASK_FOLDER_UPDATE
));
}
}
}
}
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录