Skip to content

Commit 4712bce

Browse files
committed
work
1 parent 96bffa2 commit 4712bce

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,10 @@ public final List<TaskTime> getListTaskTime(){
114114
return TaskTime.list();
115115
}
116116

117-
/*
118-
@ModelAttribute("listTaskState")
119-
public final List<TaskState> getTaskStates(){
120-
121-
TaskState[] listTaskStateArray = {
122-
INBOX,
123-
TODAY,
124-
NEXT,
125-
WAITING,
126-
SCHEDULED,
127-
SOMEDAY,
128-
FOCUS,
129-
COMPLETED
130-
};
131-
132-
List<TaskState> listTaskState = new ArrayList<>(listTaskStateArray.length);
133-
134-
for(TaskState taskState:listTaskStateArray){
135-
listTaskState.add(taskState);
136-
}
137-
return listTaskState;
138-
}
139-
*/
117+
@ModelAttribute("listTaskState")
118+
public final List<TaskState> getTaskStates(){
119+
return TaskState.getLlist4Ui();
120+
}
140121

141122
@ModelAttribute("context")
142123
public final String getCurrentContext(

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.woehlke.java.simpleworklist.domain.db.data.task;
22

33
import java.io.Serializable;
4+
import java.util.ArrayList;
45
import java.util.Arrays;
56
import java.util.List;
67

@@ -63,5 +64,19 @@ public static List<TaskState> list() {
6364
return Arrays.asList(values());
6465
}
6566

67+
public static List<TaskState> getLlist4Ui(){
68+
TaskState[] listTaskStateArray = {
69+
INBOX,
70+
TODAY,
71+
NEXT,
72+
WAITING,
73+
SCHEDULED,
74+
SOMEDAY,
75+
FOCUS,
76+
COMPLETED
77+
};
78+
return Arrays.asList(listTaskStateArray);
79+
}
80+
6681
private static final long serialVersionUID = 0L;
6782
}

0 commit comments

Comments
 (0)