Fixed #183

thomaswoehlke · thomaswoehlke · commit 3512c1cf911f · 2020-04-09T12:38:13.000+02:00
diff --git a/etc/serialversions/getserialversionid.sh b/etc/serialversions/getserialversionid.sh
@@ -29,7 +29,7 @@ echo "CLASSPATH $CLASSPATH"
 cd $CLASSES_PATH
 serialver org.woehlke.simpleworklist.language.Language > $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskEnergy >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.taskstate.TaskState >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.task.TaskState >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskTime >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> $SERIALVERSIONS_FILE
diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt
@@ -1,6 +1,6 @@
 org.woehlke.simpleworklist.language.Language:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskEnergy:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.taskstate.TaskState:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.task.TaskState:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskTime:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java
@@ -3,7 +3,7 @@
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java
@@ -9,7 +9,7 @@
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 
 import java.util.Locale;
 import java.util.Stack;
diff --git a/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java
@@ -9,7 +9,7 @@
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.TaskService;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.task.TaskEnergy;
 import org.woehlke.simpleworklist.task.TaskTime;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -15,8 +15,8 @@
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskEnergy;
 import org.woehlke.simpleworklist.task.TaskTime;
-import org.woehlke.simpleworklist.taskstate.TaskMoveService;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskMoveService;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.user.UserSessionBean;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java
@@ -2,7 +2,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 
 import javax.persistence.*;
 import javax.persistence.Index;
@@ -15,15 +14,12 @@
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 import org.hibernate.validator.constraints.SafeHtml;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.common.AuditModel;
 import org.woehlke.simpleworklist.common.ComparableById;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskController.java
@@ -7,8 +7,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.project.ProjectControllerService;
-import org.woehlke.simpleworklist.taskstate.TaskMoveService;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 
 @Slf4j
 @Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskControllerService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskControllerService.java
@@ -3,7 +3,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskControllerServiceImpl.java
@@ -9,7 +9,6 @@
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import java.util.Locale;
@@ -47,7 +46,7 @@ public String getTaskStatePage(
         model.addAttribute("taskPage", taskPage);
         model.addAttribute("taskstateType", taskState.name().toLowerCase());
         model.addAttribute("userSession", userSession);
-        return "taskstate/"+taskState.name().toLowerCase();
+        return taskState.getUrl();
     }
 
 }
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskMoveService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskMoveService.java
@@ -1,8 +1,7 @@
-package org.woehlke.simpleworklist.taskstate;
+package org.woehlke.simpleworklist.task;
 
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
 
 public interface TaskMoveService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskMoveServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskMoveServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.taskstate;
+package org.woehlke.simpleworklist.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,9 +10,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskRepository;
-import org.woehlke.simpleworklist.task.TaskService;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java b/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Repository;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 
 @Repository
 public interface TaskRepository extends JpaRepository<Task, Long> {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskService.java
@@ -4,7 +4,6 @@
 import org.springframework.data.domain.Pageable;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.taskstate.TaskState;
 
 public interface TaskService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java b/src/main/java/org/woehlke/simpleworklist/task/TaskState.java
@@ -1,9 +1,6 @@
-package org.woehlke.simpleworklist.taskstate;
-
-import org.woehlke.simpleworklist.task.TaskEnergy;
+package org.woehlke.simpleworklist.task;
 
 import javax.persistence.Enumerated;
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
@@ -67,7 +64,6 @@ public static List<TaskState> list() {
         return Arrays.asList(values());
     }
 
-
     public String getIcon() {
         return icon;
     }
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.taskstate;
+package org.woehlke.simpleworklist.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +13,7 @@
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.TaskControllerService;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateMoveController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateMoveController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.taskstate;
+package org.woehlke.simpleworklist.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -10,9 +10,7 @@
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskEnergy;
-import org.woehlke.simpleworklist.task.TaskTime;
+import org.woehlke.simpleworklist.task.*;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
@@ -9,7 +9,7 @@
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskEnergy;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.task.TaskTime;
 import org.woehlke.simpleworklist.context.ContextRepository;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/UserSessionBean.java b/src/main/java/org/woehlke/simpleworklist/user/UserSessionBean.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.woehlke.simpleworklist.taskstate.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 
 import java.io.Serializable;
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;`
`10`	`10`	`import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService;`
`11`	`11`	`import org.woehlke.simpleworklist.context.Context;`
`12`		`-import org.woehlke.simpleworklist.taskstate.TaskState;`
`13`	`12`	`import org.woehlke.simpleworklist.user.UserSessionBean;`
`14`	`13`
`15`	`14`	`import java.util.Locale;`
`@@ -47,7 +46,7 @@ public String getTaskStatePage(`
`47`	`46`	`model.addAttribute("taskPage", taskPage);`
`48`	`47`	`model.addAttribute("taskstateType", taskState.name().toLowerCase());`
`49`	`48`	`model.addAttribute("userSession", userSession);`
`50`		`- return "taskstate/"+taskState.name().toLowerCase();`
	`49`	`+ return taskState.getUrl();`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`}`