Skip to content

Commit 29b9680

Browse files
committed
Fix Exit & Find Bug
1 parent 1751c8e commit 29b9680

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

data/events/event.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Plan Trip | 2023-12-20T12:30:30 | 2023-12-20T12:30:30
1+
hello | 2023-12-20T12:30:30 | 2023-12-20T12:30:30
2+
2023-12-20T12:30:30 | 2023-12-20T12:30:30 | 2023-12-20T12:30:30

src/main/java/seedu/duke/Duke.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private void run() {
3131
fc.processInput(input);
3232
} else if (cm.isResponsible(input)) {
3333
cm.processInput(input);
34-
} else if (input.equals("exit program")) {
34+
} else if (input.equals("exit")) {
3535
System.out.println(" You are exiting TaskLinker! Bye!");
3636
break;
3737
} else if (input.startsWith("help")) {
@@ -61,6 +61,7 @@ private void printHelp() {
6161
"delete all events",
6262
"find event",
6363
"list events",
64+
"exit",
6465
};
6566

6667
for (String commandFormat : commandFormats) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ public int getSize() {
2424
return eventList.size();
2525
}
2626

27-
public void findEvent(String keyword) {
27+
public int findEvent(String keyword) {
2828
int count = 0;
2929
for (Event event: eventList) {
3030
if (event.getName().contains(keyword)) {
3131
System.out.println((++count) + ". " + event);
3232
}
3333
}
34+
35+
return count;
3436
}
3537

3638
public int deleteEvent(String name) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public void execute(Scanner scanner, EventList eventList) {
1212
System.out.print("What event are you looking for?: ");
1313
String eventName = scanner.nextLine();
1414

15-
if (eventList.getSize() > 0) {
16-
System.out.println(" Here are the matching events in your list:");
17-
eventList.findEvent(eventName);
15+
int count = eventList.findEvent(eventName);
16+
17+
if (count > 0) {
1818
System.out.println(" These events have been found");
1919
} else {
2020
System.out.println(" No such event found");

0 commit comments

Comments
 (0)