work

Author: thomaswoehlke

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

@@ -12,7 +12,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
@@ -30,7 +30,7 @@
 import java.util.Locale;
 
 import static java.util.Locale.GERMAN;
-import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.*;
+import static org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.*;
 
 /**
  * Created by tw on 14.02.16.

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

@@ -21,7 +21,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMoveService;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
+import static org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.PROJECTS;
 
 /**
  * Created by tw on 14.02.16.

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

@@ -22,7 +22,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMoveService;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
@@ -32,7 +32,7 @@
 import java.util.Locale;
 import java.util.UUID;
 
-import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
+import static org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.PROJECTS;
 
 @Slf4j
 @Controller

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java

@@ -25,6 +25,7 @@
 
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.application.framework.AuditModel;

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectControllerServiceImpl.java

@@ -20,7 +20,7 @@
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 
-import static org.woehlke.java.simpleworklist.domain.db.data.TaskState.PROJECTS;
+import static org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.PROJECTS;
 
 @Slf4j
 @Service

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskRepository.java

@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Repository;
 import org.woehlke.java.simpleworklist.domain.db.data.Project;
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 
 @Repository

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

@@ -5,7 +5,6 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 import org.woehlke.java.simpleworklist.domain.db.data.Project;
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
 
 import java.util.List;
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java

@@ -11,7 +11,6 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Project;
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectRepository;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/TaskState.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskState.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.db.data;
+package org.woehlke.java.simpleworklist.domain.db.data.task;
 
 import java.io.Serializable;
 import java.util.Arrays;

src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskLifecycleController.java

@@ -14,7 +14,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
-import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskLifecycleService;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;