From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/47] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..20c0521cc7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.29' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From 487213cece3e4879e7a973b1526ef5ab3846184b Mon Sep 17 00:00:00 2001 From: brian16600 Date: Thu, 20 Jan 2022 03:22:36 +0800 Subject: [PATCH 02/47] Level-1 --- src/main/java/Duke.java | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..760527bf8b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,5 @@ +import java.util.Scanner; //import Scanner + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -5,6 +7,27 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + String dukeGreeting = "Hello! I'm Duke \nWhat can I do for you?"; + boolean endChat = false; + String endMessage = "Bye. Hope to see you again soon!"; + Scanner sc = new Scanner(System.in); + System.out.println(dukeGreeting); + while (!endChat) { + String userResponse = sc.nextLine(); + endChat = levelOneRespond(userResponse); + } + System.out.println(endMessage); + + + } + public static boolean levelOneRespond (String input) { + String bye = "bye"; + String dukeMessage = "Duke: "; + if (!input.equals(bye)) { + System.out.println(dukeMessage + input); + return false; + } else { + return true; + } } } From 63bd8fe5fa1e35941f97c56157ed342ccf82131e Mon Sep 17 00:00:00 2001 From: brian16600 Date: Thu, 20 Jan 2022 11:34:59 +0800 Subject: [PATCH 03/47] Level-2. Changed the return values of levelOneRespond and implemented levelTwoRespond --- src/main/java/Duke.java | 47 ++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 760527bf8b..252635a3c0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,5 @@ import java.util.Scanner; //import Scanner +import java.util.ArrayList; //import ArrayList public class Duke { public static void main(String[] args) { @@ -10,24 +11,54 @@ public static void main(String[] args) { String dukeGreeting = "Hello! I'm Duke \nWhat can I do for you?"; boolean endChat = false; String endMessage = "Bye. Hope to see you again soon!"; - Scanner sc = new Scanner(System.in); + + //arraylist to store the list of tasks + ArrayList arrayLst = new ArrayList<>(); + System.out.println(dukeGreeting); - while (!endChat) { - String userResponse = sc.nextLine(); - endChat = levelOneRespond(userResponse); - } + levelTwoRespond(arrayLst); System.out.println(endMessage); } - public static boolean levelOneRespond (String input) { + + /** + * Method that handles the response for Level-1. + */ + public static void levelOneRespond () { + Scanner sc = new Scanner(System.in); String bye = "bye"; String dukeMessage = "Duke: "; + String endMessage = "Bye. Hope to see you again soon!"; + String input = sc.nextLine(); if (!input.equals(bye)) { System.out.println(dukeMessage + input); - return false; + levelOneRespond(); + } + } + + /** + * Method that handles the response for Level-2. Includes Add and List + * @param arrayLst arraylist that stores the String entries for add and can be listed out. + */ + public static void levelTwoRespond (ArrayList arrayLst) { + Scanner sc = new Scanner(System.in); + String bye = "bye"; + String lst = "list"; + String input = sc.nextLine(); + if (input.equals(bye)); + else if (input.equals(lst)) { + int i = 0; + for (String item : arrayLst) { + i += 1; + System.out.println(i + ". " + item); + } + levelTwoRespond(arrayLst); } else { - return true; + String added = "added: "; + arrayLst.add(input); + System.out.println(added + input); + levelTwoRespond(arrayLst); } } } From 63b73848fb4f40c66524d6d108021c2dbd1a3108 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Thu, 20 Jan 2022 20:03:45 +0800 Subject: [PATCH 04/47] Level-3 --- src/main/java/Duke.java | 86 +++++++++++++++++++++++++++++++++++------ 1 file changed, 75 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 252635a3c0..a5a7c0c350 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -13,10 +13,10 @@ public static void main(String[] args) { String endMessage = "Bye. Hope to see you again soon!"; //arraylist to store the list of tasks - ArrayList arrayLst = new ArrayList<>(); + ArrayList arrayLst = new ArrayList<>(); System.out.println(dukeGreeting); - levelTwoRespond(arrayLst); + levelThreeRespond(arrayLst); System.out.println(endMessage); @@ -38,27 +38,91 @@ public static void levelOneRespond () { } /** - * Method that handles the response for Level-2. Includes Add and List - * @param arrayLst arraylist that stores the String entries for add and can be listed out. + * Method that handles the response for Level-3. Building on level 2, it adds the ability to mark and unmark tasks as well as different representation for Tasks. Furthermore, + * the arraylist is changed to contain Task objects + * @param arrayLst arraylist that stores the Task entries for add and can be listed out. */ - public static void levelTwoRespond (ArrayList arrayLst) { + public static void levelThreeRespond (ArrayList arrayLst) { Scanner sc = new Scanner(System.in); String bye = "bye"; String lst = "list"; + String markCommand = "mark"; + String unmarkCommand = "unmark"; + String tasksInList = "Here are the tasks in your list:\n"; String input = sc.nextLine(); - if (input.equals(bye)); + + if (input.equals(bye)); //ends recursive loop, causing the bye statement in main to be executed else if (input.equals(lst)) { + System.out.println(tasksInList); int i = 0; - for (String item : arrayLst) { + for (Task item : arrayLst) { i += 1; - System.out.println(i + ". " + item); + if (item.isMark()) { + System.out.println(i + ". " + item); + } else { + System.out.println(i + ". " + item); + } } - levelTwoRespond(arrayLst); + levelThreeRespond(arrayLst); + + } else if (input.contains(unmarkCommand)) { + String stringIdx = input.split(" ")[1]; + int idx = Integer.parseInt(stringIdx) - 1; + Task unmarkTask = arrayLst.get(idx); + unmarkTask.unmarkTask(); + levelThreeRespond(arrayLst); + + } else if (input.contains(markCommand)){ + String stringIdx = input.split(" ")[1]; + int idx = Integer.parseInt(stringIdx) - 1; + Task markTask = arrayLst.get(idx); + markTask.markTask(); + levelThreeRespond(arrayLst); + } else { String added = "added: "; - arrayLst.add(input); + Task newTask = new Task(input); + arrayLst.add(newTask); System.out.println(added + input); - levelTwoRespond(arrayLst); + levelThreeRespond(arrayLst); + } + } + + /** + * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked + */ + + public static class Task { + private boolean mark; + public String name; + + public Task (String name) { + this.name = name; + this.mark = false; + } + + public void markTask () { + String markedMessage = "Nice! I've marked this task as done:\n"; + this.mark = true; + System.out.println(markedMessage + " " + this); + } + public void unmarkTask() { + String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; + this.mark = false; + System.out.println(unmarkedMessage + " " + this); + } + public boolean isMark() { + return this.mark; + } + public String toString() { + if (this.mark) { + String marked = "[X] "; + return marked + this.name; + } else { + String unmarked = "[ ] "; + return unmarked + this.name; + } } } } + From 5188549336628de1e81b5f8dc25f967be078b8dd Mon Sep 17 00:00:00 2001 From: brian16600 Date: Fri, 21 Jan 2022 00:34:09 +0800 Subject: [PATCH 05/47] Level-3 --- src/main/java/Duke.java | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a5a7c0c350..8752cc9c23 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -52,6 +52,8 @@ public static void levelThreeRespond (ArrayList arrayLst) { String input = sc.nextLine(); if (input.equals(bye)); //ends recursive loop, causing the bye statement in main to be executed + + //list command else if (input.equals(lst)) { System.out.println(tasksInList); int i = 0; @@ -64,22 +66,21 @@ else if (input.equals(lst)) { } } levelThreeRespond(arrayLst); - - } else if (input.contains(unmarkCommand)) { + } else if (input.contains(unmarkCommand)) { //unmark command String stringIdx = input.split(" ")[1]; int idx = Integer.parseInt(stringIdx) - 1; Task unmarkTask = arrayLst.get(idx); unmarkTask.unmarkTask(); levelThreeRespond(arrayLst); - } else if (input.contains(markCommand)){ + } else if (input.contains(markCommand)){ //mark command String stringIdx = input.split(" ")[1]; int idx = Integer.parseInt(stringIdx) - 1; Task markTask = arrayLst.get(idx); markTask.markTask(); levelThreeRespond(arrayLst); - } else { + } else { //add task String added = "added: "; Task newTask = new Task(input); arrayLst.add(newTask); @@ -96,24 +97,45 @@ public static class Task { private boolean mark; public String name; + /** + * Constructor + * @param name name of the task + */ public Task (String name) { this.name = name; this.mark = false; } + /** + * markTask as done + */ public void markTask () { String markedMessage = "Nice! I've marked this task as done:\n"; this.mark = true; System.out.println(markedMessage + " " + this); } + + /** + * unmarkTask + */ public void unmarkTask() { String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; this.mark = false; System.out.println(unmarkedMessage + " " + this); } + + /** + * + * @return boolean on whether task is marked + */ public boolean isMark() { return this.mark; } + + /** + * + * @return String version of task, with marked and name + */ public String toString() { if (this.mark) { String marked = "[X] "; From 629d77c37e31fb970f268633bc3d7d1875eba78a Mon Sep 17 00:00:00 2001 From: brian16600 Date: Fri, 21 Jan 2022 15:12:26 +0800 Subject: [PATCH 06/47] Level-3 --- src/main/java/Duke.java | 98 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8752cc9c23..c7ba360ed3 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,6 @@ import java.util.Scanner; //import Scanner import java.util.ArrayList; //import ArrayList +import java.util.Arrays; public class Duke { public static void main(String[] args) { @@ -16,7 +17,7 @@ public static void main(String[] args) { ArrayList arrayLst = new ArrayList<>(); System.out.println(dukeGreeting); - levelThreeRespond(arrayLst); + levelFourRespond(arrayLst); System.out.println(endMessage); @@ -42,13 +43,16 @@ public static void levelOneRespond () { * the arraylist is changed to contain Task objects * @param arrayLst arraylist that stores the Task entries for add and can be listed out. */ - public static void levelThreeRespond (ArrayList arrayLst) { + public static void levelFourRespond (ArrayList arrayLst) { Scanner sc = new Scanner(System.in); String bye = "bye"; String lst = "list"; String markCommand = "mark"; String unmarkCommand = "unmark"; - String tasksInList = "Here are the tasks in your list:\n"; + String todo = "todo"; + String event = "event"; + String deadline = "deadline"; + String tasksInList = "Here are the tasks in your list:"; String input = sc.nextLine(); if (input.equals(bye)); //ends recursive loop, causing the bye statement in main to be executed @@ -65,28 +69,63 @@ else if (input.equals(lst)) { System.out.println(i + ". " + item); } } - levelThreeRespond(arrayLst); + levelFourRespond(arrayLst); } else if (input.contains(unmarkCommand)) { //unmark command String stringIdx = input.split(" ")[1]; int idx = Integer.parseInt(stringIdx) - 1; Task unmarkTask = arrayLst.get(idx); unmarkTask.unmarkTask(); - levelThreeRespond(arrayLst); + levelFourRespond(arrayLst); } else if (input.contains(markCommand)){ //mark command String stringIdx = input.split(" ")[1]; int idx = Integer.parseInt(stringIdx) - 1; Task markTask = arrayLst.get(idx); markTask.markTask(); - levelThreeRespond(arrayLst); - - } else { //add task + levelFourRespond(arrayLst); + + } else if (input.contains(todo)) { + String[] stringArray = input.split(" "); + String[] nameArray = Arrays.copyOfRange(stringArray, 1, stringArray.length); + String name = String.join(" ", nameArray); + Todo newTodo = new Todo(name); + arrayLst.add(newTodo); + String todoMessage = "Got it. I've added this task:\n" + newTodo + "\nNow you have " + arrayLst.size() + " tasks in the list."; + System.out.println(todoMessage); + levelFourRespond(arrayLst); + } else if (input.contains(event)) { + String[] stringArrayIncludingEvent = input.split(" "); + String[] stringArrayExcludingEvent = Arrays.copyOfRange(stringArrayIncludingEvent, 1, stringArrayIncludingEvent.length); + String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); + String[] nameAndTimeArray = stringExcludingEvent.split("/at"); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + Event newEvent = new Event(name, time); + arrayLst.add(newEvent); + String eventMessage = "Got it. I've added this task:\n" + newEvent + "\nNow you have " + arrayLst.size() + " tasks in the list."; + System.out.println(eventMessage); + levelFourRespond(arrayLst); + } else if (input.contains(deadline)) { + String[] stringArrayIncludingDeadline = input.split(" "); + String[] stringArrayExcludingDeadline = Arrays.copyOfRange(stringArrayIncludingDeadline, 1, stringArrayIncludingDeadline.length); + String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); + String[] nameAndTimeArray = stringExcludingDeadline.split("/by"); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + Deadline newDeadline = new Deadline(name, time); + arrayLst.add(newDeadline); + String deadlineMessage = "Got it. I've added this task:\n" + newDeadline + "\nNow you have " + arrayLst.size() + " tasks in the list."; + System.out.println(deadlineMessage); + levelFourRespond(arrayLst); + } + else { //add task String added = "added: "; Task newTask = new Task(input); arrayLst.add(newTask); System.out.println(added + input); - levelThreeRespond(arrayLst); + levelFourRespond(arrayLst); } + } /** @@ -133,8 +172,8 @@ public boolean isMark() { } /** - * - * @return String version of task, with marked and name + * @override + * @return String version of task, with marked and name. E.g. [X] Task */ public String toString() { if (this.mark) { @@ -146,5 +185,42 @@ public String toString() { } } } + + public static class Todo extends Task { + public Todo (String name) { + super(name); + } + + /** + * @override + * @return String of Todo task, eg: [T][X] Todo + */ + public String toString() { + return "[T]" + super.toString(); + } + } + + public static class Event extends Task { + private static String dueDate; + public Event (String name, String time) { super(name); this.dueDate = time;} + + /** + * @override + * @return String of Event task, eg: [E][X] Event + */ + public String toString() { return "[E]" + super.toString() + "(at:" + this.dueDate + ")"; } + } + + public static class Deadline extends Task { + private static String dueDate; + public Deadline(String name, String time) {super(name); this.dueDate = time;} + + /** + * @override + * @return String of Deadline task, eg [D][X] Deadline (by:XX) + */ + + public String toString() { return "[D]" + super.toString() + "(by:" + this.dueDate + ")"; } + } } From 62a2177f7cd01dccdfa4bd50d07d7373222a2b23 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Wed, 26 Jan 2022 09:29:29 +0800 Subject: [PATCH 07/47] Level-4. Added Event, Deadline and Todo subclasses of Task. Updated if-else in levelFourRespond to handle the 3 subclasses. --- src/main/java/Deadline.java | 20 ++++++ src/main/java/Duke.java | 119 +++++++----------------------------- src/main/java/Event.java | 18 ++++++ src/main/java/Task.java | 60 ++++++++++++++++++ src/main/java/Todo.java | 22 +++++++ 5 files changed, 141 insertions(+), 98 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Task.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..1fb1752801 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,20 @@ +import java.util.Scanner; +import java.util.ArrayList; +import java.util.Arrays; + + +/** + * Represents a Deadline which is a subclass of Task + * Includes a dueDate attribute. Overrides toString() from Task + */ +public class Deadline extends Task { + private String dueDate; + public Deadline(String name, String time) {super(name); this.dueDate = time;} + + /** + * @override + * @return String of Deadline task, eg [D][X] Deadline (by:XX) + */ + + public String toString() { return "[D]" + super.toString() + "(by:" + this.dueDate + ")"; } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c7ba360ed3..1c60f909da 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,6 @@ import java.util.Scanner; //import Scanner import java.util.ArrayList; //import ArrayList -import java.util.Arrays; +import java.util.Arrays; //import Arrays public class Duke { public static void main(String[] args) { @@ -26,7 +26,7 @@ public static void main(String[] args) { /** * Method that handles the response for Level-1. */ - public static void levelOneRespond () { + public static void levelOneRespond() { Scanner sc = new Scanner(System.in); String bye = "bye"; String dukeMessage = "Duke: "; @@ -39,11 +39,14 @@ public static void levelOneRespond () { } /** - * Method that handles the response for Level-3. Building on level 2, it adds the ability to mark and unmark tasks as well as different representation for Tasks. Furthermore, + * Method that handles the response for Level-4. + * Level 3:added the ability to mark and unmark tasks as well as different representation for Tasks. Furthermore, * the arraylist is changed to contain Task objects + * Level 4: Added Todo, Event and Deadline subclasses to be detected and handled in each seperate case + * * @param arrayLst arraylist that stores the Task entries for add and can be listed out. */ - public static void levelFourRespond (ArrayList arrayLst) { + public static void levelFourRespond(ArrayList arrayLst) { Scanner sc = new Scanner(System.in); String bye = "bye"; String lst = "list"; @@ -55,9 +58,9 @@ public static void levelFourRespond (ArrayList arrayLst) { String tasksInList = "Here are the tasks in your list:"; String input = sc.nextLine(); - if (input.equals(bye)); //ends recursive loop, causing the bye statement in main to be executed + if (input.equals(bye)) ; //ends recursive loop, causing the bye statement in main to be executed - //list command + //list command else if (input.equals(lst)) { System.out.println(tasksInList); int i = 0; @@ -70,20 +73,24 @@ else if (input.equals(lst)) { } } levelFourRespond(arrayLst); + + //unmark } else if (input.contains(unmarkCommand)) { //unmark command String stringIdx = input.split(" ")[1]; - int idx = Integer.parseInt(stringIdx) - 1; + int idx = Integer.parseInt(stringIdx) - 1; Task unmarkTask = arrayLst.get(idx); unmarkTask.unmarkTask(); levelFourRespond(arrayLst); - } else if (input.contains(markCommand)){ //mark command + //mark + } else if (input.contains(markCommand)) { //mark command String stringIdx = input.split(" ")[1]; int idx = Integer.parseInt(stringIdx) - 1; Task markTask = arrayLst.get(idx); markTask.markTask(); levelFourRespond(arrayLst); + //Todo } else if (input.contains(todo)) { String[] stringArray = input.split(" "); String[] nameArray = Arrays.copyOfRange(stringArray, 1, stringArray.length); @@ -93,6 +100,8 @@ else if (input.equals(lst)) { String todoMessage = "Got it. I've added this task:\n" + newTodo + "\nNow you have " + arrayLst.size() + " tasks in the list."; System.out.println(todoMessage); levelFourRespond(arrayLst); + + //Event } else if (input.contains(event)) { String[] stringArrayIncludingEvent = input.split(" "); String[] stringArrayExcludingEvent = Arrays.copyOfRange(stringArrayIncludingEvent, 1, stringArrayIncludingEvent.length); @@ -105,6 +114,8 @@ else if (input.equals(lst)) { String eventMessage = "Got it. I've added this task:\n" + newEvent + "\nNow you have " + arrayLst.size() + " tasks in the list."; System.out.println(eventMessage); levelFourRespond(arrayLst); + + //Deadline } else if (input.contains(deadline)) { String[] stringArrayIncludingDeadline = input.split(" "); String[] stringArrayExcludingDeadline = Arrays.copyOfRange(stringArrayIncludingDeadline, 1, stringArrayIncludingDeadline.length); @@ -117,8 +128,7 @@ else if (input.equals(lst)) { String deadlineMessage = "Got it. I've added this task:\n" + newDeadline + "\nNow you have " + arrayLst.size() + " tasks in the list."; System.out.println(deadlineMessage); levelFourRespond(arrayLst); - } - else { //add task + } else { //add task String added = "added: "; Task newTask = new Task(input); arrayLst.add(newTask); @@ -127,100 +137,13 @@ else if (input.equals(lst)) { } } +} - /** - * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked - */ - - public static class Task { - private boolean mark; - public String name; - - /** - * Constructor - * @param name name of the task - */ - public Task (String name) { - this.name = name; - this.mark = false; - } - - /** - * markTask as done - */ - public void markTask () { - String markedMessage = "Nice! I've marked this task as done:\n"; - this.mark = true; - System.out.println(markedMessage + " " + this); - } - - /** - * unmarkTask - */ - public void unmarkTask() { - String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; - this.mark = false; - System.out.println(unmarkedMessage + " " + this); - } - - /** - * - * @return boolean on whether task is marked - */ - public boolean isMark() { - return this.mark; - } - /** - * @override - * @return String version of task, with marked and name. E.g. [X] Task - */ - public String toString() { - if (this.mark) { - String marked = "[X] "; - return marked + this.name; - } else { - String unmarked = "[ ] "; - return unmarked + this.name; - } - } - } - public static class Todo extends Task { - public Todo (String name) { - super(name); - } - /** - * @override - * @return String of Todo task, eg: [T][X] Todo - */ - public String toString() { - return "[T]" + super.toString(); - } - } - - public static class Event extends Task { - private static String dueDate; - public Event (String name, String time) { super(name); this.dueDate = time;} - /** - * @override - * @return String of Event task, eg: [E][X] Event - */ - public String toString() { return "[E]" + super.toString() + "(at:" + this.dueDate + ")"; } - } - public static class Deadline extends Task { - private static String dueDate; - public Deadline(String name, String time) {super(name); this.dueDate = time;} - /** - * @override - * @return String of Deadline task, eg [D][X] Deadline (by:XX) - */ - public String toString() { return "[D]" + super.toString() + "(by:" + this.dueDate + ")"; } - } -} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..3f9375e89b --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,18 @@ +import java.util.Scanner; +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Represents a Event which is a subclass of Task + * Overrides toString() from Task + */ +public class Event extends Task { + private String dueDate; + public Event (String name, String time) { super(name); this.dueDate = time;} + + /** + * @override + * @return String of Event task, eg: [E][X] Event + */ + public String toString() { return "[E]" + super.toString() + "(at:" + this.dueDate + ")"; } +} \ No newline at end of file diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..576ac76756 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,60 @@ +import java.util.Scanner; +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked + */ +public class Task { + private boolean mark; + public String name; + + /** + * Constructor + * @param name name of the task + */ + public Task (String name) { + this.name = name; + this.mark = false; + } + + /** + * markTask as done + */ + public void markTask () { + String markedMessage = "Nice! I've marked this task as done:\n"; + this.mark = true; + System.out.println(markedMessage + " " + this); + } + + /** + * unmarkTask + */ + public void unmarkTask() { + String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; + this.mark = false; + System.out.println(unmarkedMessage + " " + this); + } + + /** + * + * @return boolean on whether task is marked + */ + public boolean isMark() { + return this.mark; + } + + /** + * @override + * @return String version of task, with marked and name. E.g. [X] Task + */ + public String toString() { + if (this.mark) { + String marked = "[X] "; + return marked + this.name; + } else { + String unmarked = "[ ] "; + return unmarked + this.name; + } + } +} \ No newline at end of file diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..90e54c56ed --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,22 @@ +import java.util.Scanner; +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Represents a Todo which is a subclass of Task + * Includes a dueDate attribute. Overrides toString() from Task + */ + +public class Todo extends Task { + public Todo (String name) { + super(name); + } + + /** + * @override + * @return String of Todo task, eg: [T][X] Todo + */ + public String toString() { + return "[T]" + super.toString(); + } +} \ No newline at end of file From 49d9e0a907e3748dffcf5efcc94e1697eedb7c63 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 29 Jan 2022 16:46:13 +0800 Subject: [PATCH 08/47] Level-5. Created DukeException class to handle incorrect input length/commands. Shifted if-else loop to a switch-case in InputHandler.java, --- src/main/java/Duke.java | 129 +++---------------------------- src/main/java/DukeException.java | 12 +++ src/main/java/InputHandler.java | 116 +++++++++++++++++++++++++++ src/main/java/Todo.java | 1 + 4 files changed, 139 insertions(+), 119 deletions(-) create mode 100644 src/main/java/DukeException.java create mode 100644 src/main/java/InputHandler.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1c60f909da..e62eb4d75e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -10,133 +10,24 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; String dukeGreeting = "Hello! I'm Duke \nWhat can I do for you?"; - boolean endChat = false; String endMessage = "Bye. Hope to see you again soon!"; - //arraylist to store the list of tasks - ArrayList arrayLst = new ArrayList<>(); - System.out.println(dukeGreeting); - levelFourRespond(arrayLst); - System.out.println(endMessage); - - - } - - /** - * Method that handles the response for Level-1. - */ - public static void levelOneRespond() { Scanner sc = new Scanner(System.in); - String bye = "bye"; - String dukeMessage = "Duke: "; - String endMessage = "Bye. Hope to see you again soon!"; - String input = sc.nextLine(); - if (!input.equals(bye)) { - System.out.println(dukeMessage + input); - levelOneRespond(); + InputHandler inputHandler = new InputHandler(); + boolean isChatEnded = false; + while (!isChatEnded) { + try { + String input = sc.nextLine(); + isChatEnded = inputHandler.handleInput(input); + } catch (DukeException e) { + System.out.println(e.getMessage()); + } } + System.out.println(endMessage); } - /** - * Method that handles the response for Level-4. - * Level 3:added the ability to mark and unmark tasks as well as different representation for Tasks. Furthermore, - * the arraylist is changed to contain Task objects - * Level 4: Added Todo, Event and Deadline subclasses to be detected and handled in each seperate case - * - * @param arrayLst arraylist that stores the Task entries for add and can be listed out. - */ - public static void levelFourRespond(ArrayList arrayLst) { - Scanner sc = new Scanner(System.in); - String bye = "bye"; - String lst = "list"; - String markCommand = "mark"; - String unmarkCommand = "unmark"; - String todo = "todo"; - String event = "event"; - String deadline = "deadline"; - String tasksInList = "Here are the tasks in your list:"; - String input = sc.nextLine(); - - if (input.equals(bye)) ; //ends recursive loop, causing the bye statement in main to be executed - - //list command - else if (input.equals(lst)) { - System.out.println(tasksInList); - int i = 0; - for (Task item : arrayLst) { - i += 1; - if (item.isMark()) { - System.out.println(i + ". " + item); - } else { - System.out.println(i + ". " + item); - } - } - levelFourRespond(arrayLst); - - //unmark - } else if (input.contains(unmarkCommand)) { //unmark command - String stringIdx = input.split(" ")[1]; - int idx = Integer.parseInt(stringIdx) - 1; - Task unmarkTask = arrayLst.get(idx); - unmarkTask.unmarkTask(); - levelFourRespond(arrayLst); - - //mark - } else if (input.contains(markCommand)) { //mark command - String stringIdx = input.split(" ")[1]; - int idx = Integer.parseInt(stringIdx) - 1; - Task markTask = arrayLst.get(idx); - markTask.markTask(); - levelFourRespond(arrayLst); - //Todo - } else if (input.contains(todo)) { - String[] stringArray = input.split(" "); - String[] nameArray = Arrays.copyOfRange(stringArray, 1, stringArray.length); - String name = String.join(" ", nameArray); - Todo newTodo = new Todo(name); - arrayLst.add(newTodo); - String todoMessage = "Got it. I've added this task:\n" + newTodo + "\nNow you have " + arrayLst.size() + " tasks in the list."; - System.out.println(todoMessage); - levelFourRespond(arrayLst); - - //Event - } else if (input.contains(event)) { - String[] stringArrayIncludingEvent = input.split(" "); - String[] stringArrayExcludingEvent = Arrays.copyOfRange(stringArrayIncludingEvent, 1, stringArrayIncludingEvent.length); - String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); - String[] nameAndTimeArray = stringExcludingEvent.split("/at"); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - Event newEvent = new Event(name, time); - arrayLst.add(newEvent); - String eventMessage = "Got it. I've added this task:\n" + newEvent + "\nNow you have " + arrayLst.size() + " tasks in the list."; - System.out.println(eventMessage); - levelFourRespond(arrayLst); - - //Deadline - } else if (input.contains(deadline)) { - String[] stringArrayIncludingDeadline = input.split(" "); - String[] stringArrayExcludingDeadline = Arrays.copyOfRange(stringArrayIncludingDeadline, 1, stringArrayIncludingDeadline.length); - String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); - String[] nameAndTimeArray = stringExcludingDeadline.split("/by"); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - Deadline newDeadline = new Deadline(name, time); - arrayLst.add(newDeadline); - String deadlineMessage = "Got it. I've added this task:\n" + newDeadline + "\nNow you have " + arrayLst.size() + " tasks in the list."; - System.out.println(deadlineMessage); - levelFourRespond(arrayLst); - } else { //add task - String added = "added: "; - Task newTask = new Task(input); - arrayLst.add(newTask); - System.out.println(added + input); - levelFourRespond(arrayLst); - } - - } } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..5ff77f264d --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,12 @@ +public class DukeException extends Exception{ + private String errorMessage; + public DukeException (String errorMessage) { + this.errorMessage = errorMessage; + } + + /** + * @override + * @return String errorMessage + */ + public String getMessage() {return this.errorMessage;} +} diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java new file mode 100644 index 0000000000..cd2ae2d506 --- /dev/null +++ b/src/main/java/InputHandler.java @@ -0,0 +1,116 @@ +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Handles input in main in Duke.java. Receives String from Scanner in main + * Processes the input into 7 categories: Todo, Event, Deadline, list, mark, unmark, bye and throws error + */ +public class InputHandler { + private ArrayList arr; + public InputHandler() { + this.arr = new ArrayList<>(); + } + + + /** + * + * @param input String input from main in Duke.java, from user input + * @return boolean representing isChatEnded variable in main. If "bye" command is given, a true boolean is returned, else false is returned + * @throws DukeException Invalid input types, or unrecognisable commands + */ + public boolean handleInput(String input) throws DukeException { + String[] splitInput = input.split(" "); + String inputCommand = splitInput[0]; + switch (inputCommand) { + case "todo": + if (splitInput.length > 1) { + String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String name = String.join(" ", nameArray); + Todo newTodo = new Todo(name); + arr.add(newTodo); + printMessage(newTodo); + return false; + } else { + throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + } + case "event": + if (splitInput.length > 3) { + String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); + String[] nameAndTimeArray = stringExcludingEvent.split("/at"); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + Event newEvent = new Event(name, time); + arr.add(newEvent); + printMessage(newEvent); + return false; + } else { + throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + } + case "deadline": + if (splitInput.length > 3) { + String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); + String[] nameAndTimeArray = stringExcludingDeadline.split("/by"); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + Deadline newDeadline = new Deadline(name, time); + arr.add(newDeadline); + printMessage(newDeadline); + return false; + } else { + throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + } + case "list": + if (splitInput.length == 1) { + System.out.println("Here are the tasks in your list:"); + int i = 0; + for (Task item : arr) { + i += 1; + if (item.isMark()) { + System.out.println(i + ". " + item); + } else { + System.out.println(i + ". " + item); + } + } + return false; + } else { + throw new DukeException("Wrong usage of list!"); + } + case "mark": + if (splitInput.length == 2) { + System.out.println("Nice! I've marked this task as done:\n"); + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeMarked = arr.get(idx); + taskToBeMarked.markTask(); + return false; + } else { + throw new DukeException("Wrong usage of mark!"); + } + case "unmark": + if (splitInput.length == 2) { + System.out.println("OK, I've marked this task as not done yet:\n"); + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeUnmarked = arr.get(idx); + taskToBeUnmarked.unmarkTask(); + return false; + } else { + throw new DukeException("Wrong usage of unmark!"); + } + case "bye": + return true; + default: + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means :("); + } + + } + + /** + * Prints out the task name that has been added as well as the number of tasks in the list + * @param task The task that has been added + */ + public void printMessage(Task task) { + System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + arr.size() + " tasks in the list." ); + } +} + diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 90e54c56ed..d5f0339cea 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -19,4 +19,5 @@ public Todo (String name) { public String toString() { return "[T]" + super.toString(); } + } \ No newline at end of file From 89c0746e803b244bad1f2e2e427e6c71328fe9fd Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 29 Jan 2022 17:17:43 +0800 Subject: [PATCH 09/47] Level-6 Added recommended inputs for exceptions and added delete case in InputHandler.java. --- src/main/java/InputHandler.java | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index cd2ae2d506..31548be1ae 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -28,10 +28,10 @@ public boolean handleInput(String input) throws DukeException { String name = String.join(" ", nameArray); Todo newTodo = new Todo(name); arr.add(newTodo); - printMessage(newTodo); + printAddTaskMessage(newTodo); return false; } else { - throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + throw new DukeException(":( OOPS!!! The description of a todo cannot be empty. Correct usage: todo [task]"); } case "event": if (splitInput.length > 3) { @@ -42,10 +42,10 @@ public boolean handleInput(String input) throws DukeException { String time = nameAndTimeArray[1]; Event newEvent = new Event(name, time); arr.add(newEvent); - printMessage(newEvent); + printAddTaskMessage(newEvent); return false; } else { - throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); } case "deadline": if (splitInput.length > 3) { @@ -56,10 +56,10 @@ public boolean handleInput(String input) throws DukeException { String time = nameAndTimeArray[1]; Deadline newDeadline = new Deadline(name, time); arr.add(newDeadline); - printMessage(newDeadline); + printAddTaskMessage(newDeadline); return false; } else { - throw new DukeException(":( OOPS!!! The description of a todo cannot be empty."); + throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); } case "list": if (splitInput.length == 1) { @@ -75,7 +75,7 @@ public boolean handleInput(String input) throws DukeException { } return false; } else { - throw new DukeException("Wrong usage of list!"); + throw new DukeException("Wrong usage of list! Correct usage: list"); } case "mark": if (splitInput.length == 2) { @@ -85,7 +85,7 @@ public boolean handleInput(String input) throws DukeException { taskToBeMarked.markTask(); return false; } else { - throw new DukeException("Wrong usage of mark!"); + throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); } case "unmark": if (splitInput.length == 2) { @@ -95,12 +95,23 @@ public boolean handleInput(String input) throws DukeException { taskToBeUnmarked.unmarkTask(); return false; } else { - throw new DukeException("Wrong usage of unmark!"); + throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); + } + case "delete": + if (splitInput.length == 2) { + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeDeleted = arr.get(idx); + arr.remove(idx); + System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + arr.size() + " tasks in the list"); + return false; + } else { + throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); } case "bye": return true; default: - throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means :("); + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," + + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); } } @@ -109,7 +120,7 @@ public boolean handleInput(String input) throws DukeException { * Prints out the task name that has been added as well as the number of tasks in the list * @param task The task that has been added */ - public void printMessage(Task task) { + public void printAddTaskMessage(Task task) { System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + arr.size() + " tasks in the list." ); } } From 22f31af4e31bc82a11cd6d55b76e7f1dd6be50d6 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Wed, 2 Feb 2022 10:50:30 +0800 Subject: [PATCH 10/47] Level-7 Rewrote code into InputHandler.java. Added Storage.java to handle the storage of tasks as well as writing to data.txt file for saving. --- src/main/java/Deadline.java | 4 +- src/main/java/Duke.java | 3 +- src/main/java/Event.java | 4 +- src/main/java/InputHandler.java | 41 +++++---- src/main/java/Storage.java | 146 ++++++++++++++++++++++++++++++++ src/main/java/Task.java | 6 +- 6 files changed, 175 insertions(+), 29 deletions(-) create mode 100644 src/main/java/Storage.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 1fb1752801..9276cccb8b 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -8,12 +8,12 @@ * Includes a dueDate attribute. Overrides toString() from Task */ public class Deadline extends Task { - private String dueDate; + public String dueDate; public Deadline(String name, String time) {super(name); this.dueDate = time;} /** * @override - * @return String of Deadline task, eg [D][X] Deadline (by:XX) + * @return String of Deadline task, eg [D][X] Deadline (by:XX) vs [D][✓] Deadline (by;XX) */ public String toString() { return "[D]" + super.toString() + "(by:" + this.dueDate + ")"; } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e62eb4d75e..d626af3dee 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,9 +1,10 @@ import java.util.Scanner; //import Scanner import java.util.ArrayList; //import ArrayList import java.util.Arrays; //import Arrays +import java.io.IOException; public class Duke { - public static void main(String[] args) { + public static void main(String[] args) throws IOException { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 3f9375e89b..a353c88523 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -7,12 +7,12 @@ * Overrides toString() from Task */ public class Event extends Task { - private String dueDate; + public String dueDate; public Event (String name, String time) { super(name); this.dueDate = time;} /** * @override - * @return String of Event task, eg: [E][X] Event + * @return String of Event task, eg: [E][X] Event (at:) vs [E] [✓] Event (at:) */ public String toString() { return "[E]" + super.toString() + "(at:" + this.dueDate + ")"; } } \ No newline at end of file diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index 31548be1ae..6fa628f88a 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -1,14 +1,20 @@ import java.util.ArrayList; import java.util.Arrays; +import java.io.IOException; /** * Handles input in main in Duke.java. Receives String from Scanner in main * Processes the input into 7 categories: Todo, Event, Deadline, list, mark, unmark, bye and throws error */ public class InputHandler { - private ArrayList arr; - public InputHandler() { - this.arr = new ArrayList<>(); + private Storage storage; + + /** + * Constructs an InputHandler for Duke.java to handle inputs from user + * @throws IOException If Storage class fails to initialise + */ + public InputHandler() throws IOException { + this.storage = new Storage(); } @@ -18,7 +24,7 @@ public InputHandler() { * @return boolean representing isChatEnded variable in main. If "bye" command is given, a true boolean is returned, else false is returned * @throws DukeException Invalid input types, or unrecognisable commands */ - public boolean handleInput(String input) throws DukeException { + public boolean handleInput(String input) throws DukeException, IOException { String[] splitInput = input.split(" "); String inputCommand = splitInput[0]; switch (inputCommand) { @@ -27,7 +33,7 @@ public boolean handleInput(String input) throws DukeException { String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); String name = String.join(" ", nameArray); Todo newTodo = new Todo(name); - arr.add(newTodo); + this.storage.writeData(newTodo); printAddTaskMessage(newTodo); return false; } else { @@ -41,7 +47,7 @@ public boolean handleInput(String input) throws DukeException { String name = nameAndTimeArray[0]; String time = nameAndTimeArray[1]; Event newEvent = new Event(name, time); - arr.add(newEvent); + this.storage.writeData(newEvent); printAddTaskMessage(newEvent); return false; } else { @@ -55,7 +61,7 @@ public boolean handleInput(String input) throws DukeException { String name = nameAndTimeArray[0]; String time = nameAndTimeArray[1]; Deadline newDeadline = new Deadline(name, time); - arr.add(newDeadline); + this.storage.writeData(newDeadline); printAddTaskMessage(newDeadline); return false; } else { @@ -65,14 +71,7 @@ public boolean handleInput(String input) throws DukeException { if (splitInput.length == 1) { System.out.println("Here are the tasks in your list:"); int i = 0; - for (Task item : arr) { - i += 1; - if (item.isMark()) { - System.out.println(i + ". " + item); - } else { - System.out.println(i + ". " + item); - } - } + System.out.println(this.storage.list()); return false; } else { throw new DukeException("Wrong usage of list! Correct usage: list"); @@ -81,7 +80,7 @@ public boolean handleInput(String input) throws DukeException { if (splitInput.length == 2) { System.out.println("Nice! I've marked this task as done:\n"); int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeMarked = arr.get(idx); + Task taskToBeMarked = this.storage.get(idx); taskToBeMarked.markTask(); return false; } else { @@ -91,7 +90,7 @@ public boolean handleInput(String input) throws DukeException { if (splitInput.length == 2) { System.out.println("OK, I've marked this task as not done yet:\n"); int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeUnmarked = arr.get(idx); + Task taskToBeUnmarked = this.storage.get(idx); taskToBeUnmarked.unmarkTask(); return false; } else { @@ -100,9 +99,9 @@ public boolean handleInput(String input) throws DukeException { case "delete": if (splitInput.length == 2) { int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeDeleted = arr.get(idx); - arr.remove(idx); - System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + arr.size() + " tasks in the list"); + Task taskToBeDeleted = storage.get(idx); + this.storage.deleteData(idx); + System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + this.storage.taskListSize() + " tasks in the list"); return false; } else { throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); @@ -121,7 +120,7 @@ public boolean handleInput(String input) throws DukeException { * @param task The task that has been added */ public void printAddTaskMessage(Task task) { - System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + arr.size() + " tasks in the list." ); + System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + " tasks in the list." ); } } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..bdcbc37270 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,146 @@ +import java.util.ArrayList; +import java.io.File; +import java.util.Scanner; +import java.io.IOException; +import java.nio.file.Paths; +import java.nio.file.Files; +import java.nio.file.Path; +import java.io.FileWriter; + +public class Storage { + ArrayList arr; + String FILEPATH = "data/data.txt"; + + /** + * Constructs a Storage object. Loads the data from data/data.txt. if no data dir or data.txt is found, create an empty one + */ + public Storage() throws IOException { + try { + File dataFile = new File(FILEPATH); + Scanner sc = new Scanner(dataFile); + ArrayList newArr = new ArrayList<>(); + while (sc.hasNextLine()) { + String nextLine = sc.nextLine(); + String[] nextLineArr = nextLine.split(" "); + String taskType = nextLineArr[0]; + switch (taskType) { + case "[T]": + Todo newTodo = new Todo(nextLineArr[2]); + if (nextLineArr[1].equals("[✓]")) { + newTodo.markTask(); + } + newArr.add(newTodo); + break; + case "[D]": + Deadline newDeadline = new Deadline(nextLineArr[2], nextLineArr[4]); + if (nextLineArr[1].equals("[✓]")) { + newDeadline.markTask(); + } + newArr.add(newDeadline); + break; + case "[E]": + Event newEvent = new Event(nextLineArr[2], nextLineArr[4]); + if (nextLineArr[1].equals("[✓]")) { + newEvent.markTask(); + } + newArr.add(newEvent); + break; + default: + } + } + this.arr = newArr; + } catch (IOException e){ + Path filePath = Paths.get("data"); + boolean dataDirectoryExists = Files.exists(filePath); + if (!dataDirectoryExists) { + new File("data").mkdir(); + } + new File(FILEPATH).createNewFile(); + this.arr = new ArrayList<>(); + } + } + + /** + * + * @param task Converts task to string format for storage in the data.txt file for records + * @return String format of the task eg: [D] [✓] deadline | duedate + */ + public String taskToStringConverter(Task task) { + String output = ""; + if (task instanceof Todo) { + String mark = (task.isMark()) ? "[✓]" : "[X]"; + output = "[T] " + mark + " " + task.name + "\n"; + } else if (task instanceof Deadline deadline) { + String mark = (deadline.isMark()) ? "[✓]" : "[X]"; + output = "[D] " + mark + " " + deadline.name + "|" + deadline.dueDate +"\n"; + } else if (task instanceof Event event) { + String mark = (event.isMark()) ? "[✓]" : "[X]"; + output = "[E] " + mark + " " + event.name + "|" + event.dueDate + "\n"; + } + return output; + } + + /** + * Appends a single task to the file + * @param task task to be added to the data.txt file + * @throws IOException if there is an error appending the task to data.txt + */ + public void writeData(Task task) throws IOException { + this.arr.add(task); + FileWriter fw = new FileWriter(this.FILEPATH, true); + fw.write(taskToStringConverter(task)); + fw.close(); + } + + /** + * Used when delete [index] is called for Duke. Deletes the entire file and rewrites it based on the new array + * Amends the current stored array as well + * @param idx index of task to be deleted + * @throws IOException if there is an error rewriting data.txt + */ + public void deleteData(int idx) throws IOException { + Task taskToBeDeleted = this.arr.get(idx); + arr.remove(idx); + FileWriter fw = new FileWriter(this.FILEPATH); + for (Task task : this.arr) { + fw.write(taskToStringConverter(task)); + } + fw.close(); + } + + /** + * Obtains list of tasks from this.arr and returns it + * @return String that lists out the tasks currently + */ + public String list() { + String listOfTasks = ""; + int i = 0; + for (Task item : this.arr) { + i += 1; + if (item.isMark()) { + listOfTasks += i + ". " + item + "\n"; + } else { + listOfTasks += i + ". " + item + "\n"; + } + } + return listOfTasks; + } + + /** + * + * @param idx index of task to be gotten + * @return task that is requested + */ + public Task get(int idx) { + return this.arr.get(idx); + } + + /** + * + * @return size of task list + */ + public int taskListSize() { + return this.arr.size(); + } + +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 576ac76756..74c6e3bf56 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -46,14 +46,14 @@ public boolean isMark() { /** * @override - * @return String version of task, with marked and name. E.g. [X] Task + * @return String version of task, with marked and name. E.g. [X] Task vs [✓] Task */ public String toString() { if (this.mark) { - String marked = "[X] "; + String marked = "[✓] "; return marked + this.name; } else { - String unmarked = "[ ] "; + String unmarked = "[X] "; return unmarked + this.name; } } From a2b7ffd528cfa5a86f14c6fc9937b4e9dd40c9be Mon Sep 17 00:00:00 2001 From: brian16600 Date: Thu, 3 Feb 2022 11:57:58 +0800 Subject: [PATCH 11/47] Level-8 Changed multiple variable names to better suit their purposes. Added ability to take in specific date/time for Event/Deadline classes in yyyy-mm-dd hh:mm format and convert it. Added handling for DateTimeParseException --- src/main/java/Deadline.java | 24 ++++- src/main/java/Duke.java | 1 + src/main/java/DukeException.java | 2 +- src/main/java/Event.java | 23 ++++- src/main/java/InputHandler.java | 165 +++++++++++++++++-------------- src/main/java/Storage.java | 58 +++++------ src/main/java/Task.java | 28 +++++- 7 files changed, 185 insertions(+), 116 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 9276cccb8b..c8fa37f96f 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,20 +1,36 @@ +import java.time.format.DateTimeParseException; import java.util.Scanner; import java.util.ArrayList; import java.util.Arrays; - +import java.time.LocalDateTime; +import java.time.LocalDate; +import java.time.LocalTime; /** * Represents a Deadline which is a subclass of Task * Includes a dueDate attribute. Overrides toString() from Task */ public class Deadline extends Task { - public String dueDate; - public Deadline(String name, String time) {super(name); this.dueDate = time;} + public LocalDate dueDate; + public LocalTime dueTime; + public Deadline(String name, String date) throws DateTimeParseException { + super(name); + this.dueDate = LocalDate.parse(date); + this.dueTime = null; + } + + public Deadline(String name, String date, String time) throws DateTimeParseException { + super(name); + this.dueDate = LocalDate.parse(date); + this.dueTime = LocalTime.parse(time); + } /** * @override * @return String of Deadline task, eg [D][X] Deadline (by:XX) vs [D][✓] Deadline (by;XX) */ - public String toString() { return "[D]" + super.toString() + "(by:" + this.dueDate + ")"; } + public String toString() { + String dueDateAndTime = (this.dueTime == null) ? dateConverterToString(this.dueDate) : dateConverterToString(this.dueDate) + " " + timeConverterToString(this.dueTime); + return "[D]" + super.toString() + " (by:" + dueDateAndTime + ")"; } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index d626af3dee..11eaf55de6 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.time.format.DateTimeParseException; import java.util.Scanner; //import Scanner import java.util.ArrayList; //import ArrayList import java.util.Arrays; //import Arrays diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 5ff77f264d..5d023a23bc 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -5,7 +5,7 @@ public DukeException (String errorMessage) { } /** - * @override + * @override Returns customised error message for DukeException when input is incorrect * @return String errorMessage */ public String getMessage() {return this.errorMessage;} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index a353c88523..b339f6f62a 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,18 +1,35 @@ +import java.time.format.DateTimeParseException; +import java.util.Date; import java.util.Scanner; import java.util.ArrayList; import java.util.Arrays; +import java.time.LocalDateTime; +import java.time.LocalDate; +import java.time.LocalTime; /** * Represents a Event which is a subclass of Task * Overrides toString() from Task */ public class Event extends Task { - public String dueDate; - public Event (String name, String time) { super(name); this.dueDate = time;} + public LocalDate dueDate; + public LocalTime dueTime; + public Event (String name, String date) throws DateTimeParseException { + super(name); + this.dueDate = LocalDate.parse(date); + this.dueTime = null; + } + public Event (String name, String date, String time) throws DateTimeParseException { + super(name); + this.dueDate = LocalDate.parse(date); + this.dueTime = LocalTime.parse(time); + } /** * @override * @return String of Event task, eg: [E][X] Event (at:) vs [E] [✓] Event (at:) */ - public String toString() { return "[E]" + super.toString() + "(at:" + this.dueDate + ")"; } + public String toString() { + String dueDateAndTime = (this.dueTime == null) ? dateConverterToString(this.dueDate) : dateConverterToString(this.dueDate) + " " + timeConverterToString(this.dueTime); + return "[E]" + super.toString() + " (at:" + dueDateAndTime + ")"; } } \ No newline at end of file diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index 6fa628f88a..7e83abed04 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -1,6 +1,9 @@ -import java.util.ArrayList; import java.util.Arrays; import java.io.IOException; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.LocalDate; +import java.time.format.DateTimeParseException; /** * Handles input in main in Duke.java. Receives String from Scanner in main @@ -28,89 +31,99 @@ public boolean handleInput(String input) throws DukeException, IOException { String[] splitInput = input.split(" "); String inputCommand = splitInput[0]; switch (inputCommand) { - case "todo": - if (splitInput.length > 1) { - String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String name = String.join(" ", nameArray); - Todo newTodo = new Todo(name); - this.storage.writeData(newTodo); - printAddTaskMessage(newTodo); - return false; - } else { - throw new DukeException(":( OOPS!!! The description of a todo cannot be empty. Correct usage: todo [task]"); - } - case "event": - if (splitInput.length > 3) { - String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); - String[] nameAndTimeArray = stringExcludingEvent.split("/at"); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - Event newEvent = new Event(name, time); + case "todo": + if (splitInput.length > 1) { + String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String name = String.join(" ", nameArray); + Todo newTodo = new Todo(name); + this.storage.writeData(newTodo); + printAddTaskMessage(newTodo); + return false; + } else { + throw new DukeException(":( OOPS!!! The description of a todo cannot be empty. Correct usage: todo [task]"); + } + case "event": + if (splitInput.length > 3) { + String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); + String[] nameAndTimeArray = stringExcludingEvent.split("/at "); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + String[] timeArray = time.split(" "); + try { + Event newEvent = (timeArray.length > 1) ? new Event(name, timeArray[0], timeArray[1]) : new Event(name, timeArray[0]); this.storage.writeData(newEvent); printAddTaskMessage(newEvent); return false; - } else { - throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); + } catch (DateTimeParseException e) { + System.out.println(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); } - case "deadline": - if (splitInput.length > 3) { - String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); - String[] nameAndTimeArray = stringExcludingDeadline.split("/by"); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - Deadline newDeadline = new Deadline(name, time); + } else { + throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); + } + case "deadline": + if (splitInput.length > 3) { + String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); + String[] nameAndTimeArray = stringExcludingDeadline.split("/by "); + String name = nameAndTimeArray[0]; + String time = nameAndTimeArray[1]; + String[] timeArray = time.split(" "); + try { + Deadline newDeadline = (timeArray.length > 1) ? new Deadline(name, timeArray[0], timeArray[1]) : new Deadline(name, timeArray[0]); this.storage.writeData(newDeadline); printAddTaskMessage(newDeadline); return false; - } else { - throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); - } - case "list": - if (splitInput.length == 1) { - System.out.println("Here are the tasks in your list:"); - int i = 0; - System.out.println(this.storage.list()); - return false; - } else { - throw new DukeException("Wrong usage of list! Correct usage: list"); - } - case "mark": - if (splitInput.length == 2) { - System.out.println("Nice! I've marked this task as done:\n"); - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeMarked = this.storage.get(idx); - taskToBeMarked.markTask(); - return false; - } else { - throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); - } - case "unmark": - if (splitInput.length == 2) { - System.out.println("OK, I've marked this task as not done yet:\n"); - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeUnmarked = this.storage.get(idx); - taskToBeUnmarked.unmarkTask(); - return false; - } else { - throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); - } - case "delete": - if (splitInput.length == 2) { - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeDeleted = storage.get(idx); - this.storage.deleteData(idx); - System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + this.storage.taskListSize() + " tasks in the list"); - return false; - } else { - throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); + } catch (DateTimeParseException e) { + System.out.println(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); } - case "bye": - return true; - default: - throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," - + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + } else { + throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); + } + case "list": + if (splitInput.length == 1) { + System.out.println("Here are the tasks in your list:"); + int i = 0; + System.out.println(this.storage.list()); + return false; + } else { + throw new DukeException("Wrong usage of list! Correct usage: list"); + } + case "mark": + if (splitInput.length == 2) { + System.out.println("Nice! I've marked this task as done:\n"); + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeMarked = this.storage.get(idx); + taskToBeMarked.setMarkedTask(); + return false; + } else { + throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); + } + case "unmark": + if (splitInput.length == 2) { + System.out.println("OK, I've marked this task as not done yet:\n"); + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeUnmarked = this.storage.get(idx); + taskToBeUnmarked.setUnmarkedTask(); + return false; + } else { + throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); + } + case "delete": + if (splitInput.length == 2) { + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeDeleted = storage.get(idx); + this.storage.deleteData(idx); + System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + this.storage.taskListSize() + " tasks in the list"); + return false; + } else { + throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); + } + case "bye": + return true; + default: + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," + + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); } } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index bdcbc37270..1b8411a98a 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -24,28 +24,28 @@ public Storage() throws IOException { String[] nextLineArr = nextLine.split(" "); String taskType = nextLineArr[0]; switch (taskType) { - case "[T]": - Todo newTodo = new Todo(nextLineArr[2]); - if (nextLineArr[1].equals("[✓]")) { - newTodo.markTask(); - } - newArr.add(newTodo); - break; - case "[D]": - Deadline newDeadline = new Deadline(nextLineArr[2], nextLineArr[4]); - if (nextLineArr[1].equals("[✓]")) { - newDeadline.markTask(); - } - newArr.add(newDeadline); - break; - case "[E]": - Event newEvent = new Event(nextLineArr[2], nextLineArr[4]); - if (nextLineArr[1].equals("[✓]")) { - newEvent.markTask(); - } - newArr.add(newEvent); - break; - default: + case "[T]": + Todo newTodo = new Todo(nextLineArr[2]); + if (nextLineArr[1].equals("[✓]")) { + newTodo.setMarkedTask(); + } + newArr.add(newTodo); + break; + case "[D]": + Deadline newDeadline = (nextLineArr[6].equals("null")) ? new Deadline(nextLineArr[2], nextLineArr[4]) : new Deadline(nextLineArr[2], nextLineArr[4], nextLineArr[6]); + if (nextLineArr[1].equals("[✓]")) { + newDeadline.setMarkedTask(); + } + newArr.add(newDeadline); + break; + case "[E]": + Event newEvent = (nextLineArr[6].equals("null")) ? new Event(nextLineArr[2], nextLineArr[4]) : new Event(nextLineArr[2], nextLineArr[4], nextLineArr[6]); + if (nextLineArr[1].equals("[✓]")) { + newEvent.setMarkedTask(); + } + newArr.add(newEvent); + break; + default: } } this.arr = newArr; @@ -63,19 +63,19 @@ public Storage() throws IOException { /** * * @param task Converts task to string format for storage in the data.txt file for records - * @return String format of the task eg: [D] [✓] deadline | duedate + * @return String format of the task eg: [D] [✓] deadline | duedate | duetime */ public String taskToStringConverter(Task task) { String output = ""; if (task instanceof Todo) { - String mark = (task.isMark()) ? "[✓]" : "[X]"; + String mark = (task.hasBeenMarked()) ? "[✓]" : "[X]"; output = "[T] " + mark + " " + task.name + "\n"; } else if (task instanceof Deadline deadline) { - String mark = (deadline.isMark()) ? "[✓]" : "[X]"; - output = "[D] " + mark + " " + deadline.name + "|" + deadline.dueDate +"\n"; + String mark = (deadline.hasBeenMarked()) ? "[✓]" : "[X]"; + output = "[D] " + mark + " " + deadline.name + "| " + deadline.dueDate + " | " + deadline.dueTime + "\n"; } else if (task instanceof Event event) { - String mark = (event.isMark()) ? "[✓]" : "[X]"; - output = "[E] " + mark + " " + event.name + "|" + event.dueDate + "\n"; + String mark = (event.hasBeenMarked()) ? "[✓]" : "[X]"; + output = "[E] " + mark + " " + event.name + "| " + event.dueDate + " | " + event.dueTime + "\n"; } return output; } @@ -117,7 +117,7 @@ public String list() { int i = 0; for (Task item : this.arr) { i += 1; - if (item.isMark()) { + if (item.hasBeenMarked()) { listOfTasks += i + ". " + item + "\n"; } else { listOfTasks += i + ". " + item + "\n"; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 74c6e3bf56..eb83ebfe1b 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,6 +1,10 @@ import java.util.Scanner; import java.util.ArrayList; import java.util.Arrays; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.format.FormatStyle; +import java.time.format.DateTimeFormatter; /** * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked @@ -21,7 +25,7 @@ public Task (String name) { /** * markTask as done */ - public void markTask () { + public void setMarkedTask () { String markedMessage = "Nice! I've marked this task as done:\n"; this.mark = true; System.out.println(markedMessage + " " + this); @@ -30,7 +34,7 @@ public void markTask () { /** * unmarkTask */ - public void unmarkTask() { + public void setUnmarkedTask() { String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; this.mark = false; System.out.println(unmarkedMessage + " " + this); @@ -40,10 +44,28 @@ public void unmarkTask() { * * @return boolean on whether task is marked */ - public boolean isMark() { + public boolean hasBeenMarked() { return this.mark; } + /** + * + * @param date LocalDate for Deadline/Event tasks + * @return String format: converts from yyyy-mm-dd format to Aug dd, yyyy format + */ + public String dateConverterToString(LocalDate date) { + return DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(date); + } + + /** + * + * @param time LocalTime for Deadline/Event tasks + * @return String format: converts hh:mm format to hh:mm am/pm format + */ + public String timeConverterToString(LocalTime time) { + return DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(time); + } + /** * @override * @return String version of task, with marked and name. E.g. [X] Task vs [✓] Task From 3c16b7bf68fcfcda178b66581f0c398ec1d36575 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 13:28:54 +0800 Subject: [PATCH 12/47] Added Parser, Storage and Tasklist --- src/main/java/Parser.java | 84 +++++++++++++++++++++++++++++++++++++ src/main/java/Storage.java | 68 +++++++++++++++--------------- src/main/java/TaskList.java | 23 ++++++++++ 3 files changed, 141 insertions(+), 34 deletions(-) create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/TaskList.java diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..2c46e638fe --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,84 @@ +import java.time.format.DateTimeParseException; +import java.util.Arrays; +import java.io.IOException; + +public class Parser { + + public Task parse(InputHandler.CommandType type, String[] splitInput) throws DukeException { + switch (type) { + case TODO: + String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String todoName = String.join(" ", nameArray); + return new Todo(todoName); + + case EVENT: + String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); + String[] eventNameAndTimeArray = stringExcludingEvent.split("/at "); + String eventName = eventNameAndTimeArray[0]; + String eventTime = eventNameAndTimeArray[1]; + String[] eventTimeArray = eventTime.split(" "); + try { + Event newEvent = (eventTimeArray.length > 1) ? new Event(eventName, eventTimeArray[0], eventTimeArray[1]) : new Event(eventName, eventTimeArray[0]); + return newEvent; + } catch (DateTimeParseException e) { + throw new DukeException(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); + + } + + case DEADLINE: + String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); + String[] deadlineNameAndTimeArray = stringExcludingDeadline.split("/by "); + String deadlineName = deadlineNameAndTimeArray[0]; + String deadlineTime = deadlineNameAndTimeArray[1]; + String[] deadlineTimeArray = deadlineTime.split(" "); + try { + Deadline newDeadline = (deadlineTimeArray.length > 1) ? new Deadline(deadlineName, deadlineTimeArray[0], deadlineTimeArray[1]) : new Deadline(deadlineName, deadlineTimeArray[0]); + return newDeadline; + } catch (DateTimeParseException e) { + throw new DukeException(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); + + } + + default: + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," + + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + } + } + + public void parse(InputHandler.CommandType type, Storage storage, String[] splitInput) throws DukeException, IOException { + switch (type) { + case LIST: + System.out.println("Here are the tasks in your list:"); + System.out.println(storage.list()); + break; + + case MARK: + System.out.println("Nice! I've marked this task as done:\n"); + int taskToBeMarkedIndex = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeMarked = storage.get(taskToBeMarkedIndex); + taskToBeMarked.setMarkedTask(); + break; + + case UNMARK: + System.out.println("OK, I've marked this task as not done yet:\n"); + int taskToBeUnmarkedIndex = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeUnmarked = storage.get(taskToBeUnmarkedIndex); + taskToBeUnmarked.setUnmarkedTask(); + break; + + case DELETE: + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeDeleted = storage.get(idx); + storage.deleteData(idx); + System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"); + break; + + default: + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," + + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + } + } + +} \ No newline at end of file diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 1b8411a98a..95d5d06169 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -1,4 +1,3 @@ -import java.util.ArrayList; import java.io.File; import java.util.Scanner; import java.io.IOException; @@ -8,7 +7,7 @@ import java.io.FileWriter; public class Storage { - ArrayList arr; + TaskList taskList; String FILEPATH = "data/data.txt"; /** @@ -18,37 +17,38 @@ public Storage() throws IOException { try { File dataFile = new File(FILEPATH); Scanner sc = new Scanner(dataFile); - ArrayList newArr = new ArrayList<>(); + TaskList newTaskList = new TaskList(); while (sc.hasNextLine()) { String nextLine = sc.nextLine(); - String[] nextLineArr = nextLine.split(" "); - String taskType = nextLineArr[0]; + String[] taskListaySplitBySpaces = nextLine.split(" "); + String taskType = taskListaySplitBySpaces[0]; + String[] taskListaySplitBySlash = nextLine.split(" / "); switch (taskType) { case "[T]": - Todo newTodo = new Todo(nextLineArr[2]); - if (nextLineArr[1].equals("[✓]")) { + Todo newTodo = new Todo(taskListaySplitBySlash[1]); + if (taskListaySplitBySpaces[1].equals("[✓]")) { newTodo.setMarkedTask(); } - newArr.add(newTodo); + newTaskList.add(newTodo); break; case "[D]": - Deadline newDeadline = (nextLineArr[6].equals("null")) ? new Deadline(nextLineArr[2], nextLineArr[4]) : new Deadline(nextLineArr[2], nextLineArr[4], nextLineArr[6]); - if (nextLineArr[1].equals("[✓]")) { + Deadline newDeadline = (taskListaySplitBySlash[3].equals("null")) ? new Deadline(taskListaySplitBySlash[1], taskListaySplitBySlash[2]) : new Deadline(taskListaySplitBySlash[1], taskListaySplitBySlash[2], taskListaySplitBySlash[3]); + if (taskListaySplitBySpaces[1].equals("[✓]")) { newDeadline.setMarkedTask(); } - newArr.add(newDeadline); + newTaskList.add(newDeadline); break; case "[E]": - Event newEvent = (nextLineArr[6].equals("null")) ? new Event(nextLineArr[2], nextLineArr[4]) : new Event(nextLineArr[2], nextLineArr[4], nextLineArr[6]); - if (nextLineArr[1].equals("[✓]")) { + Event newEvent = (taskListaySplitBySlash[3].equals("null")) ? new Event(taskListaySplitBySlash[1], taskListaySplitBySlash[2]) : new Event(taskListaySplitBySlash[1], taskListaySplitBySlash[2], taskListaySplitBySlash[3]); + if (taskListaySplitBySpaces[1].equals("[✓]")) { newEvent.setMarkedTask(); } - newArr.add(newEvent); + newTaskList.add(newEvent); break; default: } } - this.arr = newArr; + this.taskList = newTaskList; } catch (IOException e){ Path filePath = Paths.get("data"); boolean dataDirectoryExists = Files.exists(filePath); @@ -56,7 +56,7 @@ public Storage() throws IOException { new File("data").mkdir(); } new File(FILEPATH).createNewFile(); - this.arr = new ArrayList<>(); + this.taskList = new TaskList(); } } @@ -69,13 +69,13 @@ public String taskToStringConverter(Task task) { String output = ""; if (task instanceof Todo) { String mark = (task.hasBeenMarked()) ? "[✓]" : "[X]"; - output = "[T] " + mark + " " + task.name + "\n"; + output = "[T] " + mark + " / " + task.name + "\n"; } else if (task instanceof Deadline deadline) { String mark = (deadline.hasBeenMarked()) ? "[✓]" : "[X]"; - output = "[D] " + mark + " " + deadline.name + "| " + deadline.dueDate + " | " + deadline.dueTime + "\n"; + output = "[D] " + mark + " / " + deadline.name + " / " + deadline.dueDate + " / " + deadline.dueTime + "\n"; } else if (task instanceof Event event) { String mark = (event.hasBeenMarked()) ? "[✓]" : "[X]"; - output = "[E] " + mark + " " + event.name + "| " + event.dueDate + " | " + event.dueTime + "\n"; + output = "[E] " + mark + " / " + event.name + " / " + event.dueDate + " / " + event.dueTime + "\n"; } return output; } @@ -86,41 +86,41 @@ public String taskToStringConverter(Task task) { * @throws IOException if there is an error appending the task to data.txt */ public void writeData(Task task) throws IOException { - this.arr.add(task); + this.taskList.add(task); FileWriter fw = new FileWriter(this.FILEPATH, true); fw.write(taskToStringConverter(task)); fw.close(); } /** - * Used when delete [index] is called for Duke. Deletes the entire file and rewrites it based on the new array - * Amends the current stored array as well + * Used when delete [index] is called for Duke. Deletes the entire file and rewrites it based on the new taskListay + * Amends the current stored taskListay as well * @param idx index of task to be deleted * @throws IOException if there is an error rewriting data.txt */ public void deleteData(int idx) throws IOException { - Task taskToBeDeleted = this.arr.get(idx); - arr.remove(idx); + Task taskToBeDeleted = this.taskList.get(idx); + taskList.remove(idx); FileWriter fw = new FileWriter(this.FILEPATH); - for (Task task : this.arr) { + for (int i = 0; i < this.taskList.size(); i++) { + Task task = this.taskList.get(i); fw.write(taskToStringConverter(task)); } fw.close(); } /** - * Obtains list of tasks from this.arr and returns it + * Obtains list of tasks from this.taskList and returns it * @return String that lists out the tasks currently */ public String list() { String listOfTasks = ""; - int i = 0; - for (Task item : this.arr) { - i += 1; - if (item.hasBeenMarked()) { - listOfTasks += i + ". " + item + "\n"; + for (int i = 1; i <= this.taskList.size(); i++) { + Task task = this.taskList.get(i - 1); + if (task.hasBeenMarked()) { + listOfTasks += i + ". " + task + "\n"; } else { - listOfTasks += i + ". " + item + "\n"; + listOfTasks += i + ". " + task + "\n"; } } return listOfTasks; @@ -132,7 +132,7 @@ public String list() { * @return task that is requested */ public Task get(int idx) { - return this.arr.get(idx); + return this.taskList.get(idx); } /** @@ -140,7 +140,7 @@ public Task get(int idx) { * @return size of task list */ public int taskListSize() { - return this.arr.size(); + return this.taskList.size(); } } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..e7d891e1d3 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,23 @@ +import java.util.ArrayList; +public class TaskList { + ArrayList list; + public TaskList() { + this.list = new ArrayList<>(); + } + + public void add(Task task) { + this.list.add(task); + } + + public void remove(int index) { + this.list.remove(index); + } + + public Task get(int index) { + return this.list.get(index); + } + + public int size() { + return this.list.size(); + } +} From 633dca67e82576a6b215d54640213d6545d463b0 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 11:13:57 +0800 Subject: [PATCH 13/47] Added TaskList and Parser classes. TaskList contains the arraylist of tasks with methods and Parser makes sense of user input for Duke --- src/main/java/InputHandler.java | 71 ++++++++++++--------------------- 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index 7e83abed04..dc354f56a0 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -30,12 +30,11 @@ public InputHandler() throws IOException { public boolean handleInput(String input) throws DukeException, IOException { String[] splitInput = input.split(" "); String inputCommand = splitInput[0]; + Parser parser = new Parser(); switch (inputCommand) { case "todo": if (splitInput.length > 1) { - String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String name = String.join(" ", nameArray); - Todo newTodo = new Todo(name); + Todo newTodo = (Todo) parser.parse(CommandType.TODO, splitInput); this.storage.writeData(newTodo); printAddTaskMessage(newTodo); return false; @@ -44,77 +43,47 @@ public boolean handleInput(String input) throws DukeException, IOException { } case "event": if (splitInput.length > 3) { - String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); - String[] nameAndTimeArray = stringExcludingEvent.split("/at "); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - String[] timeArray = time.split(" "); - try { - Event newEvent = (timeArray.length > 1) ? new Event(name, timeArray[0], timeArray[1]) : new Event(name, timeArray[0]); - this.storage.writeData(newEvent); - printAddTaskMessage(newEvent); - return false; - } catch (DateTimeParseException e) { - System.out.println(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); - } + Event newEvent = (Event) parser.parse(CommandType.EVENT, splitInput); + this.storage.writeData(newEvent); + printAddTaskMessage(newEvent); + return false; + } else { throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); } case "deadline": if (splitInput.length > 3) { - String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); - String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); - String[] nameAndTimeArray = stringExcludingDeadline.split("/by "); - String name = nameAndTimeArray[0]; - String time = nameAndTimeArray[1]; - String[] timeArray = time.split(" "); - try { - Deadline newDeadline = (timeArray.length > 1) ? new Deadline(name, timeArray[0], timeArray[1]) : new Deadline(name, timeArray[0]); - this.storage.writeData(newDeadline); - printAddTaskMessage(newDeadline); - return false; - } catch (DateTimeParseException e) { - System.out.println(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); - } + Deadline newDeadline = (Deadline) parser.parse(CommandType.DEADLINE, splitInput); + this.storage.writeData(newDeadline); + printAddTaskMessage(newDeadline); + return false; } else { throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); } case "list": if (splitInput.length == 1) { - System.out.println("Here are the tasks in your list:"); - int i = 0; - System.out.println(this.storage.list()); + parser.parse(CommandType.LIST, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of list! Correct usage: list"); } case "mark": if (splitInput.length == 2) { - System.out.println("Nice! I've marked this task as done:\n"); - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeMarked = this.storage.get(idx); - taskToBeMarked.setMarkedTask(); + parser.parse(CommandType.MARK, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); } case "unmark": if (splitInput.length == 2) { - System.out.println("OK, I've marked this task as not done yet:\n"); - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeUnmarked = this.storage.get(idx); - taskToBeUnmarked.setUnmarkedTask(); + parser.parse(CommandType.UNMARK, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); } case "delete": if (splitInput.length == 2) { - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeDeleted = storage.get(idx); - this.storage.deleteData(idx); - System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + this.storage.taskListSize() + " tasks in the list"); + parser.parse(CommandType.DELETE, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); @@ -135,5 +104,15 @@ public boolean handleInput(String input) throws DukeException, IOException { public void printAddTaskMessage(Task task) { System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + " tasks in the list." ); } + + enum CommandType { + TODO, + EVENT, + DEADLINE, + LIST, + MARK, + UNMARK, + DELETE + } } From 38a246268aa0330d21a1a82d623e2759bce4daac Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 14:37:46 +0800 Subject: [PATCH 14/47] Added more OOP and documentation --- src/main/data/data.txt | 0 src/main/java/Deadline.java | 14 ++++++++++++++ src/main/java/Event.java | 15 +++++++++++++++ src/main/java/InputHandler.java | 3 +++ src/main/java/Parser.java | 15 +++++++++++++++ src/main/java/Storage.java | 4 ++-- src/main/java/Task.java | 12 ++++++------ src/main/java/TaskList.java | 21 +++++++++++++++++++++ src/main/java/Todo.java | 5 +++++ 9 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 src/main/data/data.txt diff --git a/src/main/data/data.txt b/src/main/data/data.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index c8fa37f96f..f032ac301f 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -13,12 +13,26 @@ public class Deadline extends Task { public LocalDate dueDate; public LocalTime dueTime; + + /** + * Constructor for Deadline with date + * @param name Name of Deadline + * @param date Date of deadline in yyyy-mm-dd format + * @throws DateTimeParseException If date time is in wrong format + */ public Deadline(String name, String date) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); this.dueTime = null; } + /** + * Constructor for Deadline with date and time + * @param name Name of Deadline + * @param date Date of deadline in yyyy-mm-dd format + * @param time Time of deadline in hh:mm format + * @throws DateTimeParseException If date time is in wrong format + */ public Deadline(String name, String date, String time) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); diff --git a/src/main/java/Event.java b/src/main/java/Event.java index b339f6f62a..63f75d1b38 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -14,11 +14,26 @@ public class Event extends Task { public LocalDate dueDate; public LocalTime dueTime; + + /** + * Constructor for Event with date + * @param name Name of Event + * @param date Date of event in yyyy-mm-dd format + * @throws DateTimeParseException If date time is in wrong format + */ public Event (String name, String date) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); this.dueTime = null; } + + /** + * Constructor for Event with date and time + * @param name Name of Event + * @param date Date of event in yyyy-mm-dd format + * @param time Time of event in hh:mm format + * @throws DateTimeParseException If date time is in wrong format + */ public Event (String name, String date, String time) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index dc354f56a0..933b19a716 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -105,6 +105,9 @@ public void printAddTaskMessage(Task task) { System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + " tasks in the list." ); } + /** + * Type of Command enum to be passed into Parser object + */ enum CommandType { TODO, EVENT, diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 2c46e638fe..9a90350d81 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -4,6 +4,13 @@ public class Parser { + /** + * Parses input from InputHandler and returns a new Task to be added to TaskList + * @param type CommandType of input, including (TODO, DEADLINE, EVENT) + * @param splitInput SplitInput from InputHandler is user's input, split by empty spaces for processing + * @return Task object of new task to be added to TaskList + * @throws DukeException If format is wrong + */ public Task parse(InputHandler.CommandType type, String[] splitInput) throws DukeException { switch (type) { case TODO: @@ -47,6 +54,14 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk } } + /** + * Parses input from InputHandler and writes/deletes/prints from storage accordingly + * @param type CommandType of input, including (LIST, MARK, UNMARK, DELETE) + * @param storage Storage object in InputHandler to write/delete/get data from + * @param splitInput SplitInput from InputHandler is user's input, split by empty spaces for processing + * @throws DukeException Handles unrecognised commands + * @throws IOException Handles IO Errors + */ public void parse(InputHandler.CommandType type, Storage storage, String[] splitInput) throws DukeException, IOException { switch (type) { case LIST: diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 95d5d06169..ae56d1c86f 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -127,7 +127,7 @@ public String list() { } /** - * + * Get task * @param idx index of task to be gotten * @return task that is requested */ @@ -136,7 +136,7 @@ public Task get(int idx) { } /** - * + * Size of tasklist * @return size of task list */ public int taskListSize() { diff --git a/src/main/java/Task.java b/src/main/java/Task.java index eb83ebfe1b..2fc75c6d5d 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -14,7 +14,7 @@ public class Task { public String name; /** - * Constructor + * Constructor for Task. Is called in subclasses Todo, Event and Deadline * @param name name of the task */ public Task (String name) { @@ -23,7 +23,7 @@ public Task (String name) { } /** - * markTask as done + * Marks task as done */ public void setMarkedTask () { String markedMessage = "Nice! I've marked this task as done:\n"; @@ -32,7 +32,7 @@ public void setMarkedTask () { } /** - * unmarkTask + * Sets task to be unmarked */ public void setUnmarkedTask() { String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; @@ -41,7 +41,7 @@ public void setUnmarkedTask() { } /** - * + * Whether task has been marked * @return boolean on whether task is marked */ public boolean hasBeenMarked() { @@ -49,7 +49,7 @@ public boolean hasBeenMarked() { } /** - * + * Converts date to String format for printing * @param date LocalDate for Deadline/Event tasks * @return String format: converts from yyyy-mm-dd format to Aug dd, yyyy format */ @@ -58,7 +58,7 @@ public String dateConverterToString(LocalDate date) { } /** - * + * Converts time to String format for printing * @param time LocalTime for Deadline/Event tasks * @return String format: converts hh:mm format to hh:mm am/pm format */ diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index e7d891e1d3..ff26570281 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,22 +1,43 @@ import java.util.ArrayList; public class TaskList { ArrayList list; + + /** + * Constructor for TaskList. Initialises an empty ArrayList + */ public TaskList() { this.list = new ArrayList<>(); } + /** + * Add Task to TaskList + * @param task Task to be added + */ public void add(Task task) { this.list.add(task); } + /** + * Remove Task from TaskList + * @param index index of Task to be removed + */ public void remove(int index) { this.list.remove(index); } + /** + * Get task by index + * @param index index of Task to be retrieved + * @return Retrieved Task + */ public Task get(int index) { return this.list.get(index); } + /** + * Size of tasklist + * @return integer size of TaskList + */ public int size() { return this.list.size(); } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index d5f0339cea..9d51277f17 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -8,6 +8,11 @@ */ public class Todo extends Task { + + /** + * Constructor for Todo + * @param name Name of Todo + */ public Todo (String name) { super(name); } From e129edd266cb6c36c86889e973fdcabe13673abd Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 14:54:25 +0800 Subject: [PATCH 15/47] Added packages: duke.duke, duke.ui, duke.storage and duke.task --- src/main/java/Deadline.java | 18 ++++++++++++------ src/main/java/Duke.java | 10 ++++++---- src/main/java/DukeException.java | 11 +++++++++++ src/main/java/Event.java | 19 +++++++++++++------ src/main/java/InputHandler.java | 14 ++++++++++++++ src/main/java/Parser.java | 10 ++++++++++ src/main/java/Storage.java | 11 +++++++++++ src/main/java/Task.java | 16 ++++++++++++---- src/main/java/TaskList.java | 12 ++++++++++++ src/main/java/Todo.java | 15 +++++++++++---- 10 files changed, 112 insertions(+), 24 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index f032ac301f..250765a535 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,11 +1,17 @@ -import java.time.format.DateTimeParseException; -import java.util.Scanner; -import java.util.ArrayList; -import java.util.Arrays; -import java.time.LocalDateTime; +package duke.task; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; import java.time.LocalDate; import java.time.LocalTime; - +import java.time.format.DateTimeParseException; /** * Represents a Deadline which is a subclass of Task * Includes a dueDate attribute. Overrides toString() from Task diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 11eaf55de6..c8927fe565 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,8 +1,10 @@ -import java.time.format.DateTimeParseException; -import java.util.Scanner; //import Scanner -import java.util.ArrayList; //import ArrayList -import java.util.Arrays; //import Arrays +package duke.duke; + +import duke.ui.DukeException; +import duke.ui.InputHandler; + import java.io.IOException; +import java.util.Scanner; public class Duke { public static void main(String[] args) throws IOException { diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 5d023a23bc..cc21e512af 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -1,3 +1,14 @@ +package duke.ui; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; public class DukeException extends Exception{ private String errorMessage; public DukeException (String errorMessage) { diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 63f75d1b38..682c800384 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,11 +1,18 @@ -import java.time.format.DateTimeParseException; -import java.util.Date; -import java.util.Scanner; -import java.util.ArrayList; -import java.util.Arrays; -import java.time.LocalDateTime; +package duke.task; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; + import java.time.LocalDate; import java.time.LocalTime; +import java.time.format.DateTimeParseException; /** * Represents a Event which is a subclass of Task diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index 933b19a716..fd24eea6ee 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -1,3 +1,17 @@ +package duke.ui; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; +import java.time.format.DateTimeParseException; +import java.util.Arrays; +import java.io.IOException; import java.util.Arrays; import java.io.IOException; import java.time.LocalDateTime; diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 9a90350d81..ea21177a3f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,3 +1,13 @@ +package duke.ui; +import duke.duke.Duke; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; import java.time.format.DateTimeParseException; import java.util.Arrays; import java.io.IOException; diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index ae56d1c86f..25f06949ac 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -1,3 +1,14 @@ +package duke.storage; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; import java.io.File; import java.util.Scanner; import java.io.IOException; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 2fc75c6d5d..4ebb1f3d1b 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,10 +1,18 @@ -import java.util.Scanner; -import java.util.ArrayList; -import java.util.Arrays; +package duke.task; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; import java.time.LocalDate; import java.time.LocalTime; -import java.time.format.FormatStyle; import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; /** * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index ff26570281..afcecb6489 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,3 +1,15 @@ +package duke.storage; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; +import duke.task.Task; import java.util.ArrayList; public class TaskList { ArrayList list; diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 9d51277f17..26c0a7b67b 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,7 +1,14 @@ -import java.util.Scanner; -import java.util.ArrayList; -import java.util.Arrays; - +package duke.task; +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.storage.TaskList; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; /** * Represents a Todo which is a subclass of Task * Includes a dueDate attribute. Overrides toString() from Task From 6ace06841e1eb642ae0bbef9e749fad09ac551ab Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 22:52:08 +0800 Subject: [PATCH 16/47] Added add-gradle-support branch by merging into master --- src/main/java/Deadline.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 250765a535..e648f3ddd7 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -12,6 +12,7 @@ import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeParseException; + /** * Represents a Deadline which is a subclass of Task * Includes a dueDate attribute. Overrides toString() from Task From 33617d461fc368b91a475cdc44f0d34d1f1b55be Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 5 Feb 2022 23:00:44 +0800 Subject: [PATCH 17/47] Ensured javadoc documentation is complete for all methods --- src/main/java/DukeException.java | 4 ++++ src/main/java/Parser.java | 4 ++-- src/main/java/Storage.java | 6 ++++-- src/main/java/Task.java | 10 +++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index cc21e512af..c2d455a278 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -9,6 +9,10 @@ import duke.task.Task; import duke.task.Todo; import duke.task.Deadline; + +/** + * Custom DukeException to be handled by InputHandler + */ public class DukeException extends Exception{ private String errorMessage; public DukeException (String errorMessage) { diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index ea21177a3f..b5afbbd244 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -15,7 +15,7 @@ public class Parser { /** - * Parses input from InputHandler and returns a new Task to be added to TaskList + * Parses input from InputHandler and returns a new Task to be added to TaskList. Handles event, deadline, todo commands * @param type CommandType of input, including (TODO, DEADLINE, EVENT) * @param splitInput SplitInput from InputHandler is user's input, split by empty spaces for processing * @return Task object of new task to be added to TaskList @@ -65,7 +65,7 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk } /** - * Parses input from InputHandler and writes/deletes/prints from storage accordingly + * Parses input from InputHandler and writes/deletes/prints from storage accordingly. Handles list, mark, unmark, delete commands * @param type CommandType of input, including (LIST, MARK, UNMARK, DELETE) * @param storage Storage object in InputHandler to write/delete/get data from * @param splitInput SplitInput from InputHandler is user's input, split by empty spaces for processing diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 25f06949ac..e77c46cfb4 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -81,10 +81,12 @@ public String taskToStringConverter(Task task) { if (task instanceof Todo) { String mark = (task.hasBeenMarked()) ? "[✓]" : "[X]"; output = "[T] " + mark + " / " + task.name + "\n"; - } else if (task instanceof Deadline deadline) { + } else if (task instanceof Deadline) { + Deadline deadline = (Deadline) task; String mark = (deadline.hasBeenMarked()) ? "[✓]" : "[X]"; output = "[D] " + mark + " / " + deadline.name + " / " + deadline.dueDate + " / " + deadline.dueTime + "\n"; - } else if (task instanceof Event event) { + } else if (task instanceof Event) { + Event event = (Event) task; String mark = (event.hasBeenMarked()) ? "[✓]" : "[X]"; output = "[E] " + mark + " / " + event.name + " / " + event.dueDate + " / " + event.dueTime + "\n"; } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 4ebb1f3d1b..313bccb1b1 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -18,7 +18,7 @@ * Represents a Task. Contains a Task constructor, two methods to mark and unmark tasks, toString() method as well as a isMark() method to check if Task is marked */ public class Task { - private boolean mark; + private boolean isMarked; public String name; /** @@ -27,7 +27,7 @@ public class Task { */ public Task (String name) { this.name = name; - this.mark = false; + this.isMarked = false; } /** @@ -35,7 +35,7 @@ public Task (String name) { */ public void setMarkedTask () { String markedMessage = "Nice! I've marked this task as done:\n"; - this.mark = true; + this.isMarked = true; System.out.println(markedMessage + " " + this); } @@ -44,7 +44,7 @@ public void setMarkedTask () { */ public void setUnmarkedTask() { String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; - this.mark = false; + this.isMarked = false; System.out.println(unmarkedMessage + " " + this); } @@ -79,7 +79,7 @@ public String timeConverterToString(LocalTime time) { * @return String version of task, with marked and name. E.g. [X] Task vs [✓] Task */ public String toString() { - if (this.mark) { + if (this.isMarked) { String marked = "[✓] "; return marked + this.name; } else { From 6da11ff4aa530b7dd305c9fc3b7ada8e7a19b26b Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 6 Feb 2022 18:12:31 +0800 Subject: [PATCH 18/47] Added InputHandlerTest.java and TaskListTest.java --- build.gradle | 3 ++- src/main/java/Parser.java | 6 ++++-- src/main/java/Storage.java | 1 + src/main/java/Task.java | 2 +- src/test/java/InputHandlerTest.java | 30 +++++++++++++++++++++++++++++ src/test/java/TaskListTest.java | 22 +++++++++++++++++++++ 6 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 src/test/java/InputHandlerTest.java create mode 100644 src/test/java/TaskListTest.java diff --git a/build.gradle b/build.gradle index 20c0521cc7..0182b89fc1 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.Duke" } shadowJar { @@ -43,4 +43,5 @@ checkstyle { run{ standardInput = System.in + enableAssertions = true; } diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index b5afbbd244..8cbf55eb56 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -32,7 +32,8 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); String[] eventNameAndTimeArray = stringExcludingEvent.split("/at "); - String eventName = eventNameAndTimeArray[0]; + String eventNameWithExtraSpace = eventNameAndTimeArray[0]; + String eventName = eventNameWithExtraSpace.substring(0, eventNameWithExtraSpace.length() -1); String eventTime = eventNameAndTimeArray[1]; String[] eventTimeArray = eventTime.split(" "); try { @@ -47,7 +48,8 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); String[] deadlineNameAndTimeArray = stringExcludingDeadline.split("/by "); - String deadlineName = deadlineNameAndTimeArray[0]; + String deadlineNameWithSpace = deadlineNameAndTimeArray[0]; + String deadlineName = deadlineNameWithSpace.substring(0, deadlineNameWithSpace.length() - 1); String deadlineTime = deadlineNameAndTimeArray[1]; String[] deadlineTimeArray = deadlineTime.split(" "); try { diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index e77c46cfb4..f065e5c438 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -101,6 +101,7 @@ public String taskToStringConverter(Task task) { public void writeData(Task task) throws IOException { this.taskList.add(task); FileWriter fw = new FileWriter(this.FILEPATH, true); + System.out.println(new File(this.FILEPATH).getAbsolutePath()); fw.write(taskToStringConverter(task)); fw.close(); } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 313bccb1b1..f9feb0fe2a 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -53,7 +53,7 @@ public void setUnmarkedTask() { * @return boolean on whether task is marked */ public boolean hasBeenMarked() { - return this.mark; + return this.isMarked; } /** diff --git a/src/test/java/InputHandlerTest.java b/src/test/java/InputHandlerTest.java new file mode 100644 index 0000000000..d40b991c48 --- /dev/null +++ b/src/test/java/InputHandlerTest.java @@ -0,0 +1,30 @@ +import duke.ui.InputHandler; +import duke.ui.DukeException; + +import java.io.IOException; +import java.io.File; + +import java.util.Scanner; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.DisplayName; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class InputHandlerTest { + + @Test + @DisplayName("test tasks") + void AddTodoEventDeadline() throws IOException, DukeException { + InputHandler ui = new InputHandler(); + ui.handleInput("todo test todo"); + ui.handleInput("event test event /at 2022-02-09 12:00"); + ui.handleInput("deadline test deadline /by 2022-02-11 03:59"); + String FILEPATH = "data/data.txt"; + File dataFile = new File(FILEPATH); + Scanner sc = new Scanner(dataFile); + assertEquals(sc.nextLine(), "[T] [X] / test todo"); + assertEquals(sc.nextLine(), "[E] [X] / test event / 2022-02-09 / 12:00"); + assertEquals(sc.nextLine(), "[D] [X] / test deadline / 2022-02-11 / 03:59"); + } +} + diff --git a/src/test/java/TaskListTest.java b/src/test/java/TaskListTest.java new file mode 100644 index 0000000000..07aed79401 --- /dev/null +++ b/src/test/java/TaskListTest.java @@ -0,0 +1,22 @@ +import duke.storage.TaskList; +import duke.task.Task; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.DisplayName; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskListTest { + + @Test + @DisplayName("test task list") + void testTaskList() { + TaskList tl = new TaskList(); + int taskListSize = tl.size(); + Task newTask = new Task("test task"); + tl.add(newTask); + assertEquals(tl.size(), taskListSize + 1); + assertEquals(tl.get(tl.size() - 1), newTask); + tl.remove(tl.size() - 1); + assertEquals(tl.size(), taskListSize); + } +} From ae099f53ead0bf815ed2ceea413e7940309449d2 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 6 Feb 2022 18:32:52 +0800 Subject: [PATCH 19/47] Added NumberFormatException handling for delete, unmark and mark if not in correct format. Added proper javadocs documentation --- src/main/java/InputHandler.java | 15 ++++++++++++- src/main/java/Parser.java | 38 ++++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index fd24eea6ee..ee7a706581 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -36,7 +36,7 @@ public InputHandler() throws IOException { /** - * + * Handles input from Duke.java * @param input String input from main in Duke.java, from user input * @return boolean representing isChatEnded variable in main. If "bye" command is given, a true boolean is returned, else false is returned * @throws DukeException Invalid input types, or unrecognisable commands @@ -47,6 +47,7 @@ public boolean handleInput(String input) throws DukeException, IOException { Parser parser = new Parser(); switch (inputCommand) { case "todo": + //Confirms that input is in the format: todo [task] if (splitInput.length > 1) { Todo newTodo = (Todo) parser.parse(CommandType.TODO, splitInput); this.storage.writeData(newTodo); @@ -56,6 +57,7 @@ public boolean handleInput(String input) throws DukeException, IOException { throw new DukeException(":( OOPS!!! The description of a todo cannot be empty. Correct usage: todo [task]"); } case "event": + //Confirms that input is in the format: event [task] /at [date] [time(optional)] if (splitInput.length > 3) { Event newEvent = (Event) parser.parse(CommandType.EVENT, splitInput); this.storage.writeData(newEvent); @@ -66,6 +68,7 @@ public boolean handleInput(String input) throws DukeException, IOException { throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); } case "deadline": + //Confirms that input is in the format: deadline [task] /by [date] [time(optional)] if (splitInput.length > 3) { Deadline newDeadline = (Deadline) parser.parse(CommandType.DEADLINE, splitInput); this.storage.writeData(newDeadline); @@ -74,28 +77,38 @@ public boolean handleInput(String input) throws DukeException, IOException { } else { throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); } + case "list": + //Confirms that input command is simply "list" if (splitInput.length == 1) { parser.parse(CommandType.LIST, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of list! Correct usage: list"); } + case "mark": + //Confirms that input is in the format mark [index] if (splitInput.length == 2) { + parser.parse(CommandType.MARK, this.storage, splitInput); return false; + } else { throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); } + case "unmark": + //Confirms that input is in the format mark [index] if (splitInput.length == 2) { parser.parse(CommandType.UNMARK, this.storage, splitInput); return false; } else { throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); } + case "delete": + //Confirms that input is in the format mark [index] if (splitInput.length == 2) { parser.parse(CommandType.DELETE, this.storage, splitInput); return false; diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 8cbf55eb56..df5ad6c598 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -82,24 +82,38 @@ public void parse(InputHandler.CommandType type, Storage storage, String[] split break; case MARK: - System.out.println("Nice! I've marked this task as done:\n"); - int taskToBeMarkedIndex = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeMarked = storage.get(taskToBeMarkedIndex); - taskToBeMarked.setMarkedTask(); + + try { + int taskToBeMarkedIndex = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeMarked = storage.get(taskToBeMarkedIndex); + System.out.println("Nice! I've marked this task as done:\n"); + taskToBeMarked.setMarkedTask(); + } catch (NumberFormatException e) { + System.out.println("Make sure mark is in the format: mark [index]!"); + } break; case UNMARK: - System.out.println("OK, I've marked this task as not done yet:\n"); - int taskToBeUnmarkedIndex = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeUnmarked = storage.get(taskToBeUnmarkedIndex); - taskToBeUnmarked.setUnmarkedTask(); + + try { + int taskToBeUnmarkedIndex = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeUnmarked = storage.get(taskToBeUnmarkedIndex); + System.out.println("OK, I've marked this task as not done yet:\n"); + taskToBeUnmarked.setUnmarkedTask(); + } catch (NumberFormatException e) { + System.out.println("Make sure mark is in the format: mark [index]!"); + } break; case DELETE: - int idx = Integer.parseInt(splitInput[1]) - 1; - Task taskToBeDeleted = storage.get(idx); - storage.deleteData(idx); - System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"); + try { + int idx = Integer.parseInt(splitInput[1]) - 1; + Task taskToBeDeleted = storage.get(idx); + storage.deleteData(idx); + System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"); + } catch (NumberFormatException e) { + System.out.println("Make sure mark is in the format: mark [index]!"); + } break; default: From 390edec700f3ce30bdfdea2728f4978863f264de Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 6 Feb 2022 18:45:55 +0800 Subject: [PATCH 20/47] Changed formatting for coding standards based on feedback --- src/main/java/Deadline.java | 4 ++-- src/main/java/Duke.java | 2 -- src/main/java/DukeException.java | 5 +++++ src/main/java/Event.java | 3 ++- src/main/java/InputHandler.java | 8 +++++--- src/main/java/Task.java | 3 ++- src/main/java/Todo.java | 3 ++- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index e648f3ddd7..e5e3d99917 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -47,10 +47,10 @@ public Deadline(String name, String date, String time) throws DateTimeParseExcep } /** - * @override + * * @return String of Deadline task, eg [D][X] Deadline (by:XX) vs [D][✓] Deadline (by;XX) */ - + @Override public String toString() { String dueDateAndTime = (this.dueTime == null) ? dateConverterToString(this.dueDate) : dateConverterToString(this.dueDate) + " " + timeConverterToString(this.dueTime); return "[D]" + super.toString() + " (by:" + dueDateAndTime + ")"; } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c8927fe565..68fc032552 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -30,8 +30,6 @@ public static void main(String[] args) throws IOException { } System.out.println(endMessage); } - - } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index c2d455a278..3c9b4f956a 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -15,6 +15,11 @@ */ public class DukeException extends Exception{ private String errorMessage; + + /** + * Constructs a DukeException. DukeException handles wrong inputs by user + * @param errorMessage Error message to be printed + */ public DukeException (String errorMessage) { this.errorMessage = errorMessage; } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 682c800384..a7e6e9fbc0 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -48,9 +48,10 @@ public Event (String name, String date, String time) throws DateTimeParseExcepti } /** - * @override + * * @return String of Event task, eg: [E][X] Event (at:) vs [E] [✓] Event (at:) */ + @Override public String toString() { String dueDateAndTime = (this.dueTime == null) ? dateConverterToString(this.dueDate) : dateConverterToString(this.dueDate) + " " + timeConverterToString(this.dueTime); return "[E]" + super.toString() + " (at:" + dueDateAndTime + ")"; } diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index ee7a706581..a9bf58e443 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -75,7 +75,8 @@ public boolean handleInput(String input) throws DukeException, IOException { printAddTaskMessage(newDeadline); return false; } else { - throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. Correct usage: deadline [task] /by [time]"); + throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. " + + "Correct usage: deadline [task] /by [time]"); } case "list": @@ -118,8 +119,9 @@ public boolean handleInput(String input) throws DukeException, IOException { case "bye": return true; default: - throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," - + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: " + + "todo [task], event [task] /at [time]," + + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f9feb0fe2a..1af59f0616 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -75,9 +75,10 @@ public String timeConverterToString(LocalTime time) { } /** - * @override + * * @return String version of task, with marked and name. E.g. [X] Task vs [✓] Task */ + @Override public String toString() { if (this.isMarked) { String marked = "[✓] "; diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 26c0a7b67b..d2af1fe964 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -25,9 +25,10 @@ public Todo (String name) { } /** - * @override + * * @return String of Todo task, eg: [T][X] Todo */ + @Override public String toString() { return "[T]" + super.toString(); } From 2607baf257cc90010fdffe3f2eb1e4b9a43f96ce Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 6 Feb 2022 20:08:22 +0800 Subject: [PATCH 21/47] Added find and NumberFormatException in cases where non-integer is passed in. --- src/main/java/InputHandler.java | 15 ++++++++++++- src/main/java/Parser.java | 40 +++++++++++++++++++++++++++++++-- src/main/java/Storage.java | 8 +++++-- src/main/java/TaskList.java | 2 +- 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/src/main/java/InputHandler.java b/src/main/java/InputHandler.java index a9bf58e443..336fb2da9b 100644 --- a/src/main/java/InputHandler.java +++ b/src/main/java/InputHandler.java @@ -116,8 +116,20 @@ public boolean handleInput(String input) throws DukeException, IOException { } else { throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); } + + case "find": + if (splitInput.length > 1) { + parser.parse(CommandType.FIND, this.storage, splitInput); + return false; + } else { + throw new DukeException("Uh oh! It seems like you did not specify what to find"); + } + case "bye": return true; + + + default: throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: " + "todo [task], event [task] /at [time]," @@ -144,7 +156,8 @@ enum CommandType { LIST, MARK, UNMARK, - DELETE + DELETE, + FIND } } diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index df5ad6c598..8fab487ab8 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -8,8 +8,12 @@ import duke.task.Task; import duke.task.Todo; import duke.task.Deadline; + import java.time.format.DateTimeParseException; + import java.util.Arrays; +import java.util.ArrayList; + import java.io.IOException; public class Parser { @@ -24,11 +28,13 @@ public class Parser { public Task parse(InputHandler.CommandType type, String[] splitInput) throws DukeException { switch (type) { case TODO: + //Removes the todo command word: i.e. todo task -> task String[] nameArray = Arrays.copyOfRange(splitInput, 1, splitInput.length); String todoName = String.join(" ", nameArray); return new Todo(todoName); case EVENT: + //Removes the event command word and separates into date and time (optional) String[] stringArrayExcludingEvent = Arrays.copyOfRange(splitInput, 1, splitInput.length); String stringExcludingEvent = String.join(" ", stringArrayExcludingEvent); String[] eventNameAndTimeArray = stringExcludingEvent.split("/at "); @@ -40,11 +46,13 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk Event newEvent = (eventTimeArray.length > 1) ? new Event(eventName, eventTimeArray[0], eventTimeArray[1]) : new Event(eventName, eventTimeArray[0]); return newEvent; } catch (DateTimeParseException e) { + //Datetime unable to be parsed throw new DukeException(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); } case DEADLINE: + //Removes the deadline command word and separates into date and time (optional) String[] stringArrayExcludingDeadline = Arrays.copyOfRange(splitInput, 1, splitInput.length); String stringExcludingDeadline = String.join(" ", stringArrayExcludingDeadline); String[] deadlineNameAndTimeArray = stringExcludingDeadline.split("/by "); @@ -56,6 +64,7 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk Deadline newDeadline = (deadlineTimeArray.length > 1) ? new Deadline(deadlineName, deadlineTimeArray[0], deadlineTimeArray[1]) : new Deadline(deadlineName, deadlineTimeArray[0]); return newDeadline; } catch (DateTimeParseException e) { + //Datetime unable to be parsed throw new DukeException(":( OOPS!!! The correct format for date and time is yyyy-mm-dd and hh:mm"); } @@ -82,40 +91,67 @@ public void parse(InputHandler.CommandType type, Storage storage, String[] split break; case MARK: - + //Marks task by index try { int taskToBeMarkedIndex = Integer.parseInt(splitInput[1]) - 1; Task taskToBeMarked = storage.get(taskToBeMarkedIndex); System.out.println("Nice! I've marked this task as done:\n"); taskToBeMarked.setMarkedTask(); } catch (NumberFormatException e) { + //Addresses the error of a non-integer being passed in System.out.println("Make sure mark is in the format: mark [index]!"); } break; case UNMARK: - + //Unmarks task by index try { int taskToBeUnmarkedIndex = Integer.parseInt(splitInput[1]) - 1; Task taskToBeUnmarked = storage.get(taskToBeUnmarkedIndex); System.out.println("OK, I've marked this task as not done yet:\n"); taskToBeUnmarked.setUnmarkedTask(); } catch (NumberFormatException e) { + //Addresses the issue of a non-integer being passed in System.out.println("Make sure mark is in the format: mark [index]!"); } break; case DELETE: + //Delete task by index try { int idx = Integer.parseInt(splitInput[1]) - 1; Task taskToBeDeleted = storage.get(idx); storage.deleteData(idx); System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"); } catch (NumberFormatException e) { + //Addresses the issue of a non-integer being passed in System.out.println("Make sure mark is in the format: mark [index]!"); } break; + case FIND: + //Removes the find command and iterates through the TaskList to find a task name that contains the keyword + String[] stringArrayExcludingFind = Arrays.copyOfRange(splitInput, 1, splitInput.length); + String nameOfKeyWord = String.join(" ", stringArrayExcludingFind); + ArrayList arrayOfTasks = storage.accessTaskList().list; + ArrayList indexOfFoundObjects = new ArrayList<>(); + for (int i = 0; i < arrayOfTasks.size(); i++) { + Task currentTask = arrayOfTasks.get(i); + if (currentTask.name.contains(nameOfKeyWord)) { + indexOfFoundObjects.add(i); + } + } + if (!indexOfFoundObjects.isEmpty()) { + //Task found and print + for (int j = 0; j < indexOfFoundObjects.size(); j++) { + System.out.println((j + 1) + "." + storage.get(indexOfFoundObjects.get(j))); + } + break; + } else { + //Unable to find + System.out.println("Uh oh! No task matches the description you've given :("); + } + default: throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index f065e5c438..4e5c20fe5a 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -18,8 +18,8 @@ import java.io.FileWriter; public class Storage { - TaskList taskList; - String FILEPATH = "data/data.txt"; + private TaskList taskList; + final String FILEPATH = "data/data.txt"; /** * Constructs a Storage object. Loads the data from data/data.txt. if no data dir or data.txt is found, create an empty one @@ -157,4 +157,8 @@ public int taskListSize() { return this.taskList.size(); } + public TaskList accessTaskList() { + return this.taskList; + } + } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index afcecb6489..3e840fd224 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -12,7 +12,7 @@ import duke.task.Task; import java.util.ArrayList; public class TaskList { - ArrayList list; + public ArrayList list; /** * Constructor for TaskList. Initialises an empty ArrayList From aca80eb3af1a6c3c283c28a8ec3a93c27305e677 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sat, 12 Feb 2022 17:28:15 +0800 Subject: [PATCH 22/47] Added JAR functionality --- src/main/java/META-INF/MANIFEST.MF | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/java/META-INF/MANIFEST.MF diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..918fec1efb --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: duke.duke.Duke + From f97ff93c138c33b51139c8f39361333cd943b3ec Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 13 Feb 2022 00:27:23 +0800 Subject: [PATCH 23/47] Shifted into packages --- build.gradle | 14 ++++++++++++++ src/main/java/{ => duke/duke}/Duke.java | 5 +++++ src/main/java/duke/duke/Launcher.java | 9 +++++++++ src/main/java/{ => duke/storage}/Storage.java | 0 src/main/java/{ => duke/storage}/TaskList.java | 0 src/main/java/{ => duke/task}/Deadline.java | 0 src/main/java/{ => duke/task}/Event.java | 0 src/main/java/{ => duke/task}/Task.java | 0 src/main/java/{ => duke/task}/Todo.java | 0 src/main/java/{ => duke/ui}/DukeException.java | 0 src/main/java/{ => duke/ui}/InputHandler.java | 0 src/main/java/{ => duke/ui}/Parser.java | 0 text-ui-test/input.txt | 6 ++++++ text-ui-test/runtest.bat | 6 ++++-- 14 files changed, 38 insertions(+), 2 deletions(-) rename src/main/java/{ => duke/duke}/Duke.java (89%) create mode 100644 src/main/java/duke/duke/Launcher.java rename src/main/java/{ => duke/storage}/Storage.java (100%) rename src/main/java/{ => duke/storage}/TaskList.java (100%) rename src/main/java/{ => duke/task}/Deadline.java (100%) rename src/main/java/{ => duke/task}/Event.java (100%) rename src/main/java/{ => duke/task}/Task.java (100%) rename src/main/java/{ => duke/task}/Todo.java (100%) rename src/main/java/{ => duke/ui}/DukeException.java (100%) rename src/main/java/{ => duke/ui}/InputHandler.java (100%) rename src/main/java/{ => duke/ui}/Parser.java (100%) diff --git a/build.gradle b/build.gradle index 0182b89fc1..133badba50 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,20 @@ repositories { dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' + String javaFxVersion = '11' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { diff --git a/src/main/java/Duke.java b/src/main/java/duke/duke/Duke.java similarity index 89% rename from src/main/java/Duke.java rename to src/main/java/duke/duke/Duke.java index 68fc032552..ea7f3c9dac 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -3,6 +3,11 @@ import duke.ui.DukeException; import duke.ui.InputHandler; +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.stage.Stage; + import java.io.IOException; import java.util.Scanner; diff --git a/src/main/java/duke/duke/Launcher.java b/src/main/java/duke/duke/Launcher.java new file mode 100644 index 0000000000..235f012dd2 --- /dev/null +++ b/src/main/java/duke/duke/Launcher.java @@ -0,0 +1,9 @@ +package duke.duke; + +import javafx.application.Application; + +public class Launcher { + public static void main(String[] args) { + Application.launch(Duke.class, args); + } +} diff --git a/src/main/java/Storage.java b/src/main/java/duke/storage/Storage.java similarity index 100% rename from src/main/java/Storage.java rename to src/main/java/duke/storage/Storage.java diff --git a/src/main/java/TaskList.java b/src/main/java/duke/storage/TaskList.java similarity index 100% rename from src/main/java/TaskList.java rename to src/main/java/duke/storage/TaskList.java diff --git a/src/main/java/Deadline.java b/src/main/java/duke/task/Deadline.java similarity index 100% rename from src/main/java/Deadline.java rename to src/main/java/duke/task/Deadline.java diff --git a/src/main/java/Event.java b/src/main/java/duke/task/Event.java similarity index 100% rename from src/main/java/Event.java rename to src/main/java/duke/task/Event.java diff --git a/src/main/java/Task.java b/src/main/java/duke/task/Task.java similarity index 100% rename from src/main/java/Task.java rename to src/main/java/duke/task/Task.java diff --git a/src/main/java/Todo.java b/src/main/java/duke/task/Todo.java similarity index 100% rename from src/main/java/Todo.java rename to src/main/java/duke/task/Todo.java diff --git a/src/main/java/DukeException.java b/src/main/java/duke/ui/DukeException.java similarity index 100% rename from src/main/java/DukeException.java rename to src/main/java/duke/ui/DukeException.java diff --git a/src/main/java/InputHandler.java b/src/main/java/duke/ui/InputHandler.java similarity index 100% rename from src/main/java/InputHandler.java rename to src/main/java/duke/ui/InputHandler.java diff --git a/src/main/java/Parser.java b/src/main/java/duke/ui/Parser.java similarity index 100% rename from src/main/java/Parser.java rename to src/main/java/duke/ui/Parser.java diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..851a579e6e 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,6 @@ +todo test1 +deadline test2 /by 2022-12-21 01:00 +event test3 /at 2022-03-05 13:00 +mark 2 +list +bye \ No newline at end of file diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..35045a388a 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,8 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java +javac -cp ..\src\main\java\ -Xlint:none -d ..\bin ..\src\main\java\duke\duke\*.java + IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -15,7 +16,8 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin\duke\duke Duke < input.txt > ACTUAL.TXT +pause REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From bb37f219d8572a3bc8ac94b41da556b3ecb29d36 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 13 Feb 2022 00:31:30 +0800 Subject: [PATCH 24/47] revert --- src/main/java/duke/storage/Storage.java | 4 ++-- src/main/java/duke/storage/TaskList.java | 14 +------------- src/main/java/duke/task/Event.java | 15 --------------- src/main/java/duke/task/Task.java | 12 ++++++------ src/main/java/duke/task/Todo.java | 5 ----- src/main/java/duke/ui/InputHandler.java | 3 --- 6 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java index 4e5c20fe5a..f13bf7622a 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -141,7 +141,7 @@ public String list() { } /** - * Get task + * * @param idx index of task to be gotten * @return task that is requested */ @@ -150,7 +150,7 @@ public Task get(int idx) { } /** - * Size of tasklist + * * @return size of task list */ public int taskListSize() { diff --git a/src/main/java/duke/storage/TaskList.java b/src/main/java/duke/storage/TaskList.java index 3e840fd224..ff26570281 100644 --- a/src/main/java/duke/storage/TaskList.java +++ b/src/main/java/duke/storage/TaskList.java @@ -1,18 +1,6 @@ -package duke.storage; -import duke.duke.Duke; -import duke.ui.Parser; -import duke.ui.DukeException; -import duke.ui.InputHandler; -import duke.storage.Storage; -import duke.storage.TaskList; -import duke.task.Event; -import duke.task.Task; -import duke.task.Todo; -import duke.task.Deadline; -import duke.task.Task; import java.util.ArrayList; public class TaskList { - public ArrayList list; + ArrayList list; /** * Constructor for TaskList. Initialises an empty ArrayList diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java index a7e6e9fbc0..d9ba7d0a87 100644 --- a/src/main/java/duke/task/Event.java +++ b/src/main/java/duke/task/Event.java @@ -21,26 +21,11 @@ public class Event extends Task { public LocalDate dueDate; public LocalTime dueTime; - - /** - * Constructor for Event with date - * @param name Name of Event - * @param date Date of event in yyyy-mm-dd format - * @throws DateTimeParseException If date time is in wrong format - */ public Event (String name, String date) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); this.dueTime = null; } - - /** - * Constructor for Event with date and time - * @param name Name of Event - * @param date Date of event in yyyy-mm-dd format - * @param time Time of event in hh:mm format - * @throws DateTimeParseException If date time is in wrong format - */ public Event (String name, String date, String time) throws DateTimeParseException { super(name); this.dueDate = LocalDate.parse(date); diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 1af59f0616..0e2b91db1e 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -22,7 +22,7 @@ public class Task { public String name; /** - * Constructor for Task. Is called in subclasses Todo, Event and Deadline + * Constructor * @param name name of the task */ public Task (String name) { @@ -31,7 +31,7 @@ public Task (String name) { } /** - * Marks task as done + * markTask as done */ public void setMarkedTask () { String markedMessage = "Nice! I've marked this task as done:\n"; @@ -40,7 +40,7 @@ public void setMarkedTask () { } /** - * Sets task to be unmarked + * unmarkTask */ public void setUnmarkedTask() { String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; @@ -49,7 +49,7 @@ public void setUnmarkedTask() { } /** - * Whether task has been marked + * * @return boolean on whether task is marked */ public boolean hasBeenMarked() { @@ -57,7 +57,7 @@ public boolean hasBeenMarked() { } /** - * Converts date to String format for printing + * * @param date LocalDate for Deadline/Event tasks * @return String format: converts from yyyy-mm-dd format to Aug dd, yyyy format */ @@ -66,7 +66,7 @@ public String dateConverterToString(LocalDate date) { } /** - * Converts time to String format for printing + * * @param time LocalTime for Deadline/Event tasks * @return String format: converts hh:mm format to hh:mm am/pm format */ diff --git a/src/main/java/duke/task/Todo.java b/src/main/java/duke/task/Todo.java index d2af1fe964..f030b28144 100644 --- a/src/main/java/duke/task/Todo.java +++ b/src/main/java/duke/task/Todo.java @@ -15,11 +15,6 @@ */ public class Todo extends Task { - - /** - * Constructor for Todo - * @param name Name of Todo - */ public Todo (String name) { super(name); } diff --git a/src/main/java/duke/ui/InputHandler.java b/src/main/java/duke/ui/InputHandler.java index 336fb2da9b..4f7cacb157 100644 --- a/src/main/java/duke/ui/InputHandler.java +++ b/src/main/java/duke/ui/InputHandler.java @@ -146,9 +146,6 @@ public void printAddTaskMessage(Task task) { System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + " tasks in the list." ); } - /** - * Type of Command enum to be passed into Parser object - */ enum CommandType { TODO, EVENT, From 255fbefdc5da7de07a13ac485f3ad3d45145f90c Mon Sep 17 00:00:00 2001 From: brian16600 Date: Sun, 13 Feb 2022 01:08:38 +0800 Subject: [PATCH 25/47] Tentative changes --- src/main/data/data.txt | 0 src/main/java/duke/duke/Duke.java | 5 +++++ src/main/java/duke/storage/TaskList.java | 12 ++++++++++++ 3 files changed, 17 insertions(+) delete mode 100644 src/main/data/data.txt diff --git a/src/main/data/data.txt b/src/main/data/data.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index ea7f3c9dac..88c156a7fd 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -6,6 +6,11 @@ import javafx.application.Application; import javafx.scene.Scene; import javafx.scene.control.Label; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; import javafx.stage.Stage; import java.io.IOException; diff --git a/src/main/java/duke/storage/TaskList.java b/src/main/java/duke/storage/TaskList.java index ff26570281..54aba747f8 100644 --- a/src/main/java/duke/storage/TaskList.java +++ b/src/main/java/duke/storage/TaskList.java @@ -1,3 +1,15 @@ +package duke.storage; + +import duke.duke.Duke; +import duke.ui.Parser; +import duke.ui.DukeException; +import duke.ui.InputHandler; +import duke.storage.Storage; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; + import java.util.ArrayList; public class TaskList { ArrayList list; From b4458cc834af5620718b0b60e56a9d19b8e53d18 Mon Sep 17 00:00:00 2001 From: brian16600 Date: Tue, 15 Feb 2022 09:24:11 +0800 Subject: [PATCH 26/47] Adding Duke GUI --- src/main/java/duke/duke/Duke.java | 138 ++++++++++++++++++++++- src/main/java/duke/duke/Launcher.java | 4 +- src/main/java/duke/duke/Main.java | 37 ++++++ src/main/java/duke/storage/Storage.java | 8 +- src/main/java/duke/storage/TaskList.java | 2 +- src/main/java/duke/task/Task.java | 8 +- src/main/java/duke/ui/DialogBox.java | 75 ++++++++++++ src/main/java/duke/ui/InputHandler.java | 41 ++++--- src/main/java/duke/ui/MainWindow.java | 67 +++++++++++ src/main/java/duke/ui/Parser.java | 53 +++++---- src/main/resources/view/DialogBox.fxml | 16 +++ src/main/resources/view/MainWindow.fxml | 19 ++++ text-ui-test/EXPECTED.TXT | 24 +++- 13 files changed, 426 insertions(+), 66 deletions(-) create mode 100644 src/main/java/duke/duke/Main.java create mode 100644 src/main/java/duke/ui/DialogBox.java create mode 100644 src/main/java/duke/ui/MainWindow.java create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index 88c156a7fd..f94821995f 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -2,8 +2,12 @@ import duke.ui.DukeException; import duke.ui.InputHandler; +import duke.ui.DialogBox; +import duke.ui.Parser; +import duke.ui.InputHandler; import javafx.application.Application; +import javafx.application.Platform; import javafx.scene.Scene; import javafx.scene.control.Label; import javafx.scene.control.Button; @@ -12,11 +16,26 @@ import javafx.scene.layout.AnchorPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; +import javafx.scene.layout.Region; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; import java.io.IOException; import java.util.Scanner; -public class Duke { +public class Duke extends Application { + + //For GUI + private ScrollPane scrollPane; + private VBox dialogBox; + private TextField userInput; + private Button sendButton; + private Scene scene; + //images + private Image user = new Image(this.getClass().getResourceAsStream("/images/human.jpg")); + private Image duke = new Image(this.getClass().getResourceAsStream("/images/bear.jpg")); + + public static void main(String[] args) throws IOException { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -29,17 +48,126 @@ public static void main(String[] args) throws IOException { System.out.println(dukeGreeting); Scanner sc = new Scanner(System.in); InputHandler inputHandler = new InputHandler(); - boolean isChatEnded = false; - while (!isChatEnded) { + String response = ""; + while (!response.equals(endMessage)) { try { String input = sc.nextLine(); - isChatEnded = inputHandler.handleInput(input); + System.out.println(response); + response = inputHandler.handleInput(input); } catch (DukeException e) { System.out.println(e.getMessage()); } } - System.out.println(endMessage); } + + + /** + * Start the application + * @param stage Stage object + */ + @Override + public void start(Stage stage) { + //Setting up required components + Label dukeLabel = new Label("Duke"); + + //Creating container for the chat to scroll + scrollPane = new ScrollPane(); + dialogBox = new VBox(); + scrollPane.setContent(dialogBox); + + userInput = new TextField(); + sendButton = new Button("Send"); + + AnchorPane mainLayout = new AnchorPane(); + mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); + + Scene scene = new Scene(mainLayout); + stage.setScene(scene); + stage.show(); + + //Formatting window + stage.setTitle("Duke"); + stage.setResizable(false); + stage.setMinHeight(600.0); + stage.setMinWidth(400.0); + + mainLayout.setPrefSize(400.0, 600.0); + scrollPane.setPrefSize(385, 535); + scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); + scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); + + scrollPane.setVvalue(1.0); + scrollPane.setFitToWidth(true); + + dialogBox.setPrefHeight(Region.USE_COMPUTED_SIZE); + + userInput.setPrefWidth(325.0); + userInput.setPrefHeight(55.0); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + AnchorPane.setLeftAnchor(userInput, 1.0); + AnchorPane.setBottomAnchor(userInput, 1.0); + + //Set functionality on User Input + sendButton.setOnMouseClicked((event) -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); + + //scroll down if dialogBox's height changes + dialogBox.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + } + + /** + * Creates the dialogboxes as well as user and duke's inputs + */ + private void handleUserInput() { + String userText = userInput.getText(); + String dukeText = getResponse(userInput.getText()); + dialogBox.getChildren().addAll( + DialogBox.getUserDialog(userText, user), + DialogBox.getDukeDialog(dukeText, duke) + ); + userInput.clear(); + } + + /** + * Obtains the response of Duke + * @param input user's input + * @return Duke's reply to user's input + */ + public String getResponse(String input) { + String output = ""; + try { + InputHandler inputHandler = new InputHandler(); + output = inputHandler.handleInput(input); + } catch (DukeException e) { + return e.getMessage(); + } catch (IOException e) { + return e.getMessage(); + } + + return output; + } + + /** + * Returns a Label around the text + * @param text text for the dialog + * @return Label object with text + */ + private Label getDialogLabel(String text) { + Label textToAdd = new Label(text); + textToAdd.setWrapText(true); + return textToAdd; + } + + } diff --git a/src/main/java/duke/duke/Launcher.java b/src/main/java/duke/duke/Launcher.java index 235f012dd2..70364ce52b 100644 --- a/src/main/java/duke/duke/Launcher.java +++ b/src/main/java/duke/duke/Launcher.java @@ -1,9 +1,11 @@ package duke.duke; +import duke.duke.Duke; +import duke.ui.MainWindow; import javafx.application.Application; public class Launcher { public static void main(String[] args) { - Application.launch(Duke.class, args); + Application.launch(Main.class,args); } } diff --git a/src/main/java/duke/duke/Main.java b/src/main/java/duke/duke/Main.java new file mode 100644 index 0000000000..5119ce8f75 --- /dev/null +++ b/src/main/java/duke/duke/Main.java @@ -0,0 +1,37 @@ +package duke.duke; + +import duke.ui.MainWindow; + +import java.io.IOException; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + /** + * Starts the application + * @param stage stage object passed in + */ + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java index f13bf7622a..f9014eec86 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -107,8 +107,8 @@ public void writeData(Task task) throws IOException { } /** - * Used when delete [index] is called for Duke. Deletes the entire file and rewrites it based on the new taskListay - * Amends the current stored taskListay as well + * Used when delete [index] is called for Duke. Deletes the entire file and rewrites it based on the new taskList + * Amends the current stored TaskList as well * @param idx index of task to be deleted * @throws IOException if there is an error rewriting data.txt */ @@ -157,6 +157,10 @@ public int taskListSize() { return this.taskList.size(); } + /** + * Allows external access to TaskList + * @return TaskList + */ public TaskList accessTaskList() { return this.taskList; } diff --git a/src/main/java/duke/storage/TaskList.java b/src/main/java/duke/storage/TaskList.java index 54aba747f8..59fa9d40fc 100644 --- a/src/main/java/duke/storage/TaskList.java +++ b/src/main/java/duke/storage/TaskList.java @@ -12,7 +12,7 @@ import java.util.ArrayList; public class TaskList { - ArrayList list; + public ArrayList list; /** * Constructor for TaskList. Initialises an empty ArrayList diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 0e2b91db1e..52186be544 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -34,18 +34,14 @@ public Task (String name) { * markTask as done */ public void setMarkedTask () { - String markedMessage = "Nice! I've marked this task as done:\n"; this.isMarked = true; - System.out.println(markedMessage + " " + this); } /** * unmarkTask */ public void setUnmarkedTask() { - String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; this.isMarked = false; - System.out.println(unmarkedMessage + " " + this); } /** @@ -57,7 +53,7 @@ public boolean hasBeenMarked() { } /** - * + * Converts date to String format for printing * @param date LocalDate for Deadline/Event tasks * @return String format: converts from yyyy-mm-dd format to Aug dd, yyyy format */ @@ -66,7 +62,7 @@ public String dateConverterToString(LocalDate date) { } /** - * + * Converts time to String format for printing * @param time LocalTime for Deadline/Event tasks * @return String format: converts hh:mm format to hh:mm am/pm format */ diff --git a/src/main/java/duke/ui/DialogBox.java b/src/main/java/duke/ui/DialogBox.java new file mode 100644 index 0000000000..b930de90d9 --- /dev/null +++ b/src/main/java/duke/ui/DialogBox.java @@ -0,0 +1,75 @@ +package duke.ui; + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + + /** + * Constructor + * @param text Text to be displayed + * @param img Image to be displayed + */ + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + /** + * Gets the user dialogbox + * @param text User's text + * @param img Image for the user + * @return DialogBox to be displayed + */ + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + /** + * Gets Duke's dialogbox + * @param text User's text + * @param img Image for the user + * @return DialogBox to be displayed + */ + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/duke/ui/InputHandler.java b/src/main/java/duke/ui/InputHandler.java index 4f7cacb157..71ed0628ae 100644 --- a/src/main/java/duke/ui/InputHandler.java +++ b/src/main/java/duke/ui/InputHandler.java @@ -41,7 +41,9 @@ public InputHandler() throws IOException { * @return boolean representing isChatEnded variable in main. If "bye" command is given, a true boolean is returned, else false is returned * @throws DukeException Invalid input types, or unrecognisable commands */ - public boolean handleInput(String input) throws DukeException, IOException { + public String handleInput(String input) throws DukeException, IOException { + String endMessage = "Bye. Hope to see you again soon!"; + String[] splitInput = input.split(" "); String inputCommand = splitInput[0]; Parser parser = new Parser(); @@ -51,8 +53,8 @@ public boolean handleInput(String input) throws DukeException, IOException { if (splitInput.length > 1) { Todo newTodo = (Todo) parser.parse(CommandType.TODO, splitInput); this.storage.writeData(newTodo); - printAddTaskMessage(newTodo); - return false; + return addTaskMessage(newTodo); + } else { throw new DukeException(":( OOPS!!! The description of a todo cannot be empty. Correct usage: todo [task]"); } @@ -61,8 +63,7 @@ public boolean handleInput(String input) throws DukeException, IOException { if (splitInput.length > 3) { Event newEvent = (Event) parser.parse(CommandType.EVENT, splitInput); this.storage.writeData(newEvent); - printAddTaskMessage(newEvent); - return false; + return addTaskMessage(newEvent); } else { throw new DukeException(":( OOPS!!! The description of a event cannot be empty. Correct usage: event [task] /at [time]"); @@ -72,8 +73,7 @@ public boolean handleInput(String input) throws DukeException, IOException { if (splitInput.length > 3) { Deadline newDeadline = (Deadline) parser.parse(CommandType.DEADLINE, splitInput); this.storage.writeData(newDeadline); - printAddTaskMessage(newDeadline); - return false; + return addTaskMessage(newDeadline); } else { throw new DukeException(":( OOPS!!! The description of a deadline cannot be empty. " + "Correct usage: deadline [task] /by [time]"); @@ -82,8 +82,8 @@ public boolean handleInput(String input) throws DukeException, IOException { case "list": //Confirms that input command is simply "list" if (splitInput.length == 1) { - parser.parse(CommandType.LIST, this.storage, splitInput); - return false; + return parser.parse(CommandType.LIST, this.storage, splitInput); + } else { throw new DukeException("Wrong usage of list! Correct usage: list"); } @@ -91,9 +91,7 @@ public boolean handleInput(String input) throws DukeException, IOException { case "mark": //Confirms that input is in the format mark [index] if (splitInput.length == 2) { - - parser.parse(CommandType.MARK, this.storage, splitInput); - return false; + return parser.parse(CommandType.MARK, this.storage, splitInput); } else { throw new DukeException("Wrong usage of mark! Correct usage: mark [index]"); @@ -102,8 +100,8 @@ public boolean handleInput(String input) throws DukeException, IOException { case "unmark": //Confirms that input is in the format mark [index] if (splitInput.length == 2) { - parser.parse(CommandType.UNMARK, this.storage, splitInput); - return false; + return parser.parse(CommandType.UNMARK, this.storage, splitInput); + } else { throw new DukeException("Wrong usage of unmark! Correct usage: unmark [index]"); } @@ -111,22 +109,22 @@ public boolean handleInput(String input) throws DukeException, IOException { case "delete": //Confirms that input is in the format mark [index] if (splitInput.length == 2) { - parser.parse(CommandType.DELETE, this.storage, splitInput); - return false; + return parser.parse(CommandType.DELETE, this.storage, splitInput); + } else { throw new DukeException("Wrong usage of delete! Correct usage: delete [index]"); } case "find": if (splitInput.length > 1) { - parser.parse(CommandType.FIND, this.storage, splitInput); - return false; + return parser.parse(CommandType.FIND, this.storage, splitInput); + } else { throw new DukeException("Uh oh! It seems like you did not specify what to find"); } case "bye": - return true; + return endMessage; @@ -142,8 +140,9 @@ public boolean handleInput(String input) throws DukeException, IOException { * Prints out the task name that has been added as well as the number of tasks in the list * @param task The task that has been added */ - public void printAddTaskMessage(Task task) { - System.out.println("Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + " tasks in the list." ); + public String addTaskMessage(Task task) { + return "Got it. I've added this task:\n" + task + "\nNow you have " + this.storage.taskListSize() + + " tasks in the list." ; } enum CommandType { diff --git a/src/main/java/duke/ui/MainWindow.java b/src/main/java/duke/ui/MainWindow.java new file mode 100644 index 0000000000..0e0ddf9950 --- /dev/null +++ b/src/main/java/duke/ui/MainWindow.java @@ -0,0 +1,67 @@ +package duke.ui; + +import duke.duke.Duke; + +import javafx.application.Platform; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + //setting the images + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/human.jpg")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/bear.jpg")); + + /** + * Initialises scrollpane + */ + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + /** + * Sets duke + * @param d Duke object passed in + */ + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + String endMessage = "Bye. Hope to see you again soon!"; + if (response.equals(endMessage)) { + Platform.exit(); + } + userInput.clear(); + + } +} \ No newline at end of file diff --git a/src/main/java/duke/ui/Parser.java b/src/main/java/duke/ui/Parser.java index 8fab487ab8..26f148ce58 100644 --- a/src/main/java/duke/ui/Parser.java +++ b/src/main/java/duke/ui/Parser.java @@ -1,9 +1,6 @@ package duke.ui; -import duke.duke.Duke; -import duke.ui.DukeException; -import duke.ui.InputHandler; + import duke.storage.Storage; -import duke.storage.TaskList; import duke.task.Event; import duke.task.Task; import duke.task.Todo; @@ -18,6 +15,9 @@ public class Parser { + String defaultErrorMessage = ":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task]," + + " event [task] /at [time], deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"; + /** * Parses input from InputHandler and returns a new Task to be added to TaskList. Handles event, deadline, todo commands * @param type CommandType of input, including (TODO, DEADLINE, EVENT) @@ -70,8 +70,7 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk } default: - throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," - + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + throw new DukeException(defaultErrorMessage); } } @@ -83,38 +82,44 @@ public Task parse(InputHandler.CommandType type, String[] splitInput) throws Duk * @throws DukeException Handles unrecognised commands * @throws IOException Handles IO Errors */ - public void parse(InputHandler.CommandType type, Storage storage, String[] splitInput) throws DukeException, IOException { + public String parse(InputHandler.CommandType type, Storage storage, String[] splitInput) throws DukeException, IOException { + + String wrongMarkFormatErrorMessage = "Make sure mark is in the format: mark [index]!"; + String wrongUnmarkFormatErrorMessage = "Make sure unmark is in the format: unmark [index]!"; + String wrongDeleteFormatErrorMessage = "Make sure delete is in the format delete [index]!"; + String cannotFindTaskMessage = "Uh oh! No task matches the description you've given :("; + + String listCommandStringIntro = "Here are the tasks in your list:\n"; + String markedMessage = "Nice! I've marked this task as done:\n"; + String unmarkedMessage = "OK, I've marked this task as not done yet:\n"; + switch (type) { case LIST: - System.out.println("Here are the tasks in your list:"); - System.out.println(storage.list()); - break; + return listCommandStringIntro + storage.list(); case MARK: //Marks task by index try { int taskToBeMarkedIndex = Integer.parseInt(splitInput[1]) - 1; Task taskToBeMarked = storage.get(taskToBeMarkedIndex); - System.out.println("Nice! I've marked this task as done:\n"); taskToBeMarked.setMarkedTask(); + return markedMessage + taskToBeMarked; } catch (NumberFormatException e) { //Addresses the error of a non-integer being passed in - System.out.println("Make sure mark is in the format: mark [index]!"); + throw new DukeException(wrongMarkFormatErrorMessage); } - break; case UNMARK: //Unmarks task by index try { int taskToBeUnmarkedIndex = Integer.parseInt(splitInput[1]) - 1; Task taskToBeUnmarked = storage.get(taskToBeUnmarkedIndex); - System.out.println("OK, I've marked this task as not done yet:\n"); taskToBeUnmarked.setUnmarkedTask(); + return unmarkedMessage + taskToBeUnmarked; } catch (NumberFormatException e) { //Addresses the issue of a non-integer being passed in - System.out.println("Make sure mark is in the format: mark [index]!"); + throw new DukeException(wrongUnmarkFormatErrorMessage); } - break; case DELETE: //Delete task by index @@ -122,12 +127,11 @@ public void parse(InputHandler.CommandType type, Storage storage, String[] split int idx = Integer.parseInt(splitInput[1]) - 1; Task taskToBeDeleted = storage.get(idx); storage.deleteData(idx); - System.out.println("Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"); + return "Noted. I've removed this task:\n" + taskToBeDeleted + "\nNow you have " + storage.taskListSize() + " tasks in the list"; } catch (NumberFormatException e) { //Addresses the issue of a non-integer being passed in - System.out.println("Make sure mark is in the format: mark [index]!"); + throw new DukeException(wrongDeleteFormatErrorMessage); } - break; case FIND: //Removes the find command and iterates through the TaskList to find a task name that contains the keyword @@ -135,26 +139,27 @@ public void parse(InputHandler.CommandType type, Storage storage, String[] split String nameOfKeyWord = String.join(" ", stringArrayExcludingFind); ArrayList arrayOfTasks = storage.accessTaskList().list; ArrayList indexOfFoundObjects = new ArrayList<>(); + for (int i = 0; i < arrayOfTasks.size(); i++) { Task currentTask = arrayOfTasks.get(i); if (currentTask.name.contains(nameOfKeyWord)) { indexOfFoundObjects.add(i); } } + String outputString = ""; if (!indexOfFoundObjects.isEmpty()) { //Task found and print for (int j = 0; j < indexOfFoundObjects.size(); j++) { - System.out.println((j + 1) + "." + storage.get(indexOfFoundObjects.get(j))); + outputString += (j + 1) + "." + storage.get(indexOfFoundObjects.get(j)); } - break; + return outputString; } else { //Unable to find - System.out.println("Uh oh! No task matches the description you've given :("); + throw new DukeException(cannotFindTaskMessage); } default: - throw new DukeException(":( OOPS!!! I'm sorry, but I don't know what that means! Possible commands: todo [task], event [task] /at [time]," - + " deadline [task] /by [time], mark [index], unmark [index], delete [index], bye"); + throw new DukeException(defaultErrorMessage); } } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..ede775d4f9 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..83fddd291c --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +