Skip to content

Commit 5f24147

Browse files
committed
Merge branch 'branch-A-CodingStandard'
2 parents d081eed + 2d069b3 commit 5f24147

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

src/main/java/duke/utils/InputParser.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ private boolean isTaskType(String s) {
5454

5555
private TaskType getTaskType(String type) {
5656
switch(type) {
57-
case "todo":
58-
return TaskType.TODO;
59-
case "event":
60-
return TaskType.EVENT;
61-
case "deadline":
62-
return TaskType.DEADLINE;
63-
default:
64-
return null;
57+
case "todo":
58+
return TaskType.TODO;
59+
case "event":
60+
return TaskType.EVENT;
61+
case "deadline":
62+
return TaskType.DEADLINE;
63+
default:
64+
return null;
6565
}
6666
}
6767

src/main/java/duke/utils/Storage.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ private static Task fromDataString(String dataString) {
7878

7979
try {
8080
switch(arr[0]) {
81-
case "[T]":
82-
ret = new Todo(arr[2]);
83-
break;
84-
case "[D]":
85-
ret = new Deadline(arr[2], DateParser.stringToDate(arr[3]));
86-
break;
87-
case "[E]":
88-
ret = new Event(arr[2], DateParser.stringToDate(arr[3]));
89-
break;
90-
default:
91-
return null;
81+
case "[T]":
82+
ret = new Todo(arr[2]);
83+
break;
84+
case "[D]":
85+
ret = new Deadline(arr[2], DateParser.stringToDate(arr[3]));
86+
break;
87+
case "[E]":
88+
ret = new Event(arr[2], DateParser.stringToDate(arr[3]));
89+
break;
90+
default:
91+
return null;
9292
}
9393
} catch (UnrecognisedDateException e) {
9494
return null;

src/main/java/duke/utils/TaskParser.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ public static Task stringToTask(TaskType type, String s)
2727
String[] taskInfo;
2828

2929
switch (type) {
30-
case TODO:
31-
return new Todo(s);
32-
case EVENT:
33-
taskInfo = s.split("/at");
34-
if (taskInfo.length < 2) {
35-
throw new EmptyTaskDateException();
36-
}
37-
return new Event(taskInfo[0].trim(), DateParser.stringToDate(taskInfo[1].trim()));
38-
case DEADLINE:
39-
taskInfo = s.split("/by");
40-
if (taskInfo.length < 2) {
41-
throw new EmptyTaskDateException();
42-
}
43-
return new Deadline(taskInfo[0].trim(), DateParser.stringToDate(taskInfo[1].trim()));
44-
default:
45-
throw new NoSuchTaskTypeException(type.name());
30+
case TODO:
31+
return new Todo(s);
32+
case EVENT:
33+
taskInfo = s.split("/at");
34+
if (taskInfo.length < 2) {
35+
throw new EmptyTaskDateException();
36+
}
37+
return new Event(taskInfo[0].trim(), DateParser.stringToDate(taskInfo[1].trim()));
38+
case DEADLINE:
39+
taskInfo = s.split("/by");
40+
if (taskInfo.length < 2) {
41+
throw new EmptyTaskDateException();
42+
}
43+
return new Deadline(taskInfo[0].trim(), DateParser.stringToDate(taskInfo[1].trim()));
44+
default:
45+
throw new NoSuchTaskTypeException(type.name());
4646
}
4747
}
4848

0 commit comments

Comments
 (0)