Merge pull request #13634 from dbeaver/fixTaskFolder#1040

dbeaver/dbeaver-ee#1040 task folder moving and deleting fixed

plugins/org.jkiss.dbeaver.tasks.ui.view/src/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java

@@ -896,9 +896,10 @@ public class DatabaseTasksTree {
                             for (DBTTask task : tasksToDrop) {
                                 if (task instanceof TaskImpl && task.getProject() == taskFolder.getProject()) { // Do not move tasks into another project
                                     ((TaskImpl)task).setTaskFolder(taskFolder);
+                                    taskFolder.addTaskToFolder(task);
                                 }
                             }
-                            TaskRegistry.getInstance().notifyTaskFoldersListeners(new DBTTaskFolderEvent(taskFolder, DBTTaskFolderEvent.Action.TASK_FOLDER_UPDATE));
+                            TaskRegistry.getInstance().notifyTaskFoldersListeners(new DBTTaskFolderEvent(taskFolder, DBTTaskFolderEvent.Action.TASK_FOLDER_REMOVE)); // Refresh all
                         }
                     }
                 }

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskConfigurationWizardPageTask.java

@@ -405,11 +405,16 @@ class TaskConfigurationWizardPageTask extends ActiveWizardPage<TaskConfiguration
                 DBTTaskFolder[] tasksFolders = selectedProject.getTaskManager().getTasksFolders();
                 List<DBTTaskFolder> taskFoldersList = Arrays.asList(tasksFolders != null ? tasksFolders : new DBTTaskFolder[0]);
                 DBTTaskFolder folder = DBUtils.findObject(taskFoldersList, selectedTaskFolderName);
+                DBTTaskFolder currentTaskFolder = task.getTaskFolder();
                 if (folder != null) {
                     task.setTaskFolder(folder);
+                    folder.addTaskToFolder(task);
                 } else {
                     task.setTaskFolder(null);
                 }
+                if (currentTaskFolder != null) {
+                    currentTaskFolder.removeTaskFromFolder(task);
+                }
                 TaskRegistry.getInstance().notifyTaskFoldersListeners(new DBTTaskFolderEvent(folder, DBTTaskFolderEvent.Action.TASK_FOLDER_REMOVE));
             }
         }