From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/30] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..20c0521cc7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.29' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From a320dbde3c3a73e617cda1f30adbac54b97b64e4 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 12:02:07 +0800 Subject: [PATCH 02/30] Level-1 --- src/main/java/Duke.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..ee9861740c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,7 @@ +import com.sun.source.tree.DoWhileLoopTree; + +import java.util.Scanner; + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -5,6 +9,18 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + String line = "❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤\n"; + System.out.println("Hello from\n" + logo + line + "What can I do for you?\n" + line); + + String input; + Scanner s = new Scanner(System.in); + input = s.nextLine(); + + while(!input.equals("bye")) { + System.out.println(line + input + "\n" + line); + input = s.nextLine(); + } + + System.out.println(line + "Bye. Hope to see you again soon!\n" + line); } } From 56dd70a123e64992d5cf887c326e6e23b4b76f7f Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 22:10:13 +0800 Subject: [PATCH 03/30] Level-2 --- src/main/java/Duke.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ee9861740c..c548e639b2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,6 @@ import com.sun.source.tree.DoWhileLoopTree; +import java.util.ArrayList; import java.util.Scanner; public class Duke { @@ -9,18 +10,30 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - String line = "❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤\n"; - System.out.println("Hello from\n" + logo + line + "What can I do for you?\n" + line); + String line = "❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤"; + ArrayList task = new ArrayList<>(); + System.out.println("Hello from\n" + logo + line + "\nWhat can I do for you?\n" + line); String input; Scanner s = new Scanner(System.in); input = s.nextLine(); while(!input.equals("bye")) { - System.out.println(line + input + "\n" + line); + if(input.equals("list")) { + int i = 1; + System.out.println(line); + for(String str: task) { + System.out.println(i + ". " + str); + i++; + } + System.out.println(line); + } else { + System.out.println(line + "\n" + "added: " + input + "\n" + line); + task.add(input); + } input = s.nextLine(); } - System.out.println(line + "Bye. Hope to see you again soon!\n" + line); + System.out.println(line + "\nBye. Hope to see you again soon!\n" + line); } } From 98b4bdc7bc9c6b97883b0ca2257ea2942a6c8540 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 22:39:01 +0800 Subject: [PATCH 04/30] Level-3 --- src/main/java/Duke.java | 19 ++++++++++++++----- src/main/java/Task.java | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c548e639b2..086e61e0c2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -11,7 +11,7 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; String line = "❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤"; - ArrayList task = new ArrayList<>(); + ArrayList task = new ArrayList<>(); System.out.println("Hello from\n" + logo + line + "\nWhat can I do for you?\n" + line); String input; @@ -19,17 +19,26 @@ public static void main(String[] args) { input = s.nextLine(); while(!input.equals("bye")) { + String[] parts = input.split(" "); if(input.equals("list")) { int i = 1; System.out.println(line); - for(String str: task) { - System.out.println(i + ". " + str); + System.out.println("Here are the tasks in your list:"); + for(Task t: task) { + System.out.println(i + "." + t.toString()); i++; } System.out.println(line); - } else { + } else if (parts[0].equals("done")) { + int index = Integer.valueOf(parts[1]); + Task thisTask = task.get(index - 1); + thisTask.markDone(); + System.out.println(line); + System.out.println("Nice! I've marked this task as done:\n" + thisTask.toString()); + System.out.println(line); + }else { System.out.println(line + "\n" + "added: " + input + "\n" + line); - task.add(input); + task.add(new Task(input)); } input = s.nextLine(); } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..075967ca68 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,22 @@ +public class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public void markDone(){ + this.isDone = true; + } + + @Override + public String toString(){ + return "[" + this.getStatusIcon() + "] " + this.description; + } +} From 5bf86fea35876d9320962f311c0326a8d19557c3 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 23:16:21 +0800 Subject: [PATCH 05/30] Level-4 --- src/main/java/Deadline.java | 14 ++++++++++++++ src/main/java/Duke.java | 27 ++++++++++++++++++++++++--- src/main/java/Event.java | 14 ++++++++++++++ src/main/java/Todo.java | 11 +++++++++++ 4 files changed, 63 insertions(+), 3 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..2de70b7540 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,14 @@ +public class Deadline extends Task { + + protected String by; + + public Deadline(String description, String by) { + super(description); + this.by = by; + } + + @Override + public String toString() { + return "[D]" + super.toString() + " (by: " + by + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 086e61e0c2..abbc3daa84 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -36,9 +36,30 @@ public static void main(String[] args) { System.out.println(line); System.out.println("Nice! I've marked this task as done:\n" + thisTask.toString()); System.out.println(line); - }else { - System.out.println(line + "\n" + "added: " + input + "\n" + line); - task.add(new Task(input)); + } else if (parts[0].equals("deadline")){ + String[] part2 = input.split("/by "); + String description = part2[0].split("deadline ")[1]; + Task deadline = new Deadline(description, part2[1]); + System.out.println(line + "\n" + "added: " + deadline.toString()); + task.add(deadline); + System.out.println("Now you have " + task.size() + " tasks in your list"); + System.out.println(line); + } else if (parts[0].equals("event")){ + String[] part2 = input.split("/at "); + String description = part2[0].split("event ")[1]; + Task event = new Event(description, part2[1]); + System.out.println(line + "\n" + "added: " + event.toString()); + task.add(event); + System.out.println("Now you have " + task.size() + " tasks in your list"); + System.out.println(line); + } else if (parts[0].equals("todo")){ + String[] part2 = input.split("/"); + String description = part2[0].split("todo ")[1]; + Task todo = new Todo(description); + System.out.println(line + "\n" + "added: " + todo.toString()); + task.add(todo); + System.out.println("Now you have " + task.size() + " tasks in your list"); + System.out.println(line); } input = s.nextLine(); } diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..6874b47c39 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,14 @@ +public class Event extends Task { + + protected String at; + + public Event(String description, String at) { + super(description); + this.at = at; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (at: " + at + ")"; + } +} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..931cfd4f9e --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,11 @@ +public class Todo extends Task { + + public Todo(String description) { + super(description); + } + + @Override + public String toString() { + return "[T]" + super.toString(); + } +} From 15b129b4bd7874adbff775f73941f716cc280838 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 23:38:46 +0800 Subject: [PATCH 06/30] Level-5 --- src/main/java/Duke.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index abbc3daa84..af808a06ff 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -36,6 +36,10 @@ public static void main(String[] args) { System.out.println(line); System.out.println("Nice! I've marked this task as done:\n" + thisTask.toString()); System.out.println(line); + } else if (parts.length == 1) { + System.out.println(line); + System.out.println("☹ OOPS!!! The description of a " + parts[0] + " cannot be empty."); + System.out.println(line); } else if (parts[0].equals("deadline")){ String[] part2 = input.split("/by "); String description = part2[0].split("deadline ")[1]; @@ -60,6 +64,10 @@ public static void main(String[] args) { task.add(todo); System.out.println("Now you have " + task.size() + " tasks in your list"); System.out.println(line); + } else { + System.out.println(line); + System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + System.out.println(line); } input = s.nextLine(); } From 9c82281048ac9dc741735b88b8db615bd14265e8 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 19 Aug 2021 23:46:12 +0800 Subject: [PATCH 07/30] Level-6 --- src/main/java/Duke.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index af808a06ff..ab9b3f88f1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -36,6 +36,13 @@ public static void main(String[] args) { System.out.println(line); System.out.println("Nice! I've marked this task as done:\n" + thisTask.toString()); System.out.println(line); + } else if (parts[0].equals("delete")) { + int index = Integer.valueOf(parts[1]); + Task thisTask = task.remove(index - 1); + System.out.println(line); + System.out.println("Noted I've removed this task:\n" + thisTask.toString()); + System.out.println("Now you have " + task.size() + " tasks in your list"); + System.out.println(line); } else if (parts.length == 1) { System.out.println(line); System.out.println("☹ OOPS!!! The description of a " + parts[0] + " cannot be empty."); From 79c9bdf8186dd9c424a4cf4d94012f67769ee754 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 26 Aug 2021 18:14:21 +0800 Subject: [PATCH 08/30] A-TextUiTesting --- src/main/java/Duke.java | 6 +++--- text-ui-test/EXPECTED.TXT | 35 ++++++++++++++++++++++++++++++++--- text-ui-test/input.txt | 7 +++++++ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ab9b3f88f1..334826a528 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -10,7 +10,7 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - String line = "❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤❤"; + String line = "____________________________________________________________"; ArrayList task = new ArrayList<>(); System.out.println("Hello from\n" + logo + line + "\nWhat can I do for you?\n" + line); @@ -45,7 +45,7 @@ public static void main(String[] args) { System.out.println(line); } else if (parts.length == 1) { System.out.println(line); - System.out.println("☹ OOPS!!! The description of a " + parts[0] + " cannot be empty."); + System.out.println("OOPS!!! The description of a " + parts[0] + " cannot be empty."); System.out.println(line); } else if (parts[0].equals("deadline")){ String[] part2 = input.split("/by "); @@ -73,7 +73,7 @@ public static void main(String[] args) { System.out.println(line); } else { System.out.println(line); - System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-("); System.out.println(line); } input = s.nextLine(); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..cf0598ef9a 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,36 @@ Hello from - ____ _ -| _ \ _ _| | _____ + ____ _ +| _ \ _ _| | _____ | | | | | | | |/ / _ \ | |_| | |_| | < __/ |____/ \__,_|_|\_\___| - +____________________________________________________________ +What can I do for you? +____________________________________________________________ +____________________________________________________________ +added: [T][ ] borrow book +Now you have 1 tasks in your list +____________________________________________________________ +____________________________________________________________ +added: [D][ ] return book (by: Sunday) +Now you have 2 tasks in your list +____________________________________________________________ +____________________________________________________________ +added: [E][ ] project meeting (at: Mon 2-4pm) +Now you have 3 tasks in your list +____________________________________________________________ +____________________________________________________________ +added: [D][ ] return book (by: June 6th) +Now you have 4 tasks in your list +____________________________________________________________ +____________________________________________________________ +added: [T][ ] join sports club +Now you have 5 tasks in your list +____________________________________________________________ +____________________________________________________________ +Nice! I've marked this task as done: +[E][X] project meeting (at: Mon 2-4pm) +____________________________________________________________ +____________________________________________________________ +Bye. Hope to see you again soon! +____________________________________________________________ diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..9d183261e9 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,7 @@ +todo borrow book +deadline return book /by Sunday +event project meeting /at Mon 2-4pm +deadline return book /by June 6th +todo join sports club +done 3 +bye \ No newline at end of file From 010e34e13ca5d828c26648f0f949b08055fb5a43 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 26 Aug 2021 22:55:38 +0800 Subject: [PATCH 09/30] Some modifications from last week ip --- src/main/java/Duke.java | 208 ++++++++++++++++++++----------- src/main/java/DukeException.java | 5 + 2 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 334826a528..f6d1ad51fa 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,84 +1,152 @@ -import com.sun.source.tree.DoWhileLoopTree; - import java.util.ArrayList; import java.util.Scanner; public class Duke { + + + private static final String line = "____________________________________________________________"; + private static ArrayList tasks = new ArrayList<>(); + + private static void Greet() { + System.out.println("Hello I'm Duke\n" + + line + + "\nWhat can I do for you?\n" + + line); + } + + private static void printTasks() { + int index = 0; + + System.out.println("Here are tasks in your list:"); + for(Task t: tasks) { + index++; + System.out.println(index + "." + t.toString()); + } + } + + private static void makeTaskDone (int index) throws DukeException { + if (index <= 0 || index > tasks.size()) { + throw new DukeException ("I'm sorry the index is invalid :-("); + } else { + System.out.println("Nice! I've marked this task as done:"); + tasks.get(index - 1).markDone(); + System.out.println(tasks.get(index - 1).toString()); + } + } + + private static void delete(int index) throws DukeException{ + if (index <= 0 || index > tasks.size()) { + throw new DukeException("I'm sorry the index is invalid :-("); + } else { + System.out.println("Noted. I've removed this task:"); + System.out.println(tasks.get(index - 1).toString()); + tasks.remove(index - 1); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); + } + } + + private static void DukeOperation(String input) throws DukeException { + // operation is always the first word of user input. + String[] allWords = input.split(" "); + String operation = allWords[0]; + + switch (operation) { + case "bye": { + System.out.println(" Bye. Hope to see you again soon!"); + break; + } + case "list": { + printTasks(); + break; + } + case "done": { + try { + int index = Integer.valueOf(allWords[1]); + makeTaskDone(index); + } catch (DukeException e) { + System.out.println(e.toString()); + } + break; + } + case "todo": { + if (allWords.length == 1) { + throw new DukeException("The description of todo cannot be empty"); + } else { + String description = input.substring(input.indexOf(allWords[1])); + Todo todo = new Todo(description); + System.out.println("added: " + todo.toString()); + tasks.add(todo); + System.out.println("Now you have " + tasks.size() + " tasks in your list"); + } + break; + } + case "event": { + if (allWords.length == 1) { + throw new DukeException("The description of event cannot be empty"); + } else { + if (input.contains("/at")) { + String description = input.substring(input.indexOf(allWords[1]), input.indexOf("/at") - 1); + String at = input.substring(input.indexOf("/at") + 4); + Event event = new Event(description, at); + System.out.println("added: " + event.toString()); + tasks.add(event); + System.out.println("Now you have " + tasks.size() + " tasks in your list"); + } else { + throw new DukeException("The format of event is wrong"); + } + } + break; + } + case "deadline": { + if (allWords.length == 1) { + throw new DukeException("The description of deadline cannot be empty"); + } else { + if (input.contains("/by")) { + String description = input.substring(input.indexOf(allWords[1]), input.indexOf("/by") - 1); + String at = input.substring(input.indexOf("/by") + 4); + Deadline deadline = new Deadline(description, at); + System.out.println("added: " + deadline.toString()); + tasks.add(deadline); + System.out.println("Now you have " + tasks.size() + " tasks in your list"); + } else { + throw new DukeException("The format of deadline is wrong"); + } + } + break; + } + case "delete": { + try { + int index = Integer.valueOf(allWords[1]); + delete(index); + } catch (DukeException e) { + System.out.println(e.toString()); + } + break; + } + default: { + throw new DukeException("I'm sorry, but I don't know what that means :-("); + } + } + } + + public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - String line = "____________________________________________________________"; - ArrayList task = new ArrayList<>(); - System.out.println("Hello from\n" + logo + line + "\nWhat can I do for you?\n" + line); String input; - Scanner s = new Scanner(System.in); - input = s.nextLine(); + Scanner keyboardInput = new Scanner(System.in); + + Greet(); + while (true) { + try { + input = keyboardInput.nextLine(); - while(!input.equals("bye")) { - String[] parts = input.split(" "); - if(input.equals("list")) { - int i = 1; - System.out.println(line); - System.out.println("Here are the tasks in your list:"); - for(Task t: task) { - System.out.println(i + "." + t.toString()); - i++; - } - System.out.println(line); - } else if (parts[0].equals("done")) { - int index = Integer.valueOf(parts[1]); - Task thisTask = task.get(index - 1); - thisTask.markDone(); - System.out.println(line); - System.out.println("Nice! I've marked this task as done:\n" + thisTask.toString()); - System.out.println(line); - } else if (parts[0].equals("delete")) { - int index = Integer.valueOf(parts[1]); - Task thisTask = task.remove(index - 1); - System.out.println(line); - System.out.println("Noted I've removed this task:\n" + thisTask.toString()); - System.out.println("Now you have " + task.size() + " tasks in your list"); - System.out.println(line); - } else if (parts.length == 1) { - System.out.println(line); - System.out.println("OOPS!!! The description of a " + parts[0] + " cannot be empty."); - System.out.println(line); - } else if (parts[0].equals("deadline")){ - String[] part2 = input.split("/by "); - String description = part2[0].split("deadline ")[1]; - Task deadline = new Deadline(description, part2[1]); - System.out.println(line + "\n" + "added: " + deadline.toString()); - task.add(deadline); - System.out.println("Now you have " + task.size() + " tasks in your list"); - System.out.println(line); - } else if (parts[0].equals("event")){ - String[] part2 = input.split("/at "); - String description = part2[0].split("event ")[1]; - Task event = new Event(description, part2[1]); - System.out.println(line + "\n" + "added: " + event.toString()); - task.add(event); - System.out.println("Now you have " + task.size() + " tasks in your list"); - System.out.println(line); - } else if (parts[0].equals("todo")){ - String[] part2 = input.split("/"); - String description = part2[0].split("todo ")[1]; - Task todo = new Todo(description); - System.out.println(line + "\n" + "added: " + todo.toString()); - task.add(todo); - System.out.println("Now you have " + task.size() + " tasks in your list"); - System.out.println(line); - } else { System.out.println(line); - System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-("); + DukeOperation(input); System.out.println(line); + } catch (DukeException e) { + System.out.println(e.toString()); } - input = s.nextLine(); } - - System.out.println(line + "\nBye. Hope to see you again soon!\n" + line); } + } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..c858d79e91 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,5 @@ +public class DukeException extends Exception{ + public DukeException(String message) { + super(message); + } +} From 0cc48f44fae1926d7c95eae7867afada9d49ae20 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 26 Aug 2021 23:52:47 +0800 Subject: [PATCH 10/30] Auto Save --- data/duke | 0 src/main/java/Deadline.java | 5 +++ src/main/java/Duke.java | 72 ++++++++++++++++++++++++++++++++++--- src/main/java/Event.java | 5 +++ src/main/java/Task.java | 5 +++ src/main/java/Todo.java | 5 +++ 6 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 data/duke diff --git a/data/duke b/data/duke new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 2de70b7540..ee1c9c23be 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -7,6 +7,11 @@ public Deadline(String description, String by) { this.by = by; } + @Override + public String formatForFile() { + return "D " + super.formatForFile() + " | " + by; + } + @Override public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f6d1ad51fa..905081e6ad 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,10 @@ +import java.io.FileNotFoundException; +import java.io.FileWriter; import java.util.ArrayList; import java.util.Scanner; +import java.io.File; +import java.io.IOException; + public class Duke { @@ -129,14 +134,64 @@ private static void DukeOperation(String input) throws DukeException { } } + private static void ProcessFileData(String Data) { + char taskType = Data.charAt(0); + char status = Data.charAt(4); + Task task; + String description; - public static void main(String[] args) { + if (taskType == 'T') { + description = Data.substring(8); + task = new Todo(description); + } else { + String time = Data.substring(8, Data.lastIndexOf("|") - 1); + description = Data.substring(Data.lastIndexOf("|") + 2); + if (taskType == 'E') { + task = new Event(description, time); + } else { + task = new Deadline(description, time); + } + } + + if (status == '1') { + task.markDone(); + } + tasks.add(task); + } + + private static void updateData(String filePath) { + try { + FileWriter fw = new FileWriter(filePath); + + for (Task task: tasks) { + fw.write( task.formatForFile()+ "\n"); + } + fw.close(); + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + + private static void readData(String filePath) { + try { + File f = new File(filePath); + Scanner fileInput = new Scanner(f); + while (fileInput.hasNext()) { + String Data = fileInput.nextLine(); + ProcessFileData(Data); + } + } catch (FileNotFoundException e) { + System.out.println("Error!! No File found in the given root."); + } + + } - String input; + private static void userInput() { + String input = ""; Scanner keyboardInput = new Scanner(System.in); Greet(); - while (true) { + do { try { input = keyboardInput.nextLine(); @@ -146,7 +201,16 @@ public static void main(String[] args) { } catch (DukeException e) { System.out.println(e.toString()); } - } + } while (!input.equals("bye")); + } + + public static void main(String[] args) { + String location = "data/duke.txt"; + + readData(location); + userInput(); + updateData(location); + } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 6874b47c39..3388a3e807 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -7,6 +7,11 @@ public Event(String description, String at) { this.at = at; } + @Override + public String formatForFile() { + return "E " + super.formatForFile() + " | " + at; + } + @Override public String toString() { return "[E]" + super.toString() + " (at: " + at + ")"; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 075967ca68..2425406cc5 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -15,6 +15,11 @@ public void markDone(){ this.isDone = true; } + public String formatForFile(){ + return "| " + (this.isDone ? 1 : 0) + + " | " + this.description; + }; + @Override public String toString(){ return "[" + this.getStatusIcon() + "] " + this.description; diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 931cfd4f9e..b7b7b20ad6 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -4,6 +4,11 @@ public Todo(String description) { super(description); } + @Override + public String formatForFile() { + return "T " + super.formatForFile(); + } + @Override public String toString() { return "[T]" + super.toString(); From e4d564edda68825d0086f81b3a4e3407f1d1a5a3 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Fri, 27 Aug 2021 00:57:04 +0800 Subject: [PATCH 11/30] Auto Date and Times --- src/main/java/Deadline.java | 9 ++++++--- src/main/java/Duke.java | 38 ++++++++++++++++++++++++++++++++++--- src/main/java/Event.java | 10 +++++++--- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 2de70b7540..211bea4582 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,14 +1,17 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public class Deadline extends Task { - protected String by; + protected LocalDate by; - public Deadline(String description, String by) { + public Deadline(String description, LocalDate by) { super(description); this.by = by; } @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by + ")"; + return "[D]" + super.toString() + " (by: " + by.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f6d1ad51fa..fd11b6d21b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,8 @@ import java.util.ArrayList; import java.util.Scanner; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; public class Duke { @@ -45,6 +48,21 @@ private static void delete(int index) throws DukeException{ } } + private static boolean isValidDate(String date) { + try{ + String year = date.substring(0, 3); + String month = date.substring(5, 6); + String day = date.substring(8, 9); + Integer.parseInt(year); + Integer.parseInt(month); + Integer.parseInt(day); + return date.charAt(4) == '-' && date.charAt(7) == '-'; + + } catch (Exception e) { + return false; + } + } + private static void DukeOperation(String input) throws DukeException { // operation is always the first word of user input. String[] allWords = input.split(" "); @@ -86,7 +104,14 @@ private static void DukeOperation(String input) throws DukeException { } else { if (input.contains("/at")) { String description = input.substring(input.indexOf(allWords[1]), input.indexOf("/at") - 1); - String at = input.substring(input.indexOf("/at") + 4); + String time = input.substring(input.indexOf("/at") + 4); + LocalDate at; + + if (isValidDate(time)) { + at = LocalDate.parse(time); + } else { + throw new DukeException("Date format is wrong"); + } Event event = new Event(description, at); System.out.println("added: " + event.toString()); tasks.add(event); @@ -103,8 +128,15 @@ private static void DukeOperation(String input) throws DukeException { } else { if (input.contains("/by")) { String description = input.substring(input.indexOf(allWords[1]), input.indexOf("/by") - 1); - String at = input.substring(input.indexOf("/by") + 4); - Deadline deadline = new Deadline(description, at); + String time = input.substring(input.indexOf("/by") + 4); + LocalDate by; + + if (isValidDate(time)) { + by = LocalDate.parse(time); + } else { + throw new DukeException("Date format is wrong"); + } + Deadline deadline = new Deadline(description, by); System.out.println("added: " + deadline.toString()); tasks.add(deadline); System.out.println("Now you have " + tasks.size() + " tasks in your list"); diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 6874b47c39..0b9f66cc8b 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,14 +1,18 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; + public class Event extends Task { - protected String at; + protected LocalDate at; - public Event(String description, String at) { + public Event(String description, LocalDate at) { super(description); this.at = at; } @Override public String toString() { - return "[E]" + super.toString() + " (at: " + at + ")"; + return "[E]" + super.toString() + " (at: " + at.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; } } From a0468029a8a5f8ef33fa028140cb8581a4026027 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Wed, 15 Sep 2021 21:42:24 +0800 Subject: [PATCH 12/30] Divide classes into packages --- README.md | 4 +- src/main/java/Duke.java | 100 ------------------ src/main/java/{ => duke/command}/Parser.java | 6 +- .../{ => duke/exception}/DukeException.java | 2 + src/main/java/{ => duke/storage}/Storage.java | 11 +- src/main/java/{ => duke/task}/Deadline.java | 2 + src/main/java/{ => duke/task}/Event.java | 2 + src/main/java/{ => duke/task}/Task.java | 2 + src/main/java/{ => duke/task}/TaskList.java | 2 + src/main/java/{ => duke/task}/Todo.java | 2 + src/main/java/{ => duke/ui}/Ui.java | 5 +- 11 files changed, 30 insertions(+), 108 deletions(-) delete mode 100644 src/main/java/Duke.java rename src/main/java/{ => duke/command}/Parser.java (98%) rename src/main/java/{ => duke/exception}/DukeException.java (82%) rename src/main/java/{ => duke/storage}/Storage.java (90%) rename src/main/java/{ => duke/task}/Deadline.java (96%) rename src/main/java/{ => duke/task}/Event.java (96%) rename src/main/java/{ => duke/task}/Task.java (96%) rename src/main/java/{ => duke/task}/TaskList.java (97%) rename src/main/java/{ => duke/task}/Todo.java (93%) rename src/main/java/{ => duke/ui}/Ui.java (96%) diff --git a/README.md b/README.md index 8715d4d915..3dbb5b62b7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# duke.main.Main.Duke project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run duke.main.Main.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: ``` Hello from ____ _ diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index 2de573a2dc..0000000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,100 +0,0 @@ -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.util.ArrayList; -import java.util.Scanner; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.io.File; -import java.io.IOException; - - -public class Duke { - private Storage storage; - private TaskList tasks; - private Ui ui; - - public Duke(String filePath) { - ui = new Ui(); - storage = new Storage(filePath); - try { - tasks = new TaskList(storage.load()); - } catch (DukeException e) { - ui.showLoadingError(); - tasks = new TaskList(); - } - } - - public void run() { - String input = ""; - ui.Greet(); - Scanner keyboardIn = new Scanner(System.in); - do { - try { - input = keyboardIn.nextLine(); - Parser parser = new Parser(input); - String operation = parser.getOperationType(); - switch (operation) { - case "bye": { - ui.bye(); - break; - } - case "list": { - ui.list(tasks); - break; - } - case "done": { - int index = parser.getIndex(); - tasks.markDone(index-1); - ui.done(tasks.get(index-1)); - break; - } - case "delete": { - int index = parser.getIndex(); - Task task = tasks.get(index-1); - tasks.delete(index-1); - ui.delete(tasks,task); - break; - } - case "todo": { - String description = parser.getTask(); - Task task = new Todo(description); - tasks.add(task); - ui.add(tasks,task); - break; - } - case "event": { - String description = parser.getTask(); - LocalDate time = parser.getTime(); - Task task = new Event(description, time); - tasks.add(task); - ui.add(tasks,task); - break; - } - case "deadline": { - String description = parser.getTask(); - LocalDate time = parser.getTime(); - Task task = new Deadline(description, time); - tasks.add(task); - ui.add(tasks,task); - break; - } - default: { - - } - } - - } catch (DukeException e) { - System.out.println(e.toString()); - } - } while (!input.equals("bye")); - storage.updateData(); - } - - - - public static void main(String[] args) { - new Duke("data/tasks.txt").run(); - } - -} diff --git a/src/main/java/Parser.java b/src/main/java/duke/command/Parser.java similarity index 98% rename from src/main/java/Parser.java rename to src/main/java/duke/command/Parser.java index 1dfa85958d..9825291c5d 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/duke/command/Parser.java @@ -1,8 +1,12 @@ +package duke.command; + +import duke.task.TaskList; + import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.Arrays; +import duke.exception.DukeException; public class Parser { private String userInput; diff --git a/src/main/java/DukeException.java b/src/main/java/duke/exception/DukeException.java similarity index 82% rename from src/main/java/DukeException.java rename to src/main/java/duke/exception/DukeException.java index c858d79e91..e7b248e5a8 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/duke/exception/DukeException.java @@ -1,3 +1,5 @@ +package duke.exception; + public class DukeException extends Exception{ public DukeException(String message) { super(message); diff --git a/src/main/java/Storage.java b/src/main/java/duke/storage/Storage.java similarity index 90% rename from src/main/java/Storage.java rename to src/main/java/duke/storage/Storage.java index 1c50db60c4..11c9b9521c 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -1,12 +1,17 @@ +package duke.storage; + +import duke.task.Todo; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Scanner; +import duke.task.*; +import duke.exception.DukeException; +import duke.command.Parser; public class Storage { private String filePath; @@ -17,7 +22,7 @@ public Storage(String filePath) { this.tasks= new ArrayList<>(); } - public ArrayList load() throws DukeException{ + public ArrayList load() throws DukeException { try { File f = new File(filePath); Scanner fileInput = new Scanner(f); diff --git a/src/main/java/Deadline.java b/src/main/java/duke/task/Deadline.java similarity index 96% rename from src/main/java/Deadline.java rename to src/main/java/duke/task/Deadline.java index c2fca131b2..a29df22d9e 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -1,3 +1,5 @@ +package duke.task; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/Event.java b/src/main/java/duke/task/Event.java similarity index 96% rename from src/main/java/Event.java rename to src/main/java/duke/task/Event.java index 0e0054d826..0b15520e9e 100644 --- a/src/main/java/Event.java +++ b/src/main/java/duke/task/Event.java @@ -1,3 +1,5 @@ +package duke.task; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/Task.java b/src/main/java/duke/task/Task.java similarity index 96% rename from src/main/java/Task.java rename to src/main/java/duke/task/Task.java index 2425406cc5..20e5f0b4bf 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/task/Task.java @@ -1,3 +1,5 @@ +package duke.task; + public class Task { protected String description; protected boolean isDone; diff --git a/src/main/java/TaskList.java b/src/main/java/duke/task/TaskList.java similarity index 97% rename from src/main/java/TaskList.java rename to src/main/java/duke/task/TaskList.java index 7850fdfda8..cf12723c4f 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -1,3 +1,5 @@ +package duke.task; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; diff --git a/src/main/java/Todo.java b/src/main/java/duke/task/Todo.java similarity index 93% rename from src/main/java/Todo.java rename to src/main/java/duke/task/Todo.java index b7b7b20ad6..37bb37638b 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/duke/task/Todo.java @@ -1,3 +1,5 @@ +package duke.task; + public class Todo extends Task { public Todo(String description) { diff --git a/src/main/java/Ui.java b/src/main/java/duke/ui/Ui.java similarity index 96% rename from src/main/java/Ui.java rename to src/main/java/duke/ui/Ui.java index 7c06263ba6..c91ee53727 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -1,5 +1,6 @@ -import java.util.ArrayList; -import java.util.Scanner; +package duke.ui; + +import duke.task.*; public class Ui { private static final String line = "____________________________________________________________"; From 13513a01e0acb81715d387224d4f43405ad64826 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Wed, 15 Sep 2021 22:32:07 +0800 Subject: [PATCH 13/30] Add JUnit tests --- data/tasks.txt | 0 src/main/java/duke/main/Duke.java | 107 ++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 data/tasks.txt create mode 100644 src/main/java/duke/main/Duke.java diff --git a/data/tasks.txt b/data/tasks.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java new file mode 100644 index 0000000000..bd658b982d --- /dev/null +++ b/src/main/java/duke/main/Duke.java @@ -0,0 +1,107 @@ +package duke.main; + +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.util.ArrayList; +import java.util.Scanner; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.io.File; +import java.io.IOException; + +import duke.exception.DukeException; +import duke.command.Parser; +import duke.task.*; +import duke.storage.Storage; +import duke.ui.Ui; + +public class Duke { + private Storage storage; + private TaskList tasks; + private Ui ui; + + public Duke(String filePath) { + ui = new Ui(); + storage = new Storage(filePath); + try { + tasks = new TaskList(storage.load()); + } catch (DukeException e) { + ui.showLoadingError(); + tasks = new TaskList(); + } + } + + public void run() { + String input = ""; + ui.Greet(); + Scanner keyboardIn = new Scanner(System.in); + do { + try { + input = keyboardIn.nextLine(); + Parser parser = new Parser(input); + String operation = parser.getOperationType(); + switch (operation) { + case "bye": { + ui.bye(); + break; + } + case "list": { + ui.list(tasks); + break; + } + case "done": { + int index = parser.getIndex(); + tasks.markDone(index-1); + ui.done(tasks.get(index-1)); + break; + } + case "delete": { + int index = parser.getIndex(); + Task task = tasks.get(index-1); + tasks.delete(index-1); + ui.delete(tasks,task); + break; + } + case "todo": { + String description = parser.getTask(); + Task task = new Todo(description); + tasks.add(task); + ui.add(tasks,task); + break; + } + case "event": { + String description = parser.getTask(); + LocalDate time = parser.getTime(); + Task task = new Event(description, time); + tasks.add(task); + ui.add(tasks,task); + break; + } + case "deadline": { + String description = parser.getTask(); + LocalDate time = parser.getTime(); + Task task = new Deadline(description, time); + tasks.add(task); + ui.add(tasks,task); + break; + } + default: { + + } + } + + } catch (DukeException e) { + System.out.println(e.toString()); + } + } while (!input.equals("bye")); + storage.updateData(); + } + + + + public static void main(String[] args) { + new Duke("data/tasks.txt").run(); + } + +} From e23ab33464e9decee0b1ce1f17bc37721c036b44 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Wed, 15 Sep 2021 22:38:00 +0800 Subject: [PATCH 14/30] Add JUnit tests --- src/test/java/duke/command/ParserTest.java | 27 ++++++++++++++++++++++ src/test/java/duke/task/TaskListTest.java | 19 +++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/test/java/duke/command/ParserTest.java create mode 100644 src/test/java/duke/task/TaskListTest.java diff --git a/src/test/java/duke/command/ParserTest.java b/src/test/java/duke/command/ParserTest.java new file mode 100644 index 0000000000..456c88e851 --- /dev/null +++ b/src/test/java/duke/command/ParserTest.java @@ -0,0 +1,27 @@ +package duke.command; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.Test; + +import duke.exception.DukeException; + + +public class ParserTest { + @Test + public void testGetOperationType() { + try { + assertEquals("todo", new Parser("todo borrow book").getOperationType()); + assertEquals("deadline", new Parser("deadline return book /by 2019-09-28").getOperationType()); + assertEquals("done", new Parser("done 1").getOperationType()); + assertEquals("bye", new Parser("bye").getOperationType()); + assertEquals("delete", new Parser("delete 1").getOperationType()); + assertEquals("list", new Parser("list").getOperationType()); + } catch (DukeException e) { + fail(); + } + } + + +} diff --git a/src/test/java/duke/task/TaskListTest.java b/src/test/java/duke/task/TaskListTest.java new file mode 100644 index 0000000000..15813abb96 --- /dev/null +++ b/src/test/java/duke/task/TaskListTest.java @@ -0,0 +1,19 @@ +package duke.task; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +import java.time.LocalDate; +import java.util.ArrayList; + +public class TaskListTest { + @Test + public void testTaskListSize() { + ArrayList taskList = new ArrayList<>(); + taskList.add(new Todo("borrow a book")); + taskList.add(new Deadline("return a book", LocalDate.of(2019, 9, 28))); + TaskList tasks = new TaskList(taskList); + assertEquals(2, tasks.size()); + } +} From 9e90dc7b8d2091ddd5a67ae218d9eacc24347b16 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 16 Sep 2021 01:39:32 +0800 Subject: [PATCH 15/30] Add JavaDoc comments --- src/main/java/duke/command/Parser.java | 23 ++++++++++++++++++-- src/main/java/duke/main/Duke.java | 7 ++++++- src/main/java/duke/storage/Storage.java | 12 +++++++++++ src/main/java/duke/ui/Ui.java | 28 +++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/main/java/duke/command/Parser.java b/src/main/java/duke/command/Parser.java index 9825291c5d..b28ffab97a 100644 --- a/src/main/java/duke/command/Parser.java +++ b/src/main/java/duke/command/Parser.java @@ -11,6 +11,9 @@ public class Parser { private String userInput; + /** + * Constructor of Parser class. Initialize a Parser instance from a given userInput. + */ public Parser(String userInput) { this.userInput = userInput; } @@ -30,6 +33,9 @@ private static boolean isValidDate(String date) { } } + /** + * Return the operation type of user command. + */ public String getOperationType() throws DukeException { String operation = userInput.split(" ")[0]; @@ -40,6 +46,9 @@ public String getOperationType() throws DukeException { } } + /** + * Returns the index info in a line of command. + */ public int getIndex() throws DukeException { String[] allWords = userInput.split(" "); if (allWords.length == 2) { @@ -54,6 +63,9 @@ public int getIndex() throws DukeException { } } + /** + * Returns the task info in a line of command. + */ public String getTask() throws DukeException { String taskDescription; @@ -78,6 +90,9 @@ public String getTask() throws DukeException { return taskDescription; } + /** + * Returns the time info in a line of command in LocalDate type. + */ public LocalDate getTime() throws DukeException { String time; if (this.getOperationType().equals("deadline")) { @@ -106,7 +121,9 @@ public LocalDate getTime() throws DukeException { throw new DukeException("Sorry Date format is wrong"); } } - + /** + * Returns the task info in local data. + */ public String getFileTask() { String task; char taskType = userInput.charAt(0); @@ -117,7 +134,9 @@ public String getFileTask() { } return task; } - + /** + * Returns the time info in local data. + */ public LocalDate getFileTime() { String time; LocalDate parsedTime; diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java index bd658b982d..91d4c28ddb 100644 --- a/src/main/java/duke/main/Duke.java +++ b/src/main/java/duke/main/Duke.java @@ -21,6 +21,9 @@ public class Duke { private TaskList tasks; private Ui ui; + /** + * Initializes Ui, storage and load TaskLists from specific filePath for Duke. + */ public Duke(String filePath) { ui = new Ui(); storage = new Storage(filePath); @@ -31,7 +34,9 @@ public Duke(String filePath) { tasks = new TaskList(); } } - + /** + * Run the programme of Duke. + */ public void run() { String input = ""; ui.Greet(); diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java index 11c9b9521c..0d52d9b98a 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -17,11 +17,17 @@ public class Storage { private String filePath; private ArrayList tasks; + /** + * Constructor for Storage class. Initialize Storage instance using given filePath. + */ public Storage(String filePath) { this.filePath = filePath; this.tasks= new ArrayList<>(); } + /** + * Load task info from local data. + */ public ArrayList load() throws DukeException { try { File f = new File(filePath); @@ -36,6 +42,9 @@ public ArrayList load() throws DukeException { return this.tasks; } + /** + * Parse the local data. + */ public void ProcessFileData(String Data) { char taskType = Data.charAt(0); char status = Data.charAt(4); @@ -62,6 +71,9 @@ public void ProcessFileData(String Data) { tasks.add(task); } + /** + * Save the change in the hard disk. + */ public void updateData() { try { FileWriter fw = new FileWriter(filePath); diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index c91ee53727..bba35fa397 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -5,6 +5,9 @@ public class Ui { private static final String line = "____________________________________________________________"; + /** + * Send a greeting to the user. + */ public static void Greet() { System.out.println( line + "\n" + "Hello I'm Duke\n" + @@ -12,10 +15,18 @@ public static void Greet() { line); } + /** + * Say goodbye to the user. + */ public static void bye() { System.out.println(line +"\nBye. Hope to see you again soon!\n" + line); } + /** + * Tell user the task info of tasks in the given TaskList + * + * @param tasks List of tasks. + */ public static void list(TaskList tasks) { System.out.println(line); System.out.println("Here are tasks in your list:"); @@ -25,12 +36,22 @@ public static void list(TaskList tasks) { System.out.println(line); } + /** + * Tell user the task info of the completed task. + * + * @param task A Task be done by user. + */ public static void done(Task task) { System.out.println(line); System.out.println("done:\n" + task.toString()); System.out.println(line); } + /** + * Tell user the task info of the deleted task. + * + * @param task A Task be deleted by user. + */ public static void delete(TaskList tasks, Task task) { System.out.println(line); System.out.println("removed:\n" + task); @@ -38,6 +59,13 @@ public static void delete(TaskList tasks, Task task) { System.out.println(line); } + /** + * Tell user the task info of the newly added task. + * Tell user the size of TaskList after adding a new task. + * + * @param tasks A list of task. + * @param task A Task be added by user. + */ public static void add(TaskList tasks, Task task) { System.out.println(line); System.out.println("added: " + task From d9cd2c85dbe65e6d00feb7d73b575e73e4baba33 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 16 Sep 2021 01:46:47 +0800 Subject: [PATCH 16/30] Tweak the code to comply with a coding standard --- src/main/java/duke/main/Duke.java | 13 +++++-------- src/main/java/duke/storage/Storage.java | 7 ++++--- src/main/java/duke/ui/Ui.java | 3 ++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java index bd658b982d..a8eb75bce5 100644 --- a/src/main/java/duke/main/Duke.java +++ b/src/main/java/duke/main/Duke.java @@ -1,18 +1,15 @@ package duke.main; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.util.ArrayList; import java.util.Scanner; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.io.File; -import java.io.IOException; import duke.exception.DukeException; import duke.command.Parser; -import duke.task.*; +import duke.task.TaskList; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Event; +import duke.task.Deadline; import duke.storage.Storage; import duke.ui.Ui; diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java index 11c9b9521c..e60e8bc0dc 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -1,7 +1,5 @@ package duke.storage; -import duke.task.Todo; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -9,7 +7,10 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Scanner; -import duke.task.*; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; +import duke.task.Event; import duke.exception.DukeException; import duke.command.Parser; diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index c91ee53727..1273815a5c 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -1,6 +1,7 @@ package duke.ui; -import duke.task.*; +import duke.task.TaskList; +import duke.task.Task; public class Ui { private static final String line = "____________________________________________________________"; From 6f756909f5eb36022980bb785b89e26664b19166 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Thu, 16 Sep 2021 02:28:02 +0800 Subject: [PATCH 17/30] Give users a way to find a task by searching for a keyword. --- data/tasks.txt | 2 ++ src/main/java/duke/command/Parser.java | 3 ++- src/main/java/duke/main/Duke.java | 6 +++++- src/main/java/duke/task/TaskList.java | 19 ++++++++++++++++++- src/main/java/duke/ui/Ui.java | 7 +++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/data/tasks.txt b/data/tasks.txt index e69de29bb2..bb687b5077 100644 --- a/data/tasks.txt +++ b/data/tasks.txt @@ -0,0 +1,2 @@ +T | 0 | return book +E | 0 | borrow book | Sep 22 2019 diff --git a/src/main/java/duke/command/Parser.java b/src/main/java/duke/command/Parser.java index 9825291c5d..2fde7fa7e4 100644 --- a/src/main/java/duke/command/Parser.java +++ b/src/main/java/duke/command/Parser.java @@ -54,11 +54,12 @@ public int getIndex() throws DukeException { } } + public String getTask() throws DukeException { String taskDescription; if (this.getOperationType().equals("deadline") || this.getOperationType().equals("event") || - this.getOperationType().equals("todo")) { + this.getOperationType().equals("todo") || this.getOperationType().equals("find")) { if (userInput.contains("/")) { if (userInput.indexOf(" ") < userInput.indexOf("/")) { taskDescription = userInput.substring(userInput.indexOf(" ") + 1, userInput.indexOf("/") - 1); diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java index bd658b982d..6440efc3d7 100644 --- a/src/main/java/duke/main/Duke.java +++ b/src/main/java/duke/main/Duke.java @@ -86,8 +86,12 @@ public void run() { ui.add(tasks,task); break; } + case "find": { + String keyword = parser.getTask(); + ui.find(tasks, keyword); + break; + } default: { - } } diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index cf12723c4f..0a865873d0 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -1,5 +1,7 @@ package duke.task; +import duke.exception.DukeException; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -8,7 +10,7 @@ public class TaskList { private ArrayList tasks; public static String[] OperationType = new String[]{"bye", "done", "delete", "list", - "todo", "deadline", "event"}; + "todo", "deadline", "event", "find"}; public TaskList(ArrayList tasks) { this.tasks = tasks; @@ -34,6 +36,21 @@ public Task get (int index) { return this.tasks.get(index); } + public String find(String keyword) { + StringBuilder result = new StringBuilder(); + final int[] count = {0}; + + tasks.stream(). + filter(task -> task.toString().contains(keyword)). + forEach(task -> result.append(++count[0]).append(".") + .append(task.toString()).append("\n")); + + if (count[0] == 0){ + return ""; + } + return result.toString(); + } + public int size () { return this.tasks.size(); } diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index c91ee53727..9982d536bd 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -46,6 +46,13 @@ public static void add(TaskList tasks, Task task) { System.out.println(line); } + public static void find(TaskList taskList, String keyword) { + System.out.println(line); + System.out.println("Here are the matching tasks in your list:"); + System.out.println(taskList.find(keyword)); + System.out.println(line); + } + public void showLoadingError() { System.out.println(line); System.out.println("Cannot Load From Data.\n"); From 5ab9d287b4df541605803399032ca55e418b0d2f Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Sat, 18 Sep 2021 14:56:30 +0800 Subject: [PATCH 18/30] Fix some coding style using Gradle --- src/main/java/duke/command/Parser.java | 23 ++-- .../java/duke/exception/DukeException.java | 2 +- src/main/java/duke/main/Duke.java | 115 +++++++++--------- src/main/java/duke/storage/Storage.java | 25 ++-- src/main/java/duke/task/Deadline.java | 10 +- src/main/java/duke/task/Event.java | 8 +- src/main/java/duke/task/Task.java | 25 +++- src/main/java/duke/task/TaskList.java | 43 +++++-- src/main/java/duke/ui/Ui.java | 25 ++-- src/test/java/duke/command/ParserTest.java | 1 - src/test/java/duke/task/TaskListTest.java | 4 +- 11 files changed, 168 insertions(+), 113 deletions(-) diff --git a/src/main/java/duke/command/Parser.java b/src/main/java/duke/command/Parser.java index 087efaa3c3..f26746a7b8 100644 --- a/src/main/java/duke/command/Parser.java +++ b/src/main/java/duke/command/Parser.java @@ -1,12 +1,11 @@ package duke.command; -import duke.task.TaskList; - import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import java.util.Arrays; + import duke.exception.DukeException; +import duke.task.TaskList; public class Parser { private String userInput; @@ -19,11 +18,11 @@ public Parser(String userInput) { } private static boolean isValidDate(String date) { - try{ + try { String year = date.substring(0, 3); String month = date.substring(5, 6); String day = date.substring(8, 9); - Integer.parseInt(year); + Integer.parseInt(year); Integer.parseInt(month); Integer.parseInt(day); return date.charAt(4) == '-' && date.charAt(7) == '-'; @@ -39,7 +38,7 @@ private static boolean isValidDate(String date) { public String getOperationType() throws DukeException { String operation = userInput.split(" ")[0]; - if (Arrays.asList(TaskList.OperationType).contains(operation)) { + if (TaskList.isValidOperation(operation)) { return operation; } else { throw new DukeException("I'm sorry, but I don't know what that means :-("); @@ -70,8 +69,10 @@ public int getIndex() throws DukeException { public String getTask() throws DukeException { String taskDescription; - if (this.getOperationType().equals("deadline") || this.getOperationType().equals("event") || - this.getOperationType().equals("todo") || this.getOperationType().equals("find")) { + if (this.getOperationType().equals("deadline") + || this.getOperationType().equals("event") + || this.getOperationType().equals("todo") + || this.getOperationType().equals("find")) { if (userInput.contains("/")) { if (userInput.indexOf(" ") < userInput.indexOf("/")) { taskDescription = userInput.substring(userInput.indexOf(" ") + 1, userInput.indexOf("/") - 1); @@ -80,7 +81,9 @@ public String getTask() throws DukeException { } } else { if (!userInput.contains(" ")) { - throw new DukeException("☹ OOPS!!! The description of a " + this.getOperationType() + " cannot be empty."); + throw new DukeException("OOPS!!! The description of a " + + this.getOperationType() + + " cannot be empty."); } else { taskDescription = userInput.substring(userInput.indexOf(" ") + 1); } @@ -102,7 +105,7 @@ public LocalDate getTime() throws DukeException { } else { throw new DukeException("I'm sorry, but the format of deadline is wrong :-("); } - } else if (this.getOperationType().equals("event")){ + } else if (this.getOperationType().equals("event")) { if (userInput.contains("/at")) { time = userInput.substring(userInput.indexOf("/at") + 4); } else { diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java index e7b248e5a8..f34315531c 100644 --- a/src/main/java/duke/exception/DukeException.java +++ b/src/main/java/duke/exception/DukeException.java @@ -1,6 +1,6 @@ package duke.exception; -public class DukeException extends Exception{ +public class DukeException extends Exception { public DukeException(String message) { super(message); } diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java index 87be01667c..4180adbea4 100644 --- a/src/main/java/duke/main/Duke.java +++ b/src/main/java/duke/main/Duke.java @@ -1,16 +1,16 @@ package duke.main; -import java.util.Scanner; import java.time.LocalDate; +import java.util.Scanner; -import duke.exception.DukeException; import duke.command.Parser; -import duke.task.TaskList; +import duke.exception.DukeException; +import duke.storage.Storage; +import duke.task.Deadline; +import duke.task.Event; import duke.task.Task; +import duke.task.TaskList; import duke.task.Todo; -import duke.task.Event; -import duke.task.Deadline; -import duke.storage.Storage; import duke.ui.Ui; public class Duke { @@ -36,7 +36,7 @@ public Duke(String filePath) { */ public void run() { String input = ""; - ui.Greet(); + ui.greet(); Scanner keyboardIn = new Scanner(System.in); do { try { @@ -44,57 +44,56 @@ public void run() { Parser parser = new Parser(input); String operation = parser.getOperationType(); switch (operation) { - case "bye": { - ui.bye(); - break; - } - case "list": { - ui.list(tasks); - break; - } - case "done": { - int index = parser.getIndex(); - tasks.markDone(index-1); - ui.done(tasks.get(index-1)); - break; - } - case "delete": { - int index = parser.getIndex(); - Task task = tasks.get(index-1); - tasks.delete(index-1); - ui.delete(tasks,task); - break; - } - case "todo": { - String description = parser.getTask(); - Task task = new Todo(description); - tasks.add(task); - ui.add(tasks,task); - break; - } - case "event": { - String description = parser.getTask(); - LocalDate time = parser.getTime(); - Task task = new Event(description, time); - tasks.add(task); - ui.add(tasks,task); - break; - } - case "deadline": { - String description = parser.getTask(); - LocalDate time = parser.getTime(); - Task task = new Deadline(description, time); - tasks.add(task); - ui.add(tasks,task); - break; - } - case "find": { - String keyword = parser.getTask(); - ui.find(tasks, keyword); - break; - } - default: { - } + case "bye": { + ui.bye(); + break; + } + case "list": { + ui.list(tasks); + break; + } + case "done": { + int index = parser.getIndex(); + tasks.markDone(index - 1); + ui.done(tasks.get(index - 1)); + break; + } + case "delete": { + int index = parser.getIndex(); + Task task = tasks.get(index - 1); + tasks.delete(index - 1); + ui.delete(tasks, task); + break; + } + case "todo": { + String description = parser.getTask(); + Task task = new Todo(description); + tasks.add(task); + ui.add(tasks, task); + break; + } + case "event": { + String description = parser.getTask(); + LocalDate time = parser.getTime(); + Task task = new Event(description, time); + tasks.add(task); + ui.add(tasks, task); + break; + } + case "deadline": { + String description = parser.getTask(); + LocalDate time = parser.getTime(); + Task task = new Deadline(description, time); + tasks.add(task); + ui.add(tasks, task); + break; + } + case "find": { + String keyword = parser.getTask(); + ui.find(tasks, keyword); + break; + } + default: } } catch (DukeException e) { diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java index 1a5e981c23..81292408f9 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/duke/storage/Storage.java @@ -7,12 +7,13 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Scanner; -import duke.task.Task; -import duke.task.Todo; + +import duke.command.Parser; +import duke.exception.DukeException; import duke.task.Deadline; import duke.task.Event; -import duke.exception.DukeException; -import duke.command.Parser; +import duke.task.Task; +import duke.task.Todo; public class Storage { private String filePath; @@ -23,7 +24,7 @@ public class Storage { */ public Storage(String filePath) { this.filePath = filePath; - this.tasks= new ArrayList<>(); + this.tasks = new ArrayList<>(); } /** @@ -34,8 +35,8 @@ public ArrayList load() throws DukeException { File f = new File(filePath); Scanner fileInput = new Scanner(f); while (fileInput.hasNext()) { - String Data = fileInput.nextLine(); - ProcessFileData(Data); + String data = fileInput.nextLine(); + processFileData(data); } } catch (FileNotFoundException e) { throw new DukeException("Cannot Load From Data."); @@ -46,12 +47,12 @@ public ArrayList load() throws DukeException { /** * Parse the local data. */ - public void ProcessFileData(String Data) { - char taskType = Data.charAt(0); - char status = Data.charAt(4); + public void processFileData(String data) { + char taskType = data.charAt(0); + char status = data.charAt(4); Task task; String description; - Parser parser = new Parser(Data); + Parser parser = new Parser(data); if (taskType == 'T') { description = parser.getFileTask(); @@ -80,7 +81,7 @@ public void updateData() { FileWriter fw = new FileWriter(filePath); for (Task task: tasks) { - fw.write( task.formatForFile()+ "\n"); + fw.write(task.formatForFile() + "\n"); } fw.close(); } catch (IOException e) { diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java index a29df22d9e..85a1a8c2be 100644 --- a/src/main/java/duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -4,9 +4,15 @@ import java.time.format.DateTimeFormatter; public class Deadline extends Task { - protected LocalDate by; + /** + * Constructor for Deadline class + * initializing a Deadline instance with the given task description and deadline. + * + * @param description Task description + * @param by Task deadline + */ public Deadline(String description, LocalDate by) { super(description); this.by = by; @@ -21,4 +27,4 @@ public String formatForFile() { public String toString() { return "[D]" + super.toString() + " (by: " + by.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; } -} \ No newline at end of file +} diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java index 0b15520e9e..7cdb130f6e 100644 --- a/src/main/java/duke/task/Event.java +++ b/src/main/java/duke/task/Event.java @@ -2,12 +2,18 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; public class Event extends Task { protected LocalDate at; + /** + * Constructor for Event class + * initializing a Event instance with the given task description and time. + * + * @param description Task description + * @param at Time of event + */ public Event(String description, LocalDate at) { super(description); this.at = at; diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 20e5f0b4bf..01efc16852 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -4,6 +4,12 @@ public class Task { protected String description; protected boolean isDone; + /** + * Constructor for Task class + * initializing a Task instance with given task description. + * + * @param description Task description + */ public Task(String description) { this.description = description; this.isDone = false; @@ -13,17 +19,24 @@ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } - public void markDone(){ + public void markDone() { this.isDone = true; } - public String formatForFile(){ - return "| " + (this.isDone ? 1 : 0) + - " | " + this.description; - }; + /** + * Return the task info saved in a hard disk. + * + * @return Task info saved in a hard disk. + */ + public String formatForFile() { + return "| " + + (this.isDone ? 1 : 0) + + " | " + + this.description; + } @Override - public String toString(){ + public String toString() { return "[" + this.getStatusIcon() + "] " + this.description; } } diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index 0a865873d0..f40a71545b 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -1,16 +1,9 @@ package duke.task; -import duke.exception.DukeException; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Locale; public class TaskList { private ArrayList tasks; - public static String[] OperationType = new String[]{"bye", "done", "delete", "list", - "todo", "deadline", "event", "find"}; public TaskList(ArrayList tasks) { this.tasks = tasks; @@ -20,6 +13,20 @@ public TaskList() { this.tasks = new ArrayList<>(); } + /** + * Check if the given operation is valid. + * + * @param operation Operation input by user + * @return A boolean - true if the user input operation is valid. + */ + public static boolean isValidOperation(String operation) { + String[] operationType = new String[]{"bye", "done", "delete", "list", + "todo", "deadline", "event", "find"}; + + return operation.contains(operation); + } + + public void markDone (int index) { this.tasks.get(index).markDone(); } @@ -36,16 +43,28 @@ public Task get (int index) { return this.tasks.get(index); } + /** + * Return a list of task containing given keyword. + * + * @param keyword Keyword input by user + * @return List of task containing the given keyword. + */ public String find(String keyword) { StringBuilder result = new StringBuilder(); final int[] count = {0}; - tasks.stream(). - filter(task -> task.toString().contains(keyword)). - forEach(task -> result.append(++count[0]).append(".") - .append(task.toString()).append("\n")); + tasks.stream() + .filter(task -> task + .toString() + .contains(keyword)) + .forEach(task -> result + .append(++count[0]) + .append(".") + .append(task + .toString()) + .append("\n")); - if (count[0] == 0){ + if (count[0] == 0) { return ""; } return result.toString(); diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index d1c3fd7667..b48596ec07 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -1,7 +1,7 @@ package duke.ui; -import duke.task.TaskList; import duke.task.Task; +import duke.task.TaskList; public class Ui { private static final String line = "____________________________________________________________"; @@ -9,18 +9,18 @@ public class Ui { /** * Send a greeting to the user. */ - public static void Greet() { - System.out.println( line + "\n" + - "Hello I'm Duke\n" + - "What can I do for you?\n" + - line); + public static void greet() { + System.out.println(line + "\n" + + "Hello I'm Duke\n" + + "What can I do for you?\n" + + line); } /** * Say goodbye to the user. */ public static void bye() { - System.out.println(line +"\nBye. Hope to see you again soon!\n" + line); + System.out.println(line + "\nBye. Hope to see you again soon!\n" + line); } /** @@ -31,7 +31,7 @@ public static void bye() { public static void list(TaskList tasks) { System.out.println(line); System.out.println("Here are tasks in your list:"); - for(int index = 1; index <= tasks.size(); index++) { + for (int index = 1; index <= tasks.size(); index++) { System.out.println(index + "." + tasks.get(index - 1).toString()); } System.out.println(line); @@ -75,6 +75,12 @@ public static void add(TaskList tasks, Task task) { System.out.println(line); } + /** + * Print out the list of task info searched by user using a keyword + * + * @param taskList A list of task. + * @param keyword keyword user want to search by. + */ public static void find(TaskList taskList, String keyword) { System.out.println(line); System.out.println("Here are the matching tasks in your list:"); @@ -82,6 +88,9 @@ public static void find(TaskList taskList, String keyword) { System.out.println(line); } + /** + * Tell user a error occur while loading local data + */ public void showLoadingError() { System.out.println(line); System.out.println("Cannot Load From Data.\n"); diff --git a/src/test/java/duke/command/ParserTest.java b/src/test/java/duke/command/ParserTest.java index 456c88e851..cd530baa19 100644 --- a/src/test/java/duke/command/ParserTest.java +++ b/src/test/java/duke/command/ParserTest.java @@ -7,7 +7,6 @@ import duke.exception.DukeException; - public class ParserTest { @Test public void testGetOperationType() { diff --git a/src/test/java/duke/task/TaskListTest.java b/src/test/java/duke/task/TaskListTest.java index 15813abb96..c35ffe4fb7 100644 --- a/src/test/java/duke/task/TaskListTest.java +++ b/src/test/java/duke/task/TaskListTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; - import java.time.LocalDate; import java.util.ArrayList; +import org.junit.jupiter.api.Test; + public class TaskListTest { @Test public void testTaskListSize() { From 3e1041e345381ae84d8930247e022e52ef1f2655 Mon Sep 17 00:00:00 2001 From: Kimowarui Date: Sun, 19 Sep 2021 21:50:19 +0800 Subject: [PATCH 19/30] Add a GUI to Duke --- build.gradle | 15 +++++ data/tasks.txt | 2 +- src/main/java/duke/command/Parser.java | 2 +- src/main/java/duke/gui/DialogBox.java | 61 ++++++++++++++++++++ src/main/java/duke/gui/MainWindow.java | 53 +++++++++++++++++ src/main/java/duke/main/Duke.java | 70 ++++++++++++++-------- src/main/java/duke/main/Launcher.java | 11 ++++ src/main/java/duke/main/Main.java | 33 +++++++++++ src/main/java/duke/task/Deadline.java | 4 +- src/main/java/duke/task/Event.java | 4 +- src/main/java/duke/task/TaskList.java | 8 ++- src/main/java/duke/ui/Ui.java | 77 ++++++++++++++----------- src/main/resources/view/DialogBox.fxml | 16 +++++ src/main/resources/view/MainWindow.fxml | 19 ++++++ 14 files changed, 310 insertions(+), 65 deletions(-) create mode 100644 src/main/java/duke/gui/DialogBox.java create mode 100644 src/main/java/duke/gui/MainWindow.java create mode 100644 src/main/java/duke/main/Launcher.java create mode 100644 src/main/java/duke/main/Main.java 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 20c0521cc7..8cf2a65b39 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,21 @@ repositories { dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' + + String javaFxVersion = '11' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { diff --git a/data/tasks.txt b/data/tasks.txt index bb687b5077..51906fd2d9 100644 --- a/data/tasks.txt +++ b/data/tasks.txt @@ -1,2 +1,2 @@ T | 0 | return book -E | 0 | borrow book | Sep 22 2019 +D | 0 | asdf asf | 03/02/2019 diff --git a/src/main/java/duke/command/Parser.java b/src/main/java/duke/command/Parser.java index f26746a7b8..0bfd3d4dfe 100644 --- a/src/main/java/duke/command/Parser.java +++ b/src/main/java/duke/command/Parser.java @@ -145,7 +145,7 @@ public LocalDate getFileTime() { String time; LocalDate parsedTime; time = userInput.substring(userInput.lastIndexOf("|") + 2); - parsedTime = LocalDate.parse(time, DateTimeFormatter.ofPattern("MMM d yyyy")); + parsedTime = LocalDate.parse(time, DateTimeFormatter.ofPattern("dd/MM/yyyy")); return parsedTime; } diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java new file mode 100644 index 0000000000..4d6bda125c --- /dev/null +++ b/src/main/java/duke/gui/DialogBox.java @@ -0,0 +1,61 @@ +package duke.gui; + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * 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 { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + 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/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java new file mode 100644 index 0000000000..f8bb236e19 --- /dev/null +++ b/src/main/java/duke/gui/MainWindow.java @@ -0,0 +1,53 @@ +package duke.gui; + +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 duke.main.Duke; +/** + * 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 Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + @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); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java index 4180adbea4..394291e366 100644 --- a/src/main/java/duke/main/Duke.java +++ b/src/main/java/duke/main/Duke.java @@ -31,6 +31,21 @@ public Duke(String filePath) { tasks = new TaskList(); } } + + /** + * Initializes the duke.Duke chatbot program for the duke.Launcher + */ + public Duke() { + ui = new Ui(); + storage = new Storage("data/tasks.txt"); + try { + tasks = new TaskList(storage.load()); + } catch (DukeException e) { + ui.showLoadingError(); + tasks = new TaskList(); + } + } + /** * Run the programme of Duke. */ @@ -39,37 +54,49 @@ public void run() { ui.greet(); Scanner keyboardIn = new Scanner(System.in); do { - try { - input = keyboardIn.nextLine(); - Parser parser = new Parser(input); - String operation = parser.getOperationType(); - switch (operation) { + input = keyboardIn.nextLine(); + getResponse(input); + + } while (!input.equals("bye")); + storage.updateData(); + } + + public static void main(String[] args) { + new Duke("data/tasks.txt").run(); + } + + public String getResponse(String input) { + String output = ""; + try { + Parser parser = new Parser(input); + String operation = parser.getOperationType(); + switch (operation) { case "bye": { - ui.bye(); + output = ui.bye(); break; } case "list": { - ui.list(tasks); + output = ui.list(tasks); break; } case "done": { int index = parser.getIndex(); tasks.markDone(index - 1); - ui.done(tasks.get(index - 1)); + output = ui.done(tasks.get(index - 1)); break; } case "delete": { int index = parser.getIndex(); Task task = tasks.get(index - 1); tasks.delete(index - 1); - ui.delete(tasks, task); + output = ui.delete(tasks, task); break; } case "todo": { String description = parser.getTask(); Task task = new Todo(description); tasks.add(task); - ui.add(tasks, task); + output = ui.add(tasks, task); break; } case "event": { @@ -77,7 +104,7 @@ public void run() { LocalDate time = parser.getTime(); Task task = new Event(description, time); tasks.add(task); - ui.add(tasks, task); + output = ui.add(tasks, task); break; } case "deadline": { @@ -85,28 +112,21 @@ public void run() { LocalDate time = parser.getTime(); Task task = new Deadline(description, time); tasks.add(task); - ui.add(tasks, task); + output = ui.add(tasks, task); break; } case "find": { String keyword = parser.getTask(); - ui.find(tasks, keyword); + output = ui.find(tasks, keyword); break; } default: - } - - } catch (DukeException e) { - System.out.println(e.toString()); } - } while (!input.equals("bye")); - storage.updateData(); - } - - - - public static void main(String[] args) { - new Duke("data/tasks.txt").run(); + return output; + } catch (DukeException e) { + System.out.println(e.getMessage()); + return e.getMessage(); + } } } diff --git a/src/main/java/duke/main/Launcher.java b/src/main/java/duke/main/Launcher.java new file mode 100644 index 0000000000..2120be7e5c --- /dev/null +++ b/src/main/java/duke/main/Launcher.java @@ -0,0 +1,11 @@ +package duke.main; + +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); + } +} diff --git a/src/main/java/duke/main/Main.java b/src/main/java/duke/main/Main.java new file mode 100644 index 0000000000..a8e20c1f37 --- /dev/null +++ b/src/main/java/duke/main/Main.java @@ -0,0 +1,33 @@ +package duke.main; + +import java.io.IOException; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +import duke.gui.MainWindow; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java index 85a1a8c2be..0e71ccef33 100644 --- a/src/main/java/duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -20,11 +20,11 @@ public Deadline(String description, LocalDate by) { @Override public String formatForFile() { - return "D " + super.formatForFile() + " | " + by.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + return "D " + super.formatForFile() + " | " + by.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); } @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; + return "[D]" + super.toString() + " (by: " + by.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + ")"; } } diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java index 7cdb130f6e..9e04321d8a 100644 --- a/src/main/java/duke/task/Event.java +++ b/src/main/java/duke/task/Event.java @@ -21,11 +21,11 @@ public Event(String description, LocalDate at) { @Override public String formatForFile() { - return "E " + super.formatForFile() + " | " + at.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + return "E " + super.formatForFile() + " | " + at.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); } @Override public String toString() { - return "[E]" + super.toString() + " (at: " + at.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; + return "[E]" + super.toString() + " (at: " + at.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + ")"; } } diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index f40a71545b..e1074ac559 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -1,6 +1,7 @@ package duke.task; import java.util.ArrayList; +import java.util.Arrays; public class TaskList { private ArrayList tasks; @@ -23,7 +24,12 @@ public static boolean isValidOperation(String operation) { String[] operationType = new String[]{"bye", "done", "delete", "list", "todo", "deadline", "event", "find"}; - return operation.contains(operation); + for (String str : operationType) { + if (str.equals(operation)) { + return true; + } + } + return false; } diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index b48596ec07..c777be9452 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -9,18 +9,22 @@ public class Ui { /** * Send a greeting to the user. */ - public static void greet() { - System.out.println(line + "\n" + public static String greet() { + String greet = line + "\n" + "Hello I'm Duke\n" + "What can I do for you?\n" - + line); + + line; + System.out.println(greet); + return greet; } /** * Say goodbye to the user. */ - public static void bye() { - System.out.println(line + "\nBye. Hope to see you again soon!\n" + line); + public static String bye() { + String bye = line + "\nBye. Hope to see you again soon!\n" + line; + System.out.println(bye); + return bye; } /** @@ -28,13 +32,15 @@ public static void bye() { * * @param tasks List of tasks. */ - public static void list(TaskList tasks) { - System.out.println(line); - System.out.println("Here are tasks in your list:"); + public static String list(TaskList tasks) { + String list = line + "\n" + "Here are tasks in your list:\n"; + for (int index = 1; index <= tasks.size(); index++) { - System.out.println(index + "." + tasks.get(index - 1).toString()); + list += index + "." + tasks.get(index - 1).toString() + "\n"; } - System.out.println(line); + list += line + "\n"; + System.out.println(list); + return list; } /** @@ -42,10 +48,10 @@ public static void list(TaskList tasks) { * * @param task A Task be done by user. */ - public static void done(Task task) { - System.out.println(line); - System.out.println("done:\n" + task.toString()); - System.out.println(line); + public static String done(Task task) { + String done = line + "\n" + "done:\n" + task.toString() + line + "\n"; + System.out.println(done); + return done; } /** @@ -53,11 +59,12 @@ public static void done(Task task) { * * @param task A Task be deleted by user. */ - public static void delete(TaskList tasks, Task task) { - System.out.println(line); - System.out.println("removed:\n" + task); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - System.out.println(line); + public static String delete(TaskList tasks, Task task) { + String delete = line + "\n" + "removed:\n" + task.toString() + "\n" + + "Now you have " + tasks.size() + " tasks in the list.\n" + + line + "\n"; + System.out.println(delete); + return delete; } /** @@ -67,12 +74,13 @@ public static void delete(TaskList tasks, Task task) { * @param tasks A list of task. * @param task A Task be added by user. */ - public static void add(TaskList tasks, Task task) { - System.out.println(line); - System.out.println("added: " + task + public static String add(TaskList tasks, Task task) { + String add = line + "\n" + "added: " + task + "\nNow you have " + tasks.size() + "" - + " tasks in the list."); - System.out.println(line); + + " tasks in the list.\n" + + line + "\n"; + System.out.println(add); + return add; } /** @@ -81,20 +89,23 @@ public static void add(TaskList tasks, Task task) { * @param taskList A list of task. * @param keyword keyword user want to search by. */ - public static void find(TaskList taskList, String keyword) { - System.out.println(line); - System.out.println("Here are the matching tasks in your list:"); - System.out.println(taskList.find(keyword)); - System.out.println(line); + public static String find(TaskList taskList, String keyword) { + String find = line + "\n" + "Here are the matching tasks in your list:\n" + + taskList.find(keyword) + + line + "\n"; + System.out.println(find); + return find; } /** * Tell user a error occur while loading local data */ - public void showLoadingError() { - System.out.println(line); - System.out.println("Cannot Load From Data.\n"); - System.out.println(line); + public String showLoadingError() { + String showLoadingError = line + "\n" + + "Cannot Load From Data.\n" + + line + "\n"; + System.out.println(showLoadingError); + return showLoadingError; } } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e433809947 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..53e1df09c3 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +