[jellywaiyan] iP

src/main/java/Jelly/commands/ByeCommand.java

@@ -11,7 +11,7 @@ public void execute(TaskList taskList, Ui ui, Storage storage) {
         ui.byeMessage();
     }
 
-    public boolean running() {
+    public boolean isRunning() {
         return false;
     }
 }

src/main/java/Jelly/commands/Command.java

@@ -5,7 +5,7 @@
 import Jelly.main.Ui;
 
 public abstract class Command {
-    public boolean running() {
+    public boolean isRunning() {
         return true;
     }
     public abstract void execute(TaskList taskList, Ui ui, Storage storage);

src/main/java/Jelly/commands/DeadlineCommand.java

@@ -3,6 +3,7 @@
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;
+
 import Jelly.task.Deadline;
 
 public class DeadlineCommand extends Command {

src/main/java/Jelly/commands/DeleteCommand.java

@@ -1,6 +1,5 @@
 package Jelly.commands;
 
-import Jelly.exceptions.JellyBlankMessageException;
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;

src/main/java/Jelly/commands/EventCommand.java

@@ -3,6 +3,7 @@
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;
+
 import Jelly.task.Event;
 
 public class EventCommand extends Command {

src/main/java/Jelly/commands/MarkCommand.java

@@ -1,6 +1,5 @@
 package Jelly.commands;
 
-import Jelly.exceptions.JellyBlankMessageException;
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;

src/main/java/Jelly/commands/ToDoCommand.java

@@ -3,6 +3,7 @@
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;
+
 import Jelly.task.Todo;
 
 public class ToDoCommand extends Command {

src/main/java/Jelly/commands/UnmarkCommand.java

@@ -1,6 +1,5 @@
 package Jelly.commands;
 
-import Jelly.exceptions.JellyBlankMessageException;
 import Jelly.main.Storage;
 import Jelly.main.TaskList;
 import Jelly.main.Ui;

src/main/java/Jelly/exceptions/JellyUnknownCommandException.java

@@ -1,6 +1,5 @@
 package Jelly.exceptions;
 
-
 public class JellyUnknownCommandException extends JellyException {
     public JellyUnknownCommandException() {
         super("Oops! I really don't know what you're saying :(");

src/main/java/Jelly/main/Jelly.java

@@ -1,6 +1,7 @@
 package Jelly.main;
 
 import java.util.Scanner;
+
 import Jelly.commands.Command;
 import Jelly.exceptions.JellyException;
 
@@ -48,14 +49,16 @@ public static void main(String[] args) throws JellyException {
      * Runs the commands given to the Jelly Chat bot.
      */
     private void run() {
+
         ui.startUpMessage();
-        boolean running = true;
-        while (running) {
+        boolean isRunning = true;
+
+        while (isRunning) {
             try {
                 String command = ui.commandMe();
                 Command c = Parser.parse(command);
                 c.execute(taskList, ui, storage);
-                running = c.running();
+                isRunning = c.isRunning();
             } catch (JellyException e) {
             }
         }

src/main/java/Jelly/main/Parser.java

@@ -1,6 +1,15 @@
 package Jelly.main;
 
-import Jelly.commands.*;
+import Jelly.commands.ByeCommand;
+import Jelly.commands.Command;
+import Jelly.commands.DeadlineCommand;
+import Jelly.commands.DeleteCommand;
+import Jelly.commands.EventCommand;
+import Jelly.commands.ListCommand;
+import Jelly.commands.MarkCommand;
+import Jelly.commands.ToDoCommand;
+import Jelly.commands.UnmarkCommand;
+
 import Jelly.exceptions.JellyBlankMessageException;
 import Jelly.exceptions.JellyException;
 import Jelly.exceptions.JellyUnknownCommandException;
@@ -18,8 +27,10 @@ public class Parser {
      * @throws JellyException If the input is invalid.
      */
     public static Command parse(String command) throws JellyException  {
+
         try {
             String[] stringArray = command.split(" ");
+
             if (stringArray[0].equals("list")) {
                 return new ListCommand();
             } else if (stringArray[0].equals("bye")) {
@@ -80,6 +91,7 @@ public static Command parse(String command) throws JellyException  {
                 String eventString = "";
                 String fromWhen = "";
                 String toWhen = "";
+
                 for (int i = 1; i < stringArray.length; i++) {
                     if (stringArray[i] != null) {
                         if (stringArray[i].equals("/from")) {
@@ -102,6 +114,7 @@ public static Command parse(String command) throws JellyException  {
                         break;
                     }
                 }
+                return new EventCommand(eventString, fromWhen, toWhen);
             } else if (stringArray[0].equals("delete")) {
                 if (stringArray.length == 1) {
                     throw new JellyBlankMessageException("delete");

src/main/java/Jelly/main/Storage.java

@@ -1,17 +1,17 @@
 package Jelly.main;
 
-import Jelly.exceptions.JellyException;
-import Jelly.task.Deadline;
-import Jelly.task.Event;
-import Jelly.task.Task;
-import Jelly.task.Todo;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Scanner;
 
+import Jelly.exceptions.JellyException;
+import Jelly.task.Deadline;
+import Jelly.task.Event;
+import Jelly.task.Task;
+import Jelly.task.Todo;
+
 /**
  * Stores and loads tasked based on the specified file path.
  */
@@ -39,12 +39,15 @@ public ArrayList<Task> startUp() throws JellyException {
         ArrayList<Task> storage = new ArrayList<>();
         try {
             File data = new File(filePath);
+
             if (!data.exists()) {
                 data.getParentFile().mkdirs();
                 return storage;
             }
+
             int index = storage.size();
             Scanner sc = new Scanner(data);
+
             while (sc.hasNextLine()) {
                 String str = sc.nextLine();
                 String[] taskDetails = str.split(" \\| ");

src/main/java/Jelly/main/TaskList.java

@@ -1,9 +1,9 @@
 package Jelly.main;
 
-import Jelly.task.Task;
-
 import java.util.ArrayList;
 
+import Jelly.task.Task;
+
 /**
  * Contains all the commands regarding the list of tasks.
  */

src/main/java/Jelly/main/Ui.java

@@ -1,10 +1,10 @@
 package Jelly.main;
 
-import Jelly.task.Task;
-
 import java.util.ArrayList;
 import java.util.Scanner;
 
+import Jelly.task.Task;
+
 /**
  * Responsible for the interface of the Jelly Chat Bot.
  */

src/main/java/Jelly/task/Deadline.java

@@ -1,9 +1,10 @@
 package Jelly.task;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,6 +57,7 @@ public String writeToFile() {
      * @return The parsed date, or null if the date is in a format that isn't accepted.
      */
     protected LocalDate parseDate(String date) {
+
         List<DateTimeFormatter> formats = new ArrayList<>();
         formats.add(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         formats.add(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
@@ -65,7 +67,6 @@ protected LocalDate parseDate(String date) {
             try {
                 return LocalDate.parse(date, formats.get(i));
             } catch (DateTimeParseException e) {
-
             }
         }
         return null;
@@ -78,6 +79,7 @@ protected LocalDate parseDate(String date) {
      * @return The parsed date and time, or null if incorrect format.
      */
     protected LocalDateTime parseDateTime(String dateTime) {
+
         List<DateTimeFormatter> formats = new ArrayList<>();
         formats.add(DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"));
         formats.add(DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"));
@@ -88,10 +90,8 @@ protected LocalDateTime parseDateTime(String dateTime) {
                 try {
                     return LocalDateTime.parse(dateTime, formats.get(i));
                 } catch (DateTimeParseException e) {
-
             }
         }
-
         return null;
     }
 }

src/main/java/Jelly/task/Event.java

@@ -1,9 +1,10 @@
 package Jelly.task;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,8 +15,10 @@ public class Event extends Task {
 
     protected String from;
     protected String to;
+
     protected LocalDate fromDate;
     protected LocalDate toDate;
+
     protected LocalDateTime fromDateTime;
     protected LocalDateTime toDateTime;
 
@@ -38,6 +41,7 @@ public Event(String description, String from, String to) {
 
     @Override
     public String toString() {
+
         String fromWhen = from;
         String toWhen = to;
 
@@ -54,6 +58,7 @@ public String toString() {
         }
         return "[E]" + super.toString() + "(from: " + fromWhen + " to: " + toWhen + ")";
     }
+
     @Override
     public String writeToFile() {
         return "E | " + (getIsDone() ? "1" : "0") + " | " + getDescription() + " | " + from + " to " + to;
@@ -66,6 +71,7 @@ public String writeToFile() {
      * @return The parsed date, or null if incorrect format.
      */
     protected LocalDate parseDate(String date) {
+
         List<DateTimeFormatter> formats = new ArrayList<>();
         formats.add(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         formats.add(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
@@ -87,6 +93,7 @@ protected LocalDate parseDate(String date) {
      * @return The parsed date and time, or null if incorrect format.
      */
     protected LocalDateTime parseDateTime(String dateTime) {
+
         List<DateTimeFormatter> formats = new ArrayList<>();
         formats.add(DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"));
         formats.add(DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"));
@@ -100,7 +107,6 @@ protected LocalDateTime parseDateTime(String dateTime) {
 
             }
         }
-
         return null;
     }
 }

src/main/java/Jelly/task/Task.java

@@ -4,6 +4,7 @@
  * Corresponds to a task.
  */
 public class Task {
+
     protected boolean isDone;
     protected String description;