Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
88cb2a6b
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,发现更多精彩内容 >>
提交
88cb2a6b
编写于
10月 30, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/devel' into devel
Former-commit-id:
c4e14417
上级
f02fc520
90bdf314
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
3 deletion
+24
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/task/DBTTaskManager.java
...odel/src/org/jkiss/dbeaver/model/task/DBTTaskManager.java
+1
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskManagerImpl.java
.../src/org/jkiss/dbeaver/registry/task/TaskManagerImpl.java
+8
-1
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.java
...c/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.java
+2
-0
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.properties
...jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.properties
+2
-0
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/view/TaskHandlerDelete.java
...rc/org/jkiss/dbeaver/tasks/ui/view/TaskHandlerDelete.java
+11
-1
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/task/DBTTaskManager.java
浏览文件 @
88cb2a6b
...
...
@@ -68,7 +68,7 @@ public interface DBTTaskManager {
void
updateTaskConfiguration
(
@NotNull
DBTTask
task
)
throws
DBException
;
void
deleteTaskConfiguration
(
@NotNull
DBTTask
task
);
void
deleteTaskConfiguration
(
@NotNull
DBTTask
task
)
throws
DBException
;
@NotNull
File
getStatisticsFolder
();
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskManagerImpl.java
浏览文件 @
88cb2a6b
...
...
@@ -186,7 +186,14 @@ public class TaskManagerImpl implements DBTTaskManager {
}
@Override
public
void
deleteTaskConfiguration
(
@NotNull
DBTTask
task
)
{
public
void
deleteTaskConfiguration
(
@NotNull
DBTTask
task
)
throws
DBException
{
DBTScheduler
scheduler
=
TaskRegistry
.
getInstance
().
getActiveSchedulerInstance
();
if
(
scheduler
!=
null
)
{
DBTTaskScheduleInfo
info
=
scheduler
.
getScheduledTaskInfo
(
task
);
if
(
info
!=
null
)
{
scheduler
.
removeTaskSchedule
(
task
,
info
);
}
}
synchronized
(
tasks
)
{
tasks
.
remove
(
task
);
}
...
...
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.java
浏览文件 @
88cb2a6b
...
...
@@ -110,6 +110,8 @@ public class TaskUIMessages extends NLS {
public
static
String
task_handler_delete_confirm_question_delete_task
;
public
static
String
task_handler_delete_confirm_title_delete_tasks
;
public
static
String
task_handler_delete_confirm_question_delete_tasks
;
public
static
String
task_handler_delete_error_deleting_task_from_scheduler_title
;
public
static
String
task_handler_delete_error_deleting_task_from_scheduler_message
;
public
static
String
task_configuration_wizard_page_task_error_message_enter_task_name
;
public
static
String
task_configuration_wizard_page_task_already_exists
;
...
...
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.properties
浏览文件 @
88cb2a6b
...
...
@@ -86,6 +86,8 @@ task_handler_delete_confirm_title_delete_task = Delete task
task_handler_delete_confirm_question_delete_task
=
Are you sure you want to delete task "{0}"?
task_handler_delete_confirm_title_delete_tasks
=
Delete tasks
task_handler_delete_confirm_question_delete_tasks
=
Are you sure you want to delete {0} tasks?
task_handler_delete_error_deleting_task_from_scheduler_title
=
Task deletion error
task_handler_delete_error_deleting_task_from_scheduler_message
=
Unable to delete task {0} from scheduler. The task won't be deleted from the project.
task_configuration_wizard_page_task_error_message_enter_task_name
=
Enter task name (unique)
task_configuration_wizard_page_task_already_exists
=
Task "{0}" already exists in project "{1}"
task_configuration_wizard_page_task_enter_type
=
Enter task type
...
...
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/view/TaskHandlerDelete.java
浏览文件 @
88cb2a6b
...
...
@@ -23,7 +23,9 @@ import org.eclipse.jface.viewers.ISelection;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.osgi.util.NLS
;
import
org.eclipse.ui.handlers.HandlerUtil
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.task.DBTTask
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.tasks.ui.internal.TaskUIMessages
;
import
org.jkiss.dbeaver.ui.UIUtils
;
...
...
@@ -59,7 +61,15 @@ public class TaskHandlerDelete extends AbstractHandler {
}
}
for
(
DBTTask
task
:
tasksToDelete
)
{
task
.
getProject
().
getTaskManager
().
deleteTaskConfiguration
(
task
);
try
{
task
.
getProject
().
getTaskManager
().
deleteTaskConfiguration
(
task
);
}
catch
(
DBException
e
)
{
DBWorkbench
.
getPlatformUI
().
showError
(
TaskUIMessages
.
task_handler_delete_error_deleting_task_from_scheduler_title
,
NLS
.
bind
(
TaskUIMessages
.
task_handler_delete_error_deleting_task_from_scheduler_message
,
task
.
getId
()),
e
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录