From 65f72a8d7407cfc1d4ded97e87a8cbbbe6d16d8b Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Tue, 6 Aug 2019 15:24:53 +0800 Subject: [PATCH 01/98] Add support for Gradle workflow --- build.gradle | 16 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ settings.gradle | 1 + 6 files changed, 278 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..e5b8ce7e49 --- /dev/null +++ b/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +group 'seedu.duke' +version '0.1.0' + +repositories { + mavenCentral() +} + +application { + // Change this to your main class. + mainClassName = "seedu.duke.Duke" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z 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 \(.*\)$'` + 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"' + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..6d57edc706 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 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" + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..d1e92fe5db --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'duke' From 0112efe4f745ecd1985e5362f85e8ddc5facb02c Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Mon, 12 Aug 2019 18:09:24 +0800 Subject: [PATCH 02/98] Add sample checkstyle configuration Add toolVersion block in to Gradle code sample to prevent errors. --- config/checkstyle/checkstyle.xml | 257 +++++++++++++++++++++++++++++++ tutorials/gradleTutorial.md | 7 +- 2 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..b1a57ba6c0 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/gradleTutorial.md b/tutorials/gradleTutorial.md index d16b72179a..fd6b043bf7 100644 --- a/tutorials/gradleTutorial.md +++ b/tutorials/gradleTutorial.md @@ -74,11 +74,16 @@ plugins { id 'application' id 'checkstyle' } + +checkstyle { + toolVersion = '8.23' +} + // ... ``` Checkstyle expects configuration files for checkstyle to be in `./config/checkstyle/` by convention. -For example, you can copy [these files from se-edu/addressbook-level3](https://github.com/se-edu/addressbook-level3/blob/master/config/checkstyle/) to your project. +A sample checkstyle rule configuration is provided in the branch. The plugin adds a few _tasks_ to your project. Run `gradlew checkstyleMain checkstyleTest` to verify that you have set up Checkstyle properly (the command will check your main code and test code against the style rules). From cfd6da79bab287c74d4b7f5666e61e686674fb29 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Sun, 18 Aug 2019 23:25:53 +0800 Subject: [PATCH 03/98] Change file mode on `gradle` to be executable --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From a3ca5a4e3fe35013f5690cacd168b19f7370a013 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Wed, 21 Aug 2019 00:32:40 +0800 Subject: [PATCH 04/98] Add configuration for console applications Gradle defaults to an empty stdin which results in runtime exceptions when attempting to read from `System.in`. Let's add some sensible defaults for students who may still need to work with the standard input stream. --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index e5b8ce7e49..ce97c7ba2e 100644 --- a/build.gradle +++ b/build.gradle @@ -14,3 +14,7 @@ application { // Change this to your main class. mainClassName = "seedu.duke.Duke" } + +run { + standardInput = System.in +} \ No newline at end of file From c4678f7d8b2274a013b5a9c920fcfd6981f2122a Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Fri, 20 Sep 2019 16:05:59 +0800 Subject: [PATCH 05/98] JavaFX tutorial: Support cross-platform JARs The OpenJFX plugin expects applications to be modular and bundled with jlink, resulting in fat jars that are not cross-platform. Let's manually include the required dependencies so that shadow can package them properly. --- tutorials/javaFxTutorialPart1.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tutorials/javaFxTutorialPart1.md b/tutorials/javaFxTutorialPart1.md index 2f63317346..48691f7fa1 100644 --- a/tutorials/javaFxTutorialPart1.md +++ b/tutorials/javaFxTutorialPart1.md @@ -27,18 +27,25 @@ A JavaFX application is like a play you are directing. Instead of creating props Update your `build.gradle` to include the following lines: ```groovy -plugins { - id 'java' - id 'org.openjfx.javafxplugin' version '0.0.7' -} - repositories { mavenCentral() } -javafx { - version = "11.0.2" - modules = [ 'javafx.controls', 'javafx.fxml' ] +dependencies { + 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' } ``` From 57e950246623e396805e50651537d0ade40bf005 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 21 Jan 2020 10:55:33 +0800 Subject: [PATCH 06/98] feat: added gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ce97c7ba2e..5ca4f90444 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ repositories { application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke" } run { From d96a62f5e25a5cbf7df697ee3d2bb72385ea0bf8 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 11:37:21 +0800 Subject: [PATCH 07/98] Level-1 --- src/main/java/Boxer.java | 19 +++++++++++++++++++ src/main/java/Duke.java | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/main/java/Boxer.java diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java new file mode 100644 index 0000000000..5bcf7dd1c3 --- /dev/null +++ b/src/main/java/Boxer.java @@ -0,0 +1,19 @@ +public class Boxer { + public void greet() { + String greeting = "Hey there, Red. Anything I can do for you?"; + print(greeting); + } + + public void echo(String toEcho) { + print(toEcho); + } + + public void exit() { + String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; + print(farewell); + } + + public void print(String toPrint) { + System.out.println(toPrint); + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..30e8d93de7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.util.Scanner; public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -6,5 +7,23 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + + Boxer sword = new Boxer(); + sword.greet(); + + Scanner scanner = new Scanner(System.in); + String input; + + while(true) { + input = scanner.next(); + + if (input.equals("bye")) { + sword.exit(); + break; + } else { + sword.echo(input); + } + } + } } From aa0ff80fb33db4d68d26833b1ddd1d6661fa5689 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 12:10:14 +0800 Subject: [PATCH 08/98] Level-2 --- src/main/java/Boxer.java | 22 ++++++++++++++++++++-- src/main/java/Duke.java | 27 +++++++++++++++++---------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index 5bcf7dd1c3..6604bc4ea3 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -1,11 +1,22 @@ +import java.util.ArrayList; + public class Boxer { + // Variables + private ArrayList taskList = new ArrayList(100); + public void greet() { String greeting = "Hey there, Red. Anything I can do for you?"; print(greeting); } - public void echo(String toEcho) { - print(toEcho); + public void add(String task) { + taskList.add(task); + print("added: " + task); + } + + public void list() { + taskList.forEach( + task -> print((taskList.indexOf(task) + 1) + ". " + task)); } public void exit() { @@ -16,4 +27,11 @@ public void exit() { public void print(String toPrint) { System.out.println(toPrint); } + + /* Defunct methods + public void echo(String toEcho) { + print(toEcho); + } + */ + } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 30e8d93de7..98823e113c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,6 @@ import java.util.Scanner; +import java.util.ArrayList; + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -12,18 +14,23 @@ public static void main(String[] args) { sword.greet(); Scanner scanner = new Scanner(System.in); - String input; - - while(true) { - input = scanner.next(); + boolean loop = true; + do { + String input = scanner.nextLine(); - if (input.equals("bye")) { - sword.exit(); - break; - } else { - sword.echo(input); + switch (input) { + case "bye": + sword.exit(); + loop = false; + break; + case "list": + sword.list(); + break; + default: + sword.add(input); + break; } - } + } while (loop); } } From 2abe09b2b3b488dd1ef1c0184ff1ed329b14bd5c Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 13:33:02 +0800 Subject: [PATCH 09/98] A-Classes --- src/main/java/Task.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..51edff399e --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,22 @@ +public class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols + } + + public String getDescription() { + return this.description; + } + + public void markAsDone() { + this.isDone = true; + } + +} From be9398f4b0a9517b8325b2022569e75b1ae1675e Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 13:33:15 +0800 Subject: [PATCH 10/98] Level-3 --- src/main/java/Boxer.java | 23 +++++++++++++++++++---- src/main/java/Duke.java | 12 +++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index 6604bc4ea3..c9a890ec62 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -2,7 +2,7 @@ public class Boxer { // Variables - private ArrayList taskList = new ArrayList(100); + private ArrayList taskList = new ArrayList(100); public void greet() { String greeting = "Hey there, Red. Anything I can do for you?"; @@ -10,13 +10,21 @@ public void greet() { } public void add(String task) { - taskList.add(task); + Task newTask = new Task(task); + taskList.add(newTask); print("added: " + task); } public void list() { - taskList.forEach( - task -> print((taskList.indexOf(task) + 1) + ". " + task)); + taskList.forEach(task -> printTask(task)); + } + + public void done(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + task.markAsDone(); + print("That's another one down. That'll be: "); + printTask(task); + } public void exit() { @@ -28,6 +36,13 @@ public void print(String toPrint) { System.out.println(toPrint); } + public void printTask(Task task) { + print(String.format( + "%d. %s %s", taskList.indexOf(task) + 1, + task.getStatusIcon(), + task.getDescription())); + } + /* Defunct methods public void echo(String toEcho) { print(toEcho); diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 98823e113c..930b99e5d4 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,8 +17,13 @@ public static void main(String[] args) { boolean loop = true; do { String input = scanner.nextLine(); + String[] inputSplit = input.split(" "); - switch (input) { + /* + At this moment switch block cannot catch invalid done cases + eg "done work" will be treated as done block rather than default (add) + */ + switch (inputSplit[0]) { case "bye": sword.exit(); loop = false; @@ -26,6 +31,11 @@ public static void main(String[] args) { case "list": sword.list(); break; + case "done": + int index; + index = Integer.parseInt(inputSplit[1]); + sword.done(index); + break; default: sword.add(input); break; From 681a7c6ae7d858d951dad160183cbe2cd82f3778 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 16:58:41 +0800 Subject: [PATCH 11/98] feat: changed Task from general class to abstract class --- src/main/java/Task.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 51edff399e..f2defda1cb 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,22 +1,30 @@ -public class Task { +public abstract class Task { protected String description; + protected String type; + protected String date; protected boolean isDone; - public Task(String description) { - this.description = description; - this.isDone = false; - } - public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } + //Type should only be T(odo), D(eadline), or E(vent). + public String getType() { + return this.type; + } + public String getDescription() { return this.description; } + public String getDate() { + return this.date; + } + public void markAsDone() { this.isDone = true; } + public abstract String printTaskDetails(); + } From 77b10fa5323c08f26c3aa3cfe96083470a862bc0 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 16:59:06 +0800 Subject: [PATCH 12/98] A-Inheritance --- src/main/java/Deadline.java | 18 ++++++++++++++++++ src/main/java/Event.java | 18 ++++++++++++++++++ src/main/java/Todo.java | 16 ++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.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..73b8ff166f --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,18 @@ +public class Deadline extends Task{ + public Deadline(String description, String date) { + this.description = description; + this.type = "D"; + this.date = date; + this.isDone = false; + } + + @Override + public String printTaskDetails() { + return String.format( + "[%s][%s] %s (%s)", + this.getType(), + this.getStatusIcon(), + this.getDescription(), + this.getDate()); + } +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..3e5736d0f7 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,18 @@ +public class Event extends Task{ + public Event(String description, String date) { + this.description = description; + this.type = "E"; + this.date = date; + this.isDone = false; + } + + @Override + public String printTaskDetails() { + return String.format( + "[%s][%s] %s (%s)", + this.getType(), + this.getStatusIcon(), + this.getDescription(), + this.getDate()); + } +} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..a6254073db --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,16 @@ +public class Todo extends Task { + public Todo(String description) { + this.description = description; + this.type = "T"; + this.isDone = false; + } + + @Override + public String printTaskDetails() { + return String.format( + "[%s][%s] %s", + this.getType(), + this.getStatusIcon(), + this.getDescription()); + } +} From cfa99abcf866202217cc485c8313824d86e398ec Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 21 Jan 2020 16:59:42 +0800 Subject: [PATCH 13/98] Level-4 --- src/main/java/Boxer.java | 40 +++++++++++++++++++++++++++------------- src/main/java/Duke.java | 21 +++++++++++++++------ 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index c9a890ec62..976346d360 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -1,4 +1,5 @@ import java.util.ArrayList; +import java.util.Arrays; public class Boxer { // Variables @@ -9,22 +10,42 @@ public void greet() { print(greeting); } - public void add(String task) { - Task newTask = new Task(task); + public void event(String task) { + String[] split = task.split("/", 2); + Event newTask = new Event(split[0], split[1]); + taskList.add(newTask); + print("added: " + task); + } + + public void deadline(String task) { + String[] split = task.split("/", 2); + print(Arrays.toString(split)); + Deadline newTask = new Deadline(split[0], split[1]); + print(newTask.printTaskDetails()); + taskList.add(newTask); + print("added: " + task); + } + + public void todo(String task) { + Todo newTask = new Todo(task); taskList.add(newTask); print("added: " + task); } public void list() { - taskList.forEach(task -> printTask(task)); + taskList.forEach(task -> Boxer.print(String.format( + "%d. %s", + (taskList.indexOf(task) + 1), + task.printTaskDetails()))); + print(String.format( + "That's %d in the list.", taskList.size())); } public void done(int taskIndex) { Task task = taskList.get(taskIndex - 1); task.markAsDone(); print("That's another one down. That'll be: "); - printTask(task); - + print(task.printTaskDetails()); } public void exit() { @@ -32,17 +53,10 @@ public void exit() { print(farewell); } - public void print(String toPrint) { + public static void print(String toPrint) { System.out.println(toPrint); } - public void printTask(Task task) { - print(String.format( - "%d. %s %s", taskList.indexOf(task) + 1, - task.getStatusIcon(), - task.getDescription())); - } - /* Defunct methods public void echo(String toEcho) { print(toEcho); diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 930b99e5d4..5f5e6f29ce 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,16 +17,21 @@ public static void main(String[] args) { boolean loop = true; do { String input = scanner.nextLine(); - String[] inputSplit = input.split(" "); + String[] inputSplit = input.split(" ", 2); /* - At this moment switch block cannot catch invalid done cases + At this moment switch block cannot catch invalid cases eg "done work" will be treated as done block rather than default (add) */ switch (inputSplit[0]) { - case "bye": - sword.exit(); - loop = false; + case "todo": + sword.todo(inputSplit[1]); + break; + case "deadline": + sword.deadline(inputSplit[1]); + break; + case "event": + sword.event(inputSplit[1]); break; case "list": sword.list(); @@ -36,8 +41,12 @@ public static void main(String[] args) { index = Integer.parseInt(inputSplit[1]); sword.done(index); break; + case "bye": + sword.exit(); + loop = false; + break; default: - sword.add(input); + sword.print("Uhh... You're gonna have to say that again, Red."); break; } } while (loop); From b3e6d6dc36b1a0a6b1f1ffb6194e043f8bbede43 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 13:43:17 +0800 Subject: [PATCH 14/98] A-TextUiTesting --- text-ui-test/ACTUAL.TXT | 26 ++++++++++++++++++++++++++ text-ui-test/EXPECTED.txt | 26 ++++++++++++++++++++++++++ text-ui-test/input.txt | 9 +++++++++ text-ui-test/runtest.bat | 21 +++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 text-ui-test/ACTUAL.TXT create mode 100644 text-ui-test/EXPECTED.txt create mode 100644 text-ui-test/input.txt create mode 100644 text-ui-test/runtest.bat diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT new file mode 100644 index 0000000000..5ccb59d5c7 --- /dev/null +++ b/text-ui-test/ACTUAL.TXT @@ -0,0 +1,26 @@ +Hello from + ____ _ +| _ \ _ _| | _____ +| | | | | | | |/ / _ \ +| |_| | |_| | < __/ +|____/ \__,_|_|\_\___| + +Hey there, Red. Anything I can do for you? +Uhh... You're gonna have to say that again, Red. +That's 0 in the list. +added: stay alive +[return the Transistor , by this Sunday midnight] +[D][?] return the Transistor (by this Sunday midnight) +added: return the Transistor /by this Sunday midnight +added: concert at the Empty Set /at this Saturday 6pm-9pm +1. [T][?] stay alive +2. [D][?] return the Transistor (by this Sunday midnight) +3. [E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +That's 3 in the list. +That's another one down. That'll be: +[E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +1. [T][?] stay alive +2. [D][?] return the Transistor (by this Sunday midnight) +3. [E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +That's 3 in the list. +Guess that's enough for now. I've got your back, so you keep me close. diff --git a/text-ui-test/EXPECTED.txt b/text-ui-test/EXPECTED.txt new file mode 100644 index 0000000000..5ccb59d5c7 --- /dev/null +++ b/text-ui-test/EXPECTED.txt @@ -0,0 +1,26 @@ +Hello from + ____ _ +| _ \ _ _| | _____ +| | | | | | | |/ / _ \ +| |_| | |_| | < __/ +|____/ \__,_|_|\_\___| + +Hey there, Red. Anything I can do for you? +Uhh... You're gonna have to say that again, Red. +That's 0 in the list. +added: stay alive +[return the Transistor , by this Sunday midnight] +[D][?] return the Transistor (by this Sunday midnight) +added: return the Transistor /by this Sunday midnight +added: concert at the Empty Set /at this Saturday 6pm-9pm +1. [T][?] stay alive +2. [D][?] return the Transistor (by this Sunday midnight) +3. [E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +That's 3 in the list. +That's another one down. That'll be: +[E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +1. [T][?] stay alive +2. [D][?] return the Transistor (by this Sunday midnight) +3. [E][?] concert at the Empty Set (at this Saturday 6pm-9pm) +That's 3 in the list. +Guess that's enough for now. I've got your back, so you keep me close. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt new file mode 100644 index 0000000000..9450d83f33 --- /dev/null +++ b/text-ui-test/input.txt @@ -0,0 +1,9 @@ +hi +list +todo stay alive +deadline return the Transistor /by this Sunday midnight +event concert at the Empty Set /at this Saturday 6pm-9pm +list +done 3 +list +bye \ No newline at end of file diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat new file mode 100644 index 0000000000..32bacbf241 --- /dev/null +++ b/text-ui-test/runtest.bat @@ -0,0 +1,21 @@ +@ECHO OFF + +REM create bin directory if it doesn't exist +if not exist ..\bin mkdir ..\bin + +REM delete output from previous run +del ACTUAL.TXT + +REM compile the code into the bin folder +javac -cp ..\src -Xlint:none -d ..\bin D:\School\1_Current_Sem\CS2103T\Duke\src\main\java\*.java +IF ERRORLEVEL 1 ( + echo ********** BUILD FAILURE ********** + exit /b 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 + +REM compare the output to the expected output +FC ACTUAL.TXT EXPECTED.TXT \ No newline at end of file From de4902b49b239b3d23edd4a33ab7cea2b7d06ce9 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 23:09:41 +0800 Subject: [PATCH 15/98] feat: TaskHandler to offload main class's work --- src/main/java/Duke.java | 45 +++---------------------------- src/main/java/TaskHandler.java | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 src/main/java/TaskHandler.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5f5e6f29ce..1e841b70ab 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -10,46 +10,9 @@ public static void main(String[] args) { + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); - Boxer sword = new Boxer(); - sword.greet(); - - Scanner scanner = new Scanner(System.in); - boolean loop = true; - do { - String input = scanner.nextLine(); - String[] inputSplit = input.split(" ", 2); - - /* - At this moment switch block cannot catch invalid cases - eg "done work" will be treated as done block rather than default (add) - */ - switch (inputSplit[0]) { - case "todo": - sword.todo(inputSplit[1]); - break; - case "deadline": - sword.deadline(inputSplit[1]); - break; - case "event": - sword.event(inputSplit[1]); - break; - case "list": - sword.list(); - break; - case "done": - int index; - index = Integer.parseInt(inputSplit[1]); - sword.done(index); - break; - case "bye": - sword.exit(); - loop = false; - break; - default: - sword.print("Uhh... You're gonna have to say that again, Red."); - break; - } - } while (loop); - + TaskHandler taskHandler = new TaskHandler(); + Boxer boxer = new Boxer(); + boxer.greet(); + taskHandler.handle(boxer); } } diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java new file mode 100644 index 0000000000..3b5c4100ce --- /dev/null +++ b/src/main/java/TaskHandler.java @@ -0,0 +1,49 @@ +import java.util.Scanner; + +public class TaskHandler { + + + public void handle(Boxer boxer) { + Scanner scanner = new Scanner(System.in); + boolean loop = true; + do { + String input = scanner.nextLine(); + String[] inputSplit = input.split(" ", 2); + + /* + At this moment switch block cannot catch invalid cases + eg "done work" will be treated as done block rather than default (add) + */ + try { + switch (inputSplit[0]) { + case "todo": + boxer.todo(inputSplit[1]); + break; + case "deadline": + boxer.deadline(inputSplit[1]); + break; + case "event": + boxer.event(inputSplit[1]); + break; + case "done": + int index; + index = Integer.parseInt(inputSplit[1]); + boxer.done(index); + break; + case "list": + boxer.list(); + break; + case "bye": + boxer.exit(); + loop = false; + break; + default: + Boxer.print("Uhh... You're gonna have to say that again, Red."); + break; + } + } catch(Exception e) { + + } + } while (loop); + } +} From ee7a16e15bc5f7f954fa79cd7ce353f52e04511a Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 23:10:20 +0800 Subject: [PATCH 16/98] feat: Create base DukeException and extended EmptyFieldException --- src/main/java/DukeException.java | 11 +++++++++++ src/main/java/EmptyFieldException.java | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 src/main/java/DukeException.java create mode 100644 src/main/java/EmptyFieldException.java diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..22ceba14ac --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,11 @@ +public class DukeException extends Exception { + public DukeException(String message) { + super(message); + } + + /* + AlreadyDoneException + TaskListOutOfBoundsException + WrongCommandException + */ +} diff --git a/src/main/java/EmptyFieldException.java b/src/main/java/EmptyFieldException.java new file mode 100644 index 0000000000..25321a3549 --- /dev/null +++ b/src/main/java/EmptyFieldException.java @@ -0,0 +1,5 @@ +public class EmptyFieldException extends DukeException { + public EmptyFieldException(String message) { + super(message); + } +} From c2119f70c12f495423e95e5ec4534fa82e756874 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 23:10:55 +0800 Subject: [PATCH 17/98] feat: minor change from printTaskDetails method to toString, allowing for easy printing of formatted details --- src/main/java/Deadline.java | 2 +- src/main/java/Event.java | 2 +- src/main/java/Task.java | 2 -- src/main/java/Todo.java | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 73b8ff166f..0825398bf6 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -7,7 +7,7 @@ public Deadline(String description, String date) { } @Override - public String printTaskDetails() { + public String toString() { return String.format( "[%s][%s] %s (%s)", this.getType(), diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 3e5736d0f7..9982c490cc 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -7,7 +7,7 @@ public Event(String description, String date) { } @Override - public String printTaskDetails() { + public String toString() { return String.format( "[%s][%s] %s (%s)", this.getType(), diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f2defda1cb..7c19aeadbf 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -25,6 +25,4 @@ public void markAsDone() { this.isDone = true; } - public abstract String printTaskDetails(); - } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index a6254073db..7ac0446490 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -6,7 +6,7 @@ public Todo(String description) { } @Override - public String printTaskDetails() { + public String toString() { return String.format( "[%s][%s] %s", this.getType(), From eeadc3485fffbde3a996383c471780e35c3876f9 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 23:11:15 +0800 Subject: [PATCH 18/98] fix: change Boxer's printing of task details to toString methods --- src/main/java/Boxer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index 976346d360..13fad5da85 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -21,7 +21,7 @@ public void deadline(String task) { String[] split = task.split("/", 2); print(Arrays.toString(split)); Deadline newTask = new Deadline(split[0], split[1]); - print(newTask.printTaskDetails()); + print(newTask.toString()); taskList.add(newTask); print("added: " + task); } @@ -36,7 +36,7 @@ public void list() { taskList.forEach(task -> Boxer.print(String.format( "%d. %s", (taskList.indexOf(task) + 1), - task.printTaskDetails()))); + task.toString()))); print(String.format( "That's %d in the list.", taskList.size())); } @@ -45,7 +45,7 @@ public void done(int taskIndex) { Task task = taskList.get(taskIndex - 1); task.markAsDone(); print("That's another one down. That'll be: "); - print(task.printTaskDetails()); + print(task.toString()); } public void exit() { From 8b900048c87010faeefcad966e247f5028493c71 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 22 Jan 2020 23:59:53 +0800 Subject: [PATCH 19/98] fix: removed array print statement --- src/main/java/Boxer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index 13fad5da85..e296c17664 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -19,7 +19,6 @@ public void event(String task) { public void deadline(String task) { String[] split = task.split("/", 2); - print(Arrays.toString(split)); Deadline newTask = new Deadline(split[0], split[1]); print(newTask.toString()); taskList.add(newTask); From 75205819a6a11632eb7a72a30baa9958a9e9bd6d Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:00:37 +0800 Subject: [PATCH 20/98] feat: added exceptionHandler object creation --- src/main/java/TaskHandler.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 3b5c4100ce..8b5b51016e 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -1,20 +1,17 @@ import java.util.Scanner; public class TaskHandler { - - public void handle(Boxer boxer) { Scanner scanner = new Scanner(System.in); + ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; do { String input = scanner.nextLine(); String[] inputSplit = input.split(" ", 2); - /* - At this moment switch block cannot catch invalid cases - eg "done work" will be treated as done block rather than default (add) - */ try { + exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); + switch (inputSplit[0]) { case "todo": boxer.todo(inputSplit[1]); @@ -41,8 +38,8 @@ public void handle(Boxer boxer) { Boxer.print("Uhh... You're gonna have to say that again, Red."); break; } - } catch(Exception e) { - + } catch(EmptyFieldException ex) { + System.err.println(ex); } } while (loop); } From 63d226441d8aa485ec53d5f5ce0ab84986f657a1 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:00:51 +0800 Subject: [PATCH 21/98] feat: defined ExceptionHandler --- src/main/java/ExceptionHandler.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/ExceptionHandler.java diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java new file mode 100644 index 0000000000..9b4d34015a --- /dev/null +++ b/src/main/java/ExceptionHandler.java @@ -0,0 +1,16 @@ +public class ExceptionHandler { + public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { + if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { + if (taskStringArr.length != 2) { + throw new EmptyFieldException( + "You're usually not that taciturn, Red. Explain things to me."); + } else if (!type.equals("todo")) { + String[] time = taskStringArr[1].split("/", 2); + if (time.length != 2) { + throw new EmptyFieldException( + "We're running short of time, so make sure you note it down."); + } + } + } + } +} From 7316fc3cbf3556392e982b41515f746310291365 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:10:52 +0800 Subject: [PATCH 22/98] fix: ExceptionHandler now correctly identifies empty description despite presence of date field. --- src/main/java/ExceptionHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java index 9b4d34015a..314a720912 100644 --- a/src/main/java/ExceptionHandler.java +++ b/src/main/java/ExceptionHandler.java @@ -1,14 +1,21 @@ +import java.util.Arrays; + public class ExceptionHandler { public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { + System.out.println(Arrays.toString(taskStringArr)); if (taskStringArr.length != 2) { throw new EmptyFieldException( "You're usually not that taciturn, Red. Explain things to me."); } else if (!type.equals("todo")) { String[] time = taskStringArr[1].split("/", 2); + System.out.println(Arrays.toString(time)); if (time.length != 2) { throw new EmptyFieldException( "We're running short of time, so make sure you note it down."); + } else if (time[0].isEmpty()) { + throw new EmptyFieldException( + "You're usually not that taciturn, Red. Explain things to me."); } } } From d40b10a18953842df7045999489a5305ae0310d0 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:38:49 +0800 Subject: [PATCH 23/98] Level-5 --- src/main/java/TaskHandler.java | 3 ++- src/main/java/WrongCommandException.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/main/java/WrongCommandException.java diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 8b5b51016e..5391b3dc11 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -10,6 +10,7 @@ public void handle(Boxer boxer) { String[] inputSplit = input.split(" ", 2); try { + exceptionHandler.checkWrongCommand(inputSplit[0]); exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); switch (inputSplit[0]) { @@ -38,7 +39,7 @@ public void handle(Boxer boxer) { Boxer.print("Uhh... You're gonna have to say that again, Red."); break; } - } catch(EmptyFieldException ex) { + } catch(DukeException ex) { System.err.println(ex); } } while (loop); diff --git a/src/main/java/WrongCommandException.java b/src/main/java/WrongCommandException.java new file mode 100644 index 0000000000..dd5de5984c --- /dev/null +++ b/src/main/java/WrongCommandException.java @@ -0,0 +1,5 @@ +public class WrongCommandException extends DukeException { + public WrongCommandException(String message) { + super(message); + } +} \ No newline at end of file From d94837e609d2bd5df9684a55cd390174289f8bf5 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:38:57 +0800 Subject: [PATCH 24/98] A-Exceptions --- src/main/java/ExceptionHandler.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java index 314a720912..102111b0bf 100644 --- a/src/main/java/ExceptionHandler.java +++ b/src/main/java/ExceptionHandler.java @@ -3,13 +3,11 @@ public class ExceptionHandler { public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { - System.out.println(Arrays.toString(taskStringArr)); if (taskStringArr.length != 2) { throw new EmptyFieldException( "You're usually not that taciturn, Red. Explain things to me."); } else if (!type.equals("todo")) { String[] time = taskStringArr[1].split("/", 2); - System.out.println(Arrays.toString(time)); if (time.length != 2) { throw new EmptyFieldException( "We're running short of time, so make sure you note it down."); @@ -20,4 +18,16 @@ public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFie } } } + + public void checkWrongCommand(String type) throws WrongCommandException{ + if (!(type.equals("todo") + || type.equals("deadline") + || type.equals("event") + || type.equals("list") + || type.equals("done") + || type.equals("bye"))) { + throw new WrongCommandException( + "Uhh... You're gonna have to say that again, Red."); + } + } } From a4db5957dd893b14b514285b7ce070da4b12b305 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 23 Jan 2020 00:50:25 +0800 Subject: [PATCH 25/98] Level-6 --- src/main/java/Boxer.java | 7 +++++++ src/main/java/ExceptionHandler.java | 1 + src/main/java/TaskHandler.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index e296c17664..6a5f961b8e 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -47,6 +47,13 @@ public void done(int taskIndex) { print(task.toString()); } + public void delete(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + taskList.remove(taskIndex - 1); + print("Don't need this here anymore eh? Off it goes."); + print(task.toString()); + } + public void exit() { String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; print(farewell); diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java index 102111b0bf..e31bb2b0a9 100644 --- a/src/main/java/ExceptionHandler.java +++ b/src/main/java/ExceptionHandler.java @@ -25,6 +25,7 @@ public void checkWrongCommand(String type) throws WrongCommandException{ || type.equals("event") || type.equals("list") || type.equals("done") + || type.equals("delete") || type.equals("bye"))) { throw new WrongCommandException( "Uhh... You're gonna have to say that again, Red."); diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 5391b3dc11..4b505eec99 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -28,6 +28,10 @@ public void handle(Boxer boxer) { index = Integer.parseInt(inputSplit[1]); boxer.done(index); break; + case "delete": + index = Integer.parseInt(inputSplit[1]); + boxer.delete(index); + break; case "list": boxer.list(); break; From 991b12d457149f2659961d59e7a902b36a543a9e Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 30 Jan 2020 12:22:56 +0800 Subject: [PATCH 26/98] feat: Removed Boxer; combined wiht TaskHandler, added getIsDone to Task --- src/main/java/Boxer.java | 58 ---------------------- src/main/java/Task.java | 6 ++- src/main/java/TaskHandler.java | 89 ++++++++++++++++++++++++++++++---- 3 files changed, 84 insertions(+), 69 deletions(-) diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java index 6a5f961b8e..96c8a95bb2 100644 --- a/src/main/java/Boxer.java +++ b/src/main/java/Boxer.java @@ -3,65 +3,7 @@ public class Boxer { // Variables - private ArrayList taskList = new ArrayList(100); - public void greet() { - String greeting = "Hey there, Red. Anything I can do for you?"; - print(greeting); - } - - public void event(String task) { - String[] split = task.split("/", 2); - Event newTask = new Event(split[0], split[1]); - taskList.add(newTask); - print("added: " + task); - } - - public void deadline(String task) { - String[] split = task.split("/", 2); - Deadline newTask = new Deadline(split[0], split[1]); - print(newTask.toString()); - taskList.add(newTask); - print("added: " + task); - } - - public void todo(String task) { - Todo newTask = new Todo(task); - taskList.add(newTask); - print("added: " + task); - } - - public void list() { - taskList.forEach(task -> Boxer.print(String.format( - "%d. %s", - (taskList.indexOf(task) + 1), - task.toString()))); - print(String.format( - "That's %d in the list.", taskList.size())); - } - - public void done(int taskIndex) { - Task task = taskList.get(taskIndex - 1); - task.markAsDone(); - print("That's another one down. That'll be: "); - print(task.toString()); - } - - public void delete(int taskIndex) { - Task task = taskList.get(taskIndex - 1); - taskList.remove(taskIndex - 1); - print("Don't need this here anymore eh? Off it goes."); - print(task.toString()); - } - - public void exit() { - String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; - print(farewell); - } - - public static void print(String toPrint) { - System.out.println(toPrint); - } /* Defunct methods public void echo(String toEcho) { diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7c19aeadbf..d0646a7acc 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -8,6 +8,10 @@ public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } + public boolean getIsDone() { + return this.isDone; + } + //Type should only be T(odo), D(eadline), or E(vent). public String getType() { return this.type; @@ -25,4 +29,4 @@ public void markAsDone() { this.isDone = true; } -} +} \ No newline at end of file diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 4b505eec99..2f55c5dc98 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -1,7 +1,76 @@ +import java.io.IOException; +import java.util.ArrayList; import java.util.Scanner; public class TaskHandler { - public void handle(Boxer boxer) { + ArrayList taskList; + Saver saver; + + public TaskHandler() throws IOException { + taskList = new ArrayList(100); + saver = new Saver(); + } + + public void greet() { + String greeting = "Hey there, Red. Anything I can do for you?"; + print(greeting); + } + + public void event(String task) { + String[] split = task.split("/", 2); + Event newTask = new Event(split[0], split[1]); + taskList.add(newTask); + print("added: " + task); + } + + public void deadline(String task) { + String[] split = task.split("/", 2); + Deadline newTask = new Deadline(split[0], split[1]); + print(newTask.toString()); + taskList.add(newTask); + print("added: " + task); + } + + public void todo(String task) { + Todo newTask = new Todo(task); + taskList.add(newTask); + print("added: " + task); + } + + public void list() { + taskList.forEach(task -> TaskHandler.print(String.format( + "%d. %s", + (taskList.indexOf(task) + 1), + task.toString()))); + print(String.format( + "That's %d in the list.", taskList.size())); + } + + public void done(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + task.markAsDone(); + print("That's another one down. That'll be: "); + print(task.toString()); + } + + public void delete(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + taskList.remove(taskIndex - 1); + print("Don't need this here anymore eh? Off it goes."); + print(task.toString()); + } + + public void exit() throws IOException { + this.saver.fullSaver(this.taskList); + String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; + print(farewell); + } + + public static void print(String toPrint) { + System.out.println(toPrint); + } + + public void handle() { Scanner scanner = new Scanner(System.in); ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; @@ -15,35 +84,35 @@ public void handle(Boxer boxer) { switch (inputSplit[0]) { case "todo": - boxer.todo(inputSplit[1]); + this.todo(inputSplit[1]); break; case "deadline": - boxer.deadline(inputSplit[1]); + this.deadline(inputSplit[1]); break; case "event": - boxer.event(inputSplit[1]); + this.event(inputSplit[1]); break; case "done": int index; index = Integer.parseInt(inputSplit[1]); - boxer.done(index); + this.done(index); break; case "delete": index = Integer.parseInt(inputSplit[1]); - boxer.delete(index); + this.delete(index); break; case "list": - boxer.list(); + this.list(); break; case "bye": - boxer.exit(); + this.exit(); loop = false; break; default: - Boxer.print("Uhh... You're gonna have to say that again, Red."); + this.print("Uhh... You're gonna have to say that again, Red."); break; } - } catch(DukeException ex) { + } catch(DukeException | IOException ex) { System.err.println(ex); } } while (loop); From b7e5046374fb9a251f475c41fb054f571f54270e Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 00:40:57 +0800 Subject: [PATCH 27/98] Level-7 --- savedata.txt | 2 + src/main/java/Deadline.java | 6 ++- src/main/java/Duke.java | 10 ++-- src/main/java/Event.java | 4 +- src/main/java/Saver.java | 70 ++++++++++++++++++++++++++ src/main/java/Task.java | 17 +++++-- src/main/java/TaskHandler.java | 92 ++++++++++++++++++++++++++++++---- 7 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 savedata.txt create mode 100644 src/main/java/Saver.java diff --git a/savedata.txt b/savedata.txt new file mode 100644 index 0000000000..e6763197fd --- /dev/null +++ b/savedata.txt @@ -0,0 +1,2 @@ +T|0|a|null +T|0|b|null diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 0825398bf6..881fdc8315 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,8 +1,10 @@ +import java.time.LocalDate; + public class Deadline extends Task{ public Deadline(String description, String date) { this.description = description; this.type = "D"; - this.date = date; + this.date = parseDate(date); this.isDone = false; } @@ -13,6 +15,6 @@ public String toString() { this.getType(), this.getStatusIcon(), this.getDescription(), - this.getDate()); + this.formatDate(getDate())); } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1e841b70ab..043bd45888 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,8 +1,9 @@ +import java.io.IOException; import java.util.Scanner; import java.util.ArrayList; public class Duke { - public static void main(String[] args) { + public static void main(String[] args) throws IOException { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" @@ -11,8 +12,9 @@ public static void main(String[] args) { System.out.println("Hello from\n" + logo); TaskHandler taskHandler = new TaskHandler(); - Boxer boxer = new Boxer(); - boxer.greet(); - taskHandler.handle(boxer); + // Saver saver = new Saver(); + taskHandler.greet(); + taskHandler.handle(); + // saver.fullSaver(taskHandler.taskList); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 9982c490cc..69610438c3 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -2,7 +2,7 @@ public class Event extends Task{ public Event(String description, String date) { this.description = description; this.type = "E"; - this.date = date; + this.date = parseDate(date); this.isDone = false; } @@ -13,6 +13,6 @@ public String toString() { this.getType(), this.getStatusIcon(), this.getDescription(), - this.getDate()); + this.formatDate(getDate())); } } diff --git a/src/main/java/Saver.java b/src/main/java/Saver.java new file mode 100644 index 0000000000..75888e992b --- /dev/null +++ b/src/main/java/Saver.java @@ -0,0 +1,70 @@ +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class Saver { + public static String taskParser(Task task) { + String taskString; + String isDone = task.getIsDone() ? "1" : "0"; + taskString = String.format( + "%s|%s|%s|%s", + task.getType(), isDone, + task.getDescription(), task.getDate()); + return taskString; + } + + public static void fullSaver(ArrayList taskList) throws IOException { + try { + File file = new File("savedata.txt"); + FileWriter writer = new FileWriter(file); + + for (Task task : taskList) { + String data = taskParser(task); + System.out.println(data); + writer.write(data + "\n"); + } + + writer.close(); + } catch (IOException ioe) { + System.out.println(ioe.getMessage()); + } + } + + public static void loader(ArrayList taskList) throws IOException { + try { + File file = new File("savedata.txt"); + FileReader reader = new FileReader(file); + Scanner scanner = new Scanner(file); + + while (scanner.hasNextLine()) { + String line = scanner.nextLine(); + String[] lineSplit = line.split("|"); + Task task; + + switch (lineSplit[0]) { + case "T": + task = new Todo(lineSplit[2]); + break; + case "D": + task = new Deadline(lineSplit[2], lineSplit[3]); + break; + case "E": + task = new Event(lineSplit[2], lineSplit[3]); + break; + default: + throw new IllegalStateException("Unexpected value: " + lineSplit[0]); + } + if (lineSplit[1].equals("1")) {task.markAsDone();} + taskList.add(task); + } + scanner.close(); + + } catch (IOException ioe) { + System.out.println(ioe.getMessage()); + } + } + +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7c19aeadbf..dbd06895fa 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,13 +1,22 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +import static java.time.LocalDate.parse; + public abstract class Task { protected String description; protected String type; - protected String date; + protected LocalDate date; protected boolean isDone; public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } + public boolean getIsDone() { + return this.isDone; + } + //Type should only be T(odo), D(eadline), or E(vent). public String getType() { return this.type; @@ -17,7 +26,7 @@ public String getDescription() { return this.description; } - public String getDate() { + public LocalDate getDate() { return this.date; } @@ -25,4 +34,6 @@ public void markAsDone() { this.isDone = true; } -} + + +} \ No newline at end of file diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 4b505eec99..87ccc187e5 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -1,10 +1,82 @@ +import java.io.IOException; +import java.util.ArrayList; import java.util.Scanner; public class TaskHandler { - public void handle(Boxer boxer) { + ArrayList taskList; + Saver saver; + + public TaskHandler() throws IOException { + taskList = new ArrayList(100); + saver = new Saver(); + } + + public void greet() { + String greeting = "Hey there, Red. Anything I can do for you?"; + print(greeting); + } + + public void event(String task) { + String[] split = task.split("/", 2); + Event newTask = new Event(split[0], split[1]); + taskList.add(newTask); + print("added: " + task); + } + + public void deadline(String task) { + String[] split = task.split("/", 2); + Deadline newTask = new Deadline(split[0], split[1]); + print(newTask.toString()); + taskList.add(newTask); + print("added: " + task); + } + + public void todo(String task) { + Todo newTask = new Todo(task); + taskList.add(newTask); + print("added: " + task); + } + + public void list() { + taskList.forEach(task -> TaskHandler.print(String.format( + "%d. %s", + (taskList.indexOf(task) + 1), + task.toString()))); + print(String.format( + "That's %d in the list.", taskList.size())); + } + + public void done(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + task.markAsDone(); + print("That's another one down. That'll be: "); + print(task.toString()); + } + + public void delete(int taskIndex) { + Task task = taskList.get(taskIndex - 1); + taskList.remove(taskIndex - 1); + print("Don't need this here anymore eh? Off it goes."); + print(task.toString()); + } + + public void exit() throws IOException { + Saver.fullSaver(this.taskList); + String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; + print(farewell); + } + + public static void print(String toPrint) { + System.out.println(toPrint); + } + + public void handle() throws IOException { + Saver.loader(taskList); + Scanner scanner = new Scanner(System.in); ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; + do { String input = scanner.nextLine(); String[] inputSplit = input.split(" ", 2); @@ -15,35 +87,35 @@ public void handle(Boxer boxer) { switch (inputSplit[0]) { case "todo": - boxer.todo(inputSplit[1]); + this.todo(inputSplit[1]); break; case "deadline": - boxer.deadline(inputSplit[1]); + this.deadline(inputSplit[1]); break; case "event": - boxer.event(inputSplit[1]); + this.event(inputSplit[1]); break; case "done": int index; index = Integer.parseInt(inputSplit[1]); - boxer.done(index); + this.done(index); break; case "delete": index = Integer.parseInt(inputSplit[1]); - boxer.delete(index); + this.delete(index); break; case "list": - boxer.list(); + this.list(); break; case "bye": - boxer.exit(); + this.exit(); loop = false; break; default: - Boxer.print("Uhh... You're gonna have to say that again, Red."); + print("Uhh... You're gonna have to say that again, Red."); break; } - } catch(DukeException ex) { + } catch(DukeException | IOException ex) { System.err.println(ex); } } while (loop); From 0f66914b306547c4cb51278ef01446e3cad54b69 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 00:50:17 +0800 Subject: [PATCH 28/98] feat: Added standardised Date object --- src/main/java/Task.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7c19aeadbf..fe5a9ffdc8 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,3 +1,6 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public abstract class Task { protected String description; protected String type; @@ -25,4 +28,13 @@ public void markAsDone() { this.isDone = true; } + public LocalDate parseDate(String stringDate) { + return LocalDate.parse(stringDate); + } + + public String formatDate(LocalDate date) { + return date.format( + DateTimeFormatter.ofPattern("MMM dd yyyy")); + } + } From 3cedd342048f04f24d44a526f3d6ed2d23d4a857 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 00:57:27 +0800 Subject: [PATCH 29/98] feat: changed String date property to LocalDate object --- src/main/java/Deadline.java | 4 ++-- src/main/java/Event.java | 4 ++-- src/main/java/Task.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 0825398bf6..556b62beea 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -2,7 +2,7 @@ public class Deadline extends Task{ public Deadline(String description, String date) { this.description = description; this.type = "D"; - this.date = date; + this.date = parseDate(date); this.isDone = false; } @@ -13,6 +13,6 @@ public String toString() { this.getType(), this.getStatusIcon(), this.getDescription(), - this.getDate()); + formatDate(this.getDate())); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 9982c490cc..7d9fcb336b 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -2,7 +2,7 @@ public class Event extends Task{ public Event(String description, String date) { this.description = description; this.type = "E"; - this.date = date; + this.date = parseDate(date); this.isDone = false; } @@ -13,6 +13,6 @@ public String toString() { this.getType(), this.getStatusIcon(), this.getDescription(), - this.getDate()); + formatDate(this.getDate())); } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index fe5a9ffdc8..bbe94101ac 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -4,7 +4,7 @@ public abstract class Task { protected String description; protected String type; - protected String date; + protected LocalDate date; protected boolean isDone; public String getStatusIcon() { @@ -20,7 +20,7 @@ public String getDescription() { return this.description; } - public String getDate() { + public LocalDate getDate() { return this.date; } From a92b806fbac452b1a081b257e24efde9ad19107b Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 01:15:40 +0800 Subject: [PATCH 30/98] fix: Added date-related methods back after conflict --- src/main/java/Task.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index d0646a7acc..3d4c3812b2 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,7 +1,10 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public abstract class Task { protected String description; protected String type; - protected String date; + protected LocalDate date; protected boolean isDone; public String getStatusIcon() { @@ -21,7 +24,7 @@ public String getDescription() { return this.description; } - public String getDate() { + public LocalDate getDate() { return this.date; } @@ -29,4 +32,13 @@ public void markAsDone() { this.isDone = true; } + public LocalDate parseDate(String stringDate) { + return LocalDate.parse(stringDate); + } + + public String formatDate(LocalDate date) { + return date.format( + DateTimeFormatter.ofPattern("MMM dd yyyy")); + } + } \ No newline at end of file From 8255778f121767df0558f5c7688f2369f57ffbd2 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 01:15:57 +0800 Subject: [PATCH 31/98] feat: savedata file. To be overriden upon leaving program --- savedata.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/savedata.txt b/savedata.txt index e6763197fd..941c177738 100644 --- a/savedata.txt +++ b/savedata.txt @@ -1,2 +1 @@ T|0|a|null -T|0|b|null From 2583094af448ee3fa230c5548fe40b2ef30f232c Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 01:16:36 +0800 Subject: [PATCH 32/98] fix: Added load function back into TaskHandler. Changed fullsaver to be called by Saver. --- src/main/java/TaskHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index 2f55c5dc98..db60c60c6d 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -61,7 +61,7 @@ public void delete(int taskIndex) { } public void exit() throws IOException { - this.saver.fullSaver(this.taskList); + Saver.fullSaver(this.taskList); String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; print(farewell); } @@ -70,7 +70,9 @@ public static void print(String toPrint) { System.out.println(toPrint); } - public void handle() { + public void handle() throws IOException { + Saver.loader(taskList); + Scanner scanner = new Scanner(System.in); ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; @@ -109,7 +111,7 @@ public void handle() { loop = false; break; default: - this.print("Uhh... You're gonna have to say that again, Red."); + print("Uhh... You're gonna have to say that again, Red."); break; } } catch(DukeException | IOException ex) { From 7e62b6d196e1dfa1ad371174bc015722079e3029 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Fri, 31 Jan 2020 13:34:16 +0800 Subject: [PATCH 33/98] fix: Fixed line.split bug using | as dilineator --- savedata.txt | 3 ++- src/main/java/Saver.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/savedata.txt b/savedata.txt index 941c177738..9d64c6e7f9 100644 --- a/savedata.txt +++ b/savedata.txt @@ -1 +1,2 @@ -T|0|a|null +T|0|abc|null +D|0|def |2012-10-10 diff --git a/src/main/java/Saver.java b/src/main/java/Saver.java index 75888e992b..23b3c3dafa 100644 --- a/src/main/java/Saver.java +++ b/src/main/java/Saver.java @@ -3,6 +3,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Scanner; public class Saver { @@ -41,7 +42,7 @@ public static void loader(ArrayList taskList) throws IOException { while (scanner.hasNextLine()) { String line = scanner.nextLine(); - String[] lineSplit = line.split("|"); + String[] lineSplit = line.split("\\|"); Task task; switch (lineSplit[0]) { From 0f3b1a741b1bb4ddd85024a5adb11d0c18ddc7da Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 13:56:18 +0800 Subject: [PATCH 34/98] feat: add Parser, Ui, Storage classes --- src/main/java/Parser.java | 68 +++++++++++++++++++++++++++++ src/main/java/Storage/Storage.java | 70 ++++++++++++++++++++++++++++++ src/main/java/Ui.java | 30 +++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage/Storage.java create mode 100644 src/main/java/Ui.java diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..2cae5d2570 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,68 @@ +import java.io.IOException; +import java.util.Scanner; + +public class Parser { + public static void handle(TaskList taskList, Ui ui) throws DukeException { + Scanner scanner = new Scanner(System.in); + ExceptionHandler exceptionHandler = new ExceptionHandler(); + boolean loop = true; + try { + String input = scanner.nextLine(); + String[] inputSplit = prepareHandle(input, exceptionHandler); + + switch (inputSplit[0]) { + case "todo": + taskList.addTodo(prepareTodo(inputSplit[1])); + break; + case "deadline": + taskList.addDeadline(inputSplit[1]); + break; + case "event": + taskList.addEvent(inputSplit[1]); + break; + case "done": + taskList.markDone(prepareDoneDelete(inputSplit[1])); + break; + case "delete": + taskList.deleteTask(prepareDoneDelete(inputSplit[1])); + break; + case "list": + ui.listTasks(taskList); + break; + case "bye": + ui.exitDuke(); + loop = false; + break; + default: + //ui.print("Uhh... You're gonna have to say that again, Red."); + //change to exception handler + break; + } + } catch(DukeException ex) { + System.err.println(ex); + } + + while (loop); + } + + public static String[] prepareHandle(String input, ExceptionHandler exceptionHandler) throws DukeException { + String[] inputSplit = input.split(" ", 2); + exceptionHandler.checkWrongCommand(inputSplit[0]); + exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); + + return inputSplit; + } + + public static String prepareTodo(String input) { + return input; + } + + public static String[] prepareDeadlineEvent(String input) { + return input.split("/", 2); + } + + public static int prepareDoneDelete(String input) { + return Integer.parseInt(input); + } +} + diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage/Storage.java new file mode 100644 index 0000000000..c9734de6cc --- /dev/null +++ b/src/main/java/Storage/Storage.java @@ -0,0 +1,70 @@ +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + public static String taskParser(Task task) { + String taskString; + String isDone = task.getIsDone() ? "1" : "0"; + taskString = String.format( + "%s|%s|%s|%s", + task.getType(), isDone, + task.getDescription(), task.getDate()); + return taskString; + } + + public static void fullSaver(ArrayList taskList) throws IOException { + try { + File file = new File("savedata.txt"); + FileWriter writer = new FileWriter(file); + + for (Task task : taskList) { + String data = taskParser(task); + System.out.println(data); + writer.write(data + "\n"); + } + + writer.close(); + } catch (IOException ioe) { + System.out.println(ioe.getMessage()); + } + } + + public static void load(ArrayList taskList) throws IOException { + try { + File file = new File("savedata.txt"); + FileReader reader = new FileReader(file); + Scanner scanner = new Scanner(file); + + while (scanner.hasNextLine()) { + String line = scanner.nextLine(); + String[] lineSplit = line.split("\\|"); + Task task; + + switch (lineSplit[0]) { + case "T": + task = new Todo(lineSplit[2]); + break; + case "D": + task = new Deadline(lineSplit[2], lineSplit[3]); + break; + case "E": + task = new Event(lineSplit[2], lineSplit[3]); + break; + default: + throw new IllegalStateException("Unexpected value: " + lineSplit[0]); + } + if (lineSplit[1].equals("1")) {task.markAsDone();} + taskList.add(task); + } + scanner.close(); + + } catch (IOException ioe) { + System.out.println(ioe.getMessage()); + } + } + +} diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..0fd5459858 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,30 @@ +public class Ui { + public void printLogo() { + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); + } + + public void greetDuke() { + System.out.println("Hey there, Red. Anything I can do for you?"); + } + + public void listTasks(TaskList taskList) { + taskList.tasks.forEach(task -> TaskHandler.print(String.format( + "%d. %s", + (taskList.tasks.indexOf(task) + 1), + task.toString()))); + System.out.println(String.format( + "That's %d in the list.", taskList.tasks.size())); + } + + public void exitDuke() { + System.out.println("Guess that's enough for now. I've got your back, so you keep me close."); + } + + + +} From 12a8d46488495c197f2597c2e226560c6d94d8f1 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 13:57:45 +0800 Subject: [PATCH 35/98] feat: remove code that has been shifted to new classes --- src/main/java/Duke.java | 33 +++++++++++++++++++----------- src/main/java/TaskHandler.java | 37 +--------------------------------- 2 files changed, 22 insertions(+), 48 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 043bd45888..456bdc6a77 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,20 +1,29 @@ +import Storage.Storage; + import java.io.IOException; import java.util.Scanner; import java.util.ArrayList; public class Duke { - public static void main(String[] args) throws IOException { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + private Storage storage; + private TaskList tasks; + private Ui ui; + + public Duke(String filePath) { + ui = new Ui(); + storage = new Storage(filePath); + try { + tasks = new TaskList(storage.load()); + } catch (DukeException e) { + ui.showLoadingError(); + tasks = new TaskList(); + } + } - TaskHandler taskHandler = new TaskHandler(); - // Saver saver = new Saver(); - taskHandler.greet(); - taskHandler.handle(); - // saver.fullSaver(taskHandler.taskList); + public void run() { + + } + + public static void main(String[] args) throws IOException { } } diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java index db60c60c6d..2c43da4865 100644 --- a/src/main/java/TaskHandler.java +++ b/src/main/java/TaskHandler.java @@ -16,27 +16,6 @@ public void greet() { print(greeting); } - public void event(String task) { - String[] split = task.split("/", 2); - Event newTask = new Event(split[0], split[1]); - taskList.add(newTask); - print("added: " + task); - } - - public void deadline(String task) { - String[] split = task.split("/", 2); - Deadline newTask = new Deadline(split[0], split[1]); - print(newTask.toString()); - taskList.add(newTask); - print("added: " + task); - } - - public void todo(String task) { - Todo newTask = new Todo(task); - taskList.add(newTask); - print("added: " + task); - } - public void list() { taskList.forEach(task -> TaskHandler.print(String.format( "%d. %s", @@ -46,19 +25,7 @@ public void list() { "That's %d in the list.", taskList.size())); } - public void done(int taskIndex) { - Task task = taskList.get(taskIndex - 1); - task.markAsDone(); - print("That's another one down. That'll be: "); - print(task.toString()); - } - public void delete(int taskIndex) { - Task task = taskList.get(taskIndex - 1); - taskList.remove(taskIndex - 1); - print("Don't need this here anymore eh? Off it goes."); - print(task.toString()); - } public void exit() throws IOException { Saver.fullSaver(this.taskList); @@ -70,9 +37,7 @@ public static void print(String toPrint) { System.out.println(toPrint); } - public void handle() throws IOException { - Saver.loader(taskList); - + public void handle() throws DukeException { Scanner scanner = new Scanner(System.in); ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; From eb2a7e63b924bd5cdb2f3797d0d64e18afe981aa Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 13:58:11 +0800 Subject: [PATCH 36/98] feat: add TaskList class --- src/main/java/TaskList.java | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/java/TaskList.java diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..0a37e61ff1 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,49 @@ +import java.lang.reflect.Array; +import java.util.ArrayList; + +public class TaskList { + public ArrayList tasks; + + public TaskList() { + this.tasks = new ArrayList(); + } + + public void addTodo(String task) { + Todo newTask = new Todo(task); + tasks.add(newTask); + print("added new todo: " + task); + } + + public void addEvent(String task) { + String[] split = Parser.prepareDeadlineEvent(task); + Event newTask = new Event(split[0], split[1]); + tasks.add(newTask); + print("added new event: " + task); + } + + public void addDeadline(String task) { + String[] split = Parser.prepareDeadlineEvent(task); + Deadline newTask = new Deadline(split[0], split[1]); + print(newTask.toString()); + tasks.add(newTask); + print("added new deadline: " + task); + } + + public void markDone(int taskIndex) { + Task task = tasks.get(taskIndex - 1); + task.markAsDone(); + print("That's another one down. That'll be: "); + print(task.toString()); + } + + public void deleteTask(int taskIndex) { + Task task = tasks.get(taskIndex - 1); + tasks.remove(taskIndex - 1); + print("Don't need this here anymore eh? Off it goes."); + print(task.toString()); + } + + public void print(String string) { + System.out.println(string); + } +} From 8325e3ee3a6aca6edbcad9f058e98a83a4238026 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 16:33:35 +0800 Subject: [PATCH 37/98] feat: refactor code for OOP purposes. Currently cannot catch exceptions --- src/main/java/Deadline.java | 4 +--- src/main/java/Duke.java | 16 ++++++++-------- src/main/java/ExceptionHandler.java | 4 +--- src/main/java/Parser.java | 17 ++++++++--------- src/main/java/TaskList.java | 5 ++++- src/main/java/Ui.java | 2 +- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 881fdc8315..ca9bf80719 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,6 +1,4 @@ -import java.time.LocalDate; - -public class Deadline extends Task{ +public class Deadline extends Task { public Deadline(String description, String date) { this.description = description; this.type = "D"; diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 456bdc6a77..326ee2e4f1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,8 +1,4 @@ -import Storage.Storage; - import java.io.IOException; -import java.util.Scanner; -import java.util.ArrayList; public class Duke { private Storage storage; @@ -14,16 +10,20 @@ public Duke(String filePath) { storage = new Storage(filePath); try { tasks = new TaskList(storage.load()); - } catch (DukeException e) { - ui.showLoadingError(); + } catch (IOException ioe) { + //ui.showLoadingError(); tasks = new TaskList(); } } public void run() { - + ui.printLogo(); + ui.greetDuke(); + Parser.handle(tasks, ui); } - public static void main(String[] args) throws IOException { + public static void main(String[] args) { + Duke duke = new Duke("savedata.txt"); + duke.run(); } } diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java index e31bb2b0a9..ba958756c7 100644 --- a/src/main/java/ExceptionHandler.java +++ b/src/main/java/ExceptionHandler.java @@ -1,5 +1,3 @@ -import java.util.Arrays; - public class ExceptionHandler { public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { @@ -19,7 +17,7 @@ public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFie } } - public void checkWrongCommand(String type) throws WrongCommandException{ + public void checkWrongCommand(String type) throws WrongCommandException { if (!(type.equals("todo") || type.equals("deadline") || type.equals("event") diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 2cae5d2570..dc6b3a25a0 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,12 +1,11 @@ -import java.io.IOException; import java.util.Scanner; public class Parser { - public static void handle(TaskList taskList, Ui ui) throws DukeException { + public static void handle(TaskList taskList, Ui ui) { Scanner scanner = new Scanner(System.in); ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; - try { + do { String input = scanner.nextLine(); String[] inputSplit = prepareHandle(input, exceptionHandler); @@ -38,17 +37,17 @@ public static void handle(TaskList taskList, Ui ui) throws DukeException { //change to exception handler break; } - } catch(DukeException ex) { - System.err.println(ex); - } + } //catch(DukeException ex) { + //System.err.println(ex); + //} while (loop); } - public static String[] prepareHandle(String input, ExceptionHandler exceptionHandler) throws DukeException { + public static String[] prepareHandle(String input, ExceptionHandler exceptionHandler) { String[] inputSplit = input.split(" ", 2); - exceptionHandler.checkWrongCommand(inputSplit[0]); - exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); + //exceptionHandler.checkWrongCommand(inputSplit[0]); + //exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); return inputSplit; } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 0a37e61ff1..a1c6b5c5fa 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,4 +1,3 @@ -import java.lang.reflect.Array; import java.util.ArrayList; public class TaskList { @@ -8,6 +7,10 @@ public TaskList() { this.tasks = new ArrayList(); } + public TaskList(ArrayList tasks) { + this.tasks = tasks; + } + public void addTodo(String task) { Todo newTask = new Todo(task); tasks.add(newTask); diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 0fd5459858..75ef7164ae 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -13,7 +13,7 @@ public void greetDuke() { } public void listTasks(TaskList taskList) { - taskList.tasks.forEach(task -> TaskHandler.print(String.format( + taskList.tasks.forEach(task -> System.out.println(String.format( "%d. %s", (taskList.tasks.indexOf(task) + 1), task.toString()))); From 2f6e1665905bc1759cc0b7f02869ac464f3100ca Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 16:33:59 +0800 Subject: [PATCH 38/98] fix: remove unused class files and packages --- src/main/java/Boxer.java | 14 ---- src/main/java/Saver.java | 71 ------------------- src/main/java/{Storage => }/Storage.java | 19 ++++-- src/main/java/TaskHandler.java | 87 ------------------------ 4 files changed, 15 insertions(+), 176 deletions(-) delete mode 100644 src/main/java/Boxer.java delete mode 100644 src/main/java/Saver.java rename src/main/java/{Storage => }/Storage.java (82%) delete mode 100644 src/main/java/TaskHandler.java diff --git a/src/main/java/Boxer.java b/src/main/java/Boxer.java deleted file mode 100644 index 96c8a95bb2..0000000000 --- a/src/main/java/Boxer.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.ArrayList; -import java.util.Arrays; - -public class Boxer { - // Variables - - - /* Defunct methods - public void echo(String toEcho) { - print(toEcho); - } - */ - -} diff --git a/src/main/java/Saver.java b/src/main/java/Saver.java deleted file mode 100644 index 23b3c3dafa..0000000000 --- a/src/main/java/Saver.java +++ /dev/null @@ -1,71 +0,0 @@ -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Scanner; - -public class Saver { - public static String taskParser(Task task) { - String taskString; - String isDone = task.getIsDone() ? "1" : "0"; - taskString = String.format( - "%s|%s|%s|%s", - task.getType(), isDone, - task.getDescription(), task.getDate()); - return taskString; - } - - public static void fullSaver(ArrayList taskList) throws IOException { - try { - File file = new File("savedata.txt"); - FileWriter writer = new FileWriter(file); - - for (Task task : taskList) { - String data = taskParser(task); - System.out.println(data); - writer.write(data + "\n"); - } - - writer.close(); - } catch (IOException ioe) { - System.out.println(ioe.getMessage()); - } - } - - public static void loader(ArrayList taskList) throws IOException { - try { - File file = new File("savedata.txt"); - FileReader reader = new FileReader(file); - Scanner scanner = new Scanner(file); - - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - String[] lineSplit = line.split("\\|"); - Task task; - - switch (lineSplit[0]) { - case "T": - task = new Todo(lineSplit[2]); - break; - case "D": - task = new Deadline(lineSplit[2], lineSplit[3]); - break; - case "E": - task = new Event(lineSplit[2], lineSplit[3]); - break; - default: - throw new IllegalStateException("Unexpected value: " + lineSplit[0]); - } - if (lineSplit[1].equals("1")) {task.markAsDone();} - taskList.add(task); - } - scanner.close(); - - } catch (IOException ioe) { - System.out.println(ioe.getMessage()); - } - } - -} diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage.java similarity index 82% rename from src/main/java/Storage/Storage.java rename to src/main/java/Storage.java index c9734de6cc..51fb5844c9 100644 --- a/src/main/java/Storage/Storage.java +++ b/src/main/java/Storage.java @@ -6,6 +6,13 @@ import java.util.Scanner; public class Storage { + String filePath; + + public Storage(String filePath) { + this.filePath = filePath; + } + + public static String taskParser(Task task) { String taskString; String isDone = task.getIsDone() ? "1" : "0"; @@ -16,9 +23,9 @@ public static String taskParser(Task task) { return taskString; } - public static void fullSaver(ArrayList taskList) throws IOException { + public void save(ArrayList taskList, String filePath) throws IOException { try { - File file = new File("savedata.txt"); + File file = new File(filePath); FileWriter writer = new FileWriter(file); for (Task task : taskList) { @@ -33,9 +40,11 @@ public static void fullSaver(ArrayList taskList) throws IOException { } } - public static void load(ArrayList taskList) throws IOException { + public ArrayList load() throws IOException { + ArrayList taskList = new ArrayList(); + try { - File file = new File("savedata.txt"); + File file = new File(filePath); FileReader reader = new FileReader(file); Scanner scanner = new Scanner(file); @@ -65,6 +74,8 @@ public static void load(ArrayList taskList) throws IOException { } catch (IOException ioe) { System.out.println(ioe.getMessage()); } + + return taskList; } } diff --git a/src/main/java/TaskHandler.java b/src/main/java/TaskHandler.java deleted file mode 100644 index 2c43da4865..0000000000 --- a/src/main/java/TaskHandler.java +++ /dev/null @@ -1,87 +0,0 @@ -import java.io.IOException; -import java.util.ArrayList; -import java.util.Scanner; - -public class TaskHandler { - ArrayList taskList; - Saver saver; - - public TaskHandler() throws IOException { - taskList = new ArrayList(100); - saver = new Saver(); - } - - public void greet() { - String greeting = "Hey there, Red. Anything I can do for you?"; - print(greeting); - } - - public void list() { - taskList.forEach(task -> TaskHandler.print(String.format( - "%d. %s", - (taskList.indexOf(task) + 1), - task.toString()))); - print(String.format( - "That's %d in the list.", taskList.size())); - } - - - - public void exit() throws IOException { - Saver.fullSaver(this.taskList); - String farewell = "Guess that's enough for now. I've got your back, so you keep me close."; - print(farewell); - } - - public static void print(String toPrint) { - System.out.println(toPrint); - } - - public void handle() throws DukeException { - Scanner scanner = new Scanner(System.in); - ExceptionHandler exceptionHandler = new ExceptionHandler(); - boolean loop = true; - do { - String input = scanner.nextLine(); - String[] inputSplit = input.split(" ", 2); - - try { - exceptionHandler.checkWrongCommand(inputSplit[0]); - exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); - - switch (inputSplit[0]) { - case "todo": - this.todo(inputSplit[1]); - break; - case "deadline": - this.deadline(inputSplit[1]); - break; - case "event": - this.event(inputSplit[1]); - break; - case "done": - int index; - index = Integer.parseInt(inputSplit[1]); - this.done(index); - break; - case "delete": - index = Integer.parseInt(inputSplit[1]); - this.delete(index); - break; - case "list": - this.list(); - break; - case "bye": - this.exit(); - loop = false; - break; - default: - print("Uhh... You're gonna have to say that again, Red."); - break; - } - } catch(DukeException | IOException ex) { - System.err.println(ex); - } - } while (loop); - } -} From eac552711d249525f838edbed77ea42dbfc96f3c Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 20:50:27 +0800 Subject: [PATCH 39/98] feat: add new Exception types --- src/main/java/InvalidCommandException.java | 4 ++++ src/main/java/InvalidDeadlineException.java | 4 ++++ src/main/java/InvalidEventException.java | 4 ++++ src/main/java/InvalidTodoException.java | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 src/main/java/InvalidCommandException.java create mode 100644 src/main/java/InvalidDeadlineException.java create mode 100644 src/main/java/InvalidEventException.java create mode 100644 src/main/java/InvalidTodoException.java diff --git a/src/main/java/InvalidCommandException.java b/src/main/java/InvalidCommandException.java new file mode 100644 index 0000000000..9d5f3abdf2 --- /dev/null +++ b/src/main/java/InvalidCommandException.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class InvalidCommandException { +} diff --git a/src/main/java/InvalidDeadlineException.java b/src/main/java/InvalidDeadlineException.java new file mode 100644 index 0000000000..bf5fc1fe88 --- /dev/null +++ b/src/main/java/InvalidDeadlineException.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class InvalidDeadlineException { +} diff --git a/src/main/java/InvalidEventException.java b/src/main/java/InvalidEventException.java new file mode 100644 index 0000000000..0773f66f01 --- /dev/null +++ b/src/main/java/InvalidEventException.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class InvalidEventException { +} diff --git a/src/main/java/InvalidTodoException.java b/src/main/java/InvalidTodoException.java new file mode 100644 index 0000000000..b7890bb0b1 --- /dev/null +++ b/src/main/java/InvalidTodoException.java @@ -0,0 +1,4 @@ +package PACKAGE_NAME; + +public class InvalidTodoException { +} From 922c03d3144665eb6393dffef28f9df52709979d Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 20:52:46 +0800 Subject: [PATCH 40/98] feat: add methods to Exception classes --- src/main/java/InvalidCommandException.java | 10 ++++++++-- src/main/java/InvalidDeadlineException.java | 12 ++++++++++-- src/main/java/InvalidEventException.java | 12 ++++++++++-- src/main/java/InvalidTodoException.java | 10 ++++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/InvalidCommandException.java b/src/main/java/InvalidCommandException.java index 9d5f3abdf2..e4bdbddc2d 100644 --- a/src/main/java/InvalidCommandException.java +++ b/src/main/java/InvalidCommandException.java @@ -1,4 +1,10 @@ -package PACKAGE_NAME; +public class InvalidCommandException extends DukeException{ + public InvalidCommandException(String message) { + super(message); + } -public class InvalidCommandException { + @Override + public String toString() { + return "Uhh... You're gonna have to say that again, Red."; + } } diff --git a/src/main/java/InvalidDeadlineException.java b/src/main/java/InvalidDeadlineException.java index bf5fc1fe88..7217d97df3 100644 --- a/src/main/java/InvalidDeadlineException.java +++ b/src/main/java/InvalidDeadlineException.java @@ -1,4 +1,12 @@ -package PACKAGE_NAME; +public class InvalidDeadlineException extends DukeException { + public InvalidDeadlineException(String message) { + super(message); + } -public class InvalidDeadlineException { + @Override + public String toString() { + return "We're running short of time, so make sure you note it down.\n" + + "Give a short description, then\n" + + "have the deadline as ."; + } } diff --git a/src/main/java/InvalidEventException.java b/src/main/java/InvalidEventException.java index 0773f66f01..b2a139b6c7 100644 --- a/src/main/java/InvalidEventException.java +++ b/src/main/java/InvalidEventException.java @@ -1,4 +1,12 @@ -package PACKAGE_NAME; +public class InvalidEventException extends DukeException { + public InvalidEventException(String message) { + super(message); + } -public class InvalidEventException { + @Override + public String toString() { + return "We're running short of time, so make sure you note it down.\n" + + "Give a short description, then\n" + + "have the deadline as ."; + } } diff --git a/src/main/java/InvalidTodoException.java b/src/main/java/InvalidTodoException.java index b7890bb0b1..41ee1f3caf 100644 --- a/src/main/java/InvalidTodoException.java +++ b/src/main/java/InvalidTodoException.java @@ -1,4 +1,10 @@ -package PACKAGE_NAME; +public class InvalidTodoException extends DukeException { + public InvalidTodoException(String message) { + super(message); + } -public class InvalidTodoException { + @Override + public String toString() { + return "You're usually not that taciturn, Red. Explain things to me."; + } } From 0b912ff52c5d7e10ddda1227ec9440a5f6501354 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Sun, 2 Feb 2020 20:53:23 +0800 Subject: [PATCH 41/98] feat: modify Parser and TaskList to use the new Exceptions --- src/main/java/Parser.java | 149 +++++++++++++++++++++++++----------- src/main/java/TaskList.java | 10 +-- 2 files changed, 109 insertions(+), 50 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index dc6b3a25a0..7da8d56023 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -3,65 +3,126 @@ public class Parser { public static void handle(TaskList taskList, Ui ui) { Scanner scanner = new Scanner(System.in); - ExceptionHandler exceptionHandler = new ExceptionHandler(); boolean loop = true; do { - String input = scanner.nextLine(); - String[] inputSplit = prepareHandle(input, exceptionHandler); - - switch (inputSplit[0]) { - case "todo": - taskList.addTodo(prepareTodo(inputSplit[1])); - break; - case "deadline": - taskList.addDeadline(inputSplit[1]); - break; - case "event": - taskList.addEvent(inputSplit[1]); - break; - case "done": - taskList.markDone(prepareDoneDelete(inputSplit[1])); - break; - case "delete": - taskList.deleteTask(prepareDoneDelete(inputSplit[1])); - break; - case "list": - ui.listTasks(taskList); - break; - case "bye": - ui.exitDuke(); - loop = false; - break; - default: - //ui.print("Uhh... You're gonna have to say that again, Red."); - //change to exception handler - break; - } - } //catch(DukeException ex) { - //System.err.println(ex); - //} + try { + String input = scanner.nextLine(); + String commandType = extractCommandType(input); + String[] inputSplit = input.split(" ", 2); - while (loop); + switch (commandType) { + case "todo": + taskList.addTodo(prepareTodo(inputSplit)); + break; + case "deadline": + taskList.addDeadline(prepareDeadline(inputSplit)); + break; + case "event": + taskList.addEvent(inputSplit); + break; + case "done": + taskList.markDone(prepareDoneDelete(inputSplit)); + break; + case "delete": + taskList.deleteTask(prepareDoneDelete(inputSplit)); + break; + case "list": + ui.listTasks(taskList); + break; + case "bye": + ui.exitDuke(); + loop = false; + break; + default: + //ui.print("Uhh... You're gonna have to say that again, Red."); + //change to exception handler + break; + } + } catch (InvalidCommandException ex) { + System.out.println(ex); + } + } while (loop); } - public static String[] prepareHandle(String input, ExceptionHandler exceptionHandler) { + public static String extractCommandType(String input) throws InvalidCommandException{ String[] inputSplit = input.split(" ", 2); - //exceptionHandler.checkWrongCommand(inputSplit[0]); - //exceptionHandler.checkEmptyField(inputSplit, inputSplit[0]); + boolean isValidCommand = checkValidCommand(inputSplit[0]); + + if (!isValidCommand) { + throw new InvalidCommandException(""); + } + + return inputSplit[0]; + } - return inputSplit; + public static String prepareTodo(String[] input) throws InvalidTodoException { + if (!checkValidTodo(input)) { + throw new InvalidTodoException(""); + } else { + return input[1]; + } } - public static String prepareTodo(String input) { - return input; + public static String[] prepareDeadline(String[] input) throws InvalidDeadlineException { + String[] fieldDetails = input[1].split("/", 2); + + if (!checkValidDeadline(fieldDetails)) { + throw new InvalidDeadlineException(""); + } else { + return fieldDetails; + } } - public static String[] prepareDeadlineEvent(String input) { - return input.split("/", 2); + public static String[] prepareEvent(String[] input) throws InvalidEventException { + String[] fieldDetails = input[1].split("/", 2); + + if (!checkValidEvent(fieldDetails)) { + throw new InvalidEventException(""); + } else { + return fieldDetails; + } } public static int prepareDoneDelete(String input) { return Integer.parseInt(input); } + + public static boolean checkValidCommand(String type) { + if (type.equals("todo") + || type.equals("deadline") + || type.equals("event") + || type.equals("list") + || type.equals("done") + || type.equals("delete") + || type.equals("bye")) { + return true; + } else { + return false; + } + } + + public static boolean checkValidTodo(String[] input) { + if (input.length == 2) { + return true; + } else { + return false; + } + } + + public static boolean checkValidDeadline(String[] input) { + if (input.length == 3) { + return true; + } else { + return false; + } + } + + public static boolean checkValidEvent(String[] input) { + if (input.length == 3) { + return true; + } else { + return false; + } + } } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index a1c6b5c5fa..adb96a3f9b 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -17,16 +17,14 @@ public void addTodo(String task) { print("added new todo: " + task); } - public void addEvent(String task) { - String[] split = Parser.prepareDeadlineEvent(task); - Event newTask = new Event(split[0], split[1]); + public void addEvent(String[] task) { + Event newTask = new Event(task[0], task[1]); tasks.add(newTask); print("added new event: " + task); } - public void addDeadline(String task) { - String[] split = Parser.prepareDeadlineEvent(task); - Deadline newTask = new Deadline(split[0], split[1]); + public void addDeadline(String[] task) { + Deadline newTask = new Deadline(task[0], task[1]); print(newTask.toString()); tasks.add(newTask); print("added new deadline: " + task); From bbc1dc43b7371d25e06530ace46442e771f5149e Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 10:55:32 +0800 Subject: [PATCH 42/98] feat: add JUnit test module, basic DukeTest class --- src/test/java/DukeTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/test/java/DukeTest.java diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java new file mode 100644 index 0000000000..b15736883c --- /dev/null +++ b/src/test/java/DukeTest.java @@ -0,0 +1,10 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DukeTest { + @Test + public void dummyTest(){ + assertEquals(2, 2); + } +} From 2750801a48ca7a4653e738b3e9713956622ea1a4 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 10:57:56 +0800 Subject: [PATCH 43/98] improvement: change exceptions thrown --- src/main/java/EmptyFieldException.java | 5 +++++ src/main/java/ExceptionHandler.java | 7 +++---- src/main/java/Parser.java | 15 +++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/EmptyFieldException.java b/src/main/java/EmptyFieldException.java index 25321a3549..e107960247 100644 --- a/src/main/java/EmptyFieldException.java +++ b/src/main/java/EmptyFieldException.java @@ -2,4 +2,9 @@ public class EmptyFieldException extends DukeException { public EmptyFieldException(String message) { super(message); } + + @Override + public String toString() { + return ""; + } } diff --git a/src/main/java/ExceptionHandler.java b/src/main/java/ExceptionHandler.java index ba958756c7..b6058f4f7e 100644 --- a/src/main/java/ExceptionHandler.java +++ b/src/main/java/ExceptionHandler.java @@ -1,5 +1,5 @@ public class ExceptionHandler { - public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { + public static void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { if (taskStringArr.length != 2) { throw new EmptyFieldException( @@ -17,7 +17,7 @@ public void checkEmptyField(String[] taskStringArr, String type) throws EmptyFie } } - public void checkWrongCommand(String type) throws WrongCommandException { + public static void checkInvalidCommand(String type) throws InvalidCommandException { if (!(type.equals("todo") || type.equals("deadline") || type.equals("event") @@ -25,8 +25,7 @@ public void checkWrongCommand(String type) throws WrongCommandException { || type.equals("done") || type.equals("delete") || type.equals("bye"))) { - throw new WrongCommandException( - "Uhh... You're gonna have to say that again, Red."); + throw new InvalidCommandException(""); } } } diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 7da8d56023..75aba9c266 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -18,13 +18,13 @@ public static void handle(TaskList taskList, Ui ui) { taskList.addDeadline(prepareDeadline(inputSplit)); break; case "event": - taskList.addEvent(inputSplit); + taskList.addEvent(prepareEvent(inputSplit)); break; case "done": - taskList.markDone(prepareDoneDelete(inputSplit)); + taskList.markDone(prepareDoneDelete(inputSplit[1])); break; case "delete": - taskList.deleteTask(prepareDoneDelete(inputSplit)); + taskList.deleteTask(prepareDoneDelete(inputSplit[1])); break; case "list": ui.listTasks(taskList); @@ -34,11 +34,10 @@ public static void handle(TaskList taskList, Ui ui) { loop = false; break; default: - //ui.print("Uhh... You're gonna have to say that again, Red."); - //change to exception handler - break; - } - } catch (InvalidCommandException ex) { + throw new InvalidCommandException(""); + } + } catch (InvalidCommandException | InvalidTodoException + | InvalidDeadlineException | InvalidEventException ex) { System.out.println(ex); } } while (loop); From f1809adcce7e82acc0762258187db00d36a790b2 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 17:06:03 +0800 Subject: [PATCH 44/98] feat: add DukeTest with two basic test methods (Todo and Event) --- src/test/java/DukeTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java index b15736883c..72666b21f6 100644 --- a/src/test/java/DukeTest.java +++ b/src/test/java/DukeTest.java @@ -4,7 +4,14 @@ public class DukeTest { @Test - public void dummyTest(){ - assertEquals(2, 2); + public void ToDoTest(){ + Todo task = new Todo("Find Royce on Bracket Towers"); + assertEquals("[T][\u2718] Find Royce on Bracket Towers", task.toString()); + } + + @Test + public void EventTest() { + Event task = new Event("Performance at the Empty Set", "2014-05-20"); + assertEquals("[E][\u2718] Performance at the Empty Set (May 20 2014)", task.toString()); } } From 5fd6bd610a1314e04ca7f584e6d140c26df9453d Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 21:59:19 +0800 Subject: [PATCH 45/98] fix: fix saving function --- src/main/java/Duke.java | 6 ++++++ src/main/java/Storage.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 326ee2e4f1..cc66a5b4a6 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -20,6 +20,12 @@ public void run() { ui.printLogo(); ui.greetDuke(); Parser.handle(tasks, ui); + + try { + storage.save(tasks); + } catch (IOException ioe) { + System.out.println(ioe); + } } public static void main(String[] args) { diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 51fb5844c9..588c025676 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -23,12 +23,12 @@ public static String taskParser(Task task) { return taskString; } - public void save(ArrayList taskList, String filePath) throws IOException { + public void save(TaskList taskList) throws IOException { try { File file = new File(filePath); FileWriter writer = new FileWriter(file); - for (Task task : taskList) { + for (Task task : taskList.tasks) { String data = taskParser(task); System.out.println(data); writer.write(data + "\n"); From 852bfdb5d243342c55362f2b324e21f3724908a7 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 21:59:45 +0800 Subject: [PATCH 46/98] feat: add find command --- src/main/java/Parser.java | 10 ++++++++-- src/main/java/TaskList.java | 10 ++++++++++ src/main/java/Ui.java | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 75aba9c266..357930908c 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,3 +1,4 @@ +import java.util.Arrays; import java.util.Scanner; public class Parser { @@ -29,6 +30,9 @@ public static void handle(TaskList taskList, Ui ui) { case "list": ui.listTasks(taskList); break; + case "find": + taskList.findTask(inputSplit[1]); + break; case "bye": ui.exitDuke(); loop = false; @@ -91,6 +95,7 @@ public static boolean checkValidCommand(String type) { || type.equals("deadline") || type.equals("event") || type.equals("list") + || type.equals("find") || type.equals("done") || type.equals("delete") || type.equals("bye")) { @@ -109,7 +114,8 @@ public static boolean checkValidTodo(String[] input) { } public static boolean checkValidDeadline(String[] input) { - if (input.length == 3) { + Arrays.toString(input); + if (input.length == 2) { return true; } else { return false; @@ -117,7 +123,7 @@ public static boolean checkValidDeadline(String[] input) { } public static boolean checkValidEvent(String[] input) { - if (input.length == 3) { + if (input.length == 2) { return true; } else { return false; diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index adb96a3f9b..dfef311907 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -44,6 +44,16 @@ public void deleteTask(int taskIndex) { print(task.toString()); } + public void findTask(String keyword) { + TaskList foundTasks = new TaskList(); + for (Task task : tasks) { + if (task.getDescription().contains(keyword)) { + foundTasks.tasks.add(task); + } + } + foundTasks.tasks.forEach(task -> print(task.toString())); + } + public void print(String string) { System.out.println(string); } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 75ef7164ae..201b6920ff 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -21,6 +21,7 @@ public void listTasks(TaskList taskList) { "That's %d in the list.", taskList.tasks.size())); } + public void exitDuke() { System.out.println("Guess that's enough for now. I've got your back, so you keep me close."); } From 0542147fadfb954ff103265385ce2d472b9801c3 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Mon, 3 Feb 2020 21:59:59 +0800 Subject: [PATCH 47/98] chore: update savedata --- savedata.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/savedata.txt b/savedata.txt index 9d64c6e7f9..ec827aa413 100644 --- a/savedata.txt +++ b/savedata.txt @@ -1,2 +1,3 @@ T|0|abc|null D|0|def |2012-10-10 +T|0|abcdef|null From be66f163a5cfb5588130901cb23f1d2fd49c443b Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 4 Feb 2020 01:21:14 +0800 Subject: [PATCH 48/98] chore: add javadocs --- src/main/java/Duke.java | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 326ee2e4f1..d64a58ff79 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,29 @@ import java.io.IOException; +/** + * Driver class of Duke chatbot, also saves on startup and loads on exit. + */ public class Duke { + + /** + * Storage for loading task list, and to save right before exiting Duke. + */ private Storage storage; + + /** + * TaskList to keep track of existing tasks. + */ private TaskList tasks; + + /** + * Ui to provide user interface printing. + */ private Ui ui; + /** + * Constructor of Duke. + * @param filePath + */ public Duke(String filePath) { ui = new Ui(); storage = new Storage(filePath); @@ -16,12 +35,19 @@ public Duke(String filePath) { } } + /** + * Driver method for Duke. + */ public void run() { ui.printLogo(); ui.greetDuke(); Parser.handle(tasks, ui); } + /** + * Main method of Duke. + * @param args + */ public static void main(String[] args) { Duke duke = new Duke("savedata.txt"); duke.run(); From 509c8d37544b95cf538c2705c0ae63766b3109fd Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 4 Feb 2020 01:25:15 +0800 Subject: [PATCH 49/98] fix: add description for params --- src/main/java/Duke.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index d64a58ff79..9ed285c96b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -22,7 +22,8 @@ public class Duke { /** * Constructor of Duke. - * @param filePath + * + * @param filePath String representing file path of save file of tasks. */ public Duke(String filePath) { ui = new Ui(); @@ -46,7 +47,8 @@ public void run() { /** * Main method of Duke. - * @param args + * + * @param args String array from System input. */ public static void main(String[] args) { Duke duke = new Duke("savedata.txt"); From faf284c71457a3e0b23dfa5fffdbb7ab4ae5c7a0 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 4 Feb 2020 01:40:27 +0800 Subject: [PATCH 50/98] chore: add javadocs for Parser class. --- src/main/java/Parser.java | 68 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 75aba9c266..cbef7f2597 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,6 +1,16 @@ import java.util.Scanner; +/** + * Parser class to process input. + */ public class Parser { + + /** + * Handles various permitted commands by calling relevant methods to process after parsing. + * + * @param taskList TaskList that contains ArrayList. + * @param ui Ui to print out user interface text. + */ public static void handle(TaskList taskList, Ui ui) { Scanner scanner = new Scanner(System.in); boolean loop = true; @@ -43,6 +53,14 @@ public static void handle(TaskList taskList, Ui ui) { } while (loop); } + /** + * Processes command line input to obtain the command's type + * and throws an Exception if the command is invalid. + * + * @param input String of the initial command line input. + * @return String representing the command type. + * @throws InvalidCommandException DukeException for invalid commands. + */ public static String extractCommandType(String input) throws InvalidCommandException{ String[] inputSplit = input.split(" ", 2); boolean isValidCommand = checkValidCommand(inputSplit[0]); @@ -54,6 +72,13 @@ public static String extractCommandType(String input) throws InvalidCommandExcep return inputSplit[0]; } + /** + * Processes String array of input to check if it is valid for Todo task. + * + * @param input String array of the command line input after splitting by " ". + * @return String of description for Todo task. + * @throws InvalidTodoException DukeException for invalid Todo tasks. + */ public static String prepareTodo(String[] input) throws InvalidTodoException { if (!checkValidTodo(input)) { throw new InvalidTodoException(""); @@ -62,6 +87,13 @@ public static String prepareTodo(String[] input) throws InvalidTodoException { } } + /** + * Processes String array of input to check if it is valid for Deadline task. + * + * @param input String array of the command line input after splitting by " ". + * @return String array of description and date for Deadline task. + * @throws InvalidDeadlineException DukeException for invalid Deadline task. + */ public static String[] prepareDeadline(String[] input) throws InvalidDeadlineException { String[] fieldDetails = input[1].split("/", 2); @@ -72,6 +104,12 @@ public static String[] prepareDeadline(String[] input) throws InvalidDeadlineExc } } + /** + * Processes String array of input to check if it is valid for Event task. + * @param input String array of the command line input after splitting by " ". + * @return String array of description and date for Event task. + * @throws InvalidEventException DukeException for invalid Event task. + */ public static String[] prepareEvent(String[] input) throws InvalidEventException { String[] fieldDetails = input[1].split("/", 2); @@ -82,10 +120,22 @@ public static String[] prepareEvent(String[] input) throws InvalidEventException } } + /** + * Processes String input for purpose of Done or Delete commands + * + * @param input String of command line input after splitting by " ". + * @return int value representing index + 1 of desired item to be marked as done or deleted. + */ public static int prepareDoneDelete(String input) { return Integer.parseInt(input); } + /** + * Checks if input is of valid command type. + * + * @param type String representing command type. + * @return boolean dictating if command is valid or invalid. + */ public static boolean checkValidCommand(String type) { if (type.equals("todo") || type.equals("deadline") @@ -100,6 +150,12 @@ public static boolean checkValidCommand(String type) { } } + /** + * Checks if input array is two elements long and thus a valid Todo task. + * + * @param input String array containing task's type and description. + * @return boolean dictating if array has enough elements for a valid Todo task. + */ public static boolean checkValidTodo(String[] input) { if (input.length == 2) { return true; @@ -108,6 +164,12 @@ public static boolean checkValidTodo(String[] input) { } } + /** + * Checks if input array is three elements long and thus a valid Deadline task. + * + * @param input String array containing task's type, description, and do by date. + * @return boolean dictating if array has enough elements for a valid Deadline task. + */ public static boolean checkValidDeadline(String[] input) { if (input.length == 3) { return true; @@ -116,6 +178,12 @@ public static boolean checkValidDeadline(String[] input) { } } + /** + * Checks if input array is three elements long and thus a valid Event task. + * + * @param input String array containing task's type, description, and do at date. + * @return boolean dictating if array has enough elements for a valid Event task. + */ public static boolean checkValidEvent(String[] input) { if (input.length == 3) { return true; From f5619cbfd27291d26e0dfcec0972d60465b479dd Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 4 Feb 2020 16:40:23 +0800 Subject: [PATCH 51/98] chore: tweak code to follow Java coding standards --- src/main/java/Duke.java | 2 +- src/main/java/Parser.java | 18 +++++++++--------- src/main/java/Storage.java | 5 ++++- src/main/java/TaskList.java | 3 +++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 326ee2e4f1..3128ed8331 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -19,7 +19,7 @@ public Duke(String filePath) { public void run() { ui.printLogo(); ui.greetDuke(); - Parser.handle(tasks, ui); + Parser.handleTasks(tasks, ui); } public static void main(String[] args) { diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 75aba9c266..b06302d436 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,7 +1,7 @@ import java.util.Scanner; public class Parser { - public static void handle(TaskList taskList, Ui ui) { + public static void handleTasks(TaskList taskList, Ui ui) { Scanner scanner = new Scanner(System.in); boolean loop = true; do { @@ -45,7 +45,7 @@ public static void handle(TaskList taskList, Ui ui) { public static String extractCommandType(String input) throws InvalidCommandException{ String[] inputSplit = input.split(" ", 2); - boolean isValidCommand = checkValidCommand(inputSplit[0]); + boolean isValidCommand = isValidCommand(inputSplit[0]); if (!isValidCommand) { throw new InvalidCommandException(""); @@ -55,7 +55,7 @@ public static String extractCommandType(String input) throws InvalidCommandExcep } public static String prepareTodo(String[] input) throws InvalidTodoException { - if (!checkValidTodo(input)) { + if (!isValidTodo(input)) { throw new InvalidTodoException(""); } else { return input[1]; @@ -65,7 +65,7 @@ public static String prepareTodo(String[] input) throws InvalidTodoException { public static String[] prepareDeadline(String[] input) throws InvalidDeadlineException { String[] fieldDetails = input[1].split("/", 2); - if (!checkValidDeadline(fieldDetails)) { + if (!isValidDeadline(fieldDetails)) { throw new InvalidDeadlineException(""); } else { return fieldDetails; @@ -75,7 +75,7 @@ public static String[] prepareDeadline(String[] input) throws InvalidDeadlineExc public static String[] prepareEvent(String[] input) throws InvalidEventException { String[] fieldDetails = input[1].split("/", 2); - if (!checkValidEvent(fieldDetails)) { + if (!isValidEvent(fieldDetails)) { throw new InvalidEventException(""); } else { return fieldDetails; @@ -86,7 +86,7 @@ public static int prepareDoneDelete(String input) { return Integer.parseInt(input); } - public static boolean checkValidCommand(String type) { + public static boolean isValidCommand(String type) { if (type.equals("todo") || type.equals("deadline") || type.equals("event") @@ -100,7 +100,7 @@ public static boolean checkValidCommand(String type) { } } - public static boolean checkValidTodo(String[] input) { + public static boolean isValidTodo(String[] input) { if (input.length == 2) { return true; } else { @@ -108,7 +108,7 @@ public static boolean checkValidTodo(String[] input) { } } - public static boolean checkValidDeadline(String[] input) { + public static boolean isValidDeadline(String[] input) { if (input.length == 3) { return true; } else { @@ -116,7 +116,7 @@ public static boolean checkValidDeadline(String[] input) { } } - public static boolean checkValidEvent(String[] input) { + public static boolean isValidEvent(String[] input) { if (input.length == 3) { return true; } else { diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 51fb5844c9..998c132fe0 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -2,6 +2,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; + import java.util.ArrayList; import java.util.Scanner; @@ -64,8 +65,10 @@ public ArrayList load() throws IOException { task = new Event(lineSplit[2], lineSplit[3]); break; default: - throw new IllegalStateException("Unexpected value: " + lineSplit[0]); + throw new IllegalStateException("Unexpected value: " + + lineSplit[0]); } + if (lineSplit[1].equals("1")) {task.markAsDone();} taskList.add(task); } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index adb96a3f9b..972620e595 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,5 +1,8 @@ import java.util.ArrayList; +/** + * + */ public class TaskList { public ArrayList tasks; From a9f9b3ef59b0b0d652505ae541bb18be6d960098 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Tue, 4 Feb 2020 16:58:37 +0800 Subject: [PATCH 52/98] fix: fix merge conflicts --- src/main/java/Duke.java | 15 +++------------ src/main/java/Parser.java | 38 +++++++++++++------------------------ src/main/java/Storage.java | 11 +++++++---- src/main/java/TaskList.java | 9 ++++++--- 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6bcdd07de4..81d575f269 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -28,12 +28,7 @@ public class Duke { public Duke(String filePath) { ui = new Ui(); storage = new Storage(filePath); - try { - tasks = new TaskList(storage.load()); - } catch (IOException ioe) { - //ui.showLoadingError(); - tasks = new TaskList(); - } + tasks = new TaskList(storage.load()); } /** @@ -42,13 +37,9 @@ public Duke(String filePath) { public void run() { ui.printLogo(); ui.greetDuke(); - Parser.handle(tasks, ui); + Parser.handleTasks(tasks, ui); - try { - storage.save(tasks); - } catch (IOException ioe) { - System.out.println(ioe); - } + storage.save(tasks); } /** diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 09ad5c4796..1896876dd9 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -12,7 +12,7 @@ public class Parser { * @param taskList TaskList that contains ArrayList. * @param ui Ui to print out user interface text. */ - public static void handle(TaskList taskList, Ui ui) { + public static void handleTasks(TaskList taskList, Ui ui) { Scanner scanner = new Scanner(System.in); boolean loop = true; do { @@ -67,7 +67,7 @@ public static void handle(TaskList taskList, Ui ui) { */ public static String extractCommandType(String input) throws InvalidCommandException{ String[] inputSplit = input.split(" ", 2); - boolean isValidCommand = checkValidCommand(inputSplit[0]); + boolean isValidCommand = isValidCommand(inputSplit[0]); if (!isValidCommand) { throw new InvalidCommandException(""); @@ -84,7 +84,7 @@ public static String extractCommandType(String input) throws InvalidCommandExcep * @throws InvalidTodoException DukeException for invalid Todo tasks. */ public static String prepareTodo(String[] input) throws InvalidTodoException { - if (!checkValidTodo(input)) { + if (!isValidTodo(input)) { throw new InvalidTodoException(""); } else { return input[1]; @@ -101,7 +101,7 @@ public static String prepareTodo(String[] input) throws InvalidTodoException { public static String[] prepareDeadline(String[] input) throws InvalidDeadlineException { String[] fieldDetails = input[1].split("/", 2); - if (!checkValidDeadline(fieldDetails)) { + if (!isValidDeadline(fieldDetails)) { throw new InvalidDeadlineException(""); } else { return fieldDetails; @@ -117,7 +117,7 @@ public static String[] prepareDeadline(String[] input) throws InvalidDeadlineExc public static String[] prepareEvent(String[] input) throws InvalidEventException { String[] fieldDetails = input[1].split("/", 2); - if (!checkValidEvent(fieldDetails)) { + if (!isValidEvent(fieldDetails)) { throw new InvalidEventException(""); } else { return fieldDetails; @@ -134,13 +134,14 @@ public static int prepareDoneDelete(String input) { return Integer.parseInt(input); } + /** * Checks if input is of valid command type. * * @param type String representing command type. * @return boolean dictating if command is valid or invalid. */ - public static boolean checkValidCommand(String type) { + public static boolean isValidCommand(String type) { if (type.equals("todo") || type.equals("deadline") || type.equals("event") @@ -161,12 +162,8 @@ public static boolean checkValidCommand(String type) { * @param input String array containing task's type and description. * @return boolean dictating if array has enough elements for a valid Todo task. */ - public static boolean checkValidTodo(String[] input) { - if (input.length == 2) { - return true; - } else { - return false; - } + public static boolean isValidTodo(String[] input) { + return input.length == 2; } /** @@ -175,14 +172,9 @@ public static boolean checkValidTodo(String[] input) { * @param input String array containing task's type, description, and do by date. * @return boolean dictating if array has enough elements for a valid Deadline task. */ - public static boolean checkValidDeadline(String[] input) { - Arrays.toString(input); - if (input.length == 2) { - return true; - } else { - return false; + public static boolean isValidDeadline(String[] input) { + return input.length == 2; } - } /** * Checks if input array is three elements long and thus a valid Event task. @@ -190,12 +182,8 @@ public static boolean checkValidDeadline(String[] input) { * @param input String array containing task's type, description, and do at date. * @return boolean dictating if array has enough elements for a valid Event task. */ - public static boolean checkValidEvent(String[] input) { - if (input.length == 2) { - return true; - } else { - return false; - } + public static boolean isValidEvent(String[] input) { + return input.length == 2; } } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 588c025676..f93d910263 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -2,6 +2,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; + import java.util.ArrayList; import java.util.Scanner; @@ -23,7 +24,7 @@ public static String taskParser(Task task) { return taskString; } - public void save(TaskList taskList) throws IOException { + public void save(TaskList taskList) { try { File file = new File(filePath); FileWriter writer = new FileWriter(file); @@ -40,8 +41,8 @@ public void save(TaskList taskList) throws IOException { } } - public ArrayList load() throws IOException { - ArrayList taskList = new ArrayList(); + public ArrayList load() { + ArrayList taskList = new ArrayList<>(); try { File file = new File(filePath); @@ -64,8 +65,10 @@ public ArrayList load() throws IOException { task = new Event(lineSplit[2], lineSplit[3]); break; default: - throw new IllegalStateException("Unexpected value: " + lineSplit[0]); + throw new IllegalStateException("Unexpected value: " + + lineSplit[0]); } + if (lineSplit[1].equals("1")) {task.markAsDone();} taskList.add(task); } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index dfef311907..8a0fa90aa4 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,10 +1,13 @@ import java.util.ArrayList; +/** + * + */ public class TaskList { public ArrayList tasks; public TaskList() { - this.tasks = new ArrayList(); + this.tasks = new ArrayList<>(); } public TaskList(ArrayList tasks) { @@ -20,14 +23,14 @@ public void addTodo(String task) { public void addEvent(String[] task) { Event newTask = new Event(task[0], task[1]); tasks.add(newTask); - print("added new event: " + task); + print("added new event: " + task.toString()); } public void addDeadline(String[] task) { Deadline newTask = new Deadline(task[0], task[1]); print(newTask.toString()); tasks.add(newTask); - print("added new deadline: " + task); + print("added new deadline: " + task.toString()); } public void markDone(int taskIndex) { From c5e34eeb5bbe39ca48c39a678c2085546a00a6d8 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:34:00 +0800 Subject: [PATCH 53/98] feat: add gradle --- build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build.gradle b/build.gradle index 5ca4f90444..2a4495eba0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,16 @@ repositories { mavenCentral() } +plugins { + id 'java' + id 'org.openjfx.javafxplugin' version '0.0.7' +} + +javafx { + version = "11.0.2" + modules = [ 'javafx.controls', 'javafx.fxml' ] +} + application { // Change this to your main class. mainClassName = "Duke" From 9d3c5e690270bc3721342c402268aa1ca191242b Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:36:02 +0800 Subject: [PATCH 54/98] fix: stop tracking savedata.txt file --- savedata.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 savedata.txt diff --git a/savedata.txt b/savedata.txt deleted file mode 100644 index ec827aa413..0000000000 --- a/savedata.txt +++ /dev/null @@ -1,3 +0,0 @@ -T|0|abc|null -D|0|def |2012-10-10 -T|0|abcdef|null From b0e2f512f768be7a1c9542935c697fdfe76ad6e1 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:38:06 +0800 Subject: [PATCH 55/98] fix: fix code verbosity, errors from merge conflict resolution --- src/main/java/Duke.java | 77 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 81d575f269..cb0c8220c0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,9 +1,25 @@ +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + import java.io.IOException; /** * Driver class of Duke chatbot, also saves on startup and loads on exit. */ -public class Duke { +public class Duke extends Application { + + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; /** * Storage for loading task list, and to save right before exiting Duke. @@ -20,6 +36,11 @@ public class Duke { */ private Ui ui; + /** + * Empty constructor of Duke. + */ + public Duke() {} + /** * Constructor of Duke. * @@ -42,6 +63,60 @@ public void run() { storage.save(tasks); } + + @Override + public void start(Stage stage) { + //Step 1. Setting up required components + + //The container for the content of the chat to scroll. + scrollPane = new ScrollPane(); + dialogContainer = new VBox(); + scrollPane.setContent(dialogContainer); + + userInput = new TextField(); + sendButton = new Button("Send"); + + AnchorPane mainLayout = new AnchorPane(); + mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); + + scene = new Scene(mainLayout); + + stage.setScene(scene); + stage.show(); + + //Step 2. Formatting the window to look as expected + 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); + + // You will need to import `javafx.scene.layout.Region` for this. + dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); + + userInput.setPrefWidth(325.0); + + sendButton.setPrefWidth(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); + + // more code to be added here later + } + /** * Main method of Duke. * From 5bf6ce00cd4560489000d19a6d464f41ddfebbf5 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:38:24 +0800 Subject: [PATCH 56/98] fix: fix code verbosity, errors from merge conflict resolution --- src/main/java/Parser.java | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 3f22d03a3a..8882532c63 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -84,10 +84,10 @@ public static String extractCommandType(String input) throws InvalidCommandExcep * @throws InvalidTodoException DukeException for invalid Todo tasks. */ public static String prepareTodo(String[] input) throws InvalidTodoException { - if (!isValidTodo(input)) { - throw new InvalidTodoException(""); - } else { + if (isValidTodo(input)) { return input[1]; + } else { + throw new InvalidTodoException(""); } } @@ -156,20 +156,6 @@ public static boolean isValidCommand(String type) { } } - /** - * Checks if input array is two elements long and thus a valid Todo task. - * - * @param input String array containing task's type and description. - * @return boolean dictating if array has enough elements for a valid Todo task. - */ - public static boolean isValidTodo(String[] input) { - if (input.length == 2) { - return true; - } else { - return false; - } - } - /** * Checks if input array is two elements long and thus a valid Todo task. * From f1371bde1a8e06601a20e61035c14e3d54ed7a09 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:38:35 +0800 Subject: [PATCH 57/98] fix: gitignore save data --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 99712178bf..08eadd64c1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ src/main/resources/docs/ .DS_Store *.iml bin/ +/savedata.txt From 7e62b63b665fb6b06a5f3302593a3f688e9de117 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 5 Feb 2020 21:38:48 +0800 Subject: [PATCH 58/98] feat: add launcher from JavaFX tutorials --- src/main/java/Launcher.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/Launcher.java diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..524ecb071e --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,10 @@ +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Duke.class, args); + } +} From 11f8c63a23c0ab57b671c35a7fa0281dc7de600c Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 6 Feb 2020 00:44:57 +0800 Subject: [PATCH 59/98] feat: add more JavaFX related code --- src/main/java/DialogBox.java | 22 ++++++++++++++++++++++ src/main/java/Duke.java | 29 ++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/DialogBox.java diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..82ae81e6fe --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,22 @@ +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +public class DialogBox extends HBox { + + private Label text; + private ImageView displayPicture; + + public DialogBox(Label l, ImageView iv) { + text = l; + displayPicture = iv; + + text.setWrapText(true); + displayPicture.setFitWidth(100.0); + displayPicture.setFitHeight(100.0); + + this.setAlignment(Pos.TOP_RIGHT); + this.getChildren().addAll(text, displayPicture); + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index cb0c8220c0..4b2d03568a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,7 @@ import javafx.application.Application; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; @@ -114,7 +115,33 @@ public void start(Stage stage) { AnchorPane.setLeftAnchor(userInput , 1.0); AnchorPane.setBottomAnchor(userInput, 1.0); - // more code to be added here later + //Step 3. Add functionality to handle user input. + sendButton.setOnMouseClicked((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + userInput.setOnAction((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + } + + /** + * Iteration 1: + * Creates a label with the specified text and adds it to the dialog container. + * @param text String containing text to add + * @return a label with the specified text that has word wrap enabled. + */ + private Label getDialogLabel(String text) { + // You will need to import `javafx.scene.control.Label`. + Label textToAdd = new Label(text); + textToAdd.setWrapText(true); + + return textToAdd; } /** From 7b8d55ea82a03fb42722b201835a52a54b7c5c3c Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 6 Feb 2020 10:35:31 +0800 Subject: [PATCH 60/98] feat: add JavaFX tutorial 3 related code --- src/main/java/DialogBox.java | 9 +++++ src/main/java/Duke.java | 65 ++++++++++++++++++++++++++++++++++-- src/main/java/Main.java | 1 + 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Main.java diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java index 82ae81e6fe..0b0dbe7d60 100644 --- a/src/main/java/DialogBox.java +++ b/src/main/java/DialogBox.java @@ -8,6 +8,15 @@ public class DialogBox extends HBox { private Label text; private ImageView displayPicture; + public DialogBox(Label l) { + text = l; + + text.setWrapText(true); + + this.setAlignment(Pos.TOP_RIGHT); + this.getChildren().addAll(text); + } + public DialogBox(Label l, ImageView iv) { text = l; displayPicture = iv; diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4b2d03568a..7e29f4c3e7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,6 +4,8 @@ import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; @@ -22,6 +24,9 @@ public class Duke extends Application { private Button sendButton; private Scene scene; + private Image user; + private Image duke; + /** * Storage for loading task list, and to save right before exiting Duke. */ @@ -40,19 +45,23 @@ public class Duke extends Application { /** * Empty constructor of Duke. */ - public Duke() {} + public Duke() { + this.user = new Image(this.getClass().getResourceAsStream("images/DaUser.png")); + this.duke = new Image(this.getClass().getResourceAsStream("images/DaDuke.png")); + } /** * Constructor of Duke. * * @param filePath String representing file path of save file of tasks. */ + /* public Duke(String filePath) { ui = new Ui(); storage = new Storage(filePath); tasks = new TaskList(storage.load()); } - + */ /** * Driver method for Duke. */ @@ -64,7 +73,6 @@ public void run() { storage.save(tasks); } - @Override public void start(Stage stage) { //Step 1. Setting up required components @@ -128,6 +136,29 @@ public void start(Stage stage) { //Scroll down to the end every time dialogContainer's height changes. dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + //Step 3. Add functionality to handle user input. + sendButton.setOnMouseClicked((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + userInput.setOnAction((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + //Part 3. Add functionality to handle user input. + sendButton.setOnMouseClicked((event) -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); } /** @@ -144,13 +175,41 @@ private Label getDialogLabel(String text) { return textToAdd; } + /** + * Iteration 2: + * 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. + */ + private void handleUserInput() { + Label userText = new Label(userInput.getText()); + Label dukeText = new Label(getResponse(userInput.getText())); + + dialogContainer.getChildren().addAll( + new DialogBox(userText, new ImageView(user)), + new DialogBox(dukeText, new ImageView(duke)) + ); + userInput.clear(); + } + + + /** + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. + */ + private String getResponse(String input) { + return "Duke heard: " + input; + } + + /** * Main method of Duke. * * @param args String array from System input. */ + /* public static void main(String[] args) { Duke duke = new Duke("savedata.txt"); duke.run(); } + */ } diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1 @@ + From b2c488514a0815866eb428849739e076098b77fc Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Thu, 6 Feb 2020 11:12:44 +0800 Subject: [PATCH 61/98] feat: add JavaFX tutorial 3 related code --- src/main/java/DialogBox.java | 31 +++++++++++++++++++++++-------- src/main/java/Duke.java | 5 ++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java index 0b0dbe7d60..d13d9424a1 100644 --- a/src/main/java/DialogBox.java +++ b/src/main/java/DialogBox.java @@ -1,4 +1,7 @@ +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import javafx.geometry.Pos; +import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.image.ImageView; import javafx.scene.layout.HBox; @@ -8,14 +11,6 @@ public class DialogBox extends HBox { private Label text; private ImageView displayPicture; - public DialogBox(Label l) { - text = l; - - text.setWrapText(true); - - this.setAlignment(Pos.TOP_RIGHT); - this.getChildren().addAll(text); - } public DialogBox(Label l, ImageView iv) { text = l; @@ -28,4 +23,24 @@ public DialogBox(Label l, ImageView iv) { this.setAlignment(Pos.TOP_RIGHT); this.getChildren().addAll(text, displayPicture); } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + this.setAlignment(Pos.TOP_LEFT); + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + FXCollections.reverse(tmp); + this.getChildren().setAll(tmp); + } + + public static DialogBox getUserDialog(Label l, ImageView iv) { + return new DialogBox(l, iv); + } + + public static DialogBox getDukeDialog(Label l, ImageView iv) { + DialogBox db = new DialogBox(l, iv); + db.flip(); + return db; + } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7e29f4c3e7..e37a632613 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -183,10 +183,9 @@ private Label getDialogLabel(String text) { private void handleUserInput() { Label userText = new Label(userInput.getText()); Label dukeText = new Label(getResponse(userInput.getText())); - dialogContainer.getChildren().addAll( - new DialogBox(userText, new ImageView(user)), - new DialogBox(dukeText, new ImageView(duke)) + DialogBox.getUserDialog(userText, new ImageView(user)), + DialogBox.getDukeDialog(dukeText, new ImageView(duke)) ); userInput.clear(); } From 2fd5fd9b7d43ef0ce67bedccc76bc71ee93ec006 Mon Sep 17 00:00:00 2001 From: J-Dan23 Date: Wed, 12 Feb 2020 16:37:43 +0800 Subject: [PATCH 62/98] fix: remove ExceptionHandler --- src/main/java/ExceptionHandler.java | 31 ------------------------- src/main/resources/view/DialogBox.fxml | 16 +++++++++++++ src/main/resources/view/MainWindow.fxml | 19 +++++++++++++++ 3 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 src/main/java/ExceptionHandler.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/ExceptionHandler.java b/src/main/java/ExceptionHandler.java deleted file mode 100644 index b6058f4f7e..0000000000 --- a/src/main/java/ExceptionHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -public class ExceptionHandler { - public static void checkEmptyField(String[] taskStringArr, String type) throws EmptyFieldException { - if (type.equals("todo") || type.equals("deadline") || type.equals("event")) { - if (taskStringArr.length != 2) { - throw new EmptyFieldException( - "You're usually not that taciturn, Red. Explain things to me."); - } else if (!type.equals("todo")) { - String[] time = taskStringArr[1].split("/", 2); - if (time.length != 2) { - throw new EmptyFieldException( - "We're running short of time, so make sure you note it down."); - } else if (time[0].isEmpty()) { - throw new EmptyFieldException( - "You're usually not that taciturn, Red. Explain things to me."); - } - } - } - } - - public static void checkInvalidCommand(String type) throws InvalidCommandException { - if (!(type.equals("todo") - || type.equals("deadline") - || type.equals("event") - || type.equals("list") - || type.equals("done") - || type.equals("delete") - || type.equals("bye"))) { - throw new InvalidCommandException(""); - } - } -} diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e433809947 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..435f3ce0d8 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +