Remove magic number

AY2223S2-CS2103-W17-3 · Mar 28, 2023 · dd6425d · dd6425d
1 parent b4a5f83
commit dd6425d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/ezschedule/logic/commands/ShowNextCommand.java b/src/main/java/ezschedule/logic/commands/ShowNextCommand.java
@@ -14,6 +14,7 @@
 public class ShowNextCommand extends Command {
 
     public static final String COMMAND_WORD = "next";
+    public static final int SHOW_UPCOMING_COUNT_ONE = 1;
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Display upcoming events."
             + "\nCan be used without any parameters."

diff --git a/src/main/java/ezschedule/logic/parser/ShowNextCommandParser.java b/src/main/java/ezschedule/logic/parser/ShowNextCommandParser.java
@@ -1,5 +1,7 @@
 package ezschedule.logic.parser;
 
+import static ezschedule.logic.commands.ShowNextCommand.SHOW_UPCOMING_COUNT_ONE;
+
 import ezschedule.commons.core.Messages;
 import ezschedule.logic.commands.ShowNextCommand;
 import ezschedule.logic.parser.exceptions.ParseException;
@@ -20,7 +22,7 @@ public class ShowNextCommandParser implements Parser<ShowNextCommand> {
     public ShowNextCommand parse(String userInput) throws ParseException {
         // No argument provided, just show the next one
         if (userInput.isBlank()) {
-            return new ShowNextCommand(new UpcomingEventPredicate(1));
+            return new ShowNextCommand(new UpcomingEventPredicate(SHOW_UPCOMING_COUNT_ONE));
         }
 
         try {

diff --git a/src/main/java/ezschedule/model/Model.java b/src/main/java/ezschedule/model/Model.java
@@ -5,7 +5,6 @@
 
 import ezschedule.commons.core.GuiSettings;
 import ezschedule.model.event.Event;
-import ezschedule.model.event.UpcomingEventPredicate;
 import javafx.collections.ObservableList;
 
 /**
@@ -17,11 +16,6 @@ public interface Model {
      */
     Predicate<Event> PREDICATE_SHOW_ALL_EVENTS = unused -> true;
 
-    /**
-     * {@code Predicate} that always evaluate to true
-     */
-    Predicate<Event> PREDICATE_SHOW_NEXT_FIRST_EVENT = new UpcomingEventPredicate(1);
-
     /**
      * Returns the user prefs.
      */

diff --git a/src/main/java/ezschedule/model/ModelManager.java b/src/main/java/ezschedule/model/ModelManager.java
@@ -1,6 +1,7 @@
 package ezschedule.model;
 
 import static ezschedule.commons.util.CollectionUtil.requireAllNonNull;
+import static ezschedule.logic.commands.ShowNextCommand.SHOW_UPCOMING_COUNT_ONE;
 import static java.util.Objects.requireNonNull;
 
 import java.nio.file.Path;
@@ -38,7 +39,7 @@ public ModelManager(ReadOnlyScheduler scheduler, ReadOnlyUserPrefs userPrefs) {
         this.userPrefs = new UserPrefs(userPrefs);
         filteredEvents = new FilteredList<>(this.scheduler.getEventList());
         upcomingEvents = new FilteredList<>(this.scheduler.getEventList());
-        updateUpcomingEventList(PREDICATE_SHOW_NEXT_FIRST_EVENT);
+        updateUpcomingEventList(new UpcomingEventPredicate(SHOW_UPCOMING_COUNT_ONE));
     }
 
     public ModelManager() {