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/43] 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/43] 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/43] 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/43] 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 33b39ce540a15da9c8ce5e005d68556a51ac423d Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 00:30:20 +0800 Subject: [PATCH 05/43] Creation of MainManager class --- src/main/java/Duke.java | 13 +++++++------ src/main/java/MainManager.java | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 src/main/java/MainManager.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..926203d2ab 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,11 @@ public class Duke { public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); + + MainManager mm = new MainManager(); + mm.run(); } } diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java new file mode 100644 index 0000000000..0167a16121 --- /dev/null +++ b/src/main/java/MainManager.java @@ -0,0 +1,21 @@ +import java.util.Scanner; + +public class MainManager { + public MainManager() {}; + + public void run() { + Scanner sc = new Scanner(System.in); + + while(sc.hasNext()) { + String toPrint = sc.nextLine(); + if(toPrint.equals("bye")) { + System.out.println("Bye. Hope to see you again soon!"); + break; + } else { + System.out.println(toPrint); + } + } + } + + +} From c57b8f7f3eefb5b8c3c447e9940bf13e1d1d0d3b Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 01:08:56 +0800 Subject: [PATCH 06/43] Level-2 --- src/main/java/MainManager.java | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 0167a16121..1e6c8633ea 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,18 +1,40 @@ import java.util.Scanner; public class MainManager { - public MainManager() {}; + private String[] list; + private int counter; + + public MainManager() { + this.list = new String[100]; + counter = 0; + } public void run() { Scanner sc = new Scanner(System.in); while(sc.hasNext()) { String toPrint = sc.nextLine(); + switch(toPrint) { + case "bye": + System.out.println("Bye. Hope to see you again soon!"); + break; + + case "list": + for(String curr : list) { + if(curr != null) { + System.out.println(curr); + } + } + break; + + default: + list[counter] = ++counter + ". " + toPrint; + System.out.println("added: " + toPrint); + break; + } + if(toPrint.equals("bye")) { - System.out.println("Bye. Hope to see you again soon!"); break; - } else { - System.out.println(toPrint); } } } From 979131636776cfbcc2499df37bef2a32df588634 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 01:46:39 +0800 Subject: [PATCH 07/43] Task Class created, Level-3 --- src/main/java/MainManager.java | 25 ++++++++++++++++++------- src/main/java/Task.java | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 1e6c8633ea..17027af301 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,11 +1,11 @@ import java.util.Scanner; public class MainManager { - private String[] list; + private Task[] list; private int counter; public MainManager() { - this.list = new String[100]; + this.list = new Task[100]; counter = 0; } @@ -14,21 +14,32 @@ public void run() { while(sc.hasNext()) { String toPrint = sc.nextLine(); - switch(toPrint) { + String[] command = toPrint.split(" "); + switch(command[0]) { case "bye": System.out.println("Bye. Hope to see you again soon!"); break; case "list": - for(String curr : list) { - if(curr != null) { - System.out.println(curr); + for(int i = 0; i < list.length; i++) { + if(list[i] != null) { + System.out.println(i + 1 + "." + list[i]); } } break; + case "done" : + System.out.println("Nice! I've marked this task as done:"); + Task currTask = list[Integer.parseInt(command[1]) - 1]; + currTask.setDone(); + System.out.println(" " + currTask); + break; + + default: - list[counter] = ++counter + ". " + toPrint; + Task curr = new Task(toPrint); + list[counter] = curr; + counter++; System.out.println("added: " + toPrint); break; } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..e6940351e3 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,22 @@ +public class Task { + private String name; + private boolean isDone; + + public Task(String name) { + this.name = name; + this.isDone = false; + } + + public void setDone() { + isDone = true; + } + + @Override + public String toString() { + if(isDone) { + return "[✓] " + name; + } else { + return "[✗] " + name; + } + } +} From 7b06420b9c1b47113858b517fc7e1d5734ae12b2 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 10:56:11 +0800 Subject: [PATCH 08/43] Implemented Enums in Task Class --- src/main/java/MainManager.java | 2 +- src/main/java/Task.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 17027af301..7cf6a3170f 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -37,7 +37,7 @@ public void run() { default: - Task curr = new Task(toPrint); + Task curr = new Task(toPrint, command[0].toUpperCase()); list[counter] = curr; counter++; System.out.println("added: " + toPrint); diff --git a/src/main/java/Task.java b/src/main/java/Task.java index e6940351e3..32e08d0b4c 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,9 +1,17 @@ public class Task { private String name; private boolean isDone; + private Inputs Type; - public Task(String name) { + enum Inputs { + TODO, + DEADLINE, + EVENT + } + + public Task(String name, String input) { this.name = name; + this.Type = Inputs.valueOf(input); this.isDone = false; } From 87270bee2b6a96bba2dc32adf46dbd9e22e9b63d Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 21:13:02 +0800 Subject: [PATCH 09/43] Level-4 --- src/main/java/Deadline.java | 18 +++++++++++++ src/main/java/Event.java | 18 +++++++++++++ src/main/java/MainManager.java | 48 +++++++++++++++++++++++++++++++++- src/main/java/Task.java | 25 +++++------------- src/main/java/Todo.java | 15 +++++++++++ 5 files changed, 105 insertions(+), 19 deletions(-) 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..db18196f52 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,18 @@ +public class Deadline extends Task { + protected String time; + + + public Deadline(String name, String time) { + this.name = name; + this.time = time; + this.isDone = false; + } + + public String toString() { + if (isDone) { + return "[D}[✓] " + name + " (by: " + time + ")"; + } else { + return "[D}[✗] " + name + " (by: " + time + ")"; + } + } +} \ No newline at end of file diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..19be359633 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,18 @@ +public class Event extends Task { + protected String time; + + + public Event(String name, String time) { + this.name = name; + this.time = time; + this.isDone = false; + } + + public String toString() { + if(isDone) { + return "[E}[✓] " + name + " (at: " + time + ")"; + } else { + return "[E}[✗] " + name + " (at: " + time + ")"; + } + } +} diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 7cf6a3170f..9b13afeab5 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -9,6 +9,17 @@ public MainManager() { counter = 0; } + private String[] getEventDetails(String command) { + String woCommand = command.substring(6); + return woCommand.split(" /at "); + } + + private String[] getDeadlineDetails(String command) { + String woCommand = command.substring(9); + return woCommand.split(" /by "); + } + + public void run() { Scanner sc = new Scanner(System.in); @@ -35,13 +46,48 @@ public void run() { System.out.println(" " + currTask); break; + case "todo": + String todoName = toPrint.substring(5); + Task todo = new Todo(todoName); + list[counter] = todo; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + todo); + System.out.println("Now you have " + counter + " tasks in the list."); + break; + + case "deadline": + String[] deadlineDetails = getDeadlineDetails(toPrint); + Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); + list[counter] = deadline; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + deadline); + System.out.println("Now you have " + counter + " tasks in the list."); + break; + + case "event": + String[] eventDetails = getEventDetails(toPrint); + Task event = new Event(eventDetails[0], eventDetails[1]); + list[counter] = event; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + event); + System.out.println("Now you have " + counter + " tasks in the list."); + break; + default: - Task curr = new Task(toPrint, command[0].toUpperCase()); + /* + Task curr = new Task(toPrint); list[counter] = curr; counter++; System.out.println("added: " + toPrint); + */ + System.out.println("ERROR: Unsupported action"); break; + + } if(toPrint.equals("bye")) { diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 32e08d0b4c..c718c6efee 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,17 +1,12 @@ -public class Task { - private String name; - private boolean isDone; - private Inputs Type; +public abstract class Task { + protected String name; + protected boolean isDone; + //private Inputs Type; - enum Inputs { - TODO, - DEADLINE, - EVENT - } + public Task() {} - public Task(String name, String input) { + public Task(String name) { this.name = name; - this.Type = Inputs.valueOf(input); this.isDone = false; } @@ -20,11 +15,5 @@ public void setDone() { } @Override - public String toString() { - if(isDone) { - return "[✓] " + name; - } else { - return "[✗] " + name; - } - } + public abstract String toString(); } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..acbea24770 --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,15 @@ +public class Todo extends Task { + + public Todo(String name) { + this.name = name; + this.isDone = false; + } + + public String toString() { + if(isDone) { + return "[T}[✓] " + name; + } else { + return "[T}[✗] " + name; + } + } +} From fe5ced8643af5e69ce8e754c42257f3623ba56d0 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 21:40:23 +0800 Subject: [PATCH 10/43] Implementation of TaskException --- src/main/java/MainManager.java | 70 +++++++++++++++++++++----------- src/main/java/TaskException.java | 9 ++++ 2 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 src/main/java/TaskException.java diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 9b13afeab5..f401e7ee78 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -9,18 +9,24 @@ public MainManager() { counter = 0; } - private String[] getEventDetails(String command) { + private String[] getEventDetails(String command) throws TaskException{ + if(command.length() <= 5) { + throw new TaskException(); + } String woCommand = command.substring(6); return woCommand.split(" /at "); } - private String[] getDeadlineDetails(String command) { + private String[] getDeadlineDetails(String command) throws TaskException{ + if(command.length() <= 8) { + throw new TaskException(); + } String woCommand = command.substring(9); return woCommand.split(" /by "); } - public void run() { + public void run(){ Scanner sc = new Scanner(System.in); while(sc.hasNext()) { @@ -47,33 +53,49 @@ public void run() { break; case "todo": - String todoName = toPrint.substring(5); - Task todo = new Todo(todoName); - list[counter] = todo; - counter++; - System.out.println("Got it. I've added this task: "); - System.out.println(" " + todo); - System.out.println("Now you have " + counter + " tasks in the list."); + try { + if(toPrint.length() <= 4) { + throw new TaskException(); + } + String todoName = toPrint.substring(5); + Task todo = new Todo(todoName); + list[counter] = todo; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + todo); + System.out.println("Now you have " + counter + " tasks in the list."); + + } catch(TaskException toEx) { + System.out.println(toEx); + } break; case "deadline": - String[] deadlineDetails = getDeadlineDetails(toPrint); - Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list[counter] = deadline; - counter++; - System.out.println("Got it. I've added this task: "); - System.out.println(" " + deadline); - System.out.println("Now you have " + counter + " tasks in the list."); + try { + String[] deadlineDetails = getDeadlineDetails(toPrint); + Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); + list[counter] = deadline; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + deadline); + System.out.println("Now you have " + counter + " tasks in the list."); + } catch(TaskException dlEx) { + System.out.println(dlEx); + } break; case "event": - String[] eventDetails = getEventDetails(toPrint); - Task event = new Event(eventDetails[0], eventDetails[1]); - list[counter] = event; - counter++; - System.out.println("Got it. I've added this task: "); - System.out.println(" " + event); - System.out.println("Now you have " + counter + " tasks in the list."); + try { + String[] eventDetails = getEventDetails(toPrint); + Task event = new Event(eventDetails[0], eventDetails[1]); + list[counter] = event; + counter++; + System.out.println("Got it. I've added this task: "); + System.out.println(" " + event); + System.out.println("Now you have " + counter + " tasks in the list."); + } catch (TaskException evEx) { + System.out.println(evEx); + } break; diff --git a/src/main/java/TaskException.java b/src/main/java/TaskException.java new file mode 100644 index 0000000000..5ce5ad08ad --- /dev/null +++ b/src/main/java/TaskException.java @@ -0,0 +1,9 @@ +public class TaskException extends Exception{ + + public TaskException() {}; + + @Override + public String toString() { + return "☹ OOPS!!! The description of a Task cannot be empty."; + } +} From 0552364678d58cf98cb00776fdf7cc7f97e13a14 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 21:53:17 +0800 Subject: [PATCH 11/43] DoneException + UnknownCommandException implemented, Level-5 --- src/main/java/DoneException.java | 8 +++++++ src/main/java/MainManager.java | 25 +++++++++++----------- src/main/java/TaskException.java | 3 +-- src/main/java/UnknownCommandException.java | 8 +++++++ 4 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 src/main/java/DoneException.java create mode 100644 src/main/java/UnknownCommandException.java diff --git a/src/main/java/DoneException.java b/src/main/java/DoneException.java new file mode 100644 index 0000000000..f131801a71 --- /dev/null +++ b/src/main/java/DoneException.java @@ -0,0 +1,8 @@ +public class DoneException extends Exception{ + public DoneException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! You must specify a Task to be done!"; + } +} diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index f401e7ee78..5dc9f0f8cb 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -46,10 +46,17 @@ public void run(){ break; case "done" : - System.out.println("Nice! I've marked this task as done:"); - Task currTask = list[Integer.parseInt(command[1]) - 1]; - currTask.setDone(); - System.out.println(" " + currTask); + try { + if(toPrint.length() <= 4) { + throw new DoneException(); + } + System.out.println("Nice! I've marked this task as done:"); + Task currTask = list[Integer.parseInt(command[1]) - 1]; + currTask.setDone(); + System.out.println(" " + currTask); + } catch (DoneException doEx) { + System.out.println(doEx); + } break; case "todo": @@ -100,16 +107,8 @@ public void run(){ default: - /* - Task curr = new Task(toPrint); - list[counter] = curr; - counter++; - System.out.println("added: " + toPrint); - */ - System.out.println("ERROR: Unsupported action"); + System.out.println(new UnknownCommandException()); break; - - } if(toPrint.equals("bye")) { diff --git a/src/main/java/TaskException.java b/src/main/java/TaskException.java index 5ce5ad08ad..8c59f0c7d4 100644 --- a/src/main/java/TaskException.java +++ b/src/main/java/TaskException.java @@ -1,9 +1,8 @@ public class TaskException extends Exception{ - public TaskException() {}; @Override public String toString() { - return "☹ OOPS!!! The description of a Task cannot be empty."; + return " ☹ OOPS!!! The description of a Task cannot be empty."; } } diff --git a/src/main/java/UnknownCommandException.java b/src/main/java/UnknownCommandException.java new file mode 100644 index 0000000000..5ee2bdf771 --- /dev/null +++ b/src/main/java/UnknownCommandException.java @@ -0,0 +1,8 @@ +public class UnknownCommandException extends Exception{ + public UnknownCommandException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! I'm sorry, but I don't know what that means :-("; + } +} From 6c96a18f8bf565c63646ad860e2edff978065b14 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 22 Aug 2019 22:56:54 +0800 Subject: [PATCH 12/43] Delete + DeleteException implemented, Level-6 --- src/main/java/DeleteException.java | 8 +++++ src/main/java/MainManager.java | 53 ++++++++++++++++++++---------- 2 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 src/main/java/DeleteException.java diff --git a/src/main/java/DeleteException.java b/src/main/java/DeleteException.java new file mode 100644 index 0000000000..f11e72edbb --- /dev/null +++ b/src/main/java/DeleteException.java @@ -0,0 +1,8 @@ +public class DeleteException extends Exception{ + public DeleteException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! There was an error with deleting!"; + } +} diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index 5dc9f0f8cb..cd279e639f 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,12 +1,12 @@ +import java.lang.reflect.Array; import java.util.Scanner; +import java.util.ArrayList; public class MainManager { - private Task[] list; - private int counter; + private ArrayList list; public MainManager() { - this.list = new Task[100]; - counter = 0; + this.list = new ArrayList<>(); } private String[] getEventDetails(String command) throws TaskException{ @@ -38,9 +38,9 @@ public void run(){ break; case "list": - for(int i = 0; i < list.length; i++) { - if(list[i] != null) { - System.out.println(i + 1 + "." + list[i]); + for(int i = 0; i < list.size(); i++) { + if(list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); } } break; @@ -51,7 +51,7 @@ public void run(){ throw new DoneException(); } System.out.println("Nice! I've marked this task as done:"); - Task currTask = list[Integer.parseInt(command[1]) - 1]; + Task currTask = list.get(Integer.parseInt(command[1]) - 1); currTask.setDone(); System.out.println(" " + currTask); } catch (DoneException doEx) { @@ -66,11 +66,10 @@ public void run(){ } String todoName = toPrint.substring(5); Task todo = new Todo(todoName); - list[counter] = todo; - counter++; + list.add(todo); System.out.println("Got it. I've added this task: "); System.out.println(" " + todo); - System.out.println("Now you have " + counter + " tasks in the list."); + System.out.println("Now you have " + list.size() + " tasks in the list."); } catch(TaskException toEx) { System.out.println(toEx); @@ -81,13 +80,12 @@ public void run(){ try { String[] deadlineDetails = getDeadlineDetails(toPrint); Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list[counter] = deadline; - counter++; + list.add(deadline); System.out.println("Got it. I've added this task: "); System.out.println(" " + deadline); - System.out.println("Now you have " + counter + " tasks in the list."); + System.out.println("Now you have " + list.size() + " tasks in the list."); } catch(TaskException dlEx) { - System.out.println(dlEx); + System.out.println(dlEx); } break; @@ -95,16 +93,35 @@ public void run(){ try { String[] eventDetails = getEventDetails(toPrint); Task event = new Event(eventDetails[0], eventDetails[1]); - list[counter] = event; - counter++; + list.add(event); System.out.println("Got it. I've added this task: "); System.out.println(" " + event); - System.out.println("Now you have " + counter + " tasks in the list."); + System.out.println("Now you have " + list.size() + " tasks in the list."); } catch (TaskException evEx) { System.out.println(evEx); } break; + case "delete": + try { + if (command.length <= 1){ + throw new DeleteException(); + } else { + int index = Integer.parseInt(command[1]); + + if (command.length <= 1 || index > list.size() || index <= 0) { + throw new DeleteException(); + } + + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + list.remove(index - 1)); + System.out.println("Now you have " + list.size() + " tasks in the list."); + } + } catch(DeleteException deEx) { + System.out.println(deEx); + } + break; + default: System.out.println(new UnknownCommandException()); From cb85e8d126c0c29e5dd9e6e17a0fc845714f87b5 Mon Sep 17 00:00:00 2001 From: Taha Date: Mon, 2 Sep 2019 17:20:51 +0800 Subject: [PATCH 13/43] Implemented saving to saving to/reading from disk + Level-7 --- src/main/java/Deadline.java | 12 +- src/main/java/Duke.java | 19 ++- src/main/java/Event.java | 14 +- src/main/java/MainManager.java | 261 +++++++++++++++++++++++---------- src/main/java/Task.java | 2 + src/main/java/Todo.java | 13 +- 6 files changed, 226 insertions(+), 95 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index db18196f52..e1ba15c832 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -8,11 +8,19 @@ public Deadline(String name, String time) { this.isDone = false; } + public String toFile() { + if(isDone) { + return "D-1-" + name + "-" + time; + } else { + return "D-0-" + name + "-" + time; + } + } + public String toString() { if (isDone) { - return "[D}[✓] " + name + " (by: " + time + ")"; + return "[D][✓] " + name + " (by: " + time + ")"; } else { - return "[D}[✗] " + name + " (by: " + time + ")"; + return "[D][✗] " + name + " (by: " + time + ")"; } } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 926203d2ab..2044d49fb0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,18 @@ +import java.io.FileNotFoundException; + public class Duke { public static void main(String[] args) { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); - MainManager mm = new MainManager(); - mm.run(); + MainManager mm = new MainManager(); + try { + mm.readFromFile(); + } catch (FileNotFoundException fE) { + System.out.println(fE); + } + mm.run(); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 19be359633..709d80e989 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -8,11 +8,19 @@ public Event(String name, String time) { this.isDone = false; } - public String toString() { + public String toFile() { if(isDone) { - return "[E}[✓] " + name + " (at: " + time + ")"; + return "E-1-" + name + "-" + time; + } else { + return "E-0-" + name + "-" + time; + } + } + + public String toString() { + if (isDone) { + return "[E][✓] " + name + " (at: " + time + ")"; } else { - return "[E}[✗] " + name + " (at: " + time + ")"; + return "[E][✗] " + name + " (at: " + time + ")"; } } } diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index cd279e639f..ab67839e09 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,6 +1,11 @@ -import java.lang.reflect.Array; +import java.nio.file.Paths; import java.util.Scanner; import java.util.ArrayList; +import java.io.File; +import java.io.FileWriter; +import java.nio.file.Path; +import java.io.IOException; +import java.io.FileNotFoundException; public class MainManager { private ArrayList list; @@ -25,107 +30,203 @@ private String[] getDeadlineDetails(String command) throws TaskException{ return woCommand.split(" /by "); } + private void writeToFile() throws FileNotFoundException, IOException { + try { + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + FileWriter fw = new FileWriter(data); - public void run(){ - Scanner sc = new Scanner(System.in); + String toWrite = ""; + for(Task task : list) { + toWrite += task.toFile() + " \n"; + } - while(sc.hasNext()) { - String toPrint = sc.nextLine(); - String[] command = toPrint.split(" "); - switch(command[0]) { - case "bye": - System.out.println("Bye. Hope to see you again soon!"); - break; + fw.write(toWrite); + fw.close(); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } - case "list": - for(int i = 0; i < list.size(); i++) { - if(list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); - } + public void readFromFile() throws FileNotFoundException{ + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + try { + Scanner sc = new Scanner(data); + + while(sc.hasNextLine()) { + String[] next = sc.nextLine().split("-"); + + switch (next[0]) { + case ("T"): + Task todo = new Todo(next[2]); + + if (Integer.valueOf(next[1]) == 1) { + todo.setDone(); } + list.add(todo); break; - case "done" : - try { - if(toPrint.length() <= 4) { - throw new DoneException(); - } - System.out.println("Nice! I've marked this task as done:"); - Task currTask = list.get(Integer.parseInt(command[1]) - 1); - currTask.setDone(); - System.out.println(" " + currTask); - } catch (DoneException doEx) { - System.out.println(doEx); + + case ("E"): + Task event = new Event(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + event.setDone(); } + list.add(event); break; - case "todo": - try { - if(toPrint.length() <= 4) { - throw new TaskException(); - } - String todoName = toPrint.substring(5); - Task todo = new Todo(todoName); - list.add(todo); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + todo); - System.out.println("Now you have " + list.size() + " tasks in the list."); + case ("D"): + Task deadline = new Deadline(next[2], next[3]); - } catch(TaskException toEx) { - System.out.println(toEx); + if (Integer.valueOf(next[1]) == 1) { + deadline.setDone(); } + list.add(deadline); break; + } + } + sc.close(); + } catch(FileNotFoundException fE) { + System.out.println(fE); + } - case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(toPrint); - Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list.add(deadline); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + deadline); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } catch(TaskException dlEx) { - System.out.println(dlEx); + + } + + public void run(){ + Scanner sc = new Scanner(System.in); + + while(sc.hasNext()) { + String toPrint = sc.nextLine(); + String[] command = toPrint.split(" "); + + switch(command[0]) { + case "bye": + System.out.println("Bye. Hope to see you again soon!"); + break; + + case "list": + for(int i = 0; i < list.size(); i++) { + if(list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); } - break; + } + break; - case "event": - try { - String[] eventDetails = getEventDetails(toPrint); - Task event = new Event(eventDetails[0], eventDetails[1]); - list.add(event); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + event); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } catch (TaskException evEx) { - System.out.println(evEx); + case "done" : + try { + if(toPrint.length() <= 4) { + throw new DoneException(); } - break; + System.out.println("Nice! I've marked this task as done:"); + Task currTask = list.get(Integer.parseInt(command[1]) - 1); + currTask.setDone(); + System.out.println(" " + currTask); + + writeToFile(); + } catch (DoneException doEx) { + System.out.println(doEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - case "delete": - try { - if (command.length <= 1){ - throw new DeleteException(); - } else { - int index = Integer.parseInt(command[1]); + case "todo": + try { + if(toPrint.length() <= 4) { + throw new TaskException(); + } + String todoName = toPrint.substring(5); + Task todo = new Todo(todoName); + list.add(todo); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + todo); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch(TaskException toEx) { + System.out.println(toEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - if (command.length <= 1 || index > list.size() || index <= 0) { - throw new DeleteException(); - } + case "deadline": + try { + String[] deadlineDetails = getDeadlineDetails(toPrint); + Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); + list.add(deadline); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + deadline); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch(TaskException dlEx) { + System.out.println(dlEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; + + case "event": + try { + String[] eventDetails = getEventDetails(toPrint); + Task event = new Event(eventDetails[0], eventDetails[1]); + list.add(event); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + event); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch (TaskException evEx) { + System.out.println(evEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; + + case "delete": + try { + if (command.length <= 1){ + throw new DeleteException(); + } else { + int index = Integer.parseInt(command[1]); - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + list.remove(index - 1)); - System.out.println("Now you have " + list.size() + " tasks in the list."); + if (command.length <= 1 || index > list.size() || index <= 0) { + throw new DeleteException(); } - } catch(DeleteException deEx) { - System.out.println(deEx); + + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + list.remove(index - 1)); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); } - break; + } catch(DeleteException deEx) { + System.out.println(deEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - default: - System.out.println(new UnknownCommandException()); - break; + default: + System.out.println(new UnknownCommandException()); + break; } if(toPrint.equals("bye")) { @@ -133,6 +234,4 @@ public void run(){ } } } - - } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index c718c6efee..7f2b53a0c1 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -14,6 +14,8 @@ public void setDone() { isDone = true; } + public abstract String toFile(); + @Override public abstract String toString(); } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index acbea24770..2f162a585d 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -5,11 +5,18 @@ public Todo(String name) { this.isDone = false; } - public String toString() { + public String toFile() { if(isDone) { - return "[T}[✓] " + name; + return "T-1-" + name; + } else { + return "T-0-" + name; + } + } + public String toString() { + if (isDone) { + return "[T][✓] " + name; } else { - return "[T}[✗] " + name; + return "[T][✗] " + name; } } } From 0358d35fed788c469f6e6f913d5915eb74cd3088 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 4 Sep 2019 16:05:56 +0800 Subject: [PATCH 14/43] Revert "Implemented saving to saving to/reading from disk + Level-7" This reverts commit cb85e8d126c0c29e5dd9e6e17a0fc845714f87b5. --- src/main/java/Deadline.java | 12 +- src/main/java/Duke.java | 19 +-- src/main/java/Event.java | 14 +- src/main/java/MainManager.java | 261 ++++++++++----------------------- src/main/java/Task.java | 2 - src/main/java/Todo.java | 13 +- 6 files changed, 95 insertions(+), 226 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index e1ba15c832..db18196f52 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -8,19 +8,11 @@ public Deadline(String name, String time) { this.isDone = false; } - public String toFile() { - if(isDone) { - return "D-1-" + name + "-" + time; - } else { - return "D-0-" + name + "-" + time; - } - } - public String toString() { if (isDone) { - return "[D][✓] " + name + " (by: " + time + ")"; + return "[D}[✓] " + name + " (by: " + time + ")"; } else { - return "[D][✗] " + name + " (by: " + time + ")"; + return "[D}[✗] " + name + " (by: " + time + ")"; } } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2044d49fb0..926203d2ab 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,18 +1,11 @@ -import java.io.FileNotFoundException; - public class Duke { public static void main(String[] args) { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); - MainManager mm = new MainManager(); - try { - mm.readFromFile(); - } catch (FileNotFoundException fE) { - System.out.println(fE); - } - mm.run(); + MainManager mm = new MainManager(); + mm.run(); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 709d80e989..19be359633 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -8,19 +8,11 @@ public Event(String name, String time) { this.isDone = false; } - public String toFile() { - if(isDone) { - return "E-1-" + name + "-" + time; - } else { - return "E-0-" + name + "-" + time; - } - } - public String toString() { - if (isDone) { - return "[E][✓] " + name + " (at: " + time + ")"; + if(isDone) { + return "[E}[✓] " + name + " (at: " + time + ")"; } else { - return "[E][✗] " + name + " (at: " + time + ")"; + return "[E}[✗] " + name + " (at: " + time + ")"; } } } diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index ab67839e09..cd279e639f 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,11 +1,6 @@ -import java.nio.file.Paths; +import java.lang.reflect.Array; import java.util.Scanner; import java.util.ArrayList; -import java.io.File; -import java.io.FileWriter; -import java.nio.file.Path; -import java.io.IOException; -import java.io.FileNotFoundException; public class MainManager { private ArrayList list; @@ -30,72 +25,6 @@ private String[] getDeadlineDetails(String command) throws TaskException{ return woCommand.split(" /by "); } - private void writeToFile() throws FileNotFoundException, IOException { - try { - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); - FileWriter fw = new FileWriter(data); - - String toWrite = ""; - for(Task task : list) { - toWrite += task.toFile() + " \n"; - } - - fw.write(toWrite); - fw.close(); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - } - - public void readFromFile() throws FileNotFoundException{ - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); - try { - Scanner sc = new Scanner(data); - - while(sc.hasNextLine()) { - String[] next = sc.nextLine().split("-"); - - switch (next[0]) { - case ("T"): - Task todo = new Todo(next[2]); - - if (Integer.valueOf(next[1]) == 1) { - todo.setDone(); - } - list.add(todo); - break; - - - case ("E"): - Task event = new Event(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - event.setDone(); - } - list.add(event); - break; - - case ("D"): - Task deadline = new Deadline(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - deadline.setDone(); - } - list.add(deadline); - break; - } - } - sc.close(); - } catch(FileNotFoundException fE) { - System.out.println(fE); - } - - - } public void run(){ Scanner sc = new Scanner(System.in); @@ -103,130 +32,100 @@ public void run(){ while(sc.hasNext()) { String toPrint = sc.nextLine(); String[] command = toPrint.split(" "); - switch(command[0]) { - case "bye": - System.out.println("Bye. Hope to see you again soon!"); - break; + case "bye": + System.out.println("Bye. Hope to see you again soon!"); + break; - case "list": - for(int i = 0; i < list.size(); i++) { - if(list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); + case "list": + for(int i = 0; i < list.size(); i++) { + if(list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); + } } - } - break; + break; - case "done" : - try { - if(toPrint.length() <= 4) { - throw new DoneException(); + case "done" : + try { + if(toPrint.length() <= 4) { + throw new DoneException(); + } + System.out.println("Nice! I've marked this task as done:"); + Task currTask = list.get(Integer.parseInt(command[1]) - 1); + currTask.setDone(); + System.out.println(" " + currTask); + } catch (DoneException doEx) { + System.out.println(doEx); } - System.out.println("Nice! I've marked this task as done:"); - Task currTask = list.get(Integer.parseInt(command[1]) - 1); - currTask.setDone(); - System.out.println(" " + currTask); - - writeToFile(); - } catch (DoneException doEx) { - System.out.println(doEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; + break; - case "todo": - try { - if(toPrint.length() <= 4) { - throw new TaskException(); - } - String todoName = toPrint.substring(5); - Task todo = new Todo(todoName); - list.add(todo); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + todo); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch(TaskException toEx) { - System.out.println(toEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; + case "todo": + try { + if(toPrint.length() <= 4) { + throw new TaskException(); + } + String todoName = toPrint.substring(5); + Task todo = new Todo(todoName); + list.add(todo); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + todo); + System.out.println("Now you have " + list.size() + " tasks in the list."); - case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(toPrint); - Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list.add(deadline); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + deadline); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch(TaskException dlEx) { - System.out.println(dlEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; + } catch(TaskException toEx) { + System.out.println(toEx); + } + break; - case "event": - try { - String[] eventDetails = getEventDetails(toPrint); - Task event = new Event(eventDetails[0], eventDetails[1]); - list.add(event); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + event); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch (TaskException evEx) { - System.out.println(evEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; + case "deadline": + try { + String[] deadlineDetails = getDeadlineDetails(toPrint); + Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); + list.add(deadline); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + deadline); + System.out.println("Now you have " + list.size() + " tasks in the list."); + } catch(TaskException dlEx) { + System.out.println(dlEx); + } + break; - case "delete": - try { - if (command.length <= 1){ - throw new DeleteException(); - } else { - int index = Integer.parseInt(command[1]); + case "event": + try { + String[] eventDetails = getEventDetails(toPrint); + Task event = new Event(eventDetails[0], eventDetails[1]); + list.add(event); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + event); + System.out.println("Now you have " + list.size() + " tasks in the list."); + } catch (TaskException evEx) { + System.out.println(evEx); + } + break; - if (command.length <= 1 || index > list.size() || index <= 0) { + case "delete": + try { + if (command.length <= 1){ throw new DeleteException(); - } + } else { + int index = Integer.parseInt(command[1]); - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + list.remove(index - 1)); - System.out.println("Now you have " + list.size() + " tasks in the list."); + if (command.length <= 1 || index > list.size() || index <= 0) { + throw new DeleteException(); + } - writeToFile(); + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + list.remove(index - 1)); + System.out.println("Now you have " + list.size() + " tasks in the list."); + } + } catch(DeleteException deEx) { + System.out.println(deEx); } - } catch(DeleteException deEx) { - System.out.println(deEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; + break; - default: - System.out.println(new UnknownCommandException()); - break; + default: + System.out.println(new UnknownCommandException()); + break; } if(toPrint.equals("bye")) { @@ -234,4 +133,6 @@ public void run(){ } } } + + } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7f2b53a0c1..c718c6efee 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -14,8 +14,6 @@ public void setDone() { isDone = true; } - public abstract String toFile(); - @Override public abstract String toString(); } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 2f162a585d..acbea24770 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -5,18 +5,11 @@ public Todo(String name) { this.isDone = false; } - public String toFile() { - if(isDone) { - return "T-1-" + name; - } else { - return "T-0-" + name; - } - } public String toString() { - if (isDone) { - return "[T][✓] " + name; + if(isDone) { + return "[T}[✓] " + name; } else { - return "[T][✗] " + name; + return "[T}[✗] " + name; } } } From bb1b26a17d0b209d5c24ec31a9c9fca6183ef010 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 4 Sep 2019 16:19:18 +0800 Subject: [PATCH 15/43] Implemented saving to file + Level-7 --- src/main/java/Deadline.java | 14 +- src/main/java/Duke.java | 19 ++- src/main/java/Event.java | 14 +- src/main/java/MainManager.java | 261 +++++++++++++++++++++++---------- src/main/java/Task.java | 2 + src/main/java/Todo.java | 13 +- 6 files changed, 227 insertions(+), 96 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index db18196f52..f2cc118dd2 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -8,11 +8,19 @@ public Deadline(String name, String time) { this.isDone = false; } + public String toFile() { + if(isDone) { + return "D-1-" + name + "-" + time; + } else { + return "D-0-" + name + "-" + time; + } + } + public String toString() { if (isDone) { - return "[D}[✓] " + name + " (by: " + time + ")"; + return "[D][✓] " + name + " (by: " + time + ")"; } else { - return "[D}[✗] " + name + " (by: " + time + ")"; + return "[D][✗] " + name + " (by: " + time + ")"; } } -} \ No newline at end of file +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 926203d2ab..2044d49fb0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,18 @@ +import java.io.FileNotFoundException; + public class Duke { public static void main(String[] args) { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); - MainManager mm = new MainManager(); - mm.run(); + MainManager mm = new MainManager(); + try { + mm.readFromFile(); + } catch (FileNotFoundException fE) { + System.out.println(fE); + } + mm.run(); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 19be359633..709d80e989 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -8,11 +8,19 @@ public Event(String name, String time) { this.isDone = false; } - public String toString() { + public String toFile() { if(isDone) { - return "[E}[✓] " + name + " (at: " + time + ")"; + return "E-1-" + name + "-" + time; + } else { + return "E-0-" + name + "-" + time; + } + } + + public String toString() { + if (isDone) { + return "[E][✓] " + name + " (at: " + time + ")"; } else { - return "[E}[✗] " + name + " (at: " + time + ")"; + return "[E][✗] " + name + " (at: " + time + ")"; } } } diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java index cd279e639f..ab67839e09 100644 --- a/src/main/java/MainManager.java +++ b/src/main/java/MainManager.java @@ -1,6 +1,11 @@ -import java.lang.reflect.Array; +import java.nio.file.Paths; import java.util.Scanner; import java.util.ArrayList; +import java.io.File; +import java.io.FileWriter; +import java.nio.file.Path; +import java.io.IOException; +import java.io.FileNotFoundException; public class MainManager { private ArrayList list; @@ -25,107 +30,203 @@ private String[] getDeadlineDetails(String command) throws TaskException{ return woCommand.split(" /by "); } + private void writeToFile() throws FileNotFoundException, IOException { + try { + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + FileWriter fw = new FileWriter(data); - public void run(){ - Scanner sc = new Scanner(System.in); + String toWrite = ""; + for(Task task : list) { + toWrite += task.toFile() + " \n"; + } - while(sc.hasNext()) { - String toPrint = sc.nextLine(); - String[] command = toPrint.split(" "); - switch(command[0]) { - case "bye": - System.out.println("Bye. Hope to see you again soon!"); - break; + fw.write(toWrite); + fw.close(); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } - case "list": - for(int i = 0; i < list.size(); i++) { - if(list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); - } + public void readFromFile() throws FileNotFoundException{ + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + try { + Scanner sc = new Scanner(data); + + while(sc.hasNextLine()) { + String[] next = sc.nextLine().split("-"); + + switch (next[0]) { + case ("T"): + Task todo = new Todo(next[2]); + + if (Integer.valueOf(next[1]) == 1) { + todo.setDone(); } + list.add(todo); break; - case "done" : - try { - if(toPrint.length() <= 4) { - throw new DoneException(); - } - System.out.println("Nice! I've marked this task as done:"); - Task currTask = list.get(Integer.parseInt(command[1]) - 1); - currTask.setDone(); - System.out.println(" " + currTask); - } catch (DoneException doEx) { - System.out.println(doEx); + + case ("E"): + Task event = new Event(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + event.setDone(); } + list.add(event); break; - case "todo": - try { - if(toPrint.length() <= 4) { - throw new TaskException(); - } - String todoName = toPrint.substring(5); - Task todo = new Todo(todoName); - list.add(todo); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + todo); - System.out.println("Now you have " + list.size() + " tasks in the list."); + case ("D"): + Task deadline = new Deadline(next[2], next[3]); - } catch(TaskException toEx) { - System.out.println(toEx); + if (Integer.valueOf(next[1]) == 1) { + deadline.setDone(); } + list.add(deadline); break; + } + } + sc.close(); + } catch(FileNotFoundException fE) { + System.out.println(fE); + } - case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(toPrint); - Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list.add(deadline); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + deadline); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } catch(TaskException dlEx) { - System.out.println(dlEx); + + } + + public void run(){ + Scanner sc = new Scanner(System.in); + + while(sc.hasNext()) { + String toPrint = sc.nextLine(); + String[] command = toPrint.split(" "); + + switch(command[0]) { + case "bye": + System.out.println("Bye. Hope to see you again soon!"); + break; + + case "list": + for(int i = 0; i < list.size(); i++) { + if(list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); } - break; + } + break; - case "event": - try { - String[] eventDetails = getEventDetails(toPrint); - Task event = new Event(eventDetails[0], eventDetails[1]); - list.add(event); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + event); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } catch (TaskException evEx) { - System.out.println(evEx); + case "done" : + try { + if(toPrint.length() <= 4) { + throw new DoneException(); } - break; + System.out.println("Nice! I've marked this task as done:"); + Task currTask = list.get(Integer.parseInt(command[1]) - 1); + currTask.setDone(); + System.out.println(" " + currTask); + + writeToFile(); + } catch (DoneException doEx) { + System.out.println(doEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - case "delete": - try { - if (command.length <= 1){ - throw new DeleteException(); - } else { - int index = Integer.parseInt(command[1]); + case "todo": + try { + if(toPrint.length() <= 4) { + throw new TaskException(); + } + String todoName = toPrint.substring(5); + Task todo = new Todo(todoName); + list.add(todo); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + todo); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch(TaskException toEx) { + System.out.println(toEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - if (command.length <= 1 || index > list.size() || index <= 0) { - throw new DeleteException(); - } + case "deadline": + try { + String[] deadlineDetails = getDeadlineDetails(toPrint); + Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); + list.add(deadline); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + deadline); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch(TaskException dlEx) { + System.out.println(dlEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; + + case "event": + try { + String[] eventDetails = getEventDetails(toPrint); + Task event = new Event(eventDetails[0], eventDetails[1]); + list.add(event); + System.out.println("Got it. I've added this task: "); + System.out.println(" " + event); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); + } catch (TaskException evEx) { + System.out.println(evEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; + + case "delete": + try { + if (command.length <= 1){ + throw new DeleteException(); + } else { + int index = Integer.parseInt(command[1]); - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + list.remove(index - 1)); - System.out.println("Now you have " + list.size() + " tasks in the list."); + if (command.length <= 1 || index > list.size() || index <= 0) { + throw new DeleteException(); } - } catch(DeleteException deEx) { - System.out.println(deEx); + + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + list.remove(index - 1)); + System.out.println("Now you have " + list.size() + " tasks in the list."); + + writeToFile(); } - break; + } catch(DeleteException deEx) { + System.out.println(deEx); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + break; - default: - System.out.println(new UnknownCommandException()); - break; + default: + System.out.println(new UnknownCommandException()); + break; } if(toPrint.equals("bye")) { @@ -133,6 +234,4 @@ public void run(){ } } } - - } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index c718c6efee..7f2b53a0c1 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -14,6 +14,8 @@ public void setDone() { isDone = true; } + public abstract String toFile(); + @Override public abstract String toString(); } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index acbea24770..2f162a585d 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -5,11 +5,18 @@ public Todo(String name) { this.isDone = false; } - public String toString() { + public String toFile() { if(isDone) { - return "[T}[✓] " + name; + return "T-1-" + name; + } else { + return "T-0-" + name; + } + } + public String toString() { + if (isDone) { + return "[T][✓] " + name; } else { - return "[T}[✗] " + name; + return "[T][✗] " + name; } } } From f135ac63f517e22c9471cedabf805d9b21e6d0c2 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 4 Sep 2019 16:21:07 +0800 Subject: [PATCH 16/43] Implemented Date/Time + Level-8 --- src/main/java/Deadline.java | 6 +++--- src/main/java/Event.java | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index db18196f52..6a04a1335d 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -10,9 +10,9 @@ public Deadline(String name, String time) { public String toString() { if (isDone) { - return "[D}[✓] " + name + " (by: " + time + ")"; + return "[D][✓] " + name + " (by: " + time + ")"; } else { - return "[D}[✗] " + name + " (by: " + time + ")"; + return "[D][✗] " + name + " (by: " + time + ")"; } } -} \ No newline at end of file +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 19be359633..0184cec754 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,18 +1,31 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + public class Event extends Task { - protected String time; + protected Date date; + private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); - public Event(String name, String time) { + public Event(String name, String dateString) { this.name = name; - this.time = time; + + try{ + Date dateTime = parser.parse(dateString); + this.date = dateTime; + } catch (ParseException pE) { + System.out.println(pE); + } + this.isDone = false; } public String toString() { - if(isDone) { - return "[E}[✓] " + name + " (at: " + time + ")"; + if (isDone) { + return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; } else { - return "[E}[✗] " + name + " (at: " + time + ")"; + return "[E][✗] " + name + " (at: " + formatter.format(date) + ")"; } } } From e2f54c4183532487d99f91cd5019872df8ae7e9e Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 4 Sep 2019 17:14:45 +0800 Subject: [PATCH 17/43] Cleared the clashes from merging --- src/main/java/Event.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 1af080240e..9314eb01de 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -21,7 +21,6 @@ public Event(String name, String dateString) { this.isDone = false; } -<<<<<<< HEAD public String toFile() { if(isDone) { return "E-1-" + name + "-" + parser.format(date); @@ -30,18 +29,11 @@ public String toFile() { } } - public String toString() { - if (isDone) { - return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; - } else { - return "[E][✗] " + name + " (at: " + .format(date) + ")"; -======= public String toString() { if (isDone) { return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; } else { return "[E][✗] " + name + " (at: " + formatter.format(date) + ")"; ->>>>>>> Branch-Level-8 } } } From 4e4b92cfe2a05642c023ce777c265dac8319a2dd Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 10 Sep 2019 00:34:25 +0800 Subject: [PATCH 18/43] A-MoreOOP --- src/main/java/ByeCommand.java | 9 + src/main/java/Command.java | 10 + src/main/java/Deadline.java | 27 ++- src/main/java/DeadlineCommand.java | 21 ++ src/main/java/DeleteCommand.java | 27 +++ src/main/java/DeleteException.java | 2 +- src/main/java/DoneCommand.java | 24 +++ src/main/java/DoneException.java | 2 +- src/main/java/Duke.java | 51 ++++- src/main/java/DukeException.java | 6 + src/main/java/Event.java | 2 +- src/main/java/EventCommand.java | 23 ++ src/main/java/ListCommand.java | 16 ++ src/main/java/MainManager.java | 237 --------------------- src/main/java/Parser.java | 121 +++++++++++ src/main/java/Storage.java | 85 ++++++++ src/main/java/TaskException.java | 2 +- src/main/java/TaskList.java | 26 +++ src/main/java/TodoCommand.java | 22 ++ src/main/java/UI.java | 45 ++++ src/main/java/UnknownCommand.java | 9 + src/main/java/UnknownCommandException.java | 2 +- 22 files changed, 510 insertions(+), 259 deletions(-) create mode 100644 src/main/java/ByeCommand.java create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DeadlineCommand.java create mode 100644 src/main/java/DeleteCommand.java create mode 100644 src/main/java/DoneCommand.java create mode 100644 src/main/java/DukeException.java create mode 100644 src/main/java/EventCommand.java create mode 100644 src/main/java/ListCommand.java delete mode 100644 src/main/java/MainManager.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/TaskList.java create mode 100644 src/main/java/TodoCommand.java create mode 100644 src/main/java/UI.java create mode 100644 src/main/java/UnknownCommand.java diff --git a/src/main/java/ByeCommand.java b/src/main/java/ByeCommand.java new file mode 100644 index 0000000000..6ef4b29730 --- /dev/null +++ b/src/main/java/ByeCommand.java @@ -0,0 +1,9 @@ +public class ByeCommand extends Command { + public ByeCommand() { + + } + + public void execute(TaskList tl, Storage st) { + UI.bye(); + } +} diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..bb0cf3d9e8 --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,10 @@ +import java.io.FileNotFoundException; +import java.io.IOException; + +public abstract class Command { + public Command() { + + } + + public abstract void execute(TaskList tl, Storage st) throws IOException; +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index f2cc118dd2..609833322f 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,26 +1,39 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + public class Deadline extends Task { - protected String time; + protected Date date; + private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); - public Deadline(String name, String time) { + public Deadline(String name, String dateString) { this.name = name; - this.time = time; + + try{ + Date dateTime = parser.parse(dateString); + this.date = dateTime; + } catch (ParseException pE) { + System.err.println(pE); + } + this.isDone = false; } public String toFile() { if(isDone) { - return "D-1-" + name + "-" + time; + return "D-1-" + name + "-" + parser.format(date); } else { - return "D-0-" + name + "-" + time; + return "D-0-" + name + "-" + parser.format(date); } } public String toString() { if (isDone) { - return "[D][✓] " + name + " (by: " + time + ")"; + return "[D][✓] " + name + " (by: " + formatter.format(date) + ")"; } else { - return "[D][✗] " + name + " (by: " + time + ")"; + return "[D][✗] " + name + " (by: " + formatter.format(date) + ")"; } } } diff --git a/src/main/java/DeadlineCommand.java b/src/main/java/DeadlineCommand.java new file mode 100644 index 0000000000..83e1c5cf95 --- /dev/null +++ b/src/main/java/DeadlineCommand.java @@ -0,0 +1,21 @@ +import java.io.IOException; +import java.util.ArrayList; + +public class DeadlineCommand extends Command { + private String deadlineName; + private String date; + + public DeadlineCommand(String deadlineName, String date) { + this.deadlineName = deadlineName; + this.date = date; + } + + public void execute(TaskList tl, Storage st) throws IOException { + Task deadline = new Deadline(deadlineName, date); + + tl.addTaskList(deadline); + UI.newTask(tl.list); + + st.writeToFile(tl.list); + } +} diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java new file mode 100644 index 0000000000..aac7b88e4f --- /dev/null +++ b/src/main/java/DeleteCommand.java @@ -0,0 +1,27 @@ +import java.io.IOException; + +public class DeleteCommand extends Command { + int taskNum; + + public DeleteCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tl, Storage st) { + try { + if (taskNum > tl.list.size() || taskNum <= 0) { + throw new DeleteException(); + } + Task task = tl.list.remove(taskNum - 1); + int listSize = tl.list.size(); + + UI.removedTask(task, listSize); + + st.writeToFile(tl.list); + } catch (IOException IOe) { + System.err.println(IOe); + } catch (DeleteException dE) { + System.err.println(dE); + } + } +} diff --git a/src/main/java/DeleteException.java b/src/main/java/DeleteException.java index f11e72edbb..a99eeca30a 100644 --- a/src/main/java/DeleteException.java +++ b/src/main/java/DeleteException.java @@ -1,4 +1,4 @@ -public class DeleteException extends Exception{ +public class DeleteException extends DukeException { public DeleteException() {}; @Override diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java new file mode 100644 index 0000000000..9a28bb3153 --- /dev/null +++ b/src/main/java/DoneCommand.java @@ -0,0 +1,24 @@ +import java.io.FileNotFoundException; +import java.io.IOException; + +public class DoneCommand extends Command { + int taskNum; + + public DoneCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tl, Storage st) { + try { + Task currTask = tl.list.get(taskNum); + currTask.setDone(); + UI.done(currTask); + + st.writeToFile(tl.list); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } +} diff --git a/src/main/java/DoneException.java b/src/main/java/DoneException.java index f131801a71..72fa701d44 100644 --- a/src/main/java/DoneException.java +++ b/src/main/java/DoneException.java @@ -1,4 +1,4 @@ -public class DoneException extends Exception{ +public class DoneException extends DukeException { public DoneException() {}; @Override diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2044d49fb0..adc1c8a425 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,18 +1,49 @@ import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; public class Duke { - public static void main(String[] args) { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); + private Storage storage; + private TaskList taskList; + private UI ui; + + private Duke(){ + storage = new Storage(); + try { + ArrayList list = storage.readFromFile(); + this.taskList = new TaskList(list); + + Parser parser = new Parser(); + } catch (FileNotFoundException fE) { + System.err.println(fE); + } + } + + private void run() throws FileNotFoundException, IOException { + Parser parser = new Parser(); + Scanner sc = new Scanner(System.in); - MainManager mm = new MainManager(); + while(sc.hasNextLine()) { + String nextLine = sc.nextLine(); + + Command c = parser.parse(nextLine); + c.execute(taskList, storage); + + if(c instanceof ByeCommand) { + break; + } + } + } + + + public static void main(String[] args) { + Duke duke = new Duke(); + UI.start(); try { - mm.readFromFile(); - } catch (FileNotFoundException fE) { - System.out.println(fE); + duke.run(); + } catch (IOException ioE) { + System.err.println(ioE); } - mm.run(); } } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..b1539b1091 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,6 @@ +public abstract class DukeException extends Exception{ + public DukeException() {} + + @Override + public abstract String toString(); +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 9314eb01de..844f1f4fab 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -15,7 +15,7 @@ public Event(String name, String dateString) { Date dateTime = parser.parse(dateString); this.date = dateTime; } catch (ParseException pE) { - System.out.println(pE); + System.err.println(pE); } this.isDone = false; diff --git a/src/main/java/EventCommand.java b/src/main/java/EventCommand.java new file mode 100644 index 0000000000..dc9e38c001 --- /dev/null +++ b/src/main/java/EventCommand.java @@ -0,0 +1,23 @@ +import java.io.IOException; +import java.util.ArrayList; + +public class EventCommand extends Command { + private String eventName; + private String date; + + public EventCommand(String eventName, String date) { + this.eventName = eventName; + this.date = date; + } + + public void execute(TaskList tl, Storage st) throws IOException { + ArrayList list = tl.list; + + Task event = new Event(eventName, date); + + tl.addTaskList(event); + UI.newTask(tl.list); + + st.writeToFile(tl.list); + } +} diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java new file mode 100644 index 0000000000..77e38ce68d --- /dev/null +++ b/src/main/java/ListCommand.java @@ -0,0 +1,16 @@ +import java.util.ArrayList; + +public class ListCommand extends Command { + public ListCommand() { + + } + + public void execute(TaskList tl, Storage st) { + ArrayList list = tl.list; + for (int i = 0; i < list.size(); i++) { + if (list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); + } + } + } +} diff --git a/src/main/java/MainManager.java b/src/main/java/MainManager.java deleted file mode 100644 index ab67839e09..0000000000 --- a/src/main/java/MainManager.java +++ /dev/null @@ -1,237 +0,0 @@ -import java.nio.file.Paths; -import java.util.Scanner; -import java.util.ArrayList; -import java.io.File; -import java.io.FileWriter; -import java.nio.file.Path; -import java.io.IOException; -import java.io.FileNotFoundException; - -public class MainManager { - private ArrayList list; - - public MainManager() { - this.list = new ArrayList<>(); - } - - private String[] getEventDetails(String command) throws TaskException{ - if(command.length() <= 5) { - throw new TaskException(); - } - String woCommand = command.substring(6); - return woCommand.split(" /at "); - } - - private String[] getDeadlineDetails(String command) throws TaskException{ - if(command.length() <= 8) { - throw new TaskException(); - } - String woCommand = command.substring(9); - return woCommand.split(" /by "); - } - - private void writeToFile() throws FileNotFoundException, IOException { - try { - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); - FileWriter fw = new FileWriter(data); - - String toWrite = ""; - for(Task task : list) { - toWrite += task.toFile() + " \n"; - } - - fw.write(toWrite); - fw.close(); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - } - - public void readFromFile() throws FileNotFoundException{ - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); - try { - Scanner sc = new Scanner(data); - - while(sc.hasNextLine()) { - String[] next = sc.nextLine().split("-"); - - switch (next[0]) { - case ("T"): - Task todo = new Todo(next[2]); - - if (Integer.valueOf(next[1]) == 1) { - todo.setDone(); - } - list.add(todo); - break; - - - case ("E"): - Task event = new Event(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - event.setDone(); - } - list.add(event); - break; - - case ("D"): - Task deadline = new Deadline(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - deadline.setDone(); - } - list.add(deadline); - break; - } - } - sc.close(); - } catch(FileNotFoundException fE) { - System.out.println(fE); - } - - - } - - public void run(){ - Scanner sc = new Scanner(System.in); - - while(sc.hasNext()) { - String toPrint = sc.nextLine(); - String[] command = toPrint.split(" "); - - switch(command[0]) { - case "bye": - System.out.println("Bye. Hope to see you again soon!"); - break; - - case "list": - for(int i = 0; i < list.size(); i++) { - if(list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); - } - } - break; - - case "done" : - try { - if(toPrint.length() <= 4) { - throw new DoneException(); - } - System.out.println("Nice! I've marked this task as done:"); - Task currTask = list.get(Integer.parseInt(command[1]) - 1); - currTask.setDone(); - System.out.println(" " + currTask); - - writeToFile(); - } catch (DoneException doEx) { - System.out.println(doEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; - - case "todo": - try { - if(toPrint.length() <= 4) { - throw new TaskException(); - } - String todoName = toPrint.substring(5); - Task todo = new Todo(todoName); - list.add(todo); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + todo); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch(TaskException toEx) { - System.out.println(toEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; - - case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(toPrint); - Task deadline = new Deadline(deadlineDetails[0], deadlineDetails[1]); - list.add(deadline); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + deadline); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch(TaskException dlEx) { - System.out.println(dlEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; - - case "event": - try { - String[] eventDetails = getEventDetails(toPrint); - Task event = new Event(eventDetails[0], eventDetails[1]); - list.add(event); - System.out.println("Got it. I've added this task: "); - System.out.println(" " + event); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } catch (TaskException evEx) { - System.out.println(evEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; - - case "delete": - try { - if (command.length <= 1){ - throw new DeleteException(); - } else { - int index = Integer.parseInt(command[1]); - - if (command.length <= 1 || index > list.size() || index <= 0) { - throw new DeleteException(); - } - - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + list.remove(index - 1)); - System.out.println("Now you have " + list.size() + " tasks in the list."); - - writeToFile(); - } - } catch(DeleteException deEx) { - System.out.println(deEx); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - break; - - - default: - System.out.println(new UnknownCommandException()); - break; - } - - if(toPrint.equals("bye")) { - break; - } - } - } -} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..93bc0404ed --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,121 @@ +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class Parser { + //private Scanner sc; + public Parser() { + //this.sc = new Scanner(System.in); + } + + private String[] getEventDetails(String[] command) throws TaskException { + if (command.length <= 1) { + throw new TaskException(); + } + String toReturn = ""; + for(int i = 1; i < command.length; i++) { + toReturn += command[i] + " "; + } + + return toReturn.split(" /at "); + } + + private String[] getDeadlineDetails(String[] command) throws TaskException { + if (command.length <= 1) { + throw new TaskException(); + } + String toReturn = ""; + for(int i = 1; i < command.length; i++) { + toReturn += command[i] + " "; + } + + return toReturn.split(" /by "); + } + + + + public Command parse(String commandLine) { + String[] nextCommand = commandLine.split(" "); + switch (nextCommand[0]) { + case "bye": + return new ByeCommand(); + + case "list": + return new ListCommand(); + + case "done": + try { + if (nextCommand.length <= 1) { + throw new DoneException(); + } else { + return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); + } + } catch (DukeException dE) { + System.err.println(dE); + } + break; + + case "todo": + try { + if (nextCommand.length <= 1) { + throw new TaskException(); + } + String todoName = ""; + for (int i = 1; i < nextCommand.length; i++) { + todoName += nextCommand[i] + " "; + } + + return new TodoCommand(todoName); + } catch (TaskException toEx) { + System.err.println(toEx); + } finally { + break; + } + case "event": + try { + String[] eventDetails = getEventDetails(nextCommand); + + return new EventCommand(eventDetails[0], eventDetails[1]); + + } catch (TaskException evEx) { + System.err.println(evEx); + } finally { + break; + } + + case "deadline": + try { + String[] deadlineDetails = getDeadlineDetails(nextCommand); + + return new DeadlineCommand(deadlineDetails[0], deadlineDetails[1]); + + } catch (TaskException evEx) { + System.err.println(evEx); + } finally { + break; + } + + case "delete": + try { + if (nextCommand.length <= 1) { + throw new DeleteException(); + } else { + int index = Integer.parseInt(nextCommand[1]); + + return new DeleteCommand(index); + } + } catch (DeleteException deEx) { + System.err.println(deEx); + } finally { + break; + } + + default: + break; + } + + return new UnknownCommand(); + } +} + diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..0920e3bdf2 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,85 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + private Path p = Paths.get(System.getProperty("user.dir")); + private File data = new File(p + "/data/duke.txt"); + + public Storage() { + } + + + public ArrayList readFromFile() throws FileNotFoundException { + ArrayList toReturn = new ArrayList<>(); + + try { + Scanner sc = new Scanner(data); + + while(sc.hasNextLine()) { + String[] next = sc.nextLine().split("-"); + + switch (next[0]) { + case ("T"): + Task todo = new Todo(next[2]); + + if (Integer.valueOf(next[1]) == 1) { + todo.setDone(); + } + toReturn.add(todo); + break; + + + case ("E"): + Task event = new Event(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + event.setDone(); + } + toReturn.add(event); + break; + + case ("D"): + Task deadline = new Deadline(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + deadline.setDone(); + } + toReturn.add(deadline); + break; + } + } + sc.close(); + } catch(FileNotFoundException fE) { + System.out.println(fE); + } + + return toReturn; + } + + public void writeToFile(ArrayList list) throws FileNotFoundException, IOException { + try { + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + FileWriter fw = new FileWriter(data); + + String toWrite = ""; + for(Task task : list) { + toWrite += task.toFile() + " \n"; + } + + fw.write(toWrite); + fw.close(); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } + +} diff --git a/src/main/java/TaskException.java b/src/main/java/TaskException.java index 8c59f0c7d4..774e16dd99 100644 --- a/src/main/java/TaskException.java +++ b/src/main/java/TaskException.java @@ -1,4 +1,4 @@ -public class TaskException extends Exception{ +public class TaskException extends DukeException { public TaskException() {}; @Override diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..4bba4e0afd --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,26 @@ +import java.util.ArrayList; + +public class TaskList { + protected ArrayList list; + + public TaskList() { + list = new ArrayList<>(); + } + + public TaskList(ArrayList list) { + this.list = list; + } + + public ArrayList getTaskList() { + return this.list; + } + + public void updateTaskList(ArrayList list) { + this.list = list; + } + + public void addTaskList(Task task) { + list.add(task); + } + +} diff --git a/src/main/java/TodoCommand.java b/src/main/java/TodoCommand.java new file mode 100644 index 0000000000..2eb43af2b0 --- /dev/null +++ b/src/main/java/TodoCommand.java @@ -0,0 +1,22 @@ +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; + +public class TodoCommand extends Command { + private String todoName; + + public TodoCommand(String todoName) { + this.todoName = todoName; + } + + public void execute(TaskList tl, Storage st) throws IOException { + ArrayList list = tl.list; + + Task todo = new Todo(todoName); + + tl.addTaskList(todo); + st.writeToFile(tl.list); + + UI.newTask(tl.list); + } +} diff --git a/src/main/java/UI.java b/src/main/java/UI.java new file mode 100644 index 0000000000..1fca4ac07c --- /dev/null +++ b/src/main/java/UI.java @@ -0,0 +1,45 @@ +import java.util.ArrayList; + +public class UI { + public UI(){} + + public static void start() { + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); + + } + + public static void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + public static void newTask(ArrayList tl) { + System.out.println("Got it. I've added this task: "); + System.out.println(" " + tl.get(tl.size() - 1)); + System.out.println("Now you have " + tl.size() + " tasks in the list."); + + } + + public static void removedTask(Task task, int listSize){ + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + task); + System.out.println("Now you have " + listSize + " tasks in the list."); + + } + + public static void numTasks(ArrayList tl) { + System.out.println("Now you have " + tl.size() + " tasks in the list."); + + } + + public static void done(Task task) { + System.out.println("Nice! I've marked this task as done:"); + System.out.println(" " + task); + + } + + + +} diff --git a/src/main/java/UnknownCommand.java b/src/main/java/UnknownCommand.java new file mode 100644 index 0000000000..1382d0b490 --- /dev/null +++ b/src/main/java/UnknownCommand.java @@ -0,0 +1,9 @@ +public class UnknownCommand extends Command { + public UnknownCommand() { + + } + + public void execute(TaskList tl, Storage st) { + System.err.println(new UnknownCommandException()); + } +} diff --git a/src/main/java/UnknownCommandException.java b/src/main/java/UnknownCommandException.java index 5ee2bdf771..7a4ff0f25e 100644 --- a/src/main/java/UnknownCommandException.java +++ b/src/main/java/UnknownCommandException.java @@ -1,4 +1,4 @@ -public class UnknownCommandException extends Exception{ +public class UnknownCommandException extends DukeException { public UnknownCommandException() {}; @Override From 31fd8c69dac26cfc30173a2bd0f7d3f3da8875e2 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 10 Sep 2019 02:18:33 +0800 Subject: [PATCH 19/43] A-Packages --- src/main/java/ByeCommand.java | 9 -- src/main/java/Command.java | 10 -- src/main/java/Deadline.java | 39 ------- src/main/java/DeadlineCommand.java | 21 ---- src/main/java/DeleteCommand.java | 27 ----- src/main/java/DeleteException.java | 8 -- src/main/java/DoneCommand.java | 24 ---- src/main/java/DoneException.java | 8 -- src/main/java/Duke.java | 7 +- src/main/java/DukeException.java | 6 - src/main/java/Event.java | 39 ------- src/main/java/EventCommand.java | 23 ---- src/main/java/ListCommand.java | 16 --- src/main/java/Parser.java | 121 --------------------- src/main/java/Storage.java | 85 --------------- src/main/java/Task.java | 21 ---- src/main/java/TaskException.java | 8 -- src/main/java/TaskList.java | 26 ----- src/main/java/Todo.java | 22 ---- src/main/java/TodoCommand.java | 22 ---- src/main/java/UI.java | 45 -------- src/main/java/UnknownCommand.java | 9 -- src/main/java/UnknownCommandException.java | 8 -- 23 files changed, 5 insertions(+), 599 deletions(-) delete mode 100644 src/main/java/ByeCommand.java delete mode 100644 src/main/java/Command.java delete mode 100644 src/main/java/Deadline.java delete mode 100644 src/main/java/DeadlineCommand.java delete mode 100644 src/main/java/DeleteCommand.java delete mode 100644 src/main/java/DeleteException.java delete mode 100644 src/main/java/DoneCommand.java delete mode 100644 src/main/java/DoneException.java delete mode 100644 src/main/java/DukeException.java delete mode 100644 src/main/java/Event.java delete mode 100644 src/main/java/EventCommand.java delete mode 100644 src/main/java/ListCommand.java delete mode 100644 src/main/java/Parser.java delete mode 100644 src/main/java/Storage.java delete mode 100644 src/main/java/Task.java delete mode 100644 src/main/java/TaskException.java delete mode 100644 src/main/java/TaskList.java delete mode 100644 src/main/java/Todo.java delete mode 100644 src/main/java/TodoCommand.java delete mode 100644 src/main/java/UI.java delete mode 100644 src/main/java/UnknownCommand.java delete mode 100644 src/main/java/UnknownCommandException.java diff --git a/src/main/java/ByeCommand.java b/src/main/java/ByeCommand.java deleted file mode 100644 index 6ef4b29730..0000000000 --- a/src/main/java/ByeCommand.java +++ /dev/null @@ -1,9 +0,0 @@ -public class ByeCommand extends Command { - public ByeCommand() { - - } - - public void execute(TaskList tl, Storage st) { - UI.bye(); - } -} diff --git a/src/main/java/Command.java b/src/main/java/Command.java deleted file mode 100644 index bb0cf3d9e8..0000000000 --- a/src/main/java/Command.java +++ /dev/null @@ -1,10 +0,0 @@ -import java.io.FileNotFoundException; -import java.io.IOException; - -public abstract class Command { - public Command() { - - } - - public abstract void execute(TaskList tl, Storage st) throws IOException; -} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java deleted file mode 100644 index 609833322f..0000000000 --- a/src/main/java/Deadline.java +++ /dev/null @@ -1,39 +0,0 @@ -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class Deadline extends Task { - protected Date date; - private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); - private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); - - - public Deadline(String name, String dateString) { - this.name = name; - - try{ - Date dateTime = parser.parse(dateString); - this.date = dateTime; - } catch (ParseException pE) { - System.err.println(pE); - } - - this.isDone = false; - } - - public String toFile() { - if(isDone) { - return "D-1-" + name + "-" + parser.format(date); - } else { - return "D-0-" + name + "-" + parser.format(date); - } - } - - public String toString() { - if (isDone) { - return "[D][✓] " + name + " (by: " + formatter.format(date) + ")"; - } else { - return "[D][✗] " + name + " (by: " + formatter.format(date) + ")"; - } - } -} diff --git a/src/main/java/DeadlineCommand.java b/src/main/java/DeadlineCommand.java deleted file mode 100644 index 83e1c5cf95..0000000000 --- a/src/main/java/DeadlineCommand.java +++ /dev/null @@ -1,21 +0,0 @@ -import java.io.IOException; -import java.util.ArrayList; - -public class DeadlineCommand extends Command { - private String deadlineName; - private String date; - - public DeadlineCommand(String deadlineName, String date) { - this.deadlineName = deadlineName; - this.date = date; - } - - public void execute(TaskList tl, Storage st) throws IOException { - Task deadline = new Deadline(deadlineName, date); - - tl.addTaskList(deadline); - UI.newTask(tl.list); - - st.writeToFile(tl.list); - } -} diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java deleted file mode 100644 index aac7b88e4f..0000000000 --- a/src/main/java/DeleteCommand.java +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.IOException; - -public class DeleteCommand extends Command { - int taskNum; - - public DeleteCommand(int taskNum) { - this.taskNum = taskNum; - } - - public void execute(TaskList tl, Storage st) { - try { - if (taskNum > tl.list.size() || taskNum <= 0) { - throw new DeleteException(); - } - Task task = tl.list.remove(taskNum - 1); - int listSize = tl.list.size(); - - UI.removedTask(task, listSize); - - st.writeToFile(tl.list); - } catch (IOException IOe) { - System.err.println(IOe); - } catch (DeleteException dE) { - System.err.println(dE); - } - } -} diff --git a/src/main/java/DeleteException.java b/src/main/java/DeleteException.java deleted file mode 100644 index a99eeca30a..0000000000 --- a/src/main/java/DeleteException.java +++ /dev/null @@ -1,8 +0,0 @@ -public class DeleteException extends DukeException { - public DeleteException() {}; - - @Override - public String toString() { - return " ☹ OOPS!!! There was an error with deleting!"; - } -} diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java deleted file mode 100644 index 9a28bb3153..0000000000 --- a/src/main/java/DoneCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.io.FileNotFoundException; -import java.io.IOException; - -public class DoneCommand extends Command { - int taskNum; - - public DoneCommand(int taskNum) { - this.taskNum = taskNum; - } - - public void execute(TaskList tl, Storage st) { - try { - Task currTask = tl.list.get(taskNum); - currTask.setDone(); - UI.done(currTask); - - st.writeToFile(tl.list); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - } -} diff --git a/src/main/java/DoneException.java b/src/main/java/DoneException.java deleted file mode 100644 index 72fa701d44..0000000000 --- a/src/main/java/DoneException.java +++ /dev/null @@ -1,8 +0,0 @@ -public class DoneException extends DukeException { - public DoneException() {}; - - @Override - public String toString() { - return " ☹ OOPS!!! You must specify a Task to be done!"; - } -} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index adc1c8a425..592f79c075 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,7 @@ +import command.*; +import main.*; +import task.*; + import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; @@ -14,13 +18,12 @@ private Duke(){ ArrayList list = storage.readFromFile(); this.taskList = new TaskList(list); - Parser parser = new Parser(); } catch (FileNotFoundException fE) { System.err.println(fE); } } - private void run() throws FileNotFoundException, IOException { + private void run() throws IOException { Parser parser = new Parser(); Scanner sc = new Scanner(System.in); diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java deleted file mode 100644 index b1539b1091..0000000000 --- a/src/main/java/DukeException.java +++ /dev/null @@ -1,6 +0,0 @@ -public abstract class DukeException extends Exception{ - public DukeException() {} - - @Override - public abstract String toString(); -} diff --git a/src/main/java/Event.java b/src/main/java/Event.java deleted file mode 100644 index 844f1f4fab..0000000000 --- a/src/main/java/Event.java +++ /dev/null @@ -1,39 +0,0 @@ -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class Event extends Task { - protected Date date; - private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); - private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); - - - public Event(String name, String dateString) { - this.name = name; - - try{ - Date dateTime = parser.parse(dateString); - this.date = dateTime; - } catch (ParseException pE) { - System.err.println(pE); - } - - this.isDone = false; - } - - public String toFile() { - if(isDone) { - return "E-1-" + name + "-" + parser.format(date); - } else { - return "E-0-" + name + "-" + parser.format(date); - } - } - - public String toString() { - if (isDone) { - return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; - } else { - return "[E][✗] " + name + " (at: " + formatter.format(date) + ")"; - } - } -} diff --git a/src/main/java/EventCommand.java b/src/main/java/EventCommand.java deleted file mode 100644 index dc9e38c001..0000000000 --- a/src/main/java/EventCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -import java.io.IOException; -import java.util.ArrayList; - -public class EventCommand extends Command { - private String eventName; - private String date; - - public EventCommand(String eventName, String date) { - this.eventName = eventName; - this.date = date; - } - - public void execute(TaskList tl, Storage st) throws IOException { - ArrayList list = tl.list; - - Task event = new Event(eventName, date); - - tl.addTaskList(event); - UI.newTask(tl.list); - - st.writeToFile(tl.list); - } -} diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java deleted file mode 100644 index 77e38ce68d..0000000000 --- a/src/main/java/ListCommand.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.util.ArrayList; - -public class ListCommand extends Command { - public ListCommand() { - - } - - public void execute(TaskList tl, Storage st) { - ArrayList list = tl.list; - for (int i = 0; i < list.size(); i++) { - if (list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); - } - } - } -} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java deleted file mode 100644 index 93bc0404ed..0000000000 --- a/src/main/java/Parser.java +++ /dev/null @@ -1,121 +0,0 @@ -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Scanner; - -public class Parser { - //private Scanner sc; - public Parser() { - //this.sc = new Scanner(System.in); - } - - private String[] getEventDetails(String[] command) throws TaskException { - if (command.length <= 1) { - throw new TaskException(); - } - String toReturn = ""; - for(int i = 1; i < command.length; i++) { - toReturn += command[i] + " "; - } - - return toReturn.split(" /at "); - } - - private String[] getDeadlineDetails(String[] command) throws TaskException { - if (command.length <= 1) { - throw new TaskException(); - } - String toReturn = ""; - for(int i = 1; i < command.length; i++) { - toReturn += command[i] + " "; - } - - return toReturn.split(" /by "); - } - - - - public Command parse(String commandLine) { - String[] nextCommand = commandLine.split(" "); - switch (nextCommand[0]) { - case "bye": - return new ByeCommand(); - - case "list": - return new ListCommand(); - - case "done": - try { - if (nextCommand.length <= 1) { - throw new DoneException(); - } else { - return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); - } - } catch (DukeException dE) { - System.err.println(dE); - } - break; - - case "todo": - try { - if (nextCommand.length <= 1) { - throw new TaskException(); - } - String todoName = ""; - for (int i = 1; i < nextCommand.length; i++) { - todoName += nextCommand[i] + " "; - } - - return new TodoCommand(todoName); - } catch (TaskException toEx) { - System.err.println(toEx); - } finally { - break; - } - case "event": - try { - String[] eventDetails = getEventDetails(nextCommand); - - return new EventCommand(eventDetails[0], eventDetails[1]); - - } catch (TaskException evEx) { - System.err.println(evEx); - } finally { - break; - } - - case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(nextCommand); - - return new DeadlineCommand(deadlineDetails[0], deadlineDetails[1]); - - } catch (TaskException evEx) { - System.err.println(evEx); - } finally { - break; - } - - case "delete": - try { - if (nextCommand.length <= 1) { - throw new DeleteException(); - } else { - int index = Integer.parseInt(nextCommand[1]); - - return new DeleteCommand(index); - } - } catch (DeleteException deEx) { - System.err.println(deEx); - } finally { - break; - } - - default: - break; - } - - return new UnknownCommand(); - } -} - diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java deleted file mode 100644 index 0920e3bdf2..0000000000 --- a/src/main/java/Storage.java +++ /dev/null @@ -1,85 +0,0 @@ -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Scanner; - -public class Storage { - private Path p = Paths.get(System.getProperty("user.dir")); - private File data = new File(p + "/data/duke.txt"); - - public Storage() { - } - - - public ArrayList readFromFile() throws FileNotFoundException { - ArrayList toReturn = new ArrayList<>(); - - try { - Scanner sc = new Scanner(data); - - while(sc.hasNextLine()) { - String[] next = sc.nextLine().split("-"); - - switch (next[0]) { - case ("T"): - Task todo = new Todo(next[2]); - - if (Integer.valueOf(next[1]) == 1) { - todo.setDone(); - } - toReturn.add(todo); - break; - - - case ("E"): - Task event = new Event(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - event.setDone(); - } - toReturn.add(event); - break; - - case ("D"): - Task deadline = new Deadline(next[2], next[3]); - - if (Integer.valueOf(next[1]) == 1) { - deadline.setDone(); - } - toReturn.add(deadline); - break; - } - } - sc.close(); - } catch(FileNotFoundException fE) { - System.out.println(fE); - } - - return toReturn; - } - - public void writeToFile(ArrayList list) throws FileNotFoundException, IOException { - try { - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); - FileWriter fw = new FileWriter(data); - - String toWrite = ""; - for(Task task : list) { - toWrite += task.toFile() + " \n"; - } - - fw.write(toWrite); - fw.close(); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } - } - -} diff --git a/src/main/java/Task.java b/src/main/java/Task.java deleted file mode 100644 index 7f2b53a0c1..0000000000 --- a/src/main/java/Task.java +++ /dev/null @@ -1,21 +0,0 @@ -public abstract class Task { - protected String name; - protected boolean isDone; - //private Inputs Type; - - public Task() {} - - public Task(String name) { - this.name = name; - this.isDone = false; - } - - public void setDone() { - isDone = true; - } - - public abstract String toFile(); - - @Override - public abstract String toString(); -} diff --git a/src/main/java/TaskException.java b/src/main/java/TaskException.java deleted file mode 100644 index 774e16dd99..0000000000 --- a/src/main/java/TaskException.java +++ /dev/null @@ -1,8 +0,0 @@ -public class TaskException extends DukeException { - public TaskException() {}; - - @Override - public String toString() { - return " ☹ OOPS!!! The description of a Task cannot be empty."; - } -} diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java deleted file mode 100644 index 4bba4e0afd..0000000000 --- a/src/main/java/TaskList.java +++ /dev/null @@ -1,26 +0,0 @@ -import java.util.ArrayList; - -public class TaskList { - protected ArrayList list; - - public TaskList() { - list = new ArrayList<>(); - } - - public TaskList(ArrayList list) { - this.list = list; - } - - public ArrayList getTaskList() { - return this.list; - } - - public void updateTaskList(ArrayList list) { - this.list = list; - } - - public void addTaskList(Task task) { - list.add(task); - } - -} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java deleted file mode 100644 index 2f162a585d..0000000000 --- a/src/main/java/Todo.java +++ /dev/null @@ -1,22 +0,0 @@ -public class Todo extends Task { - - public Todo(String name) { - this.name = name; - this.isDone = false; - } - - public String toFile() { - if(isDone) { - return "T-1-" + name; - } else { - return "T-0-" + name; - } - } - public String toString() { - if (isDone) { - return "[T][✓] " + name; - } else { - return "[T][✗] " + name; - } - } -} diff --git a/src/main/java/TodoCommand.java b/src/main/java/TodoCommand.java deleted file mode 100644 index 2eb43af2b0..0000000000 --- a/src/main/java/TodoCommand.java +++ /dev/null @@ -1,22 +0,0 @@ -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; - -public class TodoCommand extends Command { - private String todoName; - - public TodoCommand(String todoName) { - this.todoName = todoName; - } - - public void execute(TaskList tl, Storage st) throws IOException { - ArrayList list = tl.list; - - Task todo = new Todo(todoName); - - tl.addTaskList(todo); - st.writeToFile(tl.list); - - UI.newTask(tl.list); - } -} diff --git a/src/main/java/UI.java b/src/main/java/UI.java deleted file mode 100644 index 1fca4ac07c..0000000000 --- a/src/main/java/UI.java +++ /dev/null @@ -1,45 +0,0 @@ -import java.util.ArrayList; - -public class UI { - public UI(){} - - public static void start() { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); - - } - - public static void bye() { - System.out.println("Bye. Hope to see you again soon!"); - } - - public static void newTask(ArrayList tl) { - System.out.println("Got it. I've added this task: "); - System.out.println(" " + tl.get(tl.size() - 1)); - System.out.println("Now you have " + tl.size() + " tasks in the list."); - - } - - public static void removedTask(Task task, int listSize){ - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + task); - System.out.println("Now you have " + listSize + " tasks in the list."); - - } - - public static void numTasks(ArrayList tl) { - System.out.println("Now you have " + tl.size() + " tasks in the list."); - - } - - public static void done(Task task) { - System.out.println("Nice! I've marked this task as done:"); - System.out.println(" " + task); - - } - - - -} diff --git a/src/main/java/UnknownCommand.java b/src/main/java/UnknownCommand.java deleted file mode 100644 index 1382d0b490..0000000000 --- a/src/main/java/UnknownCommand.java +++ /dev/null @@ -1,9 +0,0 @@ -public class UnknownCommand extends Command { - public UnknownCommand() { - - } - - public void execute(TaskList tl, Storage st) { - System.err.println(new UnknownCommandException()); - } -} diff --git a/src/main/java/UnknownCommandException.java b/src/main/java/UnknownCommandException.java deleted file mode 100644 index 7a4ff0f25e..0000000000 --- a/src/main/java/UnknownCommandException.java +++ /dev/null @@ -1,8 +0,0 @@ -public class UnknownCommandException extends DukeException { - public UnknownCommandException() {}; - - @Override - public String toString() { - return " ☹ OOPS!!! I'm sorry, but I don't know what that means :-("; - } -} From 405dd68f247d418b2e40bf730424d606e27dd565 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 10 Sep 2019 15:25:40 +0800 Subject: [PATCH 20/43] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84755485a7..e9c50442d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Setting up -**Prerequisites** +**Prerequisites** * JDK 11 * Recommended: IntelliJ IDE From 7d67470582145edc4ab19252e8deb6e507c1fad0 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 10 Sep 2019 19:59:21 +0800 Subject: [PATCH 21/43] committing A-Packages correctly --- src/main/java/command/ByeCommand.java | 13 ++ src/main/java/command/Command.java | 12 ++ src/main/java/command/DeadlineCommand.java | 26 ++++ src/main/java/command/DeleteCommand.java | 35 +++++ src/main/java/command/DoneCommand.java | 33 +++++ src/main/java/command/EventCommand.java | 31 +++++ src/main/java/command/ListCommand.java | 22 ++++ src/main/java/command/TodoCommand.java | 30 +++++ src/main/java/command/UnknownCommand.java | 15 +++ src/main/java/exception/DeleteException.java | 10 ++ src/main/java/exception/DoneException.java | 10 ++ src/main/java/exception/DukeException.java | 8 ++ src/main/java/exception/TaskException.java | 10 ++ .../exception/UnknownCommandException.java | 10 ++ src/main/java/main/Parser.java | 121 ++++++++++++++++++ src/main/java/main/Storage.java | 92 +++++++++++++ src/main/java/main/TaskList.java | 30 +++++ src/main/java/main/UI.java | 49 +++++++ src/main/java/task/Deadline.java | 41 ++++++ src/main/java/task/Event.java | 41 ++++++ src/main/java/task/Task.java | 23 ++++ src/main/java/task/Todo.java | 24 ++++ 22 files changed, 686 insertions(+) create mode 100644 src/main/java/command/ByeCommand.java create mode 100644 src/main/java/command/Command.java create mode 100644 src/main/java/command/DeadlineCommand.java create mode 100644 src/main/java/command/DeleteCommand.java create mode 100644 src/main/java/command/DoneCommand.java create mode 100644 src/main/java/command/EventCommand.java create mode 100644 src/main/java/command/ListCommand.java create mode 100644 src/main/java/command/TodoCommand.java create mode 100644 src/main/java/command/UnknownCommand.java create mode 100644 src/main/java/exception/DeleteException.java create mode 100644 src/main/java/exception/DoneException.java create mode 100644 src/main/java/exception/DukeException.java create mode 100644 src/main/java/exception/TaskException.java create mode 100644 src/main/java/exception/UnknownCommandException.java create mode 100644 src/main/java/main/Parser.java create mode 100644 src/main/java/main/Storage.java create mode 100644 src/main/java/main/TaskList.java create mode 100644 src/main/java/main/UI.java create mode 100644 src/main/java/task/Deadline.java create mode 100644 src/main/java/task/Event.java create mode 100644 src/main/java/task/Task.java create mode 100644 src/main/java/task/Todo.java diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java new file mode 100644 index 0000000000..b5e0cd7e0c --- /dev/null +++ b/src/main/java/command/ByeCommand.java @@ -0,0 +1,13 @@ +package command; + +import main.*; + +public class ByeCommand extends Command { + public ByeCommand() { + + } + + public void execute(TaskList tl, Storage st) { + UI.bye(); + } +} diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java new file mode 100644 index 0000000000..2dc8d78d56 --- /dev/null +++ b/src/main/java/command/Command.java @@ -0,0 +1,12 @@ +package command; + +import java.io.IOException; +import main.*; + +public abstract class Command { + public Command() { + + } + + public abstract void execute(TaskList tl, Storage st) throws IOException; +} diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java new file mode 100644 index 0000000000..77fd6d6e41 --- /dev/null +++ b/src/main/java/command/DeadlineCommand.java @@ -0,0 +1,26 @@ +package command; + +import java.io.IOException; +import java.util.ArrayList;import main.*; +import task.Deadline; +import task.Task; + + +public class DeadlineCommand extends Command { + private String deadlineName; + private String date; + + public DeadlineCommand(String deadlineName, String date) { + this.deadlineName = deadlineName; + this.date = date; + } + + public void execute(TaskList tl, Storage st) throws IOException { + Task deadline = new Deadline(deadlineName, date); + + tl.addTaskList(deadline); + UI.newTask(tl.getTaskList()); + + st.writeToFile(tl.getTaskList()); + } +} diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java new file mode 100644 index 0000000000..7fc3f3a30d --- /dev/null +++ b/src/main/java/command/DeleteCommand.java @@ -0,0 +1,35 @@ +package command; + +import java.io.IOException; +import java.util.ArrayList; + +import main.*; +import exception.DeleteException; +import task.Task; + +public class DeleteCommand extends Command { + int taskNum; + + public DeleteCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tl, Storage st) { + try { + ArrayList list = tl.getTaskList(); + if (taskNum > list.size() || taskNum <= 0) { + throw new DeleteException(); + } + Task task = list.remove(taskNum - 1); + int listSize = list.size(); + + UI.removedTask(task, listSize); + + st.writeToFile(list); + } catch (IOException IOe) { + System.err.println(IOe); + } catch (DeleteException dE) { + System.err.println(dE); + } + } +} diff --git a/src/main/java/command/DoneCommand.java b/src/main/java/command/DoneCommand.java new file mode 100644 index 0000000000..9651091b52 --- /dev/null +++ b/src/main/java/command/DoneCommand.java @@ -0,0 +1,33 @@ +package command; + +import main.Storage; +import main.TaskList; +import main.UI; +import task.Task; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; + +public class DoneCommand extends Command { + int taskNum; + + public DoneCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tl, Storage st) { + try { + ArrayList list = tl.getTaskList(); + Task currTask = list.get(taskNum); + currTask.setDone(); + UI.done(currTask); + + st.writeToFile(list); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } +} diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java new file mode 100644 index 0000000000..7d91dc997d --- /dev/null +++ b/src/main/java/command/EventCommand.java @@ -0,0 +1,31 @@ +package command; + +import main.Storage; +import main.TaskList; +import main.UI; +import task.Event; +import task.Task; + +import java.io.IOException; +import java.util.ArrayList; + +public class EventCommand extends Command { + private String eventName; + private String date; + + public EventCommand(String eventName, String date) { + this.eventName = eventName; + this.date = date; + } + + public void execute(TaskList tl, Storage st) throws IOException { + ArrayList list = tl.getTaskList(); + + Task event = new Event(eventName, date); + + tl.addTaskList(event); + UI.newTask(list); + + st.writeToFile(list); + } +} diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java new file mode 100644 index 0000000000..a126c61fcf --- /dev/null +++ b/src/main/java/command/ListCommand.java @@ -0,0 +1,22 @@ +package command; + +import main.Storage; +import main.TaskList; +import task.Task; + +import java.util.ArrayList; + +public class ListCommand extends Command { + public ListCommand() { + + } + + public void execute(TaskList tl, Storage st) { + ArrayList list = tl.getTaskList(); + for (int i = 0; i < list.size(); i++) { + if (list.get(i) != null) { + System.out.println(i + 1 + "." + list.get(i)); + } + } + } +} diff --git a/src/main/java/command/TodoCommand.java b/src/main/java/command/TodoCommand.java new file mode 100644 index 0000000000..c1abbbdeb5 --- /dev/null +++ b/src/main/java/command/TodoCommand.java @@ -0,0 +1,30 @@ +package command; + +import main.Storage; +import main.TaskList; +import main.UI; +import task.Task; +import task.Todo; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; + +public class TodoCommand extends Command { + private String todoName; + + public TodoCommand(String todoName) { + this.todoName = todoName; + } + + public void execute(TaskList tl, Storage st) throws IOException { + ArrayList list = tl.getTaskList(); + + Task todo = new Todo(todoName); + + tl.addTaskList(todo); + st.writeToFile(list); + + UI.newTask(list); + } +} diff --git a/src/main/java/command/UnknownCommand.java b/src/main/java/command/UnknownCommand.java new file mode 100644 index 0000000000..6091781272 --- /dev/null +++ b/src/main/java/command/UnknownCommand.java @@ -0,0 +1,15 @@ +package command; + +import exception.UnknownCommandException; +import main.Storage; +import main.TaskList; + +public class UnknownCommand extends Command { + public UnknownCommand() { + + } + + public void execute(TaskList tl, Storage st) { + System.err.println(new UnknownCommandException()); + } +} diff --git a/src/main/java/exception/DeleteException.java b/src/main/java/exception/DeleteException.java new file mode 100644 index 0000000000..a018ed54b0 --- /dev/null +++ b/src/main/java/exception/DeleteException.java @@ -0,0 +1,10 @@ +package exception; + +public class DeleteException extends DukeException { + public DeleteException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! There was an error with deleting!"; + } +} diff --git a/src/main/java/exception/DoneException.java b/src/main/java/exception/DoneException.java new file mode 100644 index 0000000000..e934c86625 --- /dev/null +++ b/src/main/java/exception/DoneException.java @@ -0,0 +1,10 @@ +package exception; + +public class DoneException extends DukeException { + public DoneException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! You must specify a Task to be done!"; + } +} diff --git a/src/main/java/exception/DukeException.java b/src/main/java/exception/DukeException.java new file mode 100644 index 0000000000..a561522b22 --- /dev/null +++ b/src/main/java/exception/DukeException.java @@ -0,0 +1,8 @@ +package exception; + +public abstract class DukeException extends Exception{ + public DukeException() {} + + @Override + public abstract String toString(); +} diff --git a/src/main/java/exception/TaskException.java b/src/main/java/exception/TaskException.java new file mode 100644 index 0000000000..a8d4e3816a --- /dev/null +++ b/src/main/java/exception/TaskException.java @@ -0,0 +1,10 @@ +package exception; + +public class TaskException extends DukeException { + public TaskException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! The description of a Task cannot be empty."; + } +} diff --git a/src/main/java/exception/UnknownCommandException.java b/src/main/java/exception/UnknownCommandException.java new file mode 100644 index 0000000000..cd0e88ee43 --- /dev/null +++ b/src/main/java/exception/UnknownCommandException.java @@ -0,0 +1,10 @@ +package exception; + +public class UnknownCommandException extends DukeException { + public UnknownCommandException() {}; + + @Override + public String toString() { + return " ☹ OOPS!!! I'm sorry, but I don't know what that means :-("; + } +} diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java new file mode 100644 index 0000000000..400aa2cd56 --- /dev/null +++ b/src/main/java/main/Parser.java @@ -0,0 +1,121 @@ +package main; + +import command.*; +import exception.DeleteException; +import exception.DoneException; +import exception.DukeException; +import exception.TaskException; + +public class Parser { + //private Scanner sc; + public Parser() { + //this.sc = new Scanner(System.in); + } + + private String[] getEventDetails(String[] command) throws TaskException { + if (command.length <= 1) { + throw new TaskException(); + } + String toReturn = ""; + for(int i = 1; i < command.length; i++) { + toReturn += command[i] + " "; + } + + return toReturn.split(" /at "); + } + + private String[] getDeadlineDetails(String[] command) throws TaskException { + if (command.length <= 1) { + throw new TaskException(); + } + String toReturn = ""; + for(int i = 1; i < command.length; i++) { + toReturn += command[i] + " "; + } + + return toReturn.split(" /by "); + } + + + + public Command parse(String commandLine) { + String[] nextCommand = commandLine.split(" "); + switch (nextCommand[0]) { + case "bye": + return new ByeCommand(); + + case "list": + return new ListCommand(); + + case "done": + try { + if (nextCommand.length <= 1) { + throw new DoneException(); + } else { + return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); + } + } catch (DukeException dE) { + System.err.println(dE); + } + break; + + case "todo": + try { + if (nextCommand.length <= 1) { + throw new TaskException(); + } + String todoName = ""; + for (int i = 1; i < nextCommand.length; i++) { + todoName += nextCommand[i] + " "; + } + + return new TodoCommand(todoName); + } catch (TaskException toEx) { + System.err.println(toEx); + } + break; + case "event": + try { + String[] eventDetails = getEventDetails(nextCommand); + + return new EventCommand(eventDetails[0], eventDetails[1]); + + } catch (TaskException evEx) { + System.err.println(evEx); + } + break; + + case "deadline": + try { + String[] deadlineDetails = getDeadlineDetails(nextCommand); + + return new DeadlineCommand(deadlineDetails[0], deadlineDetails[1]); + + } catch (TaskException evEx) { + System.err.println(evEx); + } + break; + + case "delete": + try { + if (nextCommand.length <= 1) { + throw new DeleteException(); + } else { + int index = Integer.parseInt(nextCommand[1]); + + return new DeleteCommand(index); + } + } catch (DeleteException deEx) { + System.err.println(deEx); + } + break; + + + default: + break; + } + + return new UnknownCommand(); + } +} + diff --git a/src/main/java/main/Storage.java b/src/main/java/main/Storage.java new file mode 100644 index 0000000000..872b4151db --- /dev/null +++ b/src/main/java/main/Storage.java @@ -0,0 +1,92 @@ +package main; + +import task.Deadline; +import task.Event; +import task.Task; +import task.Todo; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + private Path p = Paths.get(System.getProperty("user.dir")); + private File data = new File(p + "/data/duke.txt"); + + public Storage() { + } + + + public ArrayList readFromFile() throws FileNotFoundException { + ArrayList toReturn = new ArrayList<>(); + + try { + Scanner sc = new Scanner(data); + + while(sc.hasNextLine()) { + String[] next = sc.nextLine().split("-"); + + switch (next[0]) { + case ("T"): + Task todo = new Todo(next[2]); + + if (Integer.valueOf(next[1]) == 1) { + todo.setDone(); + } + toReturn.add(todo); + break; + + + case ("E"): + Task event = new Event(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + event.setDone(); + } + toReturn.add(event); + break; + + case ("D"): + Task deadline = new Deadline(next[2], next[3]); + + if (Integer.valueOf(next[1]) == 1) { + deadline.setDone(); + } + toReturn.add(deadline); + break; + } + } + sc.close(); + } catch(FileNotFoundException fE) { + System.out.println(fE); + } + + return toReturn; + } + + public void writeToFile(ArrayList list) throws FileNotFoundException, IOException { + try { + Path p = Paths.get(System.getProperty("user.dir")); + File data = new File(p + "/data/duke.txt"); + FileWriter fw = new FileWriter(data); + + String toWrite = ""; + for(Task task : list) { + toWrite += task.toFile() + " \n"; + } + + fw.write(toWrite); + fw.close(); + } catch (FileNotFoundException Fe) { + System.out.println(Fe); + } catch (IOException IOe) { + System.out.println(IOe); + } + } + +} diff --git a/src/main/java/main/TaskList.java b/src/main/java/main/TaskList.java new file mode 100644 index 0000000000..05291f9b31 --- /dev/null +++ b/src/main/java/main/TaskList.java @@ -0,0 +1,30 @@ +package main; + +import task.Task; + +import java.util.ArrayList; + +public class TaskList { + private ArrayList list; + + public TaskList() { + list = new ArrayList<>(); + } + + public TaskList(ArrayList list) { + this.list = list; + } + + public ArrayList getTaskList() { + return this.list; + } + + public void updateTaskList(ArrayList list) { + this.list = list; + } + + public void addTaskList(Task task) { + list.add(task); + } + +} diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java new file mode 100644 index 0000000000..90e7b711a5 --- /dev/null +++ b/src/main/java/main/UI.java @@ -0,0 +1,49 @@ +package main; + +import task.Task; + +import java.util.ArrayList; + +public class UI { + public UI(){} + + public static void start() { + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); + + } + + public static void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + public static void newTask(ArrayList tl) { + System.out.println("Got it. I've added this task: "); + System.out.println(" " + tl.get(tl.size() - 1)); + System.out.println("Now you have " + tl.size() + " tasks in the list."); + + } + + public static void removedTask(Task task, int listSize){ + System.out.println(" Noted. I've removed this task: "); + System.out.println(" " + task); + System.out.println("Now you have " + listSize + " tasks in the list."); + + } + + public static void numTasks(ArrayList tl) { + System.out.println("Now you have " + tl.size() + " tasks in the list."); + + } + + public static void done(Task task) { + System.out.println("Nice! I've marked this task as done:"); + System.out.println(" " + task); + + } + + + +} diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java new file mode 100644 index 0000000000..9a8a6df2b5 --- /dev/null +++ b/src/main/java/task/Deadline.java @@ -0,0 +1,41 @@ +package task; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class Deadline extends Task { + protected Date date; + private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); + + + public Deadline(String name, String dateString) { + this.name = name; + + try{ + Date dateTime = parser.parse(dateString); + this.date = dateTime; + } catch (ParseException pE) { + System.err.println(pE); + } + + this.isDone = false; + } + + public String toFile() { + if(isDone) { + return "D-1-" + name + "-" + parser.format(date); + } else { + return "D-0-" + name + "-" + parser.format(date); + } + } + + public String toString() { + if (isDone) { + return "[D][✓] " + name + " (by: " + formatter.format(date) + ")"; + } else { + return "[D][✗] " + name + " (by: " + formatter.format(date) + ")"; + } + } +} diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java new file mode 100644 index 0000000000..caab1d94e0 --- /dev/null +++ b/src/main/java/task/Event.java @@ -0,0 +1,41 @@ +package task; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class Event extends Task { + protected Date date; + private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); + + + public Event(String name, String dateString) { + this.name = name; + + try{ + Date dateTime = parser.parse(dateString); + this.date = dateTime; + } catch (ParseException pE) { + System.err.println(pE); + } + + this.isDone = false; + } + + public String toFile() { + if(isDone) { + return "E-1-" + name + "-" + parser.format(date); + } else { + return "E-0-" + name + "-" + parser.format(date); + } + } + + public String toString() { + if (isDone) { + return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; + } else { + return "[E][✗] " + name + " (at: " + formatter.format(date) + ")"; + } + } +} diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java new file mode 100644 index 0000000000..0d90aed6fe --- /dev/null +++ b/src/main/java/task/Task.java @@ -0,0 +1,23 @@ +package task; + +public abstract class Task { + protected String name; + protected boolean isDone; + //private Inputs Type; + + public Task() {} + + public Task(String name) { + this.name = name; + this.isDone = false; + } + + public void setDone() { + isDone = true; + } + + public abstract String toFile(); + + @Override + public abstract String toString(); +} diff --git a/src/main/java/task/Todo.java b/src/main/java/task/Todo.java new file mode 100644 index 0000000000..d98820efad --- /dev/null +++ b/src/main/java/task/Todo.java @@ -0,0 +1,24 @@ +package task; + +public class Todo extends Task { + + public Todo(String name) { + this.name = name; + this.isDone = false; + } + + public String toFile() { + if(isDone) { + return "T-1-" + name; + } else { + return "T-0-" + name; + } + } + public String toString() { + if (isDone) { + return "[T][✓] " + name; + } else { + return "[T][✗] " + name; + } + } +} From 48c633953325ffb8e4431fe2d5a8db1a6a041784 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 11 Sep 2019 03:47:46 +0800 Subject: [PATCH 22/43] implemented basic Gradle, Shadowjar and JUnit requires further implementation with regards to testing (JUnit) --- build.gradle | 23 +++++++++++++++++++- src/main/java/Duke.java | 1 + src/main/java/exception/DeleteException.java | 4 ++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ce97c7ba2e..6409f17c80 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { id 'java' id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' } group 'seedu.duke' @@ -10,11 +12,30 @@ repositories { mavenCentral() } +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' +} + +checkstyle { + toolVersion = '8.23' +} + +shadowJar { + archiveBaseName = "duke" + archiveVersion = "0.1.3" + archiveClassifier = null + archiveAppendix = null +} + application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke" } run { standardInput = System.in +} + +test { + useJUnitPlatform() } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 592f79c075..cd9830aea2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -41,6 +41,7 @@ private void run() throws IOException { public static void main(String[] args) { + System.out.println("\u2718"); Duke duke = new Duke(); UI.start(); try { diff --git a/src/main/java/exception/DeleteException.java b/src/main/java/exception/DeleteException.java index a018ed54b0..b4e46c8b1c 100644 --- a/src/main/java/exception/DeleteException.java +++ b/src/main/java/exception/DeleteException.java @@ -1,10 +1,10 @@ -package exception; +package exception; public class DeleteException extends DukeException { public DeleteException() {}; @Override public String toString() { - return " ☹ OOPS!!! There was an error with deleting!"; + return " ☹ OOPS!!! There was an error with deleting!"; } } From 422e58ce927d8c6e60c57766f408a1a9aa1622a9 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 11 Sep 2019 03:50:52 +0800 Subject: [PATCH 23/43] deleted an unnecessary System.out.println --- src/main/java/Duke.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index cd9830aea2..592f79c075 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -41,7 +41,6 @@ private void run() throws IOException { public static void main(String[] args) { - System.out.println("\u2718"); Duke duke = new Duke(); UI.start(); try { From 24ad8675dd9cb3e7e1d09519ea490f956c1af5f6 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 11 Sep 2019 11:13:24 +0800 Subject: [PATCH 24/43] implemented A-Jar through GitHub directly --- build.gradle | 4 ++++ gradle/wrapper/gradle-wrapper.properties | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6409f17c80..4f6d1052c1 100644 --- a/build.gradle +++ b/build.gradle @@ -38,4 +38,8 @@ run { test { useJUnitPlatform() +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3d38..f86040c7fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Sep 11 03:55:13 SGT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip From 198dc4bbdeb39f0b93b3cc13c4a91a4ca1553af8 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 24 Sep 2019 14:42:42 +0800 Subject: [PATCH 25/43] Implemented A-JUnit testing for all Task classes and TaskList class --- src/test/java/main/TaskListTest.java | 41 ++++++++++++++++++++++++++++ src/test/java/task/DeadlineTest.java | 16 +++++++++++ src/test/java/task/EventTest.java | 16 +++++++++++ src/test/java/task/TaskTest.java | 13 +++++++++ src/test/java/task/TodoTest.java | 16 +++++++++++ 5 files changed, 102 insertions(+) create mode 100644 src/test/java/main/TaskListTest.java create mode 100644 src/test/java/task/DeadlineTest.java create mode 100644 src/test/java/task/EventTest.java create mode 100644 src/test/java/task/TaskTest.java create mode 100644 src/test/java/task/TodoTest.java diff --git a/src/test/java/main/TaskListTest.java b/src/test/java/main/TaskListTest.java new file mode 100644 index 0000000000..57ca97ba8d --- /dev/null +++ b/src/test/java/main/TaskListTest.java @@ -0,0 +1,41 @@ +package main; + +import task.Task; +import task.Todo; + +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.*; + +class TaskListTest { + + @org.junit.jupiter.api.Test + void getTaskList() { + assertEquals(new ArrayList(), new TaskList().getTaskList()); + } + + @org.junit.jupiter.api.Test + void updateTaskList() { + ArrayList arrList = new ArrayList<>(); + arrList.add(new Todo("name")); + + TaskList taskList = new TaskList(); + taskList.updateTaskList(arrList); + + + assertEquals(arrList, taskList.getTaskList()); + } + + @org.junit.jupiter.api.Test + void addTaskList() { + ArrayList arrList = new ArrayList<>(); + Todo todo = new Todo("name"); + + TaskList taskList = new TaskList(arrList); + taskList.addTaskList(todo); + + + arrList.add(new Todo("name")); + assertEquals(arrList, taskList.getTaskList()); + } +} \ No newline at end of file diff --git a/src/test/java/task/DeadlineTest.java b/src/test/java/task/DeadlineTest.java new file mode 100644 index 0000000000..3c495e3696 --- /dev/null +++ b/src/test/java/task/DeadlineTest.java @@ -0,0 +1,16 @@ +package task; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DeadlineTest { + + @org.junit.jupiter.api.Test + public void toFile() { + assertEquals("D-0-name-11/11/1991 1700", new Deadline("name", "11/11/1991 1700").toFile()); + } + + @org.junit.jupiter.api.Test + public void toString1() { + assertEquals("[D][✗] name (by: 11 Nov 1991, 0500PM)", new Deadline("name","11/11/1991 1700").toString()); + } +} \ No newline at end of file diff --git a/src/test/java/task/EventTest.java b/src/test/java/task/EventTest.java new file mode 100644 index 0000000000..94f68bf987 --- /dev/null +++ b/src/test/java/task/EventTest.java @@ -0,0 +1,16 @@ +package task; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class EventTest { + + @org.junit.jupiter.api.Test + public void toFile() { + assertEquals("E-0-name-11/11/1991 1700", new Event("name", "11/11/1991 1700").toFile()); + } + + @org.junit.jupiter.api.Test + public void toString1() { + assertEquals("[E][✗] name (at: 11 Nov 1991, 0500PM)", new Event("name","11/11/1991 1700").toString()); + } +} \ No newline at end of file diff --git a/src/test/java/task/TaskTest.java b/src/test/java/task/TaskTest.java new file mode 100644 index 0000000000..cd3b6b2cf2 --- /dev/null +++ b/src/test/java/task/TaskTest.java @@ -0,0 +1,13 @@ +package task; + +import static org.junit.jupiter.api.Assertions.*; + +class TaskTest { + + @org.junit.jupiter.api.Test + void setDone() { + Task task = new Todo("name"); + task.setDone(); + assertEquals("[T][✓] name", task.toString()); + } +} \ No newline at end of file diff --git a/src/test/java/task/TodoTest.java b/src/test/java/task/TodoTest.java new file mode 100644 index 0000000000..173b7963ca --- /dev/null +++ b/src/test/java/task/TodoTest.java @@ -0,0 +1,16 @@ +package task; + +import static org.junit.jupiter.api.Assertions.*; + +class TodoTest { + + @org.junit.jupiter.api.Test + public void toFile() { + assertEquals("T-0-name", new Todo("name").toFile()); + } + + @org.junit.jupiter.api.Test + public void toString1() { + assertEquals("[T][✗] name", new Todo("name").toString()); + } +} \ No newline at end of file From c54a5902af1a0f3d577e9fe7786babc821d5e983 Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 25 Sep 2019 01:06:55 +0800 Subject: [PATCH 26/43] Implemened A-JavaDoc --- src/main/java/Duke.java | 36 +++++++++++---- src/main/java/command/ByeCommand.java | 17 ++++--- src/main/java/command/Command.java | 13 +++--- src/main/java/command/DeadlineCommand.java | 25 ++++++++--- src/main/java/command/DeleteCommand.java | 25 +++++++---- src/main/java/command/DoneCommand.java | 36 ++++++++------- src/main/java/command/EventCommand.java | 26 ++++++++--- src/main/java/command/ListCommand.java | 19 +++++--- src/main/java/command/TodoCommand.java | 27 +++++++++--- src/main/java/command/UnknownCommand.java | 14 +++++- src/main/java/exception/DeleteException.java | 3 ++ src/main/java/exception/DoneException.java | 3 ++ src/main/java/exception/DukeException.java | 3 ++ src/main/java/exception/TaskException.java | 3 ++ .../exception/UnknownCommandException.java | 3 ++ src/main/java/main/Parser.java | 44 ++++++++++++++++--- src/main/java/main/Storage.java | 44 +++++++++++++------ src/main/java/main/TaskList.java | 23 ++++++++++ src/main/java/main/UI.java | 42 +++++++++++++++--- src/main/java/task/Deadline.java | 25 ++++++++++- src/main/java/task/Event.java | 28 ++++++++++-- src/main/java/task/Task.java | 30 ++++++++++++- src/main/java/task/Todo.java | 14 ++++++ 23 files changed, 404 insertions(+), 99 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 592f79c075..65fc05b188 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,27 +2,37 @@ import main.*; import task.*; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Scanner; +/** + * Duke runs as the main and this is where all the work is initialised at. + */ public class Duke { private Storage storage; private TaskList taskList; - private UI ui; + /** + * Constructs an instance of Duke. + * + * Also instantiates an instance of Storage and TaskList for this instance of Duke. + */ private Duke(){ storage = new Storage(); - try { - ArrayList list = storage.readFromFile(); - this.taskList = new TaskList(list); - } catch (FileNotFoundException fE) { - System.err.println(fE); - } + ArrayList list = storage.readFromFile(); + this.taskList = new TaskList(list); } + /** + * Handles the parsing of inputs and execution of parsed commands. + * + * As long as a ByeCommand is not parsed, Duke will continue parsing for more commands. If a ByeCommand is parsed, + * the while loop is terminated and Duke terminates. + * + * @throws IOException When the Parser f + */ private void run() throws IOException { Parser parser = new Parser(); Scanner sc = new Scanner(System.in); @@ -40,6 +50,16 @@ private void run() throws IOException { } + /** + * Runs the main method. + * + * There are three main steps that occur in the main method. + * Firstly, an instance of Duke is created. + * Secondly, the UI prints the start message to the console. + * Next, the duke.run() method is initiated which will handle the parsing and subsequent processes. + * + * @param args + */ public static void main(String[] args) { Duke duke = new Duke(); UI.start(); diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index b5e0cd7e0c..0c95b16947 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -2,12 +2,19 @@ import main.*; -public class ByeCommand extends Command { - public ByeCommand() { +/** + * A Command to handle "bye" inputs resulting in a termination of the Duke program. + */ +public class ByeCommand implements Command { + public ByeCommand() { } - } - - public void execute(TaskList tl, Storage st) { + /** + * Prints the bye message via the UI method, UI.bye(). + * + * @param taskList The TaskList used to store the Tasks for this instance of Duke (not used in this method). + * @param storage The Storage used to store the Tasks on the hard disk (not used in this method). + */ + public void execute(TaskList taskList, Storage storage) { UI.bye(); } } diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index 2dc8d78d56..f679aa3917 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -3,10 +3,11 @@ import java.io.IOException; import main.*; -public abstract class Command { - public Command() { - - } - - public abstract void execute(TaskList tl, Storage st) throws IOException; +/** + * An interface to be implemented by all the Command type objects. + * + * All Commands must implement an execute method, which will be accessed by the Duke.run() method. + */ +public interface Command { + void execute(TaskList tl, Storage st) throws IOException; } diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 77fd6d6e41..3913a0fa98 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -6,7 +6,12 @@ import task.Task; -public class DeadlineCommand extends Command { +/** + * A Command to create an instance of a Deadline Task. + * + * This will add the Deadline Task to the TaskList and the Storage file. + */ +public class DeadlineCommand implements Command { private String deadlineName; private String date; @@ -15,12 +20,22 @@ public DeadlineCommand(String deadlineName, String date) { this.date = date; } - public void execute(TaskList tl, Storage st) throws IOException { + /** + * Executes the Deadline command which creates a Deadline Task. + * + * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new + * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print + * a newTask message into the console. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { Task deadline = new Deadline(deadlineName, date); - tl.addTaskList(deadline); - UI.newTask(tl.getTaskList()); + taskList.addTaskList(deadline); + UI.newTask(taskList.getTaskList()); - st.writeToFile(tl.getTaskList()); + storage.writeToFile(taskList.getTaskList()); } } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 7fc3f3a30d..d39b7385f4 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,22 +1,33 @@ package command; -import java.io.IOException; import java.util.ArrayList; import main.*; import exception.DeleteException; import task.Task; -public class DeleteCommand extends Command { - int taskNum; +/** + * A Command to remove a Task from the TaskList and Storage. + */ +public class DeleteCommand implements Command { + /** + * Indicates which element of the TaskList needs to be deleted. + */ + private int taskNum; public DeleteCommand(int taskNum) { this.taskNum = taskNum; } - public void execute(TaskList tl, Storage st) { + /** + * Deletes a specific Task from the TaskList and Storage as indicated by the taskNum attribute. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { try { - ArrayList list = tl.getTaskList(); + ArrayList list = taskList.getTaskList(); if (taskNum > list.size() || taskNum <= 0) { throw new DeleteException(); } @@ -25,9 +36,7 @@ public void execute(TaskList tl, Storage st) { UI.removedTask(task, listSize); - st.writeToFile(list); - } catch (IOException IOe) { - System.err.println(IOe); + storage.writeToFile(list); } catch (DeleteException dE) { System.err.println(dE); } diff --git a/src/main/java/command/DoneCommand.java b/src/main/java/command/DoneCommand.java index 9651091b52..69a1a9fbd3 100644 --- a/src/main/java/command/DoneCommand.java +++ b/src/main/java/command/DoneCommand.java @@ -5,29 +5,33 @@ import main.UI; import task.Task; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.ArrayList; -public class DoneCommand extends Command { - int taskNum; +/** + * A Command indicate that a Task from the TaskList and Storage has been completed. + */ +public class DoneCommand implements Command { + /** + * Indicates which element of the TaskList has been completed. + */ + private int taskNum; public DoneCommand(int taskNum) { this.taskNum = taskNum; } - public void execute(TaskList tl, Storage st) { - try { - ArrayList list = tl.getTaskList(); - Task currTask = list.get(taskNum); - currTask.setDone(); - UI.done(currTask); + /** + * Marks a specific Task from the TaskList and Storage as indicated by the taskNum attribute as completed. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { + ArrayList list = taskList.getTaskList(); + Task currTask = list.get(taskNum); + currTask.setDone(); + UI.done(currTask); - st.writeToFile(list); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } + storage.writeToFile(list); } } diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index 7d91dc997d..85eaab9a64 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -6,10 +6,14 @@ import task.Event; import task.Task; -import java.io.IOException; import java.util.ArrayList; -public class EventCommand extends Command { +/** + * A Command to create an instance of a Event Task. + * + * This will add the Event Task to the TaskList and the Storage file. + */ +public class EventCommand implements Command { private String eventName; private String date; @@ -18,14 +22,24 @@ public EventCommand(String eventName, String date) { this.date = date; } - public void execute(TaskList tl, Storage st) throws IOException { - ArrayList list = tl.getTaskList(); + /** + * Executes the Event command which creates a Event Task. + * + * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new + * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print + * a newTask message into the console. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { + ArrayList list = taskList.getTaskList(); Task event = new Event(eventName, date); - tl.addTaskList(event); + taskList.addTaskList(event); UI.newTask(list); - st.writeToFile(list); + storage.writeToFile(list); } } diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index a126c61fcf..7167c51e3b 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -6,13 +6,20 @@ import java.util.ArrayList; -public class ListCommand extends Command { - public ListCommand() { +/** + * A Command to print a list of all the Tasks in the TaskList. + */ +public class ListCommand implements Command { + public ListCommand() { } - } - - public void execute(TaskList tl, Storage st) { - ArrayList list = tl.getTaskList(); + /** + * Prints into the console all the Tasks in the TaskList. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { + ArrayList list = taskList.getTaskList(); for (int i = 0; i < list.size(); i++) { if (list.get(i) != null) { System.out.println(i + 1 + "." + list.get(i)); diff --git a/src/main/java/command/TodoCommand.java b/src/main/java/command/TodoCommand.java index c1abbbdeb5..1a506642f2 100644 --- a/src/main/java/command/TodoCommand.java +++ b/src/main/java/command/TodoCommand.java @@ -6,24 +6,37 @@ import task.Task; import task.Todo; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.ArrayList; -public class TodoCommand extends Command { +/** + * A Command to create an instance of a Todo Task. + * + * This will add the Todo Task to the TaskList and the Storage file. + */ +public class TodoCommand implements Command { private String todoName; public TodoCommand(String todoName) { this.todoName = todoName; } - public void execute(TaskList tl, Storage st) throws IOException { - ArrayList list = tl.getTaskList(); + /** + * Executes the Todo command which creates a Todo Task. + * + * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new + * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print + * a newTask message into the console. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { + ArrayList list = taskList.getTaskList(); Task todo = new Todo(todoName); - tl.addTaskList(todo); - st.writeToFile(list); + taskList.addTaskList(todo); + storage.writeToFile(list); UI.newTask(list); } diff --git a/src/main/java/command/UnknownCommand.java b/src/main/java/command/UnknownCommand.java index 6091781272..4fba999da6 100644 --- a/src/main/java/command/UnknownCommand.java +++ b/src/main/java/command/UnknownCommand.java @@ -4,12 +4,22 @@ import main.Storage; import main.TaskList; -public class UnknownCommand extends Command { +/** + * A Command meant to handle the event in which an unknown command is given by the user. + */ +public class UnknownCommand implements Command { public UnknownCommand() { } - public void execute(TaskList tl, Storage st) { + /** + * Prints into the console the error message when an unknown command is given, via the instantiation of an + * UnknownCommandException. + * + * @param taskList The TaskList from the main Duke object. + * @param storage The Storage from the main Duke object. + */ + public void execute(TaskList taskList, Storage storage) { System.err.println(new UnknownCommandException()); } } diff --git a/src/main/java/exception/DeleteException.java b/src/main/java/exception/DeleteException.java index b4e46c8b1c..09cf3cf985 100644 --- a/src/main/java/exception/DeleteException.java +++ b/src/main/java/exception/DeleteException.java @@ -1,5 +1,8 @@ package exception; +/** + * An exception which only occurs if an an error is encountered when a Delete Command is executed. + */ public class DeleteException extends DukeException { public DeleteException() {}; diff --git a/src/main/java/exception/DoneException.java b/src/main/java/exception/DoneException.java index e934c86625..b35bb48c0d 100644 --- a/src/main/java/exception/DoneException.java +++ b/src/main/java/exception/DoneException.java @@ -1,5 +1,8 @@ package exception; +/** + * An exception which only occurs if an an error is encountered when a Done Command is executed. + */ public class DoneException extends DukeException { public DoneException() {}; diff --git a/src/main/java/exception/DukeException.java b/src/main/java/exception/DukeException.java index a561522b22..d0f62ed530 100644 --- a/src/main/java/exception/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,5 +1,8 @@ package exception; +/** + * A custom Exception class which is meant only for exceptions unique to Duke. + */ public abstract class DukeException extends Exception{ public DukeException() {} diff --git a/src/main/java/exception/TaskException.java b/src/main/java/exception/TaskException.java index a8d4e3816a..ece5138333 100644 --- a/src/main/java/exception/TaskException.java +++ b/src/main/java/exception/TaskException.java @@ -1,5 +1,8 @@ package exception; +/** + * An exception which only occurs if an an error is encountered when a Task Command is executed. + */ public class TaskException extends DukeException { public TaskException() {}; diff --git a/src/main/java/exception/UnknownCommandException.java b/src/main/java/exception/UnknownCommandException.java index cd0e88ee43..6a89e2d295 100644 --- a/src/main/java/exception/UnknownCommandException.java +++ b/src/main/java/exception/UnknownCommandException.java @@ -1,5 +1,8 @@ package exception; +/** + * An exception which only occurs if an an error is encountered when a UnknownCommand is executed. + */ public class UnknownCommandException extends DukeException { public UnknownCommandException() {}; diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java index 400aa2cd56..3dc6b1b1c3 100644 --- a/src/main/java/main/Parser.java +++ b/src/main/java/main/Parser.java @@ -6,12 +6,25 @@ import exception.DukeException; import exception.TaskException; +/** + * Parses all the commands input by the user. + * + * The only public method, parse(), is used to determine which command will be returned and executed in Duke. The other + * two methods are private and used to assist the parse() method in processing an Event or a Deadline type Command. + */ public class Parser { - //private Scanner sc; - public Parser() { - //this.sc = new Scanner(System.in); - } - + public Parser() { } + + /** + * Returns a String array which has two elements. + * + * The first element is the name of the new Event Task and the second element is the String representing the date + * of the Event Task. + * + * @param command A string array representing the initial input split into individual words. + * @return Returns a String array which contains the name and the date of a new Event Task. + * @throws TaskException Thrown when there is insufficient information to create an Event Task. + */ private String[] getEventDetails(String[] command) throws TaskException { if (command.length <= 1) { throw new TaskException(); @@ -24,6 +37,16 @@ private String[] getEventDetails(String[] command) throws TaskException { return toReturn.split(" /at "); } + /** + * Returns a String array which has two elements. + * + * The first element is the name of the new Deadline Task and the second element is the String representing the + * date of the Deadline Task. + * + * @param command A string array representing the initial input split into individual words. + * @return Returns a String array which contains the name and the date of a new Deadline Task. + * @throws TaskException Thrown when there is insufficient information to create an Deadline Task. + */ private String[] getDeadlineDetails(String[] command) throws TaskException { if (command.length <= 1) { throw new TaskException(); @@ -37,7 +60,16 @@ private String[] getDeadlineDetails(String[] command) throws TaskException { } - + /** + * Parses the input and returns a Command that corresponds to the type of input given. + * + * When a String (commandLine) is supplied, this method will split commandLine into multiple words (via + * String.split(" "). This will result in a String array containing individual words. The first word is then used + * to determine which Command is to be returned. If an invalid command is given, an UnknownCommand will be returned. + * + * @param commandLine A string representing a full line of input from the user. + * @return Returns a Command object corresponding to the type of input from the user. + */ public Command parse(String commandLine) { String[] nextCommand = commandLine.split(" "); switch (nextCommand[0]) { diff --git a/src/main/java/main/Storage.java b/src/main/java/main/Storage.java index 872b4151db..64c2eb74e9 100644 --- a/src/main/java/main/Storage.java +++ b/src/main/java/main/Storage.java @@ -14,15 +14,27 @@ import java.util.ArrayList; import java.util.Scanner; +/** + * Manages the storing of the TaskList to a file on the hard disk. + * + * This allows the list of Tasks to be stored and accessed for subsequent initialisations of Duke. + */ public class Storage { private Path p = Paths.get(System.getProperty("user.dir")); private File data = new File(p + "/data/duke.txt"); - public Storage() { - } - - - public ArrayList readFromFile() throws FileNotFoundException { + public Storage() { } + + /** + * Returns an ArrayList of tasks from the data file on the hard disk. + * + * This method is invoked whenever an instance of Duke is created. It reads from the data/duke.txt file. Should the + * file not be found, a FileNotFoundException is thrown and caught. A parser is also implemented in this method to + * read from the data file. + * + * @return An ArrayList of Tasks from the stored data file. + */ + public ArrayList readFromFile() { ArrayList toReturn = new ArrayList<>(); try { @@ -63,29 +75,35 @@ public ArrayList readFromFile() throws FileNotFoundException { } sc.close(); } catch(FileNotFoundException fE) { - System.out.println(fE); + System.err.println(fE); } return toReturn; } - public void writeToFile(ArrayList list) throws FileNotFoundException, IOException { + /** + * Writes all the tasks in a given ArrayList into the data/duke.txt file. + * + * A StringBuilder is used to concatenate all the strings from the toFile() method of each Task. This is then + * stored into the data file. + * + * @param list ArrayList of all the Tasks to be written into the data file. + */ + public void writeToFile(ArrayList list) { try { Path p = Paths.get(System.getProperty("user.dir")); File data = new File(p + "/data/duke.txt"); FileWriter fw = new FileWriter(data); - String toWrite = ""; + StringBuilder toWrite = new StringBuilder(""); for(Task task : list) { - toWrite += task.toFile() + " \n"; + toWrite.append(task.toFile() + " \n"); } - fw.write(toWrite); + fw.write(toWrite.toString()); fw.close(); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); } catch (IOException IOe) { - System.out.println(IOe); + System.err.println(IOe); } } diff --git a/src/main/java/main/TaskList.java b/src/main/java/main/TaskList.java index 05291f9b31..38c6b03ce7 100644 --- a/src/main/java/main/TaskList.java +++ b/src/main/java/main/TaskList.java @@ -4,21 +4,44 @@ import java.util.ArrayList; +/** + * Stores all the Tasks in an ArrayList. + * + * Contains methods to access and update the ArrayList of Tasks. + */ public class TaskList { private ArrayList list; + /** + * Instantiates a TaskList object with an empty ArrayList. + */ public TaskList() { list = new ArrayList<>(); } + /** + * Instantiates a TaskList object with an ArrayList of Task (given as an argument). + * + * @param list an ArrayList of Tasks. + */ public TaskList(ArrayList list) { this.list = list; } + /** + * Returns the ArrayList of Tasks of this TaskList. + * + * @return The ArrayList of Tasks of this TaskList. + */ public ArrayList getTaskList() { return this.list; } + /** + * Replaces the ArrayList of this TaskList with another ArrayList of Tasks (given as an argument). + * + * @param list An ArrayList of Tasks to replace the ArrayList of this TaskList. + */ public void updateTaskList(ArrayList list) { this.list = list; } diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index 90e7b711a5..ed8e42ca2a 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -4,9 +4,16 @@ import java.util.ArrayList; +/** + * Stores all the different messages to be printed to the console. This class only contains static methods and as such + * this class will never need to be initialised. + */ public class UI { public UI(){} + /** + * Prints the start message when Duke is executed. + */ public static void start() { System.out.println(" ____________________________________________________________\n" + " Hello! I'm Duke\n" + @@ -15,17 +22,32 @@ public static void start() { } + /** + * Prints the closing message when a ByeCommand is executed. + */ public static void bye() { System.out.println("Bye. Hope to see you again soon!"); } - public static void newTask(ArrayList tl) { + /** + * Prints the contents of the TaskList (given as an argument) whenever a new task is added to the TaskList. + * + * @param taskList A TaskList instance unique to each instance of Duke. + */ + public static void newTask(ArrayList taskList) { System.out.println("Got it. I've added this task: "); - System.out.println(" " + tl.get(tl.size() - 1)); - System.out.println("Now you have " + tl.size() + " tasks in the list."); + System.out.println(" " + taskList.get(taskList.size() - 1)); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); } + /** + * Prints the size of the TaskList (given as an argument) and the Task to be removed (also given as an argument) + * of the TaskList whenever a Task is removed from the TaskList. Typically occurs when a RemoveCommand is executed. + * + * @param task The Task to be removed from the TaskList. + * @param listSize The size of the TaskList, after removal of Task. + */ public static void removedTask(Task task, int listSize){ System.out.println(" Noted. I've removed this task: "); System.out.println(" " + task); @@ -33,11 +55,21 @@ public static void removedTask(Task task, int listSize){ } - public static void numTasks(ArrayList tl) { - System.out.println("Now you have " + tl.size() + " tasks in the list."); + /** + * Prints the number of Tasks in the TaskList (given as an argument). + * + * @param taskList A TaskList instance unique to each instance of Duke. + */ + public static void numTasks(ArrayList taskList) { + System.out.println("Now you have " + taskList.size() + " tasks in the list."); } + /** + * Prints that a given Task is designated as done, typically when a DoneCommand is excuted. + * + * @param task The Task designated as done. + */ public static void done(Task task) { System.out.println("Nice! I've marked this task as done:"); System.out.println(" " + task); diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java index 9a8a6df2b5..4fc1ee2604 100644 --- a/src/main/java/task/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -4,9 +4,22 @@ import java.text.SimpleDateFormat; import java.util.Date; +/** + * A type of Task that includes a date attribute for the Task to be completed by. + * + * Also includes two SimpleDateFormatter. + */ public class Deadline extends Task { - protected Date date; + private Date date; + + /** + * Used for parsing the input from the user and for formatting the date for Storage. + */ private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + + /** + * Used for formatting the date for printing to console. + */ private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); @@ -23,6 +36,11 @@ public Deadline(String name, String dateString) { this.isDone = false; } + /** + * Returns a String representing the Task in a format to be saved into the hard disk's storage file. + + * @return A String representation of this Task formatted for the storage file. + */ public String toFile() { if(isDone) { return "D-1-" + name + "-" + parser.format(date); @@ -31,6 +49,11 @@ public String toFile() { } } + /** + * Returns a String representing the Task in a format to be printed into the console. + * + * @return A String representation of this Task formatted for printing into the console. + */ public String toString() { if (isDone) { return "[D][✓] " + name + " (by: " + formatter.format(date) + ")"; diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java index caab1d94e0..1977e99c6a 100644 --- a/src/main/java/task/Event.java +++ b/src/main/java/task/Event.java @@ -4,9 +4,22 @@ import java.text.SimpleDateFormat; import java.util.Date; +/** + * A type of Task that includes a date attribute for the date in which the Task takes place. + * + * Also includes two SimpleDateFormatter. + */ public class Event extends Task { - protected Date date; + private Date date; + + /** + * Used for parsing the input from the user and for formatting the date for Storage. + */ private SimpleDateFormat parser = new SimpleDateFormat("dd/MM/yyyy HHmm"); + + /** + * Used for formatting the date for printing to console. + */ private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); @@ -14,8 +27,7 @@ public Event(String name, String dateString) { this.name = name; try{ - Date dateTime = parser.parse(dateString); - this.date = dateTime; + this.date = parser.parse(dateString); } catch (ParseException pE) { System.err.println(pE); } @@ -23,6 +35,11 @@ public Event(String name, String dateString) { this.isDone = false; } + /** + * Returns a String representing the Task in a format to be saved into the hard disk's storage file. + + * @return A String representation of this Task formatted for the storage file. + */ public String toFile() { if(isDone) { return "E-1-" + name + "-" + parser.format(date); @@ -31,6 +48,11 @@ public String toFile() { } } + /** + * Returns a String representing the Task in a format to be printed into the console. + * + * @return A String representation of this Task formatted for printing into the console. + */ public String toString() { if (isDone) { return "[E][✓] " + name + " (at: " + formatter.format(date) + ")"; diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 0d90aed6fe..a981eb43e3 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -1,9 +1,18 @@ package task; +/** + * An Abstract Class extended by all the Task type classes. + * + * Each Task contains a name and an isDone attribute. Two abstract methods (toFile() and toString()) are meant to be + * implemented by any classes that extend the Task abstract class. + */ public abstract class Task { - protected String name; + /** + * Indicates where the current task has been completed. + */ protected boolean isDone; - //private Inputs Type; + protected String name; + public Task() {} @@ -12,12 +21,29 @@ public Task(String name) { this.isDone = false; } + /** + * Indicates that this Task has already been completed. + */ public void setDone() { isDone = true; } + /** + * Returns a String representing the Task in a format to be saved into the hard disk's storage file. + * + * To be implemented by each individual Task class. + * + * @return A String representation of this Task formatted for the storage file. + */ public abstract String toFile(); + /** + * Returns a String representing the Task in a format to be printed into the console. + * + * To be implemented by each individual Task class. + * + * @return A String representation of this Task formatted for printing into the console. + */ @Override public abstract String toString(); } diff --git a/src/main/java/task/Todo.java b/src/main/java/task/Todo.java index d98820efad..764afb9cf8 100644 --- a/src/main/java/task/Todo.java +++ b/src/main/java/task/Todo.java @@ -1,5 +1,8 @@ package task; +/** + * A simple Task which only indicates what task needs to be completed. + */ public class Todo extends Task { public Todo(String name) { @@ -7,6 +10,11 @@ public Todo(String name) { this.isDone = false; } + /** + * Returns a String representing the Task in a format to be saved into the hard disk's storage file. + + * @return A String representation of this Task formatted for the storage file. + */ public String toFile() { if(isDone) { return "T-1-" + name; @@ -14,6 +22,12 @@ public String toFile() { return "T-0-" + name; } } + + /** + * Returns a String representing the Task in a format to be printed into the console. + * + * @return A String representation of this Task formatted for printing into the console. + */ public String toString() { if (isDone) { return "[T][✓] " + name; From a14e9bf78e06bce70b520529e1a950e8c6f0464a Mon Sep 17 00:00:00 2001 From: Taha Date: Wed, 25 Sep 2019 23:16:03 +0800 Subject: [PATCH 27/43] Implemented A-CodingStyle and A-CheckStyle via Gradle --- build.gradle | 7 +++-- gradlew.bat | 1 + src/main/java/Duke.java | 25 +++++++-------- src/main/java/command/ByeCommand.java | 4 ++- src/main/java/command/Command.java | 4 ++- src/main/java/command/DeadlineCommand.java | 15 +++++---- src/main/java/command/DeleteCommand.java | 10 +++--- src/main/java/command/DoneCommand.java | 16 +++------- src/main/java/command/EventCommand.java | 10 +++--- src/main/java/exception/DeleteException.java | 4 ++- src/main/java/exception/DoneException.java | 4 ++- src/main/java/exception/DukeException.java | 6 ++-- src/main/java/exception/TaskException.java | 4 ++- .../exception/UnknownCommandException.java | 4 ++- src/main/java/main/Parser.java | 18 ++++++++--- src/main/java/main/Storage.java | 31 ++++++++++--------- src/main/java/main/UI.java | 13 ++++---- src/main/java/task/Deadline.java | 8 ++--- src/main/java/task/Event.java | 8 ++--- src/main/java/task/Task.java | 4 ++- src/main/java/task/Todo.java | 3 +- 21 files changed, 112 insertions(+), 87 deletions(-) diff --git a/build.gradle b/build.gradle index 4f6d1052c1..91f0834757 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,10 @@ plugins { group 'seedu.duke' version '0.1.0' +compileJava.options.encoding = "UTF-8" +compileTestJava.options.encoding = "UTF-8" + + repositories { mavenCentral() } @@ -40,6 +44,3 @@ test { useJUnitPlatform() } -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 6d57edc706..339242ede2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -15,6 +15,7 @@ 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" +set GRADLE_OPTS="-Dfile.encodingutf-8" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 592f79c075..eb28b245e8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,10 @@ -import command.*; -import main.*; -import task.*; +import command.ByeCommand; +import command.Command; +import main.Parser; +import main.Storage; +import main.TaskList; +import main.UI; +import task.Task; import java.io.FileNotFoundException; import java.io.IOException; @@ -12,28 +16,23 @@ public class Duke { private TaskList taskList; private UI ui; - private Duke(){ + private Duke() { storage = new Storage(); - try { - ArrayList list = storage.readFromFile(); - this.taskList = new TaskList(list); - - } catch (FileNotFoundException fE) { - System.err.println(fE); - } + ArrayList list = storage.readFromFile(); + this.taskList = new TaskList(list); } private void run() throws IOException { Parser parser = new Parser(); Scanner sc = new Scanner(System.in); - while(sc.hasNextLine()) { + while (sc.hasNextLine()) { String nextLine = sc.nextLine(); Command c = parser.parse(nextLine); c.execute(taskList, storage); - if(c instanceof ByeCommand) { + if (c instanceof ByeCommand) { break; } } diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index b5e0cd7e0c..86405befbf 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -1,6 +1,8 @@ package command; -import main.*; +import main.Storage; +import main.TaskList; +import main.UI; public class ByeCommand extends Command { public ByeCommand() { diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index 2dc8d78d56..d83672a5d8 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -1,7 +1,9 @@ package command; import java.io.IOException; -import main.*; + +import main.Storage; +import main.TaskList; public abstract class Command { public Command() { diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 77fd6d6e41..4a6c66f5c2 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -1,7 +1,10 @@ package command; import java.io.IOException; -import java.util.ArrayList;import main.*; + +import main.Storage; +import main.TaskList; +import main.UI; import task.Deadline; import task.Task; @@ -15,12 +18,12 @@ public DeadlineCommand(String deadlineName, String date) { this.date = date; } - public void execute(TaskList tl, Storage st) throws IOException { - Task deadline = new Deadline(deadlineName, date); + public void execute(TaskList tl, Storage st) { + Task deadline = new Deadline(deadlineName, date); - tl.addTaskList(deadline); - UI.newTask(tl.getTaskList()); + tl.addTaskList(deadline); + UI.newTask(tl.getTaskList()); - st.writeToFile(tl.getTaskList()); + st.writeToFile(tl.getTaskList()); } } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 7fc3f3a30d..0dfe4c0d2c 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -3,8 +3,10 @@ import java.io.IOException; import java.util.ArrayList; -import main.*; import exception.DeleteException; +import main.Storage; +import main.TaskList; +import main.UI; import task.Task; public class DeleteCommand extends Command { @@ -26,10 +28,8 @@ public void execute(TaskList tl, Storage st) { UI.removedTask(task, listSize); st.writeToFile(list); - } catch (IOException IOe) { - System.err.println(IOe); - } catch (DeleteException dE) { - System.err.println(dE); + } catch (DeleteException delExp) { + System.err.println(delExp); } } } diff --git a/src/main/java/command/DoneCommand.java b/src/main/java/command/DoneCommand.java index 9651091b52..9c96b60b3f 100644 --- a/src/main/java/command/DoneCommand.java +++ b/src/main/java/command/DoneCommand.java @@ -17,17 +17,11 @@ public DoneCommand(int taskNum) { } public void execute(TaskList tl, Storage st) { - try { - ArrayList list = tl.getTaskList(); - Task currTask = list.get(taskNum); - currTask.setDone(); - UI.done(currTask); + ArrayList list = tl.getTaskList(); + Task currTask = list.get(taskNum); + currTask.setDone(); + UI.done(currTask); - st.writeToFile(list); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); - } + st.writeToFile(list); } } diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index 7d91dc997d..7559dc0272 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -19,13 +19,13 @@ public EventCommand(String eventName, String date) { } public void execute(TaskList tl, Storage st) throws IOException { - ArrayList list = tl.getTaskList(); + ArrayList list = tl.getTaskList(); - Task event = new Event(eventName, date); + Task event = new Event(eventName, date); - tl.addTaskList(event); - UI.newTask(list); + tl.addTaskList(event); + UI.newTask(list); - st.writeToFile(list); + st.writeToFile(list); } } diff --git a/src/main/java/exception/DeleteException.java b/src/main/java/exception/DeleteException.java index b4e46c8b1c..5175be3b5b 100644 --- a/src/main/java/exception/DeleteException.java +++ b/src/main/java/exception/DeleteException.java @@ -1,7 +1,9 @@ package exception; public class DeleteException extends DukeException { - public DeleteException() {}; + public DeleteException() { + + } @Override public String toString() { diff --git a/src/main/java/exception/DoneException.java b/src/main/java/exception/DoneException.java index e934c86625..9bf2690676 100644 --- a/src/main/java/exception/DoneException.java +++ b/src/main/java/exception/DoneException.java @@ -1,7 +1,9 @@ package exception; public class DoneException extends DukeException { - public DoneException() {}; + public DoneException() { + + } @Override public String toString() { diff --git a/src/main/java/exception/DukeException.java b/src/main/java/exception/DukeException.java index a561522b22..75e68c9d3c 100644 --- a/src/main/java/exception/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,7 +1,9 @@ package exception; -public abstract class DukeException extends Exception{ - public DukeException() {} +public abstract class DukeException extends Exception { + public DukeException() { + + } @Override public abstract String toString(); diff --git a/src/main/java/exception/TaskException.java b/src/main/java/exception/TaskException.java index a8d4e3816a..105af068a0 100644 --- a/src/main/java/exception/TaskException.java +++ b/src/main/java/exception/TaskException.java @@ -1,7 +1,9 @@ package exception; public class TaskException extends DukeException { - public TaskException() {}; + public TaskException() { + + } @Override public String toString() { diff --git a/src/main/java/exception/UnknownCommandException.java b/src/main/java/exception/UnknownCommandException.java index cd0e88ee43..d2ff106d14 100644 --- a/src/main/java/exception/UnknownCommandException.java +++ b/src/main/java/exception/UnknownCommandException.java @@ -1,7 +1,9 @@ package exception; public class UnknownCommandException extends DukeException { - public UnknownCommandException() {}; + public UnknownCommandException() { + + } @Override public String toString() { diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java index 400aa2cd56..ea0ef60941 100644 --- a/src/main/java/main/Parser.java +++ b/src/main/java/main/Parser.java @@ -1,6 +1,14 @@ package main; -import command.*; +import command.ByeCommand; +import command.Command; +import command.DeadlineCommand; +import command.DeleteCommand; +import command.DoneCommand; +import command.EventCommand; +import command.ListCommand; +import command.TodoCommand; +import command.UnknownCommand; import exception.DeleteException; import exception.DoneException; import exception.DukeException; @@ -17,7 +25,7 @@ private String[] getEventDetails(String[] command) throws TaskException { throw new TaskException(); } String toReturn = ""; - for(int i = 1; i < command.length; i++) { + for (int i = 1; i < command.length; i++) { toReturn += command[i] + " "; } @@ -29,7 +37,7 @@ private String[] getDeadlineDetails(String[] command) throws TaskException { throw new TaskException(); } String toReturn = ""; - for(int i = 1; i < command.length; i++) { + for (int i = 1; i < command.length; i++) { toReturn += command[i] + " "; } @@ -54,8 +62,8 @@ public Command parse(String commandLine) { } else { return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); } - } catch (DukeException dE) { - System.err.println(dE); + } catch (DukeException dukeExp) { + System.err.println(dukeExp); } break; diff --git a/src/main/java/main/Storage.java b/src/main/java/main/Storage.java index 872b4151db..3a83edd700 100644 --- a/src/main/java/main/Storage.java +++ b/src/main/java/main/Storage.java @@ -15,20 +15,20 @@ import java.util.Scanner; public class Storage { - private Path p = Paths.get(System.getProperty("user.dir")); - private File data = new File(p + "/data/duke.txt"); + private Path path = Paths.get(System.getProperty("user.dir")); + private File data = new File(path + "/data/duke.txt"); public Storage() { } - public ArrayList readFromFile() throws FileNotFoundException { + public ArrayList readFromFile() { ArrayList toReturn = new ArrayList<>(); try { Scanner sc = new Scanner(data); - while(sc.hasNextLine()) { + while (sc.hasNextLine()) { String[] next = sc.nextLine().split("-"); switch (next[0]) { @@ -59,33 +59,36 @@ public ArrayList readFromFile() throws FileNotFoundException { } toReturn.add(deadline); break; + + default: + break; } } sc.close(); - } catch(FileNotFoundException fE) { - System.out.println(fE); + } catch (FileNotFoundException fileExp) { + System.out.println(fileExp); } return toReturn; } - public void writeToFile(ArrayList list) throws FileNotFoundException, IOException { + public void writeToFile(ArrayList list) { try { - Path p = Paths.get(System.getProperty("user.dir")); - File data = new File(p + "/data/duke.txt"); + Path path = Paths.get(System.getProperty("user.dir")); + File data = new File(path + "/data/duke.txt"); FileWriter fw = new FileWriter(data); String toWrite = ""; - for(Task task : list) { + for (Task task : list) { toWrite += task.toFile() + " \n"; } fw.write(toWrite); fw.close(); - } catch (FileNotFoundException Fe) { - System.out.println(Fe); - } catch (IOException IOe) { - System.out.println(IOe); + } catch (FileNotFoundException fileExp) { + System.out.println(fileExp); + } catch (IOException inOutExp) { + System.out.println(inOutExp); } } diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index 90e7b711a5..afb2941848 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -4,14 +4,13 @@ import java.util.ArrayList; -public class UI { - public UI(){} +public interface UI { public static void start() { - System.out.println(" ____________________________________________________________\n" + - " Hello! I'm Duke\n" + - " What can I do for you?\n" + - " ____________________________________________________________\n"); + System.out.println(" ____________________________________________________________\n" + + " Hello! I'm Duke\n" + + " What can I do for you?\n" + + " ____________________________________________________________\n"); } @@ -26,7 +25,7 @@ public static void newTask(ArrayList tl) { } - public static void removedTask(Task task, int listSize){ + public static void removedTask(Task task, int listSize) { System.out.println(" Noted. I've removed this task: "); System.out.println(" " + task); System.out.println("Now you have " + listSize + " tasks in the list."); diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java index 9a8a6df2b5..ba1f143306 100644 --- a/src/main/java/task/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -13,18 +13,18 @@ public class Deadline extends Task { public Deadline(String name, String dateString) { this.name = name; - try{ + try { Date dateTime = parser.parse(dateString); this.date = dateTime; - } catch (ParseException pE) { - System.err.println(pE); + } catch (ParseException parseExp) { + System.err.println(parseExp); } this.isDone = false; } public String toFile() { - if(isDone) { + if (isDone) { return "D-1-" + name + "-" + parser.format(date); } else { return "D-0-" + name + "-" + parser.format(date); diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java index caab1d94e0..8f3ba0724f 100644 --- a/src/main/java/task/Event.java +++ b/src/main/java/task/Event.java @@ -13,18 +13,18 @@ public class Event extends Task { public Event(String name, String dateString) { this.name = name; - try{ + try { Date dateTime = parser.parse(dateString); this.date = dateTime; - } catch (ParseException pE) { - System.err.println(pE); + } catch (ParseException parseExp) { + System.err.println(parseExp); } this.isDone = false; } public String toFile() { - if(isDone) { + if (isDone) { return "E-1-" + name + "-" + parser.format(date); } else { return "E-0-" + name + "-" + parser.format(date); diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 0d90aed6fe..161a0587d6 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -5,7 +5,9 @@ public abstract class Task { protected boolean isDone; //private Inputs Type; - public Task() {} + public Task() { + + } public Task(String name) { this.name = name; diff --git a/src/main/java/task/Todo.java b/src/main/java/task/Todo.java index d98820efad..211eda0d70 100644 --- a/src/main/java/task/Todo.java +++ b/src/main/java/task/Todo.java @@ -8,12 +8,13 @@ public Todo(String name) { } public String toFile() { - if(isDone) { + if (isDone) { return "T-1-" + name; } else { return "T-0-" + name; } } + public String toString() { if (isDone) { return "[T][✓] " + name; From 8355d84d87cd2f8c1cc209a0398dd7a1b4f6f4fe Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 26 Sep 2019 00:09:00 +0800 Subject: [PATCH 28/43] Implemented Level-9 --- src/main/java/command/FindCommand.java | 33 ++++++++++++++++++++++++++ src/main/java/main/Parser.java | 2 ++ src/main/java/main/UI.java | 7 ++++++ src/main/java/task/Task.java | 4 ++++ 4 files changed, 46 insertions(+) create mode 100644 src/main/java/command/FindCommand.java diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java new file mode 100644 index 0000000000..7bf5857492 --- /dev/null +++ b/src/main/java/command/FindCommand.java @@ -0,0 +1,33 @@ +package command; + +import main.Storage; +import main.TaskList; +import main.UI; +import task.Task; + +public class FindCommand extends Command { + private String searchTerm; + + public FindCommand(String searchTerm) { + this.searchTerm = searchTerm; + } + + @Override + public void execute(TaskList tl, Storage st) { + UI.findStart(); + int counter = 1; + + for (Task task : tl.getTaskList()) { + String[] taskNameComponents = task.getName().split(" "); + + for (String nameComponent : taskNameComponents) { + if (nameComponent.equalsIgnoreCase(searchTerm)) { + System.out.println(" " + counter + "." + task); + counter++; + } + } + } + + UI.endLine(); + } +} diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java index 400aa2cd56..cc4039c8d2 100644 --- a/src/main/java/main/Parser.java +++ b/src/main/java/main/Parser.java @@ -110,6 +110,8 @@ public Command parse(String commandLine) { } break; + case "find": + return new FindCommand(nextCommand[1]); default: break; diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index 90e7b711a5..83acbed74f 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -44,6 +44,13 @@ public static void done(Task task) { } + public static void findStart(){ + System.out.println(" ____________________________________________________________\n" + + " Here are the matching tasks in your list:"); + } + public static void endLine() { + System.out.println(" ____________________________________________________________"); + } } diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 0d90aed6fe..04fa0242a5 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -16,6 +16,10 @@ public void setDone() { isDone = true; } + public String getName() { + return this.name; + } + public abstract String toFile(); @Override From 1fd5b0c14f7dd0540eef5711699daca53b363254 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 26 Sep 2019 18:38:37 +0800 Subject: [PATCH 29/43] Optimised FindCommand --- src/main/java/command/FindCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java index 20af583042..cbe6e0ecaf 100644 --- a/src/main/java/command/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -24,6 +24,7 @@ public void execute(TaskList tl, Storage st) { if (nameComponent.equalsIgnoreCase(searchTerm)) { System.out.println(" " + counter + "." + task); counter++; + break; } } } From 5f935b20fcffedf9cbe8486d2663b834c8f93c04 Mon Sep 17 00:00:00 2001 From: Taha Date: Sat, 28 Sep 2019 22:04:23 +0800 Subject: [PATCH 30/43] Implemented JavaFX GUI To be implemented: Full support of all Duke's previous features with the new GUI --- build.gradle | 7 +++ src/main/java/DialogBox.java | 65 ++++++++++++++++++++++ src/main/java/Duke.java | 56 +++++++++++++++++-- src/main/java/Launcher.java | 10 ++++ src/main/java/Main.java | 36 ++++++++++++ src/main/java/MainWindow.java | 58 +++++++++++++++++++ src/main/java/command/ByeCommand.java | 4 +- src/main/java/command/Command.java | 2 +- src/main/java/command/UnknownCommand.java | 4 +- src/main/java/main/Parser.java | 2 +- src/main/java/main/UI.java | 10 ++-- src/main/resources/images/Duke.png | Bin 0 -> 32657 bytes src/main/resources/images/User.png | Bin 0 -> 37794 bytes src/main/resources/view/DialogBox.fxml | 16 ++++++ src/main/resources/view/MainWindow.fxml | 23 ++++++++ 15 files changed, 276 insertions(+), 17 deletions(-) create mode 100644 src/main/java/DialogBox.java create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/java/Main.java create mode 100644 src/main/java/MainWindow.java create mode 100644 src/main/resources/images/Duke.png create mode 100644 src/main/resources/images/User.png create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/build.gradle b/build.gradle index 91f0834757..52da31f852 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,10 @@ plugins { id 'java' + id 'org.openjfx.javafxplugin' version '0.0.7' id 'application' id 'checkstyle' id 'com.github.johnrengelman.shadow' version '5.1.0' + } group 'seedu.duke' @@ -20,6 +22,11 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' } +javafx { + version = "11.0.2" + modules = [ 'javafx.controls', 'javafx.fxml' ] +} + checkstyle { toolVersion = '8.23' } diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..a8b312b4bc --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,65 @@ +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + Path path = Paths.get(System.getProperty("user.dir")); + File file = new File(path + "/src/main/resources/view/DialogBox.fxml"); + + FXMLLoader fxmlLoader = new FXMLLoader(file.toURI().toURL()); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index cbcfd6dcdc..4e75ae2490 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,18 @@ +import javafx.application.Application; +import javafx.fxml.FXML; +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.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.shape.Circle; +import javafx.stage.Stage; + import command.ByeCommand; import command.Command; import main.Parser; @@ -6,7 +21,10 @@ import main.UI; import task.Task; +import java.io.File; import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Scanner; @@ -14,6 +32,12 @@ * Duke runs as the main and this is where all the work is initialised at. */ public class Duke { + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + private Storage storage; private TaskList taskList; @@ -22,7 +46,7 @@ public class Duke { * * Also instantiates an instance of Storage and TaskList for this instance of Duke. */ - private Duke(){ + public Duke(){ storage = new Storage(); ArrayList list = storage.readFromFile(); this.taskList = new TaskList(list); @@ -36,11 +60,15 @@ private Duke(){ * * @throws IOException When the Parser f */ - private void run() throws IOException { + private String run(String command) throws IOException { Parser parser = new Parser(); - Scanner sc = new Scanner(System.in); + //Scanner sc = new Scanner(System.in); + + Command c = parser.parse(command); + return c.execute(taskList, storage); - while (sc.hasNextLine()) { + + /*while (sc.hasNextLine()) { String nextLine = sc.nextLine(); Command c = parser.parse(nextLine); @@ -49,7 +77,7 @@ private void run() throws IOException { if (c instanceof ByeCommand) { break; } - } + }*/ } @@ -63,7 +91,7 @@ private void run() throws IOException { * * @param args Input from the User. */ - public static void main(String[] args) { + /*public static void main(String[] args) { Duke duke = new Duke(); UI.start(); @@ -72,5 +100,21 @@ public static void main(String[] args) { } catch (IOException ioE) { System.err.println(ioE); } + }*/ + + /** + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. + */ + @FXML + public String getResponse(String input, Duke duke) { + String toReturn = ""; + try{ + toReturn = duke.run(input); + } catch (IOException io) { + System.err.println(io); + } + + return "Duke heard: " + toReturn; } } diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..11dbf00c62 --- /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(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..9fe29356c9 --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1,36 @@ +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + @Override + public void start(Stage stage) { + try { + Path path = Paths.get(System.getProperty("user.dir")); + File file = new File(path + "/src/main/resources/view/MainWindow.fxml"); + + FXMLLoader fxmlLoader = new FXMLLoader(file.toURI().toURL()); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 0000000000..671d45e5c9 --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,58 @@ +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; + +import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; + +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Path path = Paths.get(System.getProperty("user.dir")); + private File userImg = new File(path + "/src/main/resources/images/User.png"); + private File dukeImg = new File(path + "/src/main/resources/images/Duke.png"); + + private Image userImage = new Image(userImg.toURI().toString()); + private Image dukeImage = new Image(dukeImg.toURI().toString()); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input, duke); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index fb49f3adae..07ca67ca17 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -16,7 +16,7 @@ public ByeCommand() { } * @param taskList The TaskList used to store the Tasks for this instance of Duke (not used in this method). * @param storage The Storage used to store the Tasks on the hard disk (not used in this method). */ - public void execute(TaskList taskList, Storage storage) { - UI.bye(); + public String execute(TaskList taskList, Storage storage) { + return UI.bye(); } } diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index c371f3d689..f4b23715aa 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -11,5 +11,5 @@ * All Commands must implement an execute method, which will be accessed by the Duke.run() method. */ public interface Command { - void execute(TaskList tl, Storage st) throws IOException; + String execute(TaskList tl, Storage st) throws IOException; } diff --git a/src/main/java/command/UnknownCommand.java b/src/main/java/command/UnknownCommand.java index 4fba999da6..9fd09e00a7 100644 --- a/src/main/java/command/UnknownCommand.java +++ b/src/main/java/command/UnknownCommand.java @@ -19,7 +19,7 @@ public UnknownCommand() { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { - System.err.println(new UnknownCommandException()); + public String execute(TaskList taskList, Storage storage) { + return new UnknownCommandException().toString(); } } diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java index 761784d41d..a4e5fe5112 100644 --- a/src/main/java/main/Parser.java +++ b/src/main/java/main/Parser.java @@ -150,6 +150,6 @@ public Command parse(String commandLine) { } return new UnknownCommand(); + } } -} diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index 43b9408751..fc1fe481ce 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -13,19 +13,19 @@ public interface UI { /** * Prints the start message when Duke is executed. */ - static void start() { - System.out.println(" ____________________________________________________________\n" + static String start() { + return " ____________________________________________________________\n" + " Hello! I'm Duke\n" + " What can I do for you?\n" - + " ____________________________________________________________\n"); + + " ____________________________________________________________\n"; } /** * Prints the closing message when a ByeCommand is executed. */ - static void bye() { - System.out.println("Bye. Hope to see you again soon!"); + static String bye() { + return ("Bye. Hope to see you again soon!"); } /** diff --git a/src/main/resources/images/Duke.png b/src/main/resources/images/Duke.png new file mode 100644 index 0000000000000000000000000000000000000000..d893658717e29b50b4ceedada235d9f75835a118 GIT binary patch literal 32657 zcmV)5K*_&}P)Zf>Tg`t%N;{PE9Y2%-o7`CdniQG#9szpJX+ zcrVK`zK7pG^!n{1T{qo3os(XNkTqW0IXIfGihv^wpO4cHg6YjrzS7VYZJZVWev% z!fK9RcD(ntf zCxMCmC7oRZecuOe6J~p&f5@?I;U2zE;O2T?Vy_8UZ1S4i=b>l%q0jeYAI+i(>K zsIun-!&|SPodfa+5u7Z5yhtd`XRjxuF+Ww~1H4xg)(?GXYLo{q2VPiixh(3*`0iyFHj`V{p-_+Q4jWKC=o6ohr zW)q;Nb7IxtY}qD4RyBpAMv`rR!YytU)sgEIa8F)wX(O<=RwjYY+sLdy0`5o0>=a zd(GePvuhIc}2|`2Y7OgN%4u~XV>q*3e$65qJ;}bK0Li-Wh%~iQn_FhV_*O6|& z$E%S!>BN;~l+|jbw5B2<783HDuPYE-T1Z)&EZTFhZGIj)nseO*|7}7`Vz4%vMl&l& z!c*D(>n3|ulhD`D1FzG)Tik79GgrpJ#HE0O)y{gM#c%L1=xtu`A<9oj(;}Q6cpHb= zIjOSNTO3vD|G|N_tH+^nj?I`D4+@;j;9`s4!*lY>X2_|khHWO LGkWs%c&z?S( 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 z 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 KMNUMnLSTa5`eeEQ literal 0 HcmV?d00001 diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..ede775d4f9 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..1601aa1104 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + From daed460a6c5bc795eb5d13274c8fbb1834960762 Mon Sep 17 00:00:00 2001 From: Taha Date: Sun, 29 Sep 2019 20:07:15 +0800 Subject: [PATCH 31/43] Implemented Duke backend communication with GUI frontend --- src/main/java/Duke.java | 24 +++------- src/main/java/command/DeadlineCommand.java | 6 +-- src/main/java/command/DeleteCommand.java | 10 ++-- src/main/java/command/DoneCommand.java | 6 +-- src/main/java/command/EventCommand.java | 6 +-- src/main/java/command/FindCommand.java | 13 +++-- src/main/java/command/ListCommand.java | 9 +++- src/main/java/command/TodoCommand.java | 4 +- src/main/java/main/TaskList.java | 2 +- src/main/java/main/UI.java | 55 +++++++++++++--------- src/main/resources/view/DialogBox.fxml | 16 +++++-- 11 files changed, 89 insertions(+), 62 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4e75ae2490..9906b14e9a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,32 +1,18 @@ -import javafx.application.Application; import javafx.fxml.FXML; 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.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import javafx.scene.shape.Circle; -import javafx.stage.Stage; -import command.ByeCommand; import command.Command; import main.Parser; import main.Storage; import main.TaskList; -import main.UI; import task.Task; -import java.io.File; import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Scanner; /** * Duke runs as the main and this is where all the work is initialised at. @@ -103,8 +89,12 @@ private String run(String command) throws IOException { }*/ /** - * You should have your own function to generate a response to user input. - * Replace this stub with your completed method. + * Sends the user input to Duke backend to be processed. + * + * @param input String input from the user. + * @param duke This instance of Duke. + * + * @return Returns a string to be shown to the user. */ @FXML public String getResponse(String input, Duke duke) { @@ -115,6 +105,6 @@ public String getResponse(String input, Duke duke) { System.err.println(io); } - return "Duke heard: " + toReturn; + return toReturn; } } diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 9c8a3a0d79..ee9491f98f 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -31,12 +31,12 @@ public DeadlineCommand(String deadlineName, String date) { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { Task deadline = new Deadline(deadlineName, date); taskList.addTaskList(deadline); - UI.newTask(taskList.getTaskList()); - storage.writeToFile(taskList.getTaskList()); + + return UI.newTask(taskList.getTaskList()); } } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 8997ef6092..652394ba09 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -27,7 +27,9 @@ public DeleteCommand(int taskNum) { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { + String toReturn = ""; + try { ArrayList list = taskList.getTaskList(); if (taskNum > list.size() || taskNum <= 0) { @@ -36,11 +38,13 @@ public void execute(TaskList taskList, Storage storage) { Task task = list.remove(taskNum - 1); int listSize = list.size(); - UI.removedTask(task, listSize); - storage.writeToFile(list); + + return UI.removedTask(task, listSize); } catch (DeleteException delExp) { System.err.println(delExp); } + + return toReturn; } } diff --git a/src/main/java/command/DoneCommand.java b/src/main/java/command/DoneCommand.java index 685bd796b9..2684b7d285 100644 --- a/src/main/java/command/DoneCommand.java +++ b/src/main/java/command/DoneCommand.java @@ -26,13 +26,13 @@ public DoneCommand(int taskNum) { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { ArrayList list = taskList.getTaskList(); Task currTask = list.get(taskNum); currTask.setDone(); - UI.done(currTask); - storage.writeToFile(list); + + return UI.done(currTask); } } diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index b04cea479b..2460dfccd7 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -32,14 +32,14 @@ public EventCommand(String eventName, String date) { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { ArrayList list = taskList.getTaskList(); Task event = new Event(eventName, date); taskList.addTaskList(event); - UI.newTask(list); - storage.writeToFile(list); + + return UI.newTask(list); } } diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java index cbe6e0ecaf..782b3dec1b 100644 --- a/src/main/java/command/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -13,8 +13,8 @@ public FindCommand(String searchTerm) { } @Override - public void execute(TaskList tl, Storage st) { - UI.findStart(); + public String execute(TaskList tl, Storage st) { + StringBuilder toReturn = new StringBuilder(UI.findStart()); int counter = 1; for (Task task : tl.getTaskList()) { @@ -22,13 +22,18 @@ public void execute(TaskList tl, Storage st) { for (String nameComponent : taskNameComponents) { if (nameComponent.equalsIgnoreCase(searchTerm)) { - System.out.println(" " + counter + "." + task); + toReturn.append(" " ); + toReturn.append(counter); + toReturn.append("."); + toReturn.append(task); + toReturn.append("\n"); counter++; break; } } } + toReturn.append(UI.endLine()); - UI.endLine(); + return toReturn.toString(); } } diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index 7167c51e3b..3c754adc7d 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -18,12 +18,17 @@ public ListCommand() { } * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { + StringBuilder toReturn = new StringBuilder(); ArrayList list = taskList.getTaskList(); for (int i = 0; i < list.size(); i++) { if (list.get(i) != null) { - System.out.println(i + 1 + "." + list.get(i)); + toReturn.append(i + 1); + toReturn.append("."); + toReturn.append(list.get(i)); + toReturn.append("\n"); } } + return toReturn.toString(); } } diff --git a/src/main/java/command/TodoCommand.java b/src/main/java/command/TodoCommand.java index 1a506642f2..1e7e48c000 100644 --- a/src/main/java/command/TodoCommand.java +++ b/src/main/java/command/TodoCommand.java @@ -30,7 +30,7 @@ public TodoCommand(String todoName) { * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. */ - public void execute(TaskList taskList, Storage storage) { + public String execute(TaskList taskList, Storage storage) { ArrayList list = taskList.getTaskList(); Task todo = new Todo(todoName); @@ -38,6 +38,6 @@ public void execute(TaskList taskList, Storage storage) { taskList.addTaskList(todo); storage.writeToFile(list); - UI.newTask(list); + return UI.newTask(list); } } diff --git a/src/main/java/main/TaskList.java b/src/main/java/main/TaskList.java index 38c6b03ce7..1868f9be6f 100644 --- a/src/main/java/main/TaskList.java +++ b/src/main/java/main/TaskList.java @@ -13,7 +13,7 @@ public class TaskList { private ArrayList list; /** - * Instantiates a TaskList object with an empty ArrayList. + * Instantiates a TaskList object with an empty ArrayList. */ public TaskList() { list = new ArrayList<>(); diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index fc1fe481ce..a5a46bd8e3 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -12,6 +12,8 @@ public interface UI { /** * Prints the start message when Duke is executed. + * + * @return The start message. */ static String start() { return " ____________________________________________________________\n" @@ -23,6 +25,8 @@ static String start() { /** * Prints the closing message when a ByeCommand is executed. + * + * @return The bye message. */ static String bye() { return ("Bye. Hope to see you again soon!"); @@ -32,12 +36,13 @@ static String bye() { * Prints the contents of the TaskList (given as an argument) whenever a new task is added to the TaskList. * * @param taskList A TaskList instance unique to each instance of Duke. + * + * @return The message explaining a new task. */ - static void newTask(ArrayList taskList) { - System.out.println("Got it. I've added this task: "); - System.out.println(" " + taskList.get(taskList.size() - 1)); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); - + static String newTask(ArrayList taskList) { + return "Got it. I've added this task: \n" + + " " + taskList.get(taskList.size() - 1) + "\n" + + "Now you have " + taskList.size() + " tasks in the list. \n"; } /** @@ -46,46 +51,54 @@ static void newTask(ArrayList taskList) { * * @param task The Task to be removed from the TaskList. * @param listSize The size of the TaskList, after removal of Task. + * + * @return The message explaining the deletion of a task. */ - static void removedTask(Task task, int listSize){ - System.out.println(" Noted. I've removed this task: "); - System.out.println(" " + task); - System.out.println("Now you have " + listSize + " tasks in the list."); - + static String removedTask(Task task, int listSize){ + return " Noted. I've removed this task: \n" + + " " + task + "\n" + + "Now you have " + listSize + " tasks in the list.\n"; } /** * Prints the number of Tasks in the TaskList (given as an argument). * * @param taskList A TaskList instance unique to each instance of Duke. + * + * @return The number of tasks in the TaskList. */ - static void numTasks(ArrayList taskList) { - System.out.println("Now you have " + taskList.size() + " tasks in the list."); - + static String numTasks(ArrayList taskList) { + return "Now you have " + taskList.size() + " tasks in the list.\n"; } /** * Prints that a given Task is designated as done, typically when a DoneCommand is excuted. * * @param task The Task designated as done. + * + * @return The done message. */ - static void done(Task task) { - System.out.println("Nice! I've marked this task as done:"); - System.out.println(" " + task); + static String done(Task task) { + return "Nice! I've marked this task as done:\n" + + " " + task + "\n"; } /** * Prints the first portion of a find Command. + * + * @return The start message when a FindCommand is executed. */ - public static void findStart(){ - System.out.println(" ____________________________________________________________\n" + - " Here are the matching tasks in your list:"); + static String findStart(){ + return " ____________________________________________________________\n" + + " Here are the matching tasks in your list: \n"; } /** * Prints a plain line. + * + * @return Returns a line. */ - public static void endLine() { - System.out.println(" ____________________________________________________________"); + static String endLine() { + return " ____________________________________________________________"; } } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml index ede775d4f9..970eab2451 100644 --- a/src/main/resources/view/DialogBox.fxml +++ b/src/main/resources/view/DialogBox.fxml @@ -1,14 +1,24 @@ + - + - From 2d1fdfff5a561c05aa99d5cb092b1fcaa09b273a Mon Sep 17 00:00:00 2001 From: Taha Date: Mon, 30 Sep 2019 22:04:07 +0800 Subject: [PATCH 32/43] Ensured the Test Classes follow the CheckStyle. --- src/main/java/Duke.java | 45 ---------------------------- src/test/java/main/TaskListTest.java | 2 +- src/test/java/task/TaskTest.java | 2 +- src/test/java/task/TodoTest.java | 2 +- 4 files changed, 3 insertions(+), 48 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9906b14e9a..c9cc3aa507 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,9 +1,4 @@ import javafx.fxml.FXML; -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.TextField; -import javafx.scene.layout.VBox; import command.Command; import main.Parser; @@ -18,12 +13,6 @@ * Duke runs as the main and this is where all the work is initialised at. */ public class Duke { - private ScrollPane scrollPane; - private VBox dialogContainer; - private TextField userInput; - private Button sendButton; - private Scene scene; - private Storage storage; private TaskList taskList; @@ -52,42 +41,8 @@ private String run(String command) throws IOException { Command c = parser.parse(command); return c.execute(taskList, storage); - - - /*while (sc.hasNextLine()) { - String nextLine = sc.nextLine(); - - Command c = parser.parse(nextLine); - c.execute(taskList, storage); - - if (c instanceof ByeCommand) { - break; - } - }*/ } - - /** - * Runs the main method. - * - * There are three main steps that occur in the main method. - * Firstly, an instance of Duke is created. - * Secondly, the UI prints the start message to the console. - * Next, the duke.run() method is initiated which will handle the parsing and subsequent processes. - * - * @param args Input from the User. - */ - /*public static void main(String[] args) { - Duke duke = new Duke(); - UI.start(); - - try { - duke.run(); - } catch (IOException ioE) { - System.err.println(ioE); - } - }*/ - /** * Sends the user input to Duke backend to be processed. * diff --git a/src/test/java/main/TaskListTest.java b/src/test/java/main/TaskListTest.java index 57ca97ba8d..868db341b5 100644 --- a/src/test/java/main/TaskListTest.java +++ b/src/test/java/main/TaskListTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class TaskListTest { diff --git a/src/test/java/task/TaskTest.java b/src/test/java/task/TaskTest.java index cd3b6b2cf2..a9d599e89d 100644 --- a/src/test/java/task/TaskTest.java +++ b/src/test/java/task/TaskTest.java @@ -1,6 +1,6 @@ package task; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class TaskTest { diff --git a/src/test/java/task/TodoTest.java b/src/test/java/task/TodoTest.java index 173b7963ca..6a5d63550b 100644 --- a/src/test/java/task/TodoTest.java +++ b/src/test/java/task/TodoTest.java @@ -1,6 +1,6 @@ package task; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class TodoTest { From 1802dff8147e9dbc58d6e8065edee720ef195dcb Mon Sep 17 00:00:00 2001 From: Taha Jailani <44200642+PhireHandy@users.noreply.github.com> Date: Mon, 30 Sep 2019 23:13:04 +0800 Subject: [PATCH 33/43] Implemented assertion checks in Parser.java and ensured that all files in Main directory follow the CheckStyle. (#5) Assertion checks to ensure that the correct types of command are passed as inputs. --- src/main/java/DialogBox.java | 7 ++ src/main/java/Duke.java | 12 +- src/main/java/command/ByeCommand.java | 4 +- src/main/java/command/Command.java | 2 +- src/main/java/command/DeadlineCommand.java | 11 +- src/main/java/command/EventCommand.java | 10 +- src/main/java/command/FindCommand.java | 4 +- src/main/java/command/ListCommand.java | 4 +- src/main/java/command/TodoCommand.java | 6 +- src/main/java/main/Parser.java | 123 +++++++++------------ src/main/java/main/Storage.java | 23 ++-- src/main/java/main/TaskList.java | 4 +- src/main/java/main/UI.java | 7 +- src/main/java/task/Deadline.java | 10 +- src/main/java/task/Event.java | 11 +- src/main/java/task/Task.java | 8 +- src/main/resources/view/DialogBox.fxml | 4 +- src/main/resources/view/MainWindow.fxml | 6 +- 18 files changed, 121 insertions(+), 135 deletions(-) diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java index a8b312b4bc..dfc5e27819 100644 --- a/src/main/java/DialogBox.java +++ b/src/main/java/DialogBox.java @@ -57,6 +57,13 @@ public static DialogBox getUserDialog(String text, Image img) { return new DialogBox(text, img); } + /** + * Returns the DialogBox for Duke, which is flipped from the User's DialogBox. + * + * @param text String to be returned as Duke's reply to User input. + * @param img Duke's image. + * @return Duke's DialogBox. + */ public static DialogBox getDukeDialog(String text, Image img) { var db = new DialogBox(text, img); db.flip(); diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c9cc3aa507..0b0d9f4d0e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,11 +17,9 @@ public class Duke { private TaskList taskList; /** - * Constructs an instance of Duke. - * - * Also instantiates an instance of Storage and TaskList for this instance of Duke. + * Constructs an instance of Duke. Also instantiates an instance of Storage and TaskList for this instance of Duke. */ - public Duke(){ + public Duke() { storage = new Storage(); ArrayList list = storage.readFromFile(); this.taskList = new TaskList(list); @@ -30,8 +28,8 @@ public Duke(){ /** * Handles the parsing of inputs and execution of parsed commands. * - * As long as a ByeCommand is not parsed, Duke will continue parsing for more commands. If a ByeCommand is parsed, - * the while loop is terminated and Duke terminates. + *

As long as a ByeCommand is not parsed, Duke will continue parsing for more commands. If a ByeCommand is + * parsed, the while loop is terminated and Duke terminates. * * @throws IOException When the Parser f */ @@ -54,7 +52,7 @@ private String run(String command) throws IOException { @FXML public String getResponse(String input, Duke duke) { String toReturn = ""; - try{ + try { toReturn = duke.run(input); } catch (IOException io) { System.err.println(io); diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index 07ca67ca17..c114bb3cda 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -8,7 +8,9 @@ * A Command to handle "bye" inputs resulting in a termination of the Duke program. */ public class ByeCommand implements Command { - public ByeCommand() { } + public ByeCommand() { + + } /** * Prints the bye message via the UI method, UI.bye(). diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index f4b23715aa..c08d7497fc 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -8,7 +8,7 @@ /** * An interface to be implemented by all the Command type objects. * - * All Commands must implement an execute method, which will be accessed by the Duke.run() method. + *

All Commands must implement an execute method, which will be accessed by the Duke.run() method. */ public interface Command { String execute(TaskList tl, Storage st) throws IOException; diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index ee9491f98f..7ce763cb87 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -8,9 +8,8 @@ /** - * A Command to create an instance of a Deadline Task. - * - * This will add the Deadline Task to the TaskList and the Storage file. + * A Command to create an instance of a Deadline Task. This will add the Deadline Task to the TaskList and the Storage + * file. */ public class DeadlineCommand implements Command { private String deadlineName; @@ -24,9 +23,9 @@ public DeadlineCommand(String deadlineName, String date) { /** * Executes the Deadline command which creates a Deadline Task. * - * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new - * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print - * a newTask message into the console. + *

Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a + * new Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to + * print a newTask message into the console. * * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index 2460dfccd7..04e4f533bf 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -9,9 +9,7 @@ import java.util.ArrayList; /** - * A Command to create an instance of a Event Task. - * - * This will add the Event Task to the TaskList and the Storage file. + * A Command to create an instance of a Event Task. This will add the Event Task to the TaskList and the Storage file. */ public class EventCommand implements Command { private String eventName; @@ -25,9 +23,9 @@ public EventCommand(String eventName, String date) { /** * Executes the Event command which creates a Event Task. * - * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new - * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print - * a newTask message into the console. + *

Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a + * new Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to + * print a newTask message into the console. * * @param taskList The TaskList from the main Duke object. * @param storage The Storage from the main Duke object. diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java index 782b3dec1b..2b87beacfd 100644 --- a/src/main/java/command/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -22,7 +22,7 @@ public String execute(TaskList tl, Storage st) { for (String nameComponent : taskNameComponents) { if (nameComponent.equalsIgnoreCase(searchTerm)) { - toReturn.append(" " ); + toReturn.append(" "); toReturn.append(counter); toReturn.append("."); toReturn.append(task); @@ -32,8 +32,6 @@ public String execute(TaskList tl, Storage st) { } } } - toReturn.append(UI.endLine()); - return toReturn.toString(); } } diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index 3c754adc7d..f8eff4faa2 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -10,7 +10,9 @@ * A Command to print a list of all the Tasks in the TaskList. */ public class ListCommand implements Command { - public ListCommand() { } + public ListCommand() { + + } /** * Prints into the console all the Tasks in the TaskList. diff --git a/src/main/java/command/TodoCommand.java b/src/main/java/command/TodoCommand.java index 1e7e48c000..58e3b58901 100644 --- a/src/main/java/command/TodoCommand.java +++ b/src/main/java/command/TodoCommand.java @@ -9,9 +9,7 @@ import java.util.ArrayList; /** - * A Command to create an instance of a Todo Task. - * - * This will add the Todo Task to the TaskList and the Storage file. + * A Command to create an instance of a Todo Task. This will add the Todo Task to the TaskList and the Storage file. */ public class TodoCommand implements Command { private String todoName; @@ -23,7 +21,7 @@ public TodoCommand(String todoName) { /** * Executes the Todo command which creates a Todo Task. * - * Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new + *

Taking the TaskList and Storage object of the main Duke class as arguments, this command will create a new * Deadline Task which will then be added to the TaskList and Storage objects. The UI will also be used to print * a newTask message into the console. * diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java index a4e5fe5112..93229dbd55 100644 --- a/src/main/java/main/Parser.java +++ b/src/main/java/main/Parser.java @@ -1,34 +1,41 @@ package main; -import command.*; -import exception.DeleteException; -import exception.DoneException; -import exception.DukeException; +import command.ByeCommand; +import command.Command; +import command.DeadlineCommand; +import command.DeleteCommand; +import command.DoneCommand; +import command.EventCommand; +import command.FindCommand; +import command.ListCommand; +import command.TodoCommand; +import command.UnknownCommand; import exception.TaskException; /** * Parses all the commands input by the user. * - * The only public method, parse(), is used to determine which command will be returned and executed in Duke. The other - * two methods are private and used to assist the parse() method in processing an Event or a Deadline type Command. + *

The only public method, parse(), is used to determine which command will be returned and executed in Duke. + * The other two methods are private and used to assist the parse() method in processing an Event or a Deadline type + * Command. */ public class Parser { - public Parser() { } + public Parser() { + + } /** * Returns a String array which has two elements. * - * The first element is the name of the new Event Task and the second element is the String representing the date - * of the Event Task. + *

The first element is the name of the new Event Task and the second element is the String representing the + * date of the Event Task. * * @param command A string array representing the initial input split into individual words. * @return Returns a String array which contains the name and the date of a new Event Task. * @throws TaskException Thrown when there is insufficient information to create an Event Task. */ - private String[] getEventDetails(String[] command) throws TaskException { - if (command.length <= 1) { - throw new TaskException(); - } + private String[] getEventDetails(String[] command) { + taskHasName(command); String toReturn = ""; for (int i = 1; i < command.length; i++) { toReturn += command[i] + " "; @@ -40,17 +47,15 @@ private String[] getEventDetails(String[] command) throws TaskException { /** * Returns a String array which has two elements. * - * The first element is the name of the new Deadline Task and the second element is the String representing the - * date of the Deadline Task. + *

The first element is the name of the new Deadline Task and the second element is the String representing + * the date of the Deadline Task. * * @param command A string array representing the initial input split into individual words. * @return Returns a String array which contains the name and the date of a new Deadline Task. * @throws TaskException Thrown when there is insufficient information to create an Deadline Task. */ - private String[] getDeadlineDetails(String[] command) throws TaskException { - if (command.length <= 1) { - throw new TaskException(); - } + private String[] getDeadlineDetails(String[] command) { + taskHasName(command); String toReturn = ""; for (int i = 1; i < command.length; i++) { toReturn += command[i] + " "; @@ -59,11 +64,19 @@ private String[] getDeadlineDetails(String[] command) throws TaskException { return toReturn.split(" /by "); } + private void taskHasName(String[] nextCommand) { + assert nextCommand.length > 1 : "Task has no name"; + } + + private void commandHasTask(String[] nextCommand) { + assert nextCommand.length > 1 : "Command has no Task"; + } + /** * Parses the input and returns a Command that corresponds to the type of input given. * - * When a String (commandLine) is supplied, this method will split commandLine into multiple words (via + *

When a String (commandLine) is supplied, this method will split commandLine into multiple words (via * String.split(" "). This will result in a String array containing individual words. The first word is then used * to determine which Command is to be returned. If an invalid command is given, an UnknownCommand will be returned. * @@ -80,69 +93,33 @@ public Command parse(String commandLine) { return new ListCommand(); case "done": - try { - if (nextCommand.length <= 1) { - throw new DoneException(); - } else { - return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); - } - } catch (DukeException dukeExp) { - System.err.println(dukeExp); - } - break; + commandHasTask(nextCommand); + return new DoneCommand(Integer.valueOf(nextCommand[1]) - 1); case "todo": - try { - if (nextCommand.length <= 1) { - throw new TaskException(); - } - String todoName = ""; - for (int i = 1; i < nextCommand.length; i++) { - todoName += nextCommand[i] + " "; - } - - return new TodoCommand(todoName); - } catch (TaskException toEx) { - System.err.println(toEx); + taskHasName(nextCommand); + String todoName = ""; + for (int i = 1; i < nextCommand.length; i++) { + todoName += nextCommand[i] + " "; } - break; - case "event": - try { - String[] eventDetails = getEventDetails(nextCommand); + return new TodoCommand(todoName); - return new EventCommand(eventDetails[0], eventDetails[1]); + case "event": + String[] eventDetails = getEventDetails(nextCommand); + return new EventCommand(eventDetails[0], eventDetails[1]); - } catch (TaskException evEx) { - System.err.println(evEx); - } - break; case "deadline": - try { - String[] deadlineDetails = getDeadlineDetails(nextCommand); - - return new DeadlineCommand(deadlineDetails[0], deadlineDetails[1]); - - } catch (TaskException evEx) { - System.err.println(evEx); - } - break; + String[] deadlineDetails = getDeadlineDetails(nextCommand); + return new DeadlineCommand(deadlineDetails[0], deadlineDetails[1]); case "delete": - try { - if (nextCommand.length <= 1) { - throw new DeleteException(); - } else { - int index = Integer.parseInt(nextCommand[1]); - - return new DeleteCommand(index); - } - } catch (DeleteException deEx) { - System.err.println(deEx); - } - break; + commandHasTask(nextCommand); + int index = Integer.parseInt(nextCommand[1]); + return new DeleteCommand(index); case "find": + commandHasTask(nextCommand); return new FindCommand(nextCommand[1]); default: @@ -150,6 +127,6 @@ public Command parse(String commandLine) { } return new UnknownCommand(); - } } +} diff --git a/src/main/java/main/Storage.java b/src/main/java/main/Storage.java index a2e52df57a..57ec16ce92 100644 --- a/src/main/java/main/Storage.java +++ b/src/main/java/main/Storage.java @@ -15,22 +15,23 @@ import java.util.Scanner; /** - * Manages the storing of the TaskList to a file on the hard disk. - * - * This allows the list of Tasks to be stored and accessed for subsequent initialisations of Duke. + * Manages the storing of the TaskList to a file on the hard disk. This allows the list of Tasks to be stored and + * accessed for subsequent initialisations of Duke. */ public class Storage { private Path path = Paths.get(System.getProperty("user.dir")); private File data = new File(path + "/data/duke.txt"); - public Storage() { } + public Storage() { + + } /** * Returns an ArrayList of tasks from the data file on the hard disk. * - * This method is invoked whenever an instance of Duke is created. It reads from the data/duke.txt file. Should the - * file not be found, a FileNotFoundException is thrown and caught. A parser is also implemented in this method to - * read from the data file. + *

This method is invoked whenever an instance of Duke is created. It reads from the data/duke.txt file. + * Should the file not be found, a FileNotFoundException is thrown and caught. A parser is also implemented in this + * method to read from the data file. * * @return An ArrayList of Tasks from the stored data file. */ @@ -87,7 +88,7 @@ public ArrayList readFromFile() { /** * Writes all the tasks in a given ArrayList into the data/duke.txt file. * - * A StringBuilder is used to concatenate all the strings from the toFile() method of each Task. This is then + *

A StringBuilder is used to concatenate all the strings from the toFile() method of each Task. This is then * stored into the data file. * * @param list ArrayList of all the Tasks to be written into the data file. @@ -99,14 +100,14 @@ public void writeToFile(ArrayList list) { FileWriter fw = new FileWriter(data); StringBuilder toWrite = new StringBuilder(""); - for(Task task : list) { + for (Task task : list) { toWrite.append(task.toFile() + " \n"); } fw.write(toWrite.toString()); fw.close(); - } catch (IOException IOe) { - System.err.println(IOe); + } catch (IOException ioExp) { + System.err.println(ioExp); } } diff --git a/src/main/java/main/TaskList.java b/src/main/java/main/TaskList.java index 1868f9be6f..f8e7a42101 100644 --- a/src/main/java/main/TaskList.java +++ b/src/main/java/main/TaskList.java @@ -5,9 +5,7 @@ import java.util.ArrayList; /** - * Stores all the Tasks in an ArrayList. - * - * Contains methods to access and update the ArrayList of Tasks. + * Stores all the Tasks in an ArrayList. Contains methods to access and update the ArrayList of Tasks. */ public class TaskList { private ArrayList list; diff --git a/src/main/java/main/UI.java b/src/main/java/main/UI.java index a5a46bd8e3..c661670e30 100644 --- a/src/main/java/main/UI.java +++ b/src/main/java/main/UI.java @@ -54,7 +54,7 @@ static String newTask(ArrayList taskList) { * * @return The message explaining the deletion of a task. */ - static String removedTask(Task task, int listSize){ + static String removedTask(Task task, int listSize) { return " Noted. I've removed this task: \n" + " " + task + "\n" + "Now you have " + listSize + " tasks in the list.\n"; @@ -88,9 +88,8 @@ static String done(Task task) { * * @return The start message when a FindCommand is executed. */ - static String findStart(){ - return " ____________________________________________________________\n" - + " Here are the matching tasks in your list: \n"; + static String findStart() { + return " Here are the matching tasks in your list: \n"; } /** diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java index 8847ca4ee0..dafffa8183 100644 --- a/src/main/java/task/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -5,9 +5,7 @@ import java.util.Date; /** - * A type of Task that includes a date attribute for the Task to be completed by. - * - * Also includes two SimpleDateFormatter. + * A type of Task that includes a date attribute for the Task to be completed by. Also includes two SimpleDateFormatter. */ public class Deadline extends Task { private Date date; @@ -23,6 +21,12 @@ public class Deadline extends Task { private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); + /** + * Constructor for a Deadline Task. + * + * @param name A String which represents the name of the Task. + * @param dateString A String which represents the date and time of the Task. + */ public Deadline(String name, String dateString) { this.name = name; diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java index e873708617..417604f95d 100644 --- a/src/main/java/task/Event.java +++ b/src/main/java/task/Event.java @@ -5,9 +5,8 @@ import java.util.Date; /** - * A type of Task that includes a date attribute for the date in which the Task takes place. - * - * Also includes two SimpleDateFormatter. + * A type of Task that includes a date attribute for the date in which the Task takes place. Also includes two + * SimpleDateFormatter. */ public class Event extends Task { private Date date; @@ -23,6 +22,12 @@ public class Event extends Task { private SimpleDateFormat formatter = new SimpleDateFormat("d MMM yyyy, hhmma"); + /** + * Constructor for an Event Task. + * + * @param name A String representing the name of the Task. + * @param dateString A String which represents the date and time of the Task. + */ public Event(String name, String dateString) { this.name = name; diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 2ebee7aa75..c414b6e0ac 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -3,8 +3,8 @@ /** * An Abstract Class extended by all the Task type classes. * - * Each Task contains a name and an isDone attribute. Two abstract methods (toFile() and toString()) are meant to be - * implemented by any classes that extend the Task abstract class. + *

Each Task contains a name and an isDone attribute. Two abstract methods (toFile() and toString()) are meant + * to be implemented by any classes that extend the Task abstract class. */ public abstract class Task { /** @@ -42,7 +42,7 @@ public String getName() { /** * Returns a String representing the Task in a format to be saved into the hard disk's storage file. * - * To be implemented by each individual Task class. + *

To be implemented by each individual Task class. * * @return A String representation of this Task formatted for the storage file. */ @@ -51,7 +51,7 @@ public String getName() { /** * Returns a String representing the Task in a format to be printed into the console. * - * To be implemented by each individual Task class. + *

To be implemented by each individual Task class. * * @return A String representation of this Task formatted for printing into the console. */ diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml index 970eab2451..0d47fbe7c3 100644 --- a/src/main/resources/view/DialogBox.fxml +++ b/src/main/resources/view/DialogBox.fxml @@ -6,9 +6,9 @@ - + -