work in progres

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/task/Task.java

@@ -167,26 +167,22 @@ public void switchToLastFocusType() {
     }
 
     public void delete(){
-        this.lastTaskState = this.taskState;
-        this.taskState = TaskState.TRASH;
+        pushTaskstate(TaskState.TRASH);
     }
 
     public void undelete(){
         if( this.taskState == TaskState.TRASH){
-            this.taskState = this.lastTaskState;
-            this.lastTaskState = TaskState.TRASH;
+            popTaskstate(TaskState.TRASH);
         }
     }
 
     public void complete(){
-        this.lastTaskState = this.taskState;
-        this.taskState = TaskState.COMPLETED;
+        pushTaskstate(TaskState.COMPLETED);
     }
 
     public void incomplete(){
         if( this.taskState == TaskState.COMPLETED){
-            this.taskState = this.lastTaskState;
-            this.lastTaskState = TaskState.COMPLETED;
+            popTaskstate(TaskState.COMPLETED);
         }
     }
 
@@ -198,9 +194,14 @@ public void unsetFocus(){
         this.focus = false;
     }
 
-    private void pushTaskstate(TaskState newState){
+    private void popTaskstate(TaskState oldState){
         this.taskState = this.lastTaskState;
-        this.lastTaskState = newState;
+        this.lastTaskState = oldState;
+    }
+
+    private void pushTaskstate(TaskState newState){
+        this.lastTaskState = this.taskState;
+        this.taskState = newState;
     }
 
     //TODO: delete Due Date

src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java

@@ -66,6 +66,7 @@ public String transformTaskIntoProjectGet(Task task) {
             thisProject.setParent(parentProject);
         }
         thisProject = projectService.saveAndFlush(thisProject);
+        task.setProject(null);
         task.moveToTrash();
         task.emptyTrash();
         taskService.updatedViaTaskstate(task);