work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.application.framework;
+package org.woehlke.java.simpleworklist.domain;
 
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java

@@ -13,7 +13,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.chat.ChatMessage;
 import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm;

src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java

@@ -7,7 +7,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.context.ContextService;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java

@@ -11,7 +11,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.project.Project;

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java

@@ -23,7 +23,6 @@
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
 import javax.validation.Valid;
@@ -243,7 +242,9 @@ public final String editTaskPost(
             }
             UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser();
             List<Context> contexts = contextService.getAllForUser(userAccount);
+
             Task persistentTask = taskService.findOne(taskId);
+
             persistentTask.merge(task);
             task = persistentTask;
             Context thisContext = task.getContext();

src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java

@@ -7,7 +7,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.search.SearchService;
 import org.woehlke.java.simpleworklist.domain.search.result.SearchResult;

src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java

@@ -9,7 +9,6 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 

src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java

@@ -18,7 +18,6 @@
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java

@@ -19,7 +19,6 @@
 import org.woehlke.java.simpleworklist.domain.language.UserChangeLanguageForm;
 import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
-import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.NewContextForm;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;