forked from JavaOPs/topjava
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path1_0_fix.patch
More file actions
119 lines (109 loc) · 5.19 KB
/
1_0_fix.patch
File metadata and controls
119 lines (109 loc) · 5.19 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
Index: src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java
===================================================================
--- src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java (revision 44067f66e66df23f8edb88112d3e152c779e0c38)
+++ src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java (revision 44067f66e66df23f8edb88112d3e152c779e0c38)
@@ -1,31 +0,0 @@
-package ru.javawebinar.topjava.util;
-
-import ru.javawebinar.topjava.model.UserMeal;
-import ru.javawebinar.topjava.model.UserMealWithExceed;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.Month;
-import java.util.Arrays;
-import java.util.List;
-
-public class UserMealsUtil {
- public static void main(String[] args) {
- List<UserMeal> mealList = Arrays.asList(
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,10,0), "Завтрак", 500),
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,13,0), "Обед", 1000),
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,20,0), "Ужин", 500),
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,10,0), "Завтрак", 1000),
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,13,0), "Обед", 500),
- new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,20,0), "Ужин", 510)
- );
- getFilteredWithExceeded(mealList, LocalTime.of(7, 0), LocalTime.of(12,0), 2000);
-// .toLocalDate();
-// .toLocalTime();
- }
-
- public static List<UserMealWithExceed> getFilteredWithExceeded(List<UserMeal> mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
- // TODO return filtered list with correctly exceeded field
- return null;
- }
-}
Index: src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/util/MealsUtil.java (date 1530137160353)
+++ src/main/java/ru/javawebinar/topjava/util/MealsUtil.java (date 1530137160353)
@@ -0,0 +1,31 @@
+package ru.javawebinar.topjava.util;
+
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.model.MealWithExceed;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.util.Arrays;
+import java.util.List;
+
+public class MealsUtil {
+ public static void main(String[] args) {
+ List<Meal> mealList = Arrays.asList(
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30,10,0), "Завтрак", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30,13,0), "Обед", 1000),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30,20,0), "Ужин", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31,10,0), "Завтрак", 1000),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31,13,0), "Обед", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31,20,0), "Ужин", 510)
+ );
+ getFilteredWithExceeded(mealList, LocalTime.of(7, 0), LocalTime.of(12,0), 2000);
+// .toLocalDate();
+// .toLocalTime();
+ }
+
+ public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
+ // TODO return filtered list with correctly exceeded field
+ return null;
+ }
+}
\ No newline at end of file
Index: src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java
===================================================================
--- src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java (revision 44067f66e66df23f8edb88112d3e152c779e0c38)
+++ src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java (date 1530137160292)
@@ -2,7 +2,7 @@
import java.time.LocalDateTime;
-public class UserMealWithExceed {
+public class MealWithExceed {
private final LocalDateTime dateTime;
private final String description;
@@ -11,7 +11,7 @@
private final boolean exceed;
- public UserMealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) {
+ public MealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) {
this.dateTime = dateTime;
this.description = description;
this.calories = calories;
Index: src/main/java/ru/javawebinar/topjava/model/UserMeal.java
===================================================================
--- src/main/java/ru/javawebinar/topjava/model/UserMeal.java (revision 44067f66e66df23f8edb88112d3e152c779e0c38)
+++ src/main/java/ru/javawebinar/topjava/model/Meal.java (date 1530137142426)
@@ -2,14 +2,14 @@
import java.time.LocalDateTime;
-public class UserMeal {
+public class Meal {
private final LocalDateTime dateTime;
private final String description;
private final int calories;
- public UserMeal(LocalDateTime dateTime, String description, int calories) {
+ public Meal(LocalDateTime dateTime, String description, int calories) {
this.dateTime = dateTime;
this.description = description;
this.calories = calories;