Skip to content

Commit 8bfd0e8

Browse files
authored
Merge pull request nus-cs2113-AY2324S1#25 from Brian030601/master
Fix CodingStyle
2 parents 3a53123 + 666869d commit 8bfd0e8

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@ public ArrayList<Event> getEvent() {
2020
return eventList;
2121
}
2222

23-
public boolean deleteEvent(String name) {
24-
for(Event event : eventList) {
25-
if (event.getName().equals(name)) {
26-
eventList.remove(event);
27-
return true;
28-
}
29-
}
30-
return false;
23+
public void deleteEvent(String name) {
24+
eventList.removeIf(event -> event.getName().equals(name));
3125
}
3226
@Override
3327
public String toString() {

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

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

2222
eventList.addEvent(event);
2323

24-
System.out.println("The event has been added to you calendar");
24+
System.out.println(event + " has been added to you calendar");
2525
}
2626
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public void execute(Scanner scanner, EventList eventList) {
1313
String eventName = scanner.nextLine();
1414

1515
eventList.deleteEvent(eventName);
16-
17-
System.out.println("Event has been deleted from your Calendar!");
16+
System.out.println(eventName + " has been deleted from your Calendar!");
1817
}
1918
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@@author kherlenbayasgalan
1+
//@@author kherlenbayasgalan & jingxizhu
22

33
package seedu.duke.calendar.command;
44

@@ -7,5 +7,5 @@
77
import java.util.Scanner;
88

99
public abstract class EventCommand {
10-
//public abstract void execute(Scanner scanner, EventList eventList);
10+
public abstract void execute(Scanner scanner, EventList eventList);
1111
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
public class ListCalendarEventsCommand extends EventCommand{
1111
public void execute(Scanner scanner, EventList eventList) {
1212
System.out.println("Here is a list of all your events: ");
13+
printLine();
1314

14-
System.out.println("-".repeat(80));
1515
for (Event event : eventList.getEvent()) {
1616
System.out.print(event);
17-
System.out.println("-".repeat(80));
17+
printLine();
1818
}
1919
}
20+
21+
public void printLine() {
22+
System.out.println("-------------------");
23+
}
2024
}

0 commit comments

Comments
 (0)