Simplify task deletion

Author: stokito

core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java

@@ -305,6 +305,7 @@ public void actionPerformed(ActionEvent actionEvent) {
                     Task task = ui.getTask();
                     tasks.addTask(task);
                 }
+                taskList.clear();
 
                 Tasks.saveTasks(tasks);
             }
@@ -314,9 +315,8 @@ public void actionPerformed(ActionEvent actionEvent) {
             @Override
 			public void keyReleased(KeyEvent e) {
                 if (e.getKeyChar() == KeyEvent.VK_ESCAPE) {
-                    frame.dispose();
-
                     saveAction.actionPerformed(null);
+                    frame.dispose();
                 }
             }
         });
@@ -486,4 +486,21 @@ public static List<TaskUI> getTaskList() {
         return taskList;
     }
 
+    /**
+     * Delete task
+     */
+    public static void deleteTask(Task deletedTask) {
+        List<TaskUI> taskList = getTaskList();
+        // save Tasks
+        Tasks tasks = new Tasks();
+        for (TaskUI ui : taskList) {
+            Task nTask = ui.getTask();
+            if (nTask != deletedTask) {
+                tasks.addTask(nTask);
+            }
+        }
+        // update GUI
+        updateTaskUI(tasks);
+    }
+
 }

core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/TaskUI.java

@@ -18,8 +18,6 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.font.TextAttribute;
@@ -35,6 +33,7 @@
 import org.jivesoftware.resource.SparkRes;
 
 /**
+ * Task item with a checkbox and date
  */
 public class TaskUI extends JPanel {
 
@@ -97,7 +96,7 @@ else if (task.isCompleted()) {
         btn_del.addMouseListener(new MouseAdapter() {
             @Override
 			public void mouseClicked(MouseEvent arg0) {
-                    Tasks.deleteTask(task);
+                    ScratchPadPlugin.deleteTask(task);
             }
         });
     }

core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/Tasks.java

@@ -182,28 +182,4 @@ public static Tasks getTaskList() {
         }
     }
 
-    /**
-     * Delete task
-     */
-    public static void deleteTask(Task deletedTask) {
-        List<TaskUI> taskList = ScratchPadPlugin.getTaskList();
-        // find and delete task in list
-        for (int i = 0; i < taskList.size(); i++) {
-            Task t = taskList.get(i).getTask();
-            if (t == deletedTask) {
-                taskList.remove(i);
-                break;
-            }
-        }
-
-        // save Tasks
-        Tasks tasks = new Tasks();
-        for (TaskUI ui : taskList) {
-            Task nTask = ui.getTask();
-            tasks.addTask(nTask);
-        }
-
-        // update GUI
-        ScratchPadPlugin.updateTaskUI(tasks);
-    }
 }