Skip to content

Commit 359f347

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 6e1bc10 commit 359f347

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
23-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
23+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMoveService;
2424
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
2525
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2626
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -43,18 +43,18 @@
4343
public class ProjectIdController extends AbstractController {
4444

4545
private final ProjectControllerService projectControllerService;
46-
private final MoveTaskService moveTaskService;
46+
private final TaskMoveService taskMoveService;
4747
private final TaskService taskService;
4848
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4949

5050
@Autowired
5151
public ProjectIdController(
5252
ProjectControllerService projectControllerService,
53-
MoveTaskService moveTaskService, TaskService taskService,
53+
TaskMoveService taskMoveService, TaskService taskService,
5454
TransformTaskIntoProjektService transformTaskIntoProjektService
5555
) {
5656
this.projectControllerService = projectControllerService;
57-
this.moveTaskService = moveTaskService;
57+
this.taskMoveService = taskMoveService;
5858
this.taskService = taskService;
5959
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
6060
}
@@ -387,7 +387,7 @@ public final String moveAllCompletedToTrash(
387387
) {
388388
userSession.setLastProjectId(thisProject.getId());
389389
Context context = super.getContext(userSession);
390-
moveTaskService.moveAllCompletedToTrash(context);
390+
taskMoveService.moveAllCompletedToTrash(context);
391391
model.addAttribute("userSession", userSession);
392392
model.addAttribute("taskstateType",PROJECTS.getType());
393393
model.addAttribute("dataPage", true);
@@ -402,7 +402,7 @@ public final String emptyTrash(
402402
) {
403403
userSession.setLastProjectId(thisProject.getId());
404404
Context context = super.getContext(userSession);
405-
moveTaskService.emptyTrash(context);
405+
taskMoveService.emptyTrash(context);
406406
model.addAttribute("userSession", userSession);
407407
model.addAttribute("taskstateType",PROJECTS.getType());
408408
model.addAttribute("dataPage", true);
@@ -567,7 +567,7 @@ public final String moveTaskToAnotherProject(
567567
@ModelAttribute("userSession") UserSessionBean userSession,
568568
Model model
569569
) {
570-
task = moveTaskService.moveTaskToRootProject(task);
570+
task = taskMoveService.moveTaskToRootProject(task);
571571
model.addAttribute("userSession", userSession);
572572
model.addAttribute("taskstateType",PROJECTS.getType());
573573
model.addAttribute("dataPage", true);
@@ -582,7 +582,7 @@ public final String moveTaskToAnotherProject(
582582
@ModelAttribute("userSession") UserSessionBean userSession,
583583
Model model
584584
) {
585-
task = moveTaskService.moveTaskToAnotherProject(task,otherProject);
585+
task = taskMoveService.moveTaskToAnotherProject(task,otherProject);
586586
model.addAttribute("userSession", userSession);
587587
model.addAttribute("taskstateType",PROJECTS.getType());
588588
model.addAttribute("dataPage", true);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2323
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
24-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
24+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMoveService;
2525
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
2626
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2727
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -42,14 +42,14 @@ public class ProjectRootController extends AbstractController {
4242
public final static String rootProjectUrl = "redirect:/project/root";
4343

4444
private final ProjectControllerService projectControllerService;
45-
private final MoveTaskService moveTaskService;
45+
private final TaskMoveService taskMoveService;
4646
private final TaskService taskService;
4747
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4848

4949
@Autowired
50-
public ProjectRootController(ProjectControllerService projectControllerService, MoveTaskService moveTaskService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
50+
public ProjectRootController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
5151
this.projectControllerService = projectControllerService;
52-
this.moveTaskService = moveTaskService;
52+
this.taskMoveService = taskMoveService;
5353
this.taskService = taskService;
5454
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5555
}
@@ -304,7 +304,7 @@ public final String moveTaskToProjectRoot(
304304
@ModelAttribute("userSession") UserSessionBean userSession,
305305
Model model
306306
) {
307-
task = moveTaskService.moveTaskToRootProject(task);
307+
task = taskMoveService.moveTaskToRootProject(task);
308308
userSession.setLastProjectId(Project.rootProjectId);
309309
userSession.setLastTaskState(task.getTaskState());
310310
userSession.setLastTaskId(task.getId());
@@ -321,7 +321,7 @@ public final String moveTaskToProject(
321321
@ModelAttribute("userSession") UserSessionBean userSession,
322322
Model model
323323
) {
324-
task = moveTaskService.moveTaskToAnotherProject(task,targetProject);
324+
task = taskMoveService.moveTaskToAnotherProject(task,targetProject);
325325
userSession.setLastProjectId(targetProject.getId());
326326
userSession.setLastTaskState(task.getTaskState());
327327
userSession.setLastTaskId(task.getId());
@@ -481,7 +481,7 @@ public final String moveAllCompletedToTrash(
481481
Model model
482482
) {
483483
Context context = super.getContext(userSession);
484-
moveTaskService.moveAllCompletedToTrash(context);
484+
taskMoveService.moveAllCompletedToTrash(context);
485485
userSession.setLastContextId(context.getId());
486486
userSession.setLastProjectId(Project.rootProjectId);
487487
model.addAttribute("userSession", userSession);
@@ -496,7 +496,7 @@ public final String emptyTrash(
496496
Model model
497497
) {
498498
Context context = super.getContext(userSession);
499-
moveTaskService.emptyTrash(context);
499+
taskMoveService.emptyTrash(context);
500500
userSession.setLastContextId(context.getId());
501501
userSession.setLastProjectId(Project.rootProjectId);
502502
model.addAttribute("userSession", userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskMoveController.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1414
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1515
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
16-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskService;
16+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMoveService;
1717

1818
import javax.validation.constraints.NotNull;
1919

@@ -22,11 +22,11 @@
2222
@RequestMapping(path = "/taskstate/task")
2323
public class TaskMoveController extends AbstractController {
2424

25-
private final MoveTaskService moveTaskService;
25+
private final TaskMoveService taskMoveService;
2626

2727
@Autowired
28-
public TaskMoveController(MoveTaskService moveTaskService) {
29-
this.moveTaskService = moveTaskService;
28+
public TaskMoveController(TaskMoveService taskMoveService) {
29+
this.taskMoveService = taskMoveService;
3030
}
3131

3232
@RequestMapping(path = "/{taskId}/move/to/project/{projectId}", method = RequestMethod.GET)
@@ -36,7 +36,7 @@ public final String moveTaskToAnotherProject(
3636
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
3737
Model model
3838
) {
39-
task = moveTaskService.moveTaskToAnotherProject(task,project);
39+
task = taskMoveService.moveTaskToAnotherProject(task,project);
4040
userSession.setLastProjectId(project.getId());
4141
model.addAttribute("userSession",userSession);
4242
model.addAttribute("dataPage", true);
@@ -49,7 +49,7 @@ public final String moveTaskToRootProject(
4949
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
5050
Model model
5151
) {
52-
task = moveTaskService.moveTaskToRootProject(task);
52+
task = taskMoveService.moveTaskToRootProject(task);
5353
userSession.setLastProjectId(0L);
5454
model.addAttribute("userSession",userSession);
5555
model.addAttribute("dataPage", true);
@@ -63,7 +63,7 @@ public final String moveTaskToInbox(
6363
Model model
6464
) {
6565
log.info("dragged and dropped "+task.getId()+" to inbox");
66-
task = moveTaskService.moveTaskToInbox(task);
66+
task = taskMoveService.moveTaskToInbox(task);
6767
model.addAttribute("userSession", userSession);
6868
model.addAttribute("dataPage", true);
6969
return task.getTaskState().getUrl();
@@ -76,7 +76,7 @@ public final String moveTaskToToday(
7676
Model model
7777
) {
7878
log.info("dragged and dropped "+task.getId()+" to today");
79-
task = moveTaskService.moveTaskToToday(task);
79+
task = taskMoveService.moveTaskToToday(task);
8080
model.addAttribute("userSession", userSession);
8181
model.addAttribute("dataPage", true);
8282
return task.getTaskState().getUrl();
@@ -89,7 +89,7 @@ public final String moveTaskToNext(
8989
Model model
9090
) {
9191
log.info("dragged and dropped "+task.getId()+" to next");
92-
task = moveTaskService.moveTaskToNext(task);
92+
task = taskMoveService.moveTaskToNext(task);
9393
model.addAttribute("userSession", userSession);
9494
model.addAttribute("dataPage", true);
9595
return task.getTaskState().getUrl();
@@ -102,7 +102,7 @@ public final String moveTaskToWaiting(
102102
Model model
103103
) {
104104
log.info("dragged and dropped "+task.getId()+" to waiting");
105-
task = moveTaskService.moveTaskToWaiting(task);
105+
task = taskMoveService.moveTaskToWaiting(task);
106106
model.addAttribute("userSession", userSession);
107107
model.addAttribute("dataPage", true);
108108
return task.getTaskState().getUrl();
@@ -115,7 +115,7 @@ public final String moveTaskToSomeday(
115115
Model model
116116
) {
117117
log.info("dragged and dropped "+task.getId()+" to someday");
118-
task = moveTaskService.moveTaskToSomeday(task);
118+
task = taskMoveService.moveTaskToSomeday(task);
119119
model.addAttribute("userSession", userSession);
120120
model.addAttribute("dataPage", true);
121121
return task.getTaskState().getUrl();
@@ -128,7 +128,7 @@ public final String moveTaskToFocus(
128128
Model model
129129
) {
130130
log.info("dragged and dropped "+task.getId()+" to focus");
131-
task = moveTaskService.moveTaskToFocus(task);
131+
task = taskMoveService.moveTaskToFocus(task);
132132
model.addAttribute("userSession", userSession);
133133
model.addAttribute("dataPage", true);
134134
return task.getTaskState().getUrl();
@@ -141,7 +141,7 @@ public final String moveTaskToCompleted(
141141
Model model
142142
) {
143143
log.info("dragged and dropped "+task.getId()+" to completed");
144-
task = moveTaskService.moveTaskToCompleted(task);
144+
task = taskMoveService.moveTaskToCompleted(task);
145145
model.addAttribute("userSession", userSession);
146146
model.addAttribute("dataPage", true);
147147
return task.getTaskState().getUrl();
@@ -154,7 +154,7 @@ public final String moveTaskToTrash(
154154
Model model
155155
) {
156156
log.info("dragged and dropped "+task.getId()+" to trash");
157-
task = moveTaskService.moveTaskToTrash(task);
157+
task = taskMoveService.moveTaskToTrash(task);
158158
model.addAttribute("userSession", userSession);
159159
model.addAttribute("dataPage", true);
160160
return task.getTaskState().getUrl();
@@ -166,7 +166,7 @@ public final String moveAllCompletedToTrash(
166166
Model model
167167
) {
168168
Context context = super.getContext(userSession);
169-
moveTaskService.moveAllCompletedToTrash(context);
169+
taskMoveService.moveAllCompletedToTrash(context);
170170
model.addAttribute("userSession", userSession);
171171
model.addAttribute("dataPage", true);
172172
return "redirect:/taskstate/trash";
@@ -178,7 +178,7 @@ public final String emptyTrash(
178178
Model model
179179
) {
180180
Context context = super.getContext(userSession);
181-
moveTaskService.emptyTrash(context);
181+
taskMoveService.emptyTrash(context);
182182
model.addAttribute("userSession", userSession);
183183
model.addAttribute("dataPage", true);
184184
return "redirect:/taskstate/trash";

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/MoveTaskService.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/TaskMoveService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.woehlke.java.simpleworklist.domain.db.data.Project;
55
import org.woehlke.java.simpleworklist.domain.db.data.Task;
66

7-
public interface MoveTaskService {
7+
public interface TaskMoveService {
88

99
Task moveTaskToAnotherProject(Task task, Project project);
1010

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/MoveTaskServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/TaskMoveServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
@Slf4j
2121
@Service
22-
public class MoveTaskServiceImpl implements MoveTaskService {
22+
public class TaskMoveServiceImpl implements TaskMoveService {
2323

2424
private final TaskService taskService;
2525

2626
@Autowired
27-
public MoveTaskServiceImpl(TaskService taskService) {
27+
public TaskMoveServiceImpl(TaskService taskService) {
2828
this.taskService = taskService;
2929
}
3030

0 commit comments

Comments
 (0)