[Tan Juay Hee] iP

src/main/java/AddTaskCommand.java

@@ -0,0 +1,47 @@
+/**
+ * Generates the correct type of task and adds it to the task list
+ */
+
+public class AddTaskCommand extends Command {
+
+    private String input; // Details of the task
+    private String type; // Type of task
+
+    public AddTaskCommand(String input, String type) {
+        this.input = input;
+        this.type = type;
+    }
+
+    /**
+     * Formats the echo for the task that was added to the user as confirmation
+     * @return Formatted echo
+     */
+    private String formatOutput(Task newTask) {
+        String response = "added: " + newTask.toString();
+        String formattedString = Duke.indent(response, 1);
+        String finalFormatted = Duke.formatLines(formattedString);
+
+        return finalFormatted;
+    }
+
+    @Override
+    public void execute() {
+        Task newTask;
+        if (this.type.equals("todo")) {
+            newTask = new TodoTask(this.input);
+        } else if (this.type.equals("deadline")) {
+            newTask = new DeadlineTask(this.input);
+        } else if (this.type.equals("event")) {
+            newTask = new EventTask(this.input);
+        } else {
+            newTask = null;
+        }
+
+        // Adding task to TaskManager
+        TaskManager.taskList.add(newTask);
+
+        // System prints
+        String output = formatOutput(newTask);
+        System.out.println(output);
+    }
+}

src/main/java/ByeCommand.java

@@ -0,0 +1,22 @@
+/**
+ * Prints bye message, terminating command for Duke.main()
+ */
+public class ByeCommand extends Command {
+
+    final String EXIT = "Duke terminated";
+
+    private String formatOutput() {
+        String formattedBye = Duke.indent(EXIT, 1);
+        String finalFormatted = Duke.formatLines(formattedBye);
+
+        return finalFormatted;
+    }
+    @Override
+    public void execute() {
+        // Console prints
+        String output = formatOutput();
+
+        System.out.println(output);
+
+    }
+}

src/main/java/Command.java

@@ -0,0 +1,3 @@
+public abstract class Command {
+    public abstract void execute();
+}

src/main/java/CommandFactory.java

@@ -0,0 +1,62 @@
+/**
+ * Decides which type of command to generate given user input
+ */
+public class CommandFactory {
+
+    /**
+     * Extracts the command portion of the input provided by the user (usually first word)
+     *
+     * @param input Input from the user
+     * @return One word string
+     */
+    private String isolateCommand(String input) {
+        int whiteSpaceIndex = input.indexOf(" "); // Index of first whitespace
+        if (whiteSpaceIndex == -1) { // If the input string has no whitespaces (i.e. one word)
+            return input;
+        }
+        return input.substring(0, whiteSpaceIndex);
+    }
+
+    /**
+     * Extracts the command parameters portion of the input provided by the user (stuff after first word)
+     *
+     * @param input Input from the user
+     * @return Multiple-word string
+     */
+    private String isolateParameters(String input) {
+        int whiteSpaceIndex = input.indexOf(" "); // Index of first whitespace
+        if (whiteSpaceIndex == -1) { // If the input string has no whitespaces (i.e. one word)
+            return null;
+        }
+        return input.substring(whiteSpaceIndex + 1); // Return the rest of the word, starting from after whitespace
+    }
+
+    /**
+     * Generates the appropriate command type given the input
+     *
+     * @param input Input from the user
+     * @return Value of parent type Command
+     */
+    public Command makeCommand(String input) {
+        String commandWord = isolateCommand(input);
+        String commandParameters = isolateParameters(input);
+
+        if (commandWord.equals("bye")) {
+            return new ByeCommand();
+        } else if (commandWord.equals("list")) {
+            return new ListCommand();
+        } else if (commandWord.equals("mark")) {
+            return new MarkCommand(commandParameters);
+        } else if (commandWord.equals("unmark")) {
+            return new UnmarkCommand(commandParameters);
+        } else if (commandWord.equals("todo")) {
+            return new AddTaskCommand(commandParameters, "todo");
+        } else if (commandWord.equals("deadline")) {
+            return new AddTaskCommand(commandParameters, "deadline");
+        } else if (commandWord.equals("event")) {
+            return new AddTaskCommand(commandParameters, "event");
+        } else {
+            return null;
+        }
+    }
+}

src/main/java/DeadlineTask.java

@@ -0,0 +1,52 @@
+public class DeadlineTask extends Task {
+    public DeadlineTask(String input) {
+        super(input);
+        this.type = "deadline";
+        this.updateDescription();
+    }
+
+    /**
+     * Format DeadlineTask description into display format for Duke
+     */
+    private void updateDescription() {
+        this.description += this.getInfo();
+        this.description += "(by: ";
+        this.description += this.getDate();
+        this.description += ")";
+    }
+
+    /**
+     * Find the index from which datetime information starts
+     *
+     * @return Integer index
+     */
+    private int findDeadlineIndex() {
+        int index = this.input.indexOf("/by "); // "/" as delimiting character for events
+        return index;
+    }
+
+    /**
+     * Gets the task information
+     *
+     * @return Task information
+     */
+    private String getInfo() {
+        int index = this.findDeadlineIndex();
+        String info = this.input.substring(0, index);
+
+        return info;
+    }
+
+    /**
+     * Gets the deadline date
+     *
+     * @return Deadline date string
+     */
+    private String getDate() {
+        int index = this.findDeadlineIndex() + 4;
+        String date = this.input.substring(index);
+
+        return date;
+    }
+
+}

src/main/java/Duke.java

@@ -1,10 +1,96 @@
+import java.util.Scanner;
+
 public class Duke {
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
+        // Constant strings
+        final String INTRO = "Duke initialised";
+
+        // Init
+        Scanner sc = new Scanner(System.in);
+
+        // Printing Duke's intro
+        String formattedIntroText = Duke.indent(INTRO, 1);
+        String formattedIntro = Duke.formatLines(formattedIntroText);
+        System.out.println(formattedIntro);
+
+        // Reading and processing inputs
+        String nextLine = sc.nextLine();
+        CommandFactory commandFactory = new CommandFactory();
+        while (true) {
+            Command nextCommand = commandFactory.makeCommand(nextLine); // Creating the appropriate command
+            nextCommand.execute();
+
+            if (nextCommand instanceof ByeCommand) { // Check for exit command
+                break;
+            }
+            nextLine = sc.nextLine(); // Update nextLine variable with next input
+        }
+
+    }
+
+    /**
+     * Checks if input is "bye"
+     */
+    private boolean isBye(String input) {
+
+        return (input.equals("bye"));
+    }
+
+    /**
+     * Formats the given input between lines
+     * @param input Formatted input with proper indents and newlines.
+     */
+    public static String formatLines(String input) {
+        String output = "";
+        output += Duke.line();
+        output += input;
+        output += "\n" + Duke.line();
+
+        return output;
+    }
+
+    /**
+     * Provides a formatting line for Duke's responses
+     *
+     * @return A formatted line
+     */
+    public static String line() {
+        String line = "\t____________________________________________________________\n";
+        return line;
+    }
+
+    /**
+     * Formats a single line with a new line
+     *
+     * @param input Input string
+     * @return String with newline
+     */
+    public static String newLine(String input) {
+        String output = input + "\n";
+        return output;
+    }
+
+    /**
+     * Formats a single line with the specified number of indentations
+     *
+     * @param input   Input string
+     * @param indents Number of indents to add
+     * @return String with specified number of indents
+     */
+    public static String indent(String input, int indents) {
+        String indent = "";
+        String output = "";
+
+        // Adding the appropriate number of indents
+        for (int i = 0; i < indents; i++) {
+            indent += "\t";
+        }
+
+        // Forming the final string
+        output = indent + input;
+
+        return output;
+
+
     }
 }

src/main/java/EchoCommand.java

@@ -0,0 +1,25 @@
+/**
+ * Repeats input to user
+ */
+public class EchoCommand extends Command {
+
+    private String input;
+
+    public EchoCommand (String input) {
+        this.input = input;
+    }
+
+    public String formatOutput (String input) {
+        String formattedInput = Duke.indent(input, 1);
+        String finalFormatted = Duke.formatLines(formattedInput);
+
+        return finalFormatted;
+    }
+    @Override
+    public void execute() {
+
+        // Console prints
+        String output = formatOutput(input);
+        System.out.println(output);
+    }
+}

src/main/java/EventTask.java

@@ -0,0 +1,51 @@
+public class EventTask extends Task {
+    public EventTask(String input) {
+        super(input);
+        this.type = "event";
+        this.updateDescription();
+    }
+
+    /**
+     * Format EventTask description into display format for Duke
+     */
+    private void updateDescription() {
+        this.description += this.getInfo();
+        this.description += "(at: ";
+        this.description += this.getDate();
+        this.description += ")";
+    }
+
+    /**
+     * Find the index from which datetime information starts
+     * @return Integer index
+     */
+    private int findEventIndex() {
+        int index = this.input.indexOf("/at "); // "/at" as delimiting character for events
+        return index;
+    }
+
+    /**
+     * Gets the task information
+     * @return Task information
+     */
+    private String getInfo() {
+        int index = this.findEventIndex();
+        String info = this.input.substring(0, index);
+
+        return info;
+    }
+
+    /**
+     * Gets the deadline date
+     * @return Deadline date string
+     */
+    private String getDate() {
+        int index = this.findEventIndex() + 4; // Offset of the string "/at "
+        String date = this.input.substring(index);
+
+        return date;
+    }
+
+}
+
+