work

Author: thomaswoehlke

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

@@ -84,10 +84,15 @@ public class Project extends AuditModel implements Serializable, ComparableById<
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent", cascade = {CascadeType.ALL})
     private List<Project> children = new ArrayList<>();
 
+  @Transient
+  public String getUrlRoot() {
+    return "redirect:/project/root";
+  }
+
     @Transient
     public String getUrl() {
         if (this.getId() == null || this.getId() == 0L) {
-            return "redirect:/project/root";
+            return getUrlRoot();
         } else {
             return "redirect:/project/" + this.getId();
         }

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

@@ -393,7 +393,7 @@ public boolean hasContext(Context context) {
 
     @Transient
     public String getUrl(){
-        return this.taskState.getUrl();
+        return this.taskState.getUrlPathRedirect();
     }
 
     @Transient

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

@@ -52,7 +52,7 @@ public void addNewProjectToProjectIdForm(
         userSession.setLastProjectId(projectId);
         Project thisProject = projectService.findByProjectId(projectId);
         Project project = Project.newProjectFactoryForParentProject(thisProject);
-        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale,userSession);
+        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject,locale,userSession);
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("thisProject", thisProject);
         model.addAttribute("project", project);
@@ -73,7 +73,7 @@ public String addNewProjectToProjectIdPersist(
         model.addAttribute("userSession",userSession);
         if(result.hasErrors()){
             Project thisProject = projectService.findByProjectId(projectId);
-            Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale,userSession);
+            Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject,locale,userSession);
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("thisProject", thisProject);
             model.addAttribute("project", project);
@@ -113,7 +113,7 @@ public void addNewProjectToProjectRootForm(
         project = new Project();
         project.setId(Project.rootProjectId);
         project.setContext(context);
-        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowRootProject(locale,userSession);
+        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowProjectRoot(locale,userSession);
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("project", project);
         model.addAttribute("thisProjectId", project.getId());
@@ -136,7 +136,7 @@ public String addNewProjectToProjectRootPersist(
         project = projectService.add(project);
         userSession.setLastProjectId(project.getId());
         model.addAttribute("userSession", userSession);
-        model.addAttribute("myTaskState",PROJECTS.getType());
+        model.addAttribute("myTaskState",PROJECTS.getSlug());
         return project.getUrl();
     }
 

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

@@ -9,24 +9,19 @@
 
 public interface ProjectService {
 
+    Project add(Project project);
+    Project update(Project project);
+    Project delete(Project project);
+
     List<Project> findRootProjectsByContext(Context context);
     Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest);
 
     List<Project> findAllProjectsByContext(Context context);
     Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest);
 
     Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
-
-    Project findByProjectId(long projectId);
-
-    Project add(Project project);
-
-    Project update(Project project);
-
-    Project delete(Project project);
-
     Project moveProjectToAnotherContext(Project thisProject, Context newContext);
 
     Project getReferenceById(long projectId);
-
+    Project findByProjectId(long projectId);
 }

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

@@ -27,10 +27,6 @@ public enum TaskState implements Serializable {
         this.icon=icon;
     }
 
-    public String getIcon(){
-        return icon;
-    }
-
     public int getId(){
         return this.ordinal();
     }
@@ -39,19 +35,23 @@ public String getValue(){
         return this.name();
     }
 
-    public String getType(){
+    public String getIcon(){
+    return icon;
+  }
+
+    public String getSlug(){
         return this.name().toLowerCase();
     }
 
-    public String getCode(){
+    public String getMsgCode(){
         return "layout.page."+this.name().toLowerCase();
     }
 
     public String getUrlPath(){
         return "/taskstate/"+this.name().toLowerCase();
     }
 
-    public String getUrl(){
+    public String getUrlPathRedirect(){
         return "redirect:/taskstate/"+this.name().toLowerCase();
     }