1
- package seedu .duke .calendar ;
1
+ package seedu .duke .storage ;
2
+
3
+ import seedu .duke .calendar .Event ;
4
+ import seedu .duke .calendar .EventList ;
5
+ import seedu .duke .calendar .Goal ;
2
6
3
7
import java .io .File ;
4
8
import java .io .FileNotFoundException ;
5
9
import java .io .FileWriter ;
6
10
import java .io .IOException ;
7
- import java .time .LocalDateTime ;
8
11
import java .util .ArrayList ;
9
12
import java .util .Scanner ;
10
13
import java .util .logging .Level ;
@@ -31,28 +34,6 @@ public boolean isStorageAvailable(){
31
34
return f .exists ();
32
35
}
33
36
34
- /**
35
- * load an event from certain format
36
- * Tokens includes attributes of Event
37
- * @param tokens is used to get event name
38
- * @return Event object
39
- */
40
- private Event loadEvent (String [] tokens ){
41
-
42
- assert tokens .length == 3 || tokens .length == 4 : "Token length should be 3 or 4" ;
43
- if (tokens .length == 3 ) {
44
- String name = tokens [0 ].trim ();
45
- LocalDateTime from = LocalDateTime .parse (tokens [1 ].trim ());
46
- LocalDateTime to = LocalDateTime .parse (tokens [2 ].trim ());
47
- return new Event (name , from , to );
48
- }
49
- String name = tokens [0 ].trim ();
50
- LocalDateTime by = LocalDateTime .parse (tokens [1 ].trim ());
51
- int goal = Integer .parseInt (tokens [2 ].trim ());
52
- int completed = Integer .parseInt (tokens [3 ].trim ());
53
- return new Goal (name , by , goal , completed );
54
- }
55
-
56
37
/**
57
38
* load list of events
58
39
* from this.path
@@ -66,7 +47,7 @@ public EventList loadEvents() throws FileNotFoundException{
66
47
67
48
while (s .hasNext ()){
68
49
String [] eventTokens = s .nextLine ().split (" \\ | " );
69
- eventList .addEvent (loadEvent (eventTokens ));
50
+ eventList .addEvent (EventStorageParser . loadEvent (eventTokens ));
70
51
}
71
52
72
53
logger .log (Level .INFO , String .format (
0 commit comments