work

Author: thomaswoehlke

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

@@ -9,12 +9,10 @@
 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.domain.AbstractController;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
 
 import lombok.extern.slf4j.Slf4j;
-import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskstate.TaskStateTabControllerService;
 
 import javax.validation.constraints.NotNull;
@@ -40,8 +38,8 @@ public final String inbox(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.INBOX, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageInbox(
+           context, pageable, userSession, locale, model
         );
     }
 
@@ -53,8 +51,8 @@ public final String today(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.TODAY, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageToday(
+          context, pageable, userSession, locale, model
         );
     }
 
@@ -66,8 +64,8 @@ public final String next(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.NEXT, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageNext(
+           context, pageable, userSession, locale, model
         );
     }
 
@@ -79,8 +77,8 @@ public final String waiting(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.WAITING, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageWaiting(
+           context, pageable, userSession, locale, model
         );
     }
 
@@ -92,8 +90,8 @@ public final String scheduled(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-          TaskState.SCHEDULED, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageScheduled(
+          context, pageable, userSession, locale, model
         );
     }
 
@@ -105,8 +103,8 @@ public final String someday(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.SOMEDAY, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageSomeday(
+           context, pageable, userSession, locale, model
         );
     }
 
@@ -118,8 +116,8 @@ public final String completed(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.COMPLETED, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageCompleted(
+          context, pageable, userSession, locale, model
         );
     }
 
@@ -131,8 +129,8 @@ public final String trash(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.TRASH, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageTrash(
+           context, pageable, userSession, locale, model
         );
     }
 
@@ -155,8 +153,8 @@ public final String focus(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        return taskStateTabControllerService.getTaskStatePage(
-            TaskState.FOCUS, context, pageable, userSession, locale, model
+        return taskStateTabControllerService.getTaskStatePageFocus(
+            true, context, pageable, userSession, locale, model
         );
     }
 

src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskstate/TaskStateTabControllerService.java

@@ -1,17 +1,98 @@
 package org.woehlke.java.simpleworklist.domain.meso.taskstate;
 
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.ui.Model;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
-import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
 
 import java.util.Locale;
 
+
 public interface TaskStateTabControllerService {
 
-  String getTaskStatePage(
-    TaskState taskState,
+  String getTaskStatePageInbox(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageToday(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageNext(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageWaiting(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageScheduled(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageFocus(
+    boolean focus,
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageSomeday(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageCompleted(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageTrash(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageDeleted(
+    Context context,
+    Pageable pageRequest,
+    UserSessionBean userSession,
+    Locale locale,
+    Model model
+  );
+
+  String getTaskStatePageProjects(
     Context context,
     Pageable pageRequest,
     UserSessionBean userSession,