Skip to content

Commit abd888c

Browse files
committed
Updated event printing to centralised location in Event object
1 parent e86cd05 commit abd888c

File tree

5 files changed

+36
-11
lines changed

5 files changed

+36
-11
lines changed

src/main/java/seedu/duke/calendar/Event.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ public void setTo(LocalDateTime to) {
4141

4242
@Override
4343
public String toString() {
44-
return "Event{" +
45-
"name='" + name + '\'' +
46-
", from=" + from +
47-
", to=" + to +
48-
'}';
44+
return "Event '" + name + '\'' +
45+
" From: " + from +
46+
", To: " + to;
4947
}
5048

5149
}

src/main/java/seedu/duke/calendar/EventList.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public void findEvent(String keyword) {
2828
int count = 0;
2929
for (Event event: eventList) {
3030
if (event.getName().contains(keyword)) {
31-
System.out.println((++count) + ". " + event.getName() + " Event from: " +event.getFrom() +
32-
" to: " + event.getTo());
31+
System.out.println((++count) + ". " + event);
3332
}
3433
}
3534
}

src/main/java/seedu/duke/calendar/command/AddEventCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public void execute(Scanner scanner, EventList eventList) {
2121

2222
eventList.addEvent(event);
2323

24-
System.out.println(event.getName() + " Event from: " +event.getFrom() +
25-
" to: " + event.getTo() + " has been added to your Calendar");
24+
System.out.println(event + " has been added to your Calendar");
2625
}
2726
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package seedu.duke.calendar.command;
2+
3+
import seedu.duke.calendar.EventList;
4+
import seedu.duke.calendar.command.EventCommand;
5+
6+
import java.util.Scanner;
7+
8+
public abstract class DualEventCommand extends EventCommand {
9+
protected int beginnerCommandLength;
10+
protected int expertCommandLength;
11+
protected String input;
12+
protected String syntaxString;
13+
14+
protected abstract void executeBeginnerMode(Scanner scanner, EventList eventList);
15+
16+
protected abstract void executeExpertMode(Scanner scanner, EventList eventList);
17+
18+
public void execute(Scanner scanner, EventList eventList) {
19+
String[] commandParts = input.split(" ");
20+
21+
if (commandParts.length == beginnerCommandLength) {
22+
executeBeginnerMode(scanner, eventList);
23+
} else if (commandParts.length == expertCommandLength) {
24+
executeExpertMode(scanner, eventList);
25+
} else {
26+
System.out.println(" Invalid syntax! The syntax is '" + syntaxString + "'");
27+
System.out.println(" Please try again.");
28+
}
29+
}
30+
}

src/main/java/seedu/duke/calendar/command/ListCalendarEventsCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public void execute(Scanner scanner, EventList eventList) {
1515

1616
int count = 0;
1717
for (Event event : eventList.getEvent()) {
18-
System.out.println((++count) + ". " + event.getName() + " Event from: " +event.getFrom() +
19-
" to: " + event.getTo());
18+
System.out.println((++count) + ". " + event);
2019
printLine();
2120
}
2221
} else {

0 commit comments

Comments
 (0)