From 556af3f47a96b32898ab4cdbd65b16486a4871e8 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/48] Add Gradle support --- build.gradle | 41 +++++ 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, 332 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..885198fcfa --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'application' + 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 +} + +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 df365b5910d5094422dda043c0974c2084b4359f Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 01:14:10 +0800 Subject: [PATCH 02/48] Completed Level-1 --- src/main/java/Chacha.java | 15 +++++++++++++++ src/main/java/Duke.java | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 src/main/java/Chacha.java delete mode 100644 src/main/java/Duke.java diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java new file mode 100644 index 0000000000..c4b0346c1d --- /dev/null +++ b/src/main/java/Chacha.java @@ -0,0 +1,15 @@ +import java.util.Scanner; + +public class Chacha { + public static void main(String[] args) { + System.out.println("Hello! I'm Chacha\n" + "What can I do for you?"); + Scanner input = new Scanner(System.in); + String s = input.nextLine(); + while (!s.equals("bye")) { + System.out.println(s); + s = input.nextLine(); + } + System.out.println("Bye. Hope to see you again soon!"); + input.close(); + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index 5d313334cc..0000000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,10 +0,0 @@ -public class Duke { - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - } -} From 1346cd567f66dd52fed9b8f06a18f41b2b5dc08c Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 01:33:39 +0800 Subject: [PATCH 03/48] added list --- src/main/java/Chacha.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index c4b0346c1d..f5659a38d8 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -1,13 +1,23 @@ import java.util.Scanner; +import java.util.ArrayList; public class Chacha { public static void main(String[] args) { System.out.println("Hello! I'm Chacha\n" + "What can I do for you?"); Scanner input = new Scanner(System.in); String s = input.nextLine(); + ArrayList list = new ArrayList(); while (!s.equals("bye")) { - System.out.println(s); - s = input.nextLine(); + if (s.equals("list")) { + for (int i = 0; i < list.size();i++) { + System.out.println(i + 1 + ". " + list.get(i)); + } + } else { + list.add(s); + System.out.println("added: " + s); + + } + s = input.nextLine(); } System.out.println("Bye. Hope to see you again soon!"); input.close(); From 35f557b44857e0fd89006c7cc6fe2d2d275fa717 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 04:43:37 +0800 Subject: [PATCH 04/48] Added mark as done --- src/main/java/Chacha.java | 38 +++++++++++++++++++++++++++++++++----- src/main/java/Task.java | 26 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index f5659a38d8..00655e6c30 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -6,15 +6,43 @@ public static void main(String[] args) { System.out.println("Hello! I'm Chacha\n" + "What can I do for you?"); Scanner input = new Scanner(System.in); String s = input.nextLine(); - ArrayList list = new ArrayList(); + ArrayList taskList = new ArrayList(); while (!s.equals("bye")) { if (s.equals("list")) { - for (int i = 0; i < list.size();i++) { - System.out.println(i + 1 + ". " + list.get(i)); + for (int i = 0; i < taskList.size();i++) { + Task t = taskList.get(i); + System.out.println(i + 1 + + ".[" + + t.getStatusIcon() + + "] " + + t.getDescription()); } + + } else if (s.contains("unmark")) { + + String[] split = s.split("\\s+"); + Task task = taskList.get(Integer.valueOf(split[1]) - 1); + task.unmarkAsDone(); + System.out.println("OK, I've marked this task as not done yet:\n [" + + task.getStatusIcon() + + "] " + + task.getDescription()); + + } else if (s.contains("mark")) { + System.out.println(s.substring(0, 3)); + String[] split = s.split("\\s+"); + Task task = taskList.get(Integer.valueOf(split[1]) - 1); + System.out.println("here"); + task.markAsDone(); + System.out.println("Nice! I've marked this task as done:\n [" + + task.getStatusIcon() + + "] " + + task.getDescription()); + } else { - list.add(s); - System.out.println("added: " + s); + Task task = new Task(s); + taskList.add(task); + System.out.println("added: " + task.getDescription()); } s = input.nextLine(); diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..3a4ef5c124 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,26 @@ +public class Task { + private String description; + private boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public void markAsDone() { + this.isDone = true; + } + + public void unmarkAsDone() { + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public String getDescription() { + return description; + } + +} From 1427298e782b7bd266abd95ca6b326f2e1e6650e Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 05:49:54 +0800 Subject: [PATCH 05/48] ToDos, Events and Deadlines --- src/main/java/Chacha.java | 54 +++++++++++++++++++++++++------------ src/main/java/Deadline.java | 42 +++++++++++++++++++++++++++++ src/main/java/Event.java | 42 +++++++++++++++++++++++++++++ src/main/java/Task.java | 3 +++ src/main/java/Todo.java | 36 +++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 17 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/Chacha.java b/src/main/java/Chacha.java index 00655e6c30..efbcf74b76 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -12,10 +12,8 @@ public static void main(String[] args) { for (int i = 0; i < taskList.size();i++) { Task t = taskList.get(i); System.out.println(i + 1 + - ".[" + - t.getStatusIcon() + - "] " + - t.getDescription()); + "." + + t.toString()); } } else if (s.contains("unmark")) { @@ -23,10 +21,7 @@ public static void main(String[] args) { String[] split = s.split("\\s+"); Task task = taskList.get(Integer.valueOf(split[1]) - 1); task.unmarkAsDone(); - System.out.println("OK, I've marked this task as not done yet:\n [" + - task.getStatusIcon() + - "] " + - task.getDescription()); + System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); } else if (s.contains("mark")) { System.out.println(s.substring(0, 3)); @@ -34,16 +29,41 @@ public static void main(String[] args) { Task task = taskList.get(Integer.valueOf(split[1]) - 1); System.out.println("here"); task.markAsDone(); - System.out.println("Nice! I've marked this task as done:\n [" + - task.getStatusIcon() + - "] " + - task.getDescription()); + System.out.println("Nice! I've marked this task as done:\n" + task.toString()); + + } else if (s.contains("deadline")) { + String date = s.substring(s.indexOf("/by ") + 4); + date.trim(); + String description = s.substring(0,s.indexOf("/")); + description = description.substring(s.indexOf("deadline ") + 9); + description.trim(); + Deadline deadline = new Deadline(description, date); + taskList.add(deadline); + System.out.println("Got it. I've added this task:"); + System.out.println(deadline.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + + } else if (s.contains("todo")) { + String description = s.substring(s.indexOf("todo ") + 5); + description.trim(); + Todo todo = new Todo(description); + taskList.add(todo); + System.out.println("Got it. I've added this task:"); + System.out.println(todo.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + + } else if (s.contains("event")) { + String range = s.substring(s.indexOf("/at ") + 4); + range.trim(); + String description = s.substring(0,s.indexOf("/")); + description = description.substring(s.indexOf("event ") + 6); + description.trim(); + Event event = new Event(description, range); + taskList.add(event); + System.out.println("Got it. I've added this task:"); + System.out.println(event.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); - } else { - Task task = new Task(s); - taskList.add(task); - System.out.println("added: " + task.getDescription()); - } s = input.nextLine(); } diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..a44f416b82 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,42 @@ +public class Deadline extends Task { + private String description; + private String date; + private boolean isDone; + private String type; + + public Deadline(String description, String date) { + this.description = description; + this.date = date; + this.type = "D"; + } + + public void markAsDone() { + this.isDone = true; + } + + public void unmarkAsDone() { + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public String getDescription() { + return description; + } + + public String getType() { + return type; + } + + public String getDate() { + return date; + } + + @Override + public String toString() { + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + date + ")"; + } + +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..39930386f7 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,42 @@ +public class Event extends Task { + private String description; + private String range; + private boolean isDone; + private String type; + + public Event(String description, String range) { + this.description = description; + this.range = range; + this.type = "E"; + } + + public void markAsDone() { + this.isDone = true; + } + + public void unmarkAsDone() { + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public String getDescription() { + return description; + } + + public String getType() { + return type; + } + + public String getRange() { + return range; + } + + @Override + public String toString() { + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + range + ")"; + } + +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 3a4ef5c124..54ae9755ba 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -7,6 +7,9 @@ public Task(String description) { this.isDone = false; } + public Task() { + } + public void markAsDone() { this.isDone = true; } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..68ffb8c36c --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,36 @@ +public class Todo extends Task { + private String description; + private boolean isDone; + private String type; + + public Todo(String description) { + this.description = description; + this.type = "T"; + } + + public void markAsDone() { + this.isDone = true; + } + + public void unmarkAsDone() { + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public String getDescription() { + return description; + } + + public String getType() { + return type; + } + + @Override + public String toString() { + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description; + } + +} From 924806ed1ac4f5e769a993e6b1c88ac1f4f404ca Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 06:12:25 +0800 Subject: [PATCH 06/48] Text testing --- src/main/java/Chacha.java | 3 +-- text-ui-test/EXPECTED.TXT | 23 ++++++++++++++++------- text-ui-test/input.txt | 5 +++++ text-ui-test/runtest.bat | 4 ++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index efbcf74b76..1e649b02bd 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -24,10 +24,8 @@ public static void main(String[] args) { System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); } else if (s.contains("mark")) { - System.out.println(s.substring(0, 3)); String[] split = s.split("\\s+"); Task task = taskList.get(Integer.valueOf(split[1]) - 1); - System.out.println("here"); task.markAsDone(); System.out.println("Nice! I've marked this task as done:\n" + task.toString()); @@ -38,6 +36,7 @@ public static void main(String[] args) { description = description.substring(s.indexOf("deadline ") + 9); description.trim(); Deadline deadline = new Deadline(description, date); + taskList.add(deadline); System.out.println("Got it. I've added this task:"); System.out.println(deadline.toString()); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..172dc4ba16 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,16 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - +Hello! I'm Chacha +What can I do for you? +Got it. I've added this task: +[T][ ] borrow book +Now you have 1 tasks in the list. +Got it. I've added this task: +[D][ ] return book (by: Sunday) +Now you have 2 tasks in the list. +Got it. I've added this task: +[E][ ] project meeting (at: Mon 2-4pm) +Now you have 3 tasks in the list. +Nice! I've marked this task as done: +[D][X] return book (by: Sunday) +1.[T][ ] borrow book +2.[D][X] return book (by: Sunday) +3.[E][ ] project meeting (at: Mon 2-4pm) \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..0f9d35820f 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,5 @@ +todo borrow book +deadline return book /by Sunday +event project meeting /at Mon 2-4pm +mark 2 +list \ No newline at end of file diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..fff9daeae8 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java +javac -cp ..\src\main\java\Chacha.java -Xlint:none -d ..\bin ..\src\main\java\*.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin Chacha < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From 7a099dde64bc38d6fca6a257e40bf8f106adf3e5 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 06:28:35 +0800 Subject: [PATCH 07/48] error handling --- src/main/java/Chacha.java | 74 +++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index 1e649b02bd..9f15d6bc87 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -30,40 +30,52 @@ public static void main(String[] args) { System.out.println("Nice! I've marked this task as done:\n" + task.toString()); } else if (s.contains("deadline")) { - String date = s.substring(s.indexOf("/by ") + 4); - date.trim(); - String description = s.substring(0,s.indexOf("/")); - description = description.substring(s.indexOf("deadline ") + 9); - description.trim(); - Deadline deadline = new Deadline(description, date); - - taskList.add(deadline); - System.out.println("Got it. I've added this task:"); - System.out.println(deadline.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); - + try { + String date = s.substring(s.indexOf("/by ") + 4); + date.trim(); + String description = s.substring(0,s.indexOf("/")); + description = description.substring(s.indexOf("deadline ") + 9); + description.trim(); + Deadline deadline = new Deadline(description, date); + taskList.add(deadline); + System.out.println("Got it. I've added this task:"); + System.out.println(deadline.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } catch(Exception e) { + System.out.println("OOPS!!! The description of a deadline cannot be empty."); + } } else if (s.contains("todo")) { - String description = s.substring(s.indexOf("todo ") + 5); - description.trim(); - Todo todo = new Todo(description); - taskList.add(todo); - System.out.println("Got it. I've added this task:"); - System.out.println(todo.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + try { + String description = s.substring(s.indexOf("todo ") + 5); + description.charAt(6); + description.trim(); + Todo todo = new Todo(description); + taskList.add(todo); + System.out.println("Got it. I've added this task:"); + System.out.println(todo.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } catch(Exception e) { + System.out.println("OOPS!!! The description of a todo cannot be empty."); + } } else if (s.contains("event")) { - String range = s.substring(s.indexOf("/at ") + 4); - range.trim(); - String description = s.substring(0,s.indexOf("/")); - description = description.substring(s.indexOf("event ") + 6); - description.trim(); - Event event = new Event(description, range); - taskList.add(event); - System.out.println("Got it. I've added this task:"); - System.out.println(event.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); - - } + try { + String range = s.substring(s.indexOf("/at ") + 4); + range.trim(); + String description = s.substring(0,s.indexOf("/")); + description = description.substring(s.indexOf("event ") + 6); + description.trim(); + Event event = new Event(description, range); + taskList.add(event); + System.out.println("Got it. I've added this task:"); + System.out.println(event.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } catch(Exception e) { + System.out.println("OOPS!!! The description of a event cannot be empty."); + } + } else { + System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-("); + } s = input.nextLine(); } System.out.println("Bye. Hope to see you again soon!"); From 23228eb9e5d888c75f63f1fc2969c6e512d21d1e Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 26 Aug 2022 06:36:40 +0800 Subject: [PATCH 08/48] Implemented delete --- src/main/java/Chacha.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index 9f15d6bc87..9b4ec52c83 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -29,6 +29,14 @@ public static void main(String[] args) { task.markAsDone(); System.out.println("Nice! I've marked this task as done:\n" + task.toString()); + } else if (s.contains("delete")) { + String[] split = s.split("\\s+"); + Task task = taskList.get(Integer.valueOf(split[1]) - 1); + System.out.println("Noted. I've removed this task:"); + System.out.println(task.toString()); + taskList.remove(Integer.valueOf(split[1]) - 1); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } else if (s.contains("deadline")) { try { String date = s.substring(s.indexOf("/by ") + 4); @@ -47,7 +55,7 @@ public static void main(String[] args) { } else if (s.contains("todo")) { try { String description = s.substring(s.indexOf("todo ") + 5); - description.charAt(6); + System.out.println("heree"); description.trim(); Todo todo = new Todo(description); taskList.add(todo); From 79c8c7bd87866094d51fbcfbaefd19cf53e00336 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Thu, 1 Sep 2022 23:40:59 +0800 Subject: [PATCH 09/48] Added file read function (to refine save function later) --- src/main/java/Chacha.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/Chacha.java b/src/main/java/Chacha.java index 9b4ec52c83..c3ca84dbce 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/Chacha.java @@ -1,5 +1,7 @@ import java.util.Scanner; import java.util.ArrayList; +import java.io.File; +import java.io.FileNotFoundException; public class Chacha { public static void main(String[] args) { @@ -89,4 +91,13 @@ public static void main(String[] args) { System.out.println("Bye. Hope to see you again soon!"); input.close(); } + + private static void loadData(String filePath) throws FileNotFoundException { + File f = new File(filePath); // create a File for the given file path + Scanner s = new Scanner(f); // create a Scanner using the File as the source + while (s.hasNext()) { + //load task objects into array + System.out.println(s.nextLine()); + } + } } From a9e73ff1377ab4c0ec5574f8dad55911ba94cd65 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Thu, 1 Sep 2022 23:48:45 +0800 Subject: [PATCH 10/48] Store dates as date object --- src/main/java/Deadline.java | 14 ++++++++++---- src/main/java/Event.java | 16 +++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index a44f416b82..be9f527c38 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,12 +1,17 @@ +import java.text.DateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; + public class Deadline extends Task { private String description; - private String date; + private LocalDate date; private boolean isDone; private String type; public Deadline(String description, String date) { this.description = description; - this.date = date; + this.date = LocalDate.parse(date); this.type = "D"; } @@ -31,12 +36,13 @@ public String getType() { } public String getDate() { - return date; + String formattedDate = date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + return formattedDate; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + date + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + getDate() + ")"; } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 39930386f7..d28824ce08 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,12 +1,17 @@ +import java.text.DateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; + public class Event extends Task { private String description; - private String range; + private LocalDate range; private boolean isDone; private String type; public Event(String description, String range) { this.description = description; - this.range = range; + this.range = LocalDate.parse(range); this.type = "E"; } @@ -30,13 +35,14 @@ public String getType() { return type; } - public String getRange() { - return range; + public String getDate() { + String formattedDate = range.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + return formattedDate; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + range + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + getDate() + ")"; } } From 08cf2556777f8367e6806819fbeed80a1c1d822f Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 03:34:59 +0800 Subject: [PATCH 11/48] Organise classes into suitable packages --- src/main/java/{ => chacha}/Chacha.java | 7 +++++++ src/main/java/chacha/Parser.java | 4 ++++ src/main/java/chacha/Storage.java | 4 ++++ src/main/java/chacha/TaskList.java | 4 ++++ src/main/java/chacha/Ui.java | 4 ++++ src/main/java/{ => chacha/tasks}/Deadline.java | 10 +++++----- src/main/java/{ => chacha/tasks}/Event.java | 10 +++++----- src/main/java/{ => chacha/tasks}/Task.java | 1 + src/main/java/{ => chacha/tasks}/Todo.java | 1 + 9 files changed, 35 insertions(+), 10 deletions(-) rename src/main/java/{ => chacha}/Chacha.java (97%) create mode 100644 src/main/java/chacha/Parser.java create mode 100644 src/main/java/chacha/Storage.java create mode 100644 src/main/java/chacha/TaskList.java create mode 100644 src/main/java/chacha/Ui.java rename src/main/java/{ => chacha/tasks}/Deadline.java (79%) rename src/main/java/{ => chacha/tasks}/Event.java (79%) rename src/main/java/{ => chacha/tasks}/Task.java (96%) rename src/main/java/{ => chacha/tasks}/Todo.java (97%) diff --git a/src/main/java/Chacha.java b/src/main/java/chacha/Chacha.java similarity index 97% rename from src/main/java/Chacha.java rename to src/main/java/chacha/Chacha.java index c3ca84dbce..447cd6edec 100644 --- a/src/main/java/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -1,4 +1,11 @@ +package chacha; import java.util.Scanner; + +import chacha.tasks.Deadline; +import chacha.tasks.Event; +import chacha.tasks.Task; +import chacha.tasks.Todo; + import java.util.ArrayList; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java new file mode 100644 index 0000000000..984240d64c --- /dev/null +++ b/src/main/java/chacha/Parser.java @@ -0,0 +1,4 @@ +package chacha; +public class Parser { + +} diff --git a/src/main/java/chacha/Storage.java b/src/main/java/chacha/Storage.java new file mode 100644 index 0000000000..7c0dcb2ee3 --- /dev/null +++ b/src/main/java/chacha/Storage.java @@ -0,0 +1,4 @@ +package chacha; +public class Storage { + +} diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java new file mode 100644 index 0000000000..4e8f48f353 --- /dev/null +++ b/src/main/java/chacha/TaskList.java @@ -0,0 +1,4 @@ +package chacha; +public class TaskList { + +} diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java new file mode 100644 index 0000000000..155e541382 --- /dev/null +++ b/src/main/java/chacha/Ui.java @@ -0,0 +1,4 @@ +package chacha; +public class Ui { + +} diff --git a/src/main/java/Deadline.java b/src/main/java/chacha/tasks/Deadline.java similarity index 79% rename from src/main/java/Deadline.java rename to src/main/java/chacha/tasks/Deadline.java index be9f527c38..44f74a5a3b 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/chacha/tasks/Deadline.java @@ -1,3 +1,4 @@ +package chacha.tasks; import java.text.DateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -5,13 +6,13 @@ public class Deadline extends Task { private String description; - private LocalDate date; + private String date; private boolean isDone; private String type; public Deadline(String description, String date) { this.description = description; - this.date = LocalDate.parse(date); + this.date = date; this.type = "D"; } @@ -36,13 +37,12 @@ public String getType() { } public String getDate() { - String formattedDate = date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - return formattedDate; + return date; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + getDate() + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + date + ")"; } } diff --git a/src/main/java/Event.java b/src/main/java/chacha/tasks/Event.java similarity index 79% rename from src/main/java/Event.java rename to src/main/java/chacha/tasks/Event.java index d28824ce08..d4c1e857a8 100644 --- a/src/main/java/Event.java +++ b/src/main/java/chacha/tasks/Event.java @@ -1,3 +1,4 @@ +package chacha.tasks; import java.text.DateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -5,13 +6,13 @@ public class Event extends Task { private String description; - private LocalDate range; + private String range; private boolean isDone; private String type; public Event(String description, String range) { this.description = description; - this.range = LocalDate.parse(range); + this.range = range; this.type = "E"; } @@ -36,13 +37,12 @@ public String getType() { } public String getDate() { - String formattedDate = range.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - return formattedDate; + return range; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + getDate() + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + range + ")"; } } diff --git a/src/main/java/Task.java b/src/main/java/chacha/tasks/Task.java similarity index 96% rename from src/main/java/Task.java rename to src/main/java/chacha/tasks/Task.java index 54ae9755ba..43fa2f24cd 100644 --- a/src/main/java/Task.java +++ b/src/main/java/chacha/tasks/Task.java @@ -1,3 +1,4 @@ +package chacha.tasks; public class Task { private String description; private boolean isDone; diff --git a/src/main/java/Todo.java b/src/main/java/chacha/tasks/Todo.java similarity index 97% rename from src/main/java/Todo.java rename to src/main/java/chacha/tasks/Todo.java index 68ffb8c36c..bae1d1a931 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/chacha/tasks/Todo.java @@ -1,3 +1,4 @@ +package chacha.tasks; public class Todo extends Task { private String description; private boolean isDone; From 917c4daffe9c1085a4a0fe8fc17d6d934b551a43 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 04:38:53 +0800 Subject: [PATCH 12/48] abstract read user input to ui class --- src/main/java/chacha/Chacha.java | 14 ++++++++------ src/main/java/chacha/Parser.java | 10 ++++++++++ src/main/java/chacha/Ui.java | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index 447cd6edec..9b1205c7cf 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -12,11 +12,14 @@ public class Chacha { public static void main(String[] args) { - System.out.println("Hello! I'm Chacha\n" + "What can I do for you?"); - Scanner input = new Scanner(System.in); - String s = input.nextLine(); + Ui ui = new Ui(); + System.out.println(ui.printWelcome()); + String s = ui.readInput(); ArrayList taskList = new ArrayList(); while (!s.equals("bye")) { + //parse + //run command + //print ui if (s.equals("list")) { for (int i = 0; i < taskList.size();i++) { Task t = taskList.get(i); @@ -92,11 +95,10 @@ public static void main(String[] args) { } } else { System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-("); - } - s = input.nextLine(); + } + s = ui.readInput(); } System.out.println("Bye. Hope to see you again soon!"); - input.close(); } private static void loadData(String filePath) throws FileNotFoundException { diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index 984240d64c..6d410be94e 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -1,4 +1,14 @@ package chacha; public class Parser { + public String parse(String userInput) { + String[] inputArray = userInput.split(" "); + String command = inputArray[0]; + switch (command) { + case "todo": + if (inputArray.length == 1) { + return ""; + } + } return ""; + } } diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 155e541382..bbdd27b424 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -1,4 +1,18 @@ package chacha; +import java.util.Scanner; + public class Ui { - + +public String readInput() { + Scanner input = new Scanner(System.in); + String s = input.nextLine(); + if (s == "bye") { + input.close(); + } + return s; +} + + public String printWelcome() { + return "Welcome! I'm Chacha.\n" + "How may I assist you?"; + } } From dafa0e1bfafca0de43525739122147c186002ed7 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 04:56:10 +0800 Subject: [PATCH 13/48] add list command --- src/main/java/chacha/Chacha.java | 12 +++++------- src/main/java/chacha/Ui.java | 12 ++++++++++++ src/main/java/chacha/commands/Command.java | 14 ++++++++++++++ src/main/java/chacha/commands/ListCommand.java | 17 +++++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 src/main/java/chacha/commands/Command.java create mode 100644 src/main/java/chacha/commands/ListCommand.java diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index 9b1205c7cf..c5df5ad655 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -1,6 +1,8 @@ package chacha; import java.util.Scanner; +import chacha.commands.Command; +import chacha.commands.ListCommand; import chacha.tasks.Deadline; import chacha.tasks.Event; import chacha.tasks.Task; @@ -21,13 +23,9 @@ public static void main(String[] args) { //run command //print ui if (s.equals("list")) { - for (int i = 0; i < taskList.size();i++) { - Task t = taskList.get(i); - System.out.println(i + 1 + - "." + - t.toString()); - } - + //run command + Command command = new ListCommand(); + command.execute(taskList, ui); } else if (s.contains("unmark")) { String[] split = s.split("\\s+"); diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index bbdd27b424..9f593de504 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -1,6 +1,9 @@ package chacha; +import java.util.ArrayList; import java.util.Scanner; +import chacha.tasks.Task; + public class Ui { public String readInput() { @@ -15,4 +18,13 @@ public String readInput() { public String printWelcome() { return "Welcome! I'm Chacha.\n" + "How may I assist you?"; } + + public void printList(ArrayList taskList) { + for (int i = 0; i < taskList.size();i++) { + Task t = taskList.get(i); + System.out.println(i + 1 + + "." + + t.toString()); + } + } } diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java new file mode 100644 index 0000000000..c2855e8bac --- /dev/null +++ b/src/main/java/chacha/commands/Command.java @@ -0,0 +1,14 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public abstract class Command { + + public abstract void execute(ArrayList tasks, Ui ui); + +} diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java new file mode 100644 index 0000000000..7acd53f3a6 --- /dev/null +++ b/src/main/java/chacha/commands/ListCommand.java @@ -0,0 +1,17 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class ListCommand extends Command { + + @Override + public void execute(ArrayList tasks, Ui ui) { + ui.printList(tasks); + } + +} From ab17e07249cae233019d3d147fb0989a5b7745f0 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 05:12:11 +0800 Subject: [PATCH 14/48] add unmark command --- src/main/java/chacha/Chacha.java | 10 ++++---- src/main/java/chacha/commands/Command.java | 2 +- .../java/chacha/commands/ListCommand.java | 4 ++-- .../java/chacha/commands/UnmarkCommand.java | 24 +++++++++++++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 src/main/java/chacha/commands/UnmarkCommand.java diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index c5df5ad655..aaede45723 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -3,6 +3,7 @@ import chacha.commands.Command; import chacha.commands.ListCommand; +import chacha.commands.UnmarkCommand; import chacha.tasks.Deadline; import chacha.tasks.Event; import chacha.tasks.Task; @@ -23,15 +24,14 @@ public static void main(String[] args) { //run command //print ui if (s.equals("list")) { - //run command Command command = new ListCommand(); command.execute(taskList, ui); } else if (s.contains("unmark")) { - String[] split = s.split("\\s+"); - Task task = taskList.get(Integer.valueOf(split[1]) - 1); - task.unmarkAsDone(); - System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); + + Command command = new UnmarkCommand(Integer.valueOf(split[1]) - 1); + command.execute(taskList, ui); + } else if (s.contains("mark")) { String[] split = s.split("\\s+"); diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index c2855e8bac..ff0ed4f702 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -9,6 +9,6 @@ public abstract class Command { - public abstract void execute(ArrayList tasks, Ui ui); + public abstract void execute(ArrayList taskList, Ui ui); } diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 7acd53f3a6..51a16fae8e 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -10,8 +10,8 @@ public class ListCommand extends Command { @Override - public void execute(ArrayList tasks, Ui ui) { - ui.printList(tasks); + public void execute(ArrayList taskList, Ui ui) { + ui.printList(taskList); } } diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java new file mode 100644 index 0000000000..ecf69d396a --- /dev/null +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -0,0 +1,24 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class UnmarkCommand extends Command { + private int taskNumber; + + public UnmarkCommand(int taskNumber) { + this.taskNumber = taskNumber; + } + + @Override + public void execute(ArrayList taskList, Ui ui) { + Task task = taskList.get(taskNumber); + task.unmarkAsDone(); + System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); + } + +} \ No newline at end of file From ee3871eb4803db93b04e1b7f856594259622c5b3 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 05:34:20 +0800 Subject: [PATCH 15/48] add all commands --- src/main/java/chacha/Chacha.java | 45 ++++++++----------- src/main/java/chacha/commands/AddCommand.java | 25 +++++++++++ .../java/chacha/commands/DeleteCommand.java | 26 +++++++++++ .../java/chacha/commands/MarkCommand.java | 24 ++++++++++ .../java/chacha/commands/UnmarkCommand.java | 8 ++-- 5 files changed, 98 insertions(+), 30 deletions(-) create mode 100644 src/main/java/chacha/commands/AddCommand.java create mode 100644 src/main/java/chacha/commands/DeleteCommand.java create mode 100644 src/main/java/chacha/commands/MarkCommand.java diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index aaede45723..a3c1e77c15 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -1,8 +1,11 @@ package chacha; import java.util.Scanner; +import chacha.commands.AddCommand; import chacha.commands.Command; +import chacha.commands.DeleteCommand; import chacha.commands.ListCommand; +import chacha.commands.MarkCommand; import chacha.commands.UnmarkCommand; import chacha.tasks.Deadline; import chacha.tasks.Event; @@ -28,37 +31,31 @@ public static void main(String[] args) { command.execute(taskList, ui); } else if (s.contains("unmark")) { String[] split = s.split("\\s+"); - - Command command = new UnmarkCommand(Integer.valueOf(split[1]) - 1); + int taskIndex = Integer.valueOf(split[1]) - 1; + Command command = new UnmarkCommand(taskIndex); command.execute(taskList, ui); - - } else if (s.contains("mark")) { String[] split = s.split("\\s+"); - Task task = taskList.get(Integer.valueOf(split[1]) - 1); - task.markAsDone(); - System.out.println("Nice! I've marked this task as done:\n" + task.toString()); - + int taskIndex = Integer.valueOf(split[1]) - 1; + Command command = new MarkCommand(taskIndex); + command.execute(taskList, ui); } else if (s.contains("delete")) { String[] split = s.split("\\s+"); - Task task = taskList.get(Integer.valueOf(split[1]) - 1); - System.out.println("Noted. I've removed this task:"); - System.out.println(task.toString()); - taskList.remove(Integer.valueOf(split[1]) - 1); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); - + int taskIndex = Integer.valueOf(split[1]) - 1; + Command command = new DeleteCommand(taskIndex); + command.execute(taskList, ui); } else if (s.contains("deadline")) { try { + String date = s.substring(s.indexOf("/by ") + 4); date.trim(); String description = s.substring(0,s.indexOf("/")); description = description.substring(s.indexOf("deadline ") + 9); description.trim(); Deadline deadline = new Deadline(description, date); - taskList.add(deadline); - System.out.println("Got it. I've added this task:"); - System.out.println(deadline.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + Command command = new AddCommand(deadline); + command.execute(taskList, ui); + } catch(Exception e) { System.out.println("OOPS!!! The description of a deadline cannot be empty."); } @@ -68,10 +65,8 @@ public static void main(String[] args) { System.out.println("heree"); description.trim(); Todo todo = new Todo(description); - taskList.add(todo); - System.out.println("Got it. I've added this task:"); - System.out.println(todo.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + Command command = new AddCommand(todo); + command.execute(taskList, ui); } catch(Exception e) { System.out.println("OOPS!!! The description of a todo cannot be empty."); } @@ -84,10 +79,8 @@ public static void main(String[] args) { description = description.substring(s.indexOf("event ") + 6); description.trim(); Event event = new Event(description, range); - taskList.add(event); - System.out.println("Got it. I've added this task:"); - System.out.println(event.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + Command command = new AddCommand(event); + command.execute(taskList, ui); } catch(Exception e) { System.out.println("OOPS!!! The description of a event cannot be empty."); } diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java new file mode 100644 index 0000000000..39f4ce3260 --- /dev/null +++ b/src/main/java/chacha/commands/AddCommand.java @@ -0,0 +1,25 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class AddCommand extends Command { + private Task task; + + public AddCommand(Task task) { + this.task = task; + } + + @Override + public void execute(ArrayList taskList, Ui ui) { + taskList.add(task); + System.out.println("Got it. I've added this task:"); + System.out.println(task.toString()); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } + +} \ No newline at end of file diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java new file mode 100644 index 0000000000..7eee443077 --- /dev/null +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -0,0 +1,26 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class DeleteCommand extends Command { + private int taskIndex; + + public DeleteCommand(int taskIndex) { + this.taskIndex = taskIndex; + } + + @Override + public void execute(ArrayList taskList, Ui ui) { + Task task = taskList.get(taskIndex); + System.out.println("Noted. I've removed this task:"); + System.out.println(task.toString()); + taskList.remove(taskIndex); + System.out.println("Now you have " + taskList.size() + " tasks in the list."); + } + +} \ No newline at end of file diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java new file mode 100644 index 0000000000..725c8a1a14 --- /dev/null +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -0,0 +1,24 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class MarkCommand extends Command { + private int taskIndex; + + public MarkCommand(int taskIndex) { + this.taskIndex = taskIndex; + } + + @Override + public void execute(ArrayList taskList, Ui ui) { + Task task = taskList.get(taskIndex); + task.markAsDone(); + System.out.println("Nice! I've marked this task as done:\n" + task.toString()); + } + +} \ No newline at end of file diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index ecf69d396a..c5db42c52e 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -8,15 +8,15 @@ import chacha.tasks.Task; public class UnmarkCommand extends Command { - private int taskNumber; + private int taskIndex; - public UnmarkCommand(int taskNumber) { - this.taskNumber = taskNumber; + public UnmarkCommand(int taskIndex) { + this.taskIndex = taskIndex; } @Override public void execute(ArrayList taskList, Ui ui) { - Task task = taskList.get(taskNumber); + Task task = taskList.get(taskIndex); task.unmarkAsDone(); System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); } From 2b044979a524fa49a47890594e9d93d86e06be9b Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 06:46:54 +0800 Subject: [PATCH 16/48] add parser logic --- src/main/java/chacha/Chacha.java | 85 +++--------------- src/main/java/chacha/CustomException.java | 8 ++ src/main/java/chacha/Parser.java | 89 ++++++++++++++++++- src/main/java/chacha/Ui.java | 4 + src/main/java/chacha/commands/AddCommand.java | 5 ++ src/main/java/chacha/commands/Command.java | 2 + .../java/chacha/commands/DeleteCommand.java | 7 ++ .../java/chacha/commands/ExitCommand.java | 19 ++++ .../java/chacha/commands/ListCommand.java | 5 ++ .../java/chacha/commands/MarkCommand.java | 5 ++ .../java/chacha/commands/UnmarkCommand.java | 5 ++ 11 files changed, 157 insertions(+), 77 deletions(-) create mode 100644 src/main/java/chacha/CustomException.java create mode 100644 src/main/java/chacha/commands/ExitCommand.java diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index a3c1e77c15..fca205e5c8 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -1,16 +1,9 @@ package chacha; import java.util.Scanner; -import chacha.commands.AddCommand; + import chacha.commands.Command; -import chacha.commands.DeleteCommand; -import chacha.commands.ListCommand; -import chacha.commands.MarkCommand; -import chacha.commands.UnmarkCommand; -import chacha.tasks.Deadline; -import chacha.tasks.Event; import chacha.tasks.Task; -import chacha.tasks.Todo; import java.util.ArrayList; import java.io.File; @@ -18,76 +11,20 @@ public class Chacha { public static void main(String[] args) { + boolean isExit = false; Ui ui = new Ui(); System.out.println(ui.printWelcome()); - String s = ui.readInput(); + ArrayList taskList = new ArrayList(); - while (!s.equals("bye")) { - //parse - //run command - //print ui - if (s.equals("list")) { - Command command = new ListCommand(); - command.execute(taskList, ui); - } else if (s.contains("unmark")) { - String[] split = s.split("\\s+"); - int taskIndex = Integer.valueOf(split[1]) - 1; - Command command = new UnmarkCommand(taskIndex); - command.execute(taskList, ui); - } else if (s.contains("mark")) { - String[] split = s.split("\\s+"); - int taskIndex = Integer.valueOf(split[1]) - 1; - Command command = new MarkCommand(taskIndex); + while (!isExit) { + try { + String fullCommand = ui.readInput(); + Command command = Parser.parse(fullCommand); command.execute(taskList, ui); - } else if (s.contains("delete")) { - String[] split = s.split("\\s+"); - int taskIndex = Integer.valueOf(split[1]) - 1; - Command command = new DeleteCommand(taskIndex); - command.execute(taskList, ui); - } else if (s.contains("deadline")) { - try { - - String date = s.substring(s.indexOf("/by ") + 4); - date.trim(); - String description = s.substring(0,s.indexOf("/")); - description = description.substring(s.indexOf("deadline ") + 9); - description.trim(); - Deadline deadline = new Deadline(description, date); - Command command = new AddCommand(deadline); - command.execute(taskList, ui); - - } catch(Exception e) { - System.out.println("OOPS!!! The description of a deadline cannot be empty."); - } - } else if (s.contains("todo")) { - try { - String description = s.substring(s.indexOf("todo ") + 5); - System.out.println("heree"); - description.trim(); - Todo todo = new Todo(description); - Command command = new AddCommand(todo); - command.execute(taskList, ui); - } catch(Exception e) { - System.out.println("OOPS!!! The description of a todo cannot be empty."); - } - - } else if (s.contains("event")) { - try { - String range = s.substring(s.indexOf("/at ") + 4); - range.trim(); - String description = s.substring(0,s.indexOf("/")); - description = description.substring(s.indexOf("event ") + 6); - description.trim(); - Event event = new Event(description, range); - Command command = new AddCommand(event); - command.execute(taskList, ui); - } catch(Exception e) { - System.out.println("OOPS!!! The description of a event cannot be empty."); - } - } else { - System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-("); - } - s = ui.readInput(); + isExit = command.isExit(); + } catch (CustomException e) { + ui.printError(e.getMessage()); + } } System.out.println("Bye. Hope to see you again soon!"); } diff --git a/src/main/java/chacha/CustomException.java b/src/main/java/chacha/CustomException.java new file mode 100644 index 0000000000..ad57eee78f --- /dev/null +++ b/src/main/java/chacha/CustomException.java @@ -0,0 +1,8 @@ +package chacha; + +public class CustomException extends Exception { + + public CustomException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index 6d410be94e..e466b609d1 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -1,14 +1,97 @@ package chacha; + +import chacha.commands.AddCommand; +import chacha.commands.Command; +import chacha.commands.DeleteCommand; +import chacha.commands.ExitCommand; +import chacha.commands.ListCommand; +import chacha.commands.MarkCommand; +import chacha.commands.UnmarkCommand; +import chacha.tasks.Deadline; +import chacha.tasks.Event; +import chacha.tasks.Todo; +import chacha.CustomException; + public class Parser { - public String parse(String userInput) { + public static Command parse(String userInput) throws CustomException { String[] inputArray = userInput.split(" "); String command = inputArray[0]; switch (command) { case "todo": + try { + String description = userInput.substring(userInput.indexOf("todo ") + 5); + description.trim(); + Todo todo = new Todo(description); + return new AddCommand(todo); + } catch(Exception e) { + throw new CustomException("The description of a todo cannot be empty.\n" + "Please enter again with a description."); + } + case "deadline": + try { + String description = userInput.substring(0, userInput.indexOf("/")); + description = description.substring(userInput.indexOf("deadline ") + 9); + description.trim(); + String date = userInput.substring(userInput.indexOf("/by ") + 4); + date.trim(); + + Deadline deadline = new Deadline(description, date); + return new AddCommand(deadline); + + } catch(Exception e) { + throw new CustomException("The description of a deadline cannot be empty.\n" + "Please enter again with a description."); + } + case "event": + try { + String description = userInput.substring(0, userInput.indexOf("/")); + description = description.substring(userInput.indexOf("event ") + 6); + description.trim(); + String range = userInput.substring(userInput.indexOf("/at ") + 4); + range.trim(); + Event event = new Event(description, range); + return new AddCommand(event); + } catch(Exception e) { + throw new CustomException("The description of an event cannot be empty.\n" + "Please enter again with a description."); + } + case "list": + if (inputArray.length == 1) { + return new ListCommand(); + } else { + throw new CustomException("Sorry, I don't recognise this command."); + } + case "mark": + if (inputArray.length == 2) { + String[] split = userInput.split("\\s+"); + int taskIndex = Integer.valueOf(split[1]) - 1; + return new MarkCommand(taskIndex); + } else { + throw new CustomException("Please enter valid task number to mark."); + } + case "unmark": + if (inputArray.length == 2) { + String[] split = userInput.split("\\s+"); + int taskIndex = Integer.valueOf(split[1]) - 1; + return new UnmarkCommand(taskIndex); + } else { + throw new CustomException("Please enter valid task number to unmark."); + } + case "delete": + if (inputArray.length == 2) { + String[] split = userInput.split("\\s+"); + int taskIndex = Integer.valueOf(split[1]) - 1; + return new DeleteCommand(taskIndex); + } else { + throw new CustomException("Please enter valid task number to delete."); + } + case "bye": if (inputArray.length == 1) { - return ""; + return new ExitCommand(); + } else { + throw new CustomException("Sorry, I don't recognise this command."); } - } return ""; + + } + Command commands = new ListCommand(); + return commands; } } diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 9f593de504..9298c58205 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -27,4 +27,8 @@ public void printList(ArrayList taskList) { t.toString()); } } + + public void printError(String message) { + System.out.println("The following error has occurred.\n" + message); + } } diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java index 39f4ce3260..2472c1376b 100644 --- a/src/main/java/chacha/commands/AddCommand.java +++ b/src/main/java/chacha/commands/AddCommand.java @@ -22,4 +22,9 @@ public void execute(ArrayList taskList, Ui ui) { System.out.println("Now you have " + taskList.size() + " tasks in the list."); } + @Override + public boolean isExit() { + return false; + } + } \ No newline at end of file diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index ff0ed4f702..3ffc904561 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -10,5 +10,7 @@ public abstract class Command { public abstract void execute(ArrayList taskList, Ui ui); + + public abstract boolean isExit(); } diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index 7eee443077..1070141dfd 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -14,6 +14,8 @@ public DeleteCommand(int taskIndex) { this.taskIndex = taskIndex; } + + @Override public void execute(ArrayList taskList, Ui ui) { Task task = taskList.get(taskIndex); @@ -23,4 +25,9 @@ public void execute(ArrayList taskList, Ui ui) { System.out.println("Now you have " + taskList.size() + " tasks in the list."); } + @Override + public boolean isExit() { + return false; + } + } \ No newline at end of file diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java new file mode 100644 index 0000000000..301763fff0 --- /dev/null +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -0,0 +1,19 @@ +package chacha.commands; + +import java.util.ArrayList; + +import chacha.TaskList; +import chacha.Ui; +import chacha.tasks.Task; + +public class ExitCommand extends Command { + + @Override + public void execute(ArrayList taskList, Ui ui) {} + + @Override + public boolean isExit() { + return true; + } + +} diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 51a16fae8e..1df7b34d82 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -14,4 +14,9 @@ public void execute(ArrayList taskList, Ui ui) { ui.printList(taskList); } + @Override + public boolean isExit() { + return false; + } + } diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index 725c8a1a14..1e661200c1 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -21,4 +21,9 @@ public void execute(ArrayList taskList, Ui ui) { System.out.println("Nice! I've marked this task as done:\n" + task.toString()); } + @Override + public boolean isExit() { + return false; + } + } \ No newline at end of file diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index c5db42c52e..f6cec83221 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -21,4 +21,9 @@ public void execute(ArrayList taskList, Ui ui) { System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); } + @Override + public boolean isExit() { + return false; + } + } \ No newline at end of file From c453a9a57c45a82ebb6581e8c881502766e62e78 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 06:55:34 +0800 Subject: [PATCH 17/48] fix parser logic --- src/main/java/chacha/Chacha.java | 2 +- src/main/java/chacha/ChachaException.java | 8 +++++++ src/main/java/chacha/CustomException.java | 8 ------- src/main/java/chacha/Parser.java | 26 +++++++++++------------ src/main/java/chacha/Ui.java | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/main/java/chacha/ChachaException.java delete mode 100644 src/main/java/chacha/CustomException.java diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index fca205e5c8..e40e353e1c 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -22,7 +22,7 @@ public static void main(String[] args) { Command command = Parser.parse(fullCommand); command.execute(taskList, ui); isExit = command.isExit(); - } catch (CustomException e) { + } catch (ChachaException e) { ui.printError(e.getMessage()); } } diff --git a/src/main/java/chacha/ChachaException.java b/src/main/java/chacha/ChachaException.java new file mode 100644 index 0000000000..8e09c05bae --- /dev/null +++ b/src/main/java/chacha/ChachaException.java @@ -0,0 +1,8 @@ +package chacha; + +public class ChachaException extends Exception { + + public ChachaException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/chacha/CustomException.java b/src/main/java/chacha/CustomException.java deleted file mode 100644 index ad57eee78f..0000000000 --- a/src/main/java/chacha/CustomException.java +++ /dev/null @@ -1,8 +0,0 @@ -package chacha; - -public class CustomException extends Exception { - - public CustomException(String message) { - super(message); - } -} \ No newline at end of file diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index e466b609d1..cf2e2137cf 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -10,10 +10,9 @@ import chacha.tasks.Deadline; import chacha.tasks.Event; import chacha.tasks.Todo; -import chacha.CustomException; public class Parser { - public static Command parse(String userInput) throws CustomException { + public static Command parse(String userInput) throws ChachaException { String[] inputArray = userInput.split(" "); String command = inputArray[0]; switch (command) { @@ -24,7 +23,7 @@ public static Command parse(String userInput) throws CustomException { Todo todo = new Todo(description); return new AddCommand(todo); } catch(Exception e) { - throw new CustomException("The description of a todo cannot be empty.\n" + "Please enter again with a description."); + throw new ChachaException("The description of a todo cannot be empty.\n" + "Please enter again with a description."); } case "deadline": try { @@ -38,7 +37,7 @@ public static Command parse(String userInput) throws CustomException { return new AddCommand(deadline); } catch(Exception e) { - throw new CustomException("The description of a deadline cannot be empty.\n" + "Please enter again with a description."); + throw new ChachaException("The description of a deadline cannot be empty.\n" + "Please enter again with a description."); } case "event": try { @@ -50,13 +49,13 @@ public static Command parse(String userInput) throws CustomException { Event event = new Event(description, range); return new AddCommand(event); } catch(Exception e) { - throw new CustomException("The description of an event cannot be empty.\n" + "Please enter again with a description."); + throw new ChachaException("The description of an event cannot be empty.\n" + "Please enter again with a description."); } case "list": if (inputArray.length == 1) { return new ListCommand(); } else { - throw new CustomException("Sorry, I don't recognise this command."); + throw new ChachaException("Sorry, I don't recognise this command."); } case "mark": if (inputArray.length == 2) { @@ -64,7 +63,7 @@ public static Command parse(String userInput) throws CustomException { int taskIndex = Integer.valueOf(split[1]) - 1; return new MarkCommand(taskIndex); } else { - throw new CustomException("Please enter valid task number to mark."); + throw new ChachaException("Please enter valid task number to mark."); } case "unmark": if (inputArray.length == 2) { @@ -72,7 +71,7 @@ public static Command parse(String userInput) throws CustomException { int taskIndex = Integer.valueOf(split[1]) - 1; return new UnmarkCommand(taskIndex); } else { - throw new CustomException("Please enter valid task number to unmark."); + throw new ChachaException("Please enter valid task number to unmark."); } case "delete": if (inputArray.length == 2) { @@ -80,18 +79,19 @@ public static Command parse(String userInput) throws CustomException { int taskIndex = Integer.valueOf(split[1]) - 1; return new DeleteCommand(taskIndex); } else { - throw new CustomException("Please enter valid task number to delete."); + throw new ChachaException("Please enter valid task number to delete."); } - case "bye": + case "exit": if (inputArray.length == 1) { return new ExitCommand(); } else { - throw new CustomException("Sorry, I don't recognise this command."); + throw new ChachaException("Sorry, I don't recognise this command."); } + default: + throw new ChachaException("Invalid input."); } - Command commands = new ListCommand(); - return commands; + } } diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 9298c58205..5c04f686b7 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -29,6 +29,6 @@ public void printList(ArrayList taskList) { } public void printError(String message) { - System.out.println("The following error has occurred.\n" + message); + System.out.println("Chacha error: " + message); } } From 0770b6e0acc9272036ba51a85594a4d0d39f15ed Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 07:32:47 +0800 Subject: [PATCH 18/48] add TaskList class --- src/main/java/chacha/Chacha.java | 2 +- src/main/java/chacha/TaskList.java | 39 +++++++++++++++++++ src/main/java/chacha/Ui.java | 16 +++----- src/main/java/chacha/commands/AddCommand.java | 4 +- src/main/java/chacha/commands/Command.java | 2 +- .../java/chacha/commands/DeleteCommand.java | 5 ++- .../java/chacha/commands/ExitCommand.java | 2 +- .../java/chacha/commands/ListCommand.java | 2 +- .../java/chacha/commands/MarkCommand.java | 2 +- .../java/chacha/commands/UnmarkCommand.java | 2 +- 10 files changed, 56 insertions(+), 20 deletions(-) diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index e40e353e1c..d79fa84120 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -15,7 +15,7 @@ public static void main(String[] args) { Ui ui = new Ui(); System.out.println(ui.printWelcome()); - ArrayList taskList = new ArrayList(); + TaskList taskList = new TaskList(); while (!isExit) { try { String fullCommand = ui.readInput(); diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index 4e8f48f353..cc40e9b506 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -1,4 +1,43 @@ package chacha; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import chacha.tasks.Task; + public class TaskList { + private List tasks; + private HashMap> descriptionToTaskMap; + + + public TaskList() { + this.tasks = new ArrayList<>(); + } + + + public TaskList(ArrayList inputTasks) { + this.tasks = new ArrayList<>(); + for(Task task : inputTasks) { + tasks.add(task); + } + } + + public int getSize() { + return tasks.size(); + } + + public Task get(int taskIndex) { + return tasks.get(taskIndex); + } + + public void add(Task task) { + tasks.add(task); + } + + public void remove(int taskIndex) { + tasks.remove(taskIndex); + } + + } diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 5c04f686b7..fddf71ccf3 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -1,26 +1,22 @@ package chacha; -import java.util.ArrayList; import java.util.Scanner; import chacha.tasks.Task; public class Ui { -public String readInput() { - Scanner input = new Scanner(System.in); - String s = input.nextLine(); - if (s == "bye") { - input.close(); + public String readInput() { + Scanner input = new Scanner(System.in); + String s = input.nextLine(); + return s; } - return s; -} public String printWelcome() { return "Welcome! I'm Chacha.\n" + "How may I assist you?"; } - public void printList(ArrayList taskList) { - for (int i = 0; i < taskList.size();i++) { + public void printList(TaskList taskList) { + for (int i = 0; i < taskList.getSize();i++) { Task t = taskList.get(i); System.out.println(i + 1 + "." + diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java index 2472c1376b..619d02d95c 100644 --- a/src/main/java/chacha/commands/AddCommand.java +++ b/src/main/java/chacha/commands/AddCommand.java @@ -15,11 +15,11 @@ public AddCommand(Task task) { } @Override - public void execute(ArrayList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui) { taskList.add(task); System.out.println("Got it. I've added this task:"); System.out.println(task.toString()); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); } @Override diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index 3ffc904561..68b817084b 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -9,7 +9,7 @@ public abstract class Command { - public abstract void execute(ArrayList taskList, Ui ui); + public abstract void execute(TaskList taskList, Ui ui); public abstract boolean isExit(); diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index 1070141dfd..55ed425bb1 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import chacha.ChachaException; import chacha.Storage; import chacha.TaskList; import chacha.Ui; @@ -17,12 +18,12 @@ public DeleteCommand(int taskIndex) { @Override - public void execute(ArrayList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui) { Task task = taskList.get(taskIndex); System.out.println("Noted. I've removed this task:"); System.out.println(task.toString()); taskList.remove(taskIndex); - System.out.println("Now you have " + taskList.size() + " tasks in the list."); + System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); } @Override diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java index 301763fff0..0038d4bf26 100644 --- a/src/main/java/chacha/commands/ExitCommand.java +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -9,7 +9,7 @@ public class ExitCommand extends Command { @Override - public void execute(ArrayList taskList, Ui ui) {} + public void execute(TaskList taskList, Ui ui) {} @Override public boolean isExit() { diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 1df7b34d82..fcc438b9d0 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -10,7 +10,7 @@ public class ListCommand extends Command { @Override - public void execute(ArrayList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui) { ui.printList(taskList); } diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index 1e661200c1..fee189fe7d 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -15,7 +15,7 @@ public MarkCommand(int taskIndex) { } @Override - public void execute(ArrayList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui) { Task task = taskList.get(taskIndex); task.markAsDone(); System.out.println("Nice! I've marked this task as done:\n" + task.toString()); diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index f6cec83221..ce50558f3d 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -15,7 +15,7 @@ public UnmarkCommand(int taskIndex) { } @Override - public void execute(ArrayList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui) { Task task = taskList.get(taskIndex); task.unmarkAsDone(); System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); From 8e27eb5f438c0f2c5e5c2002785e57c9d1b8e89e Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 07:46:41 +0800 Subject: [PATCH 19/48] add ui logic --- src/main/java/chacha/Ui.java | 21 +++++++++++++++++++ src/main/java/chacha/commands/AddCommand.java | 6 +----- src/main/java/chacha/commands/Command.java | 2 -- .../java/chacha/commands/DeleteCommand.java | 9 ++------ .../java/chacha/commands/ExitCommand.java | 2 +- .../java/chacha/commands/ListCommand.java | 4 ++-- .../java/chacha/commands/MarkCommand.java | 7 +++---- .../java/chacha/commands/UnmarkCommand.java | 4 +--- 8 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index fddf71ccf3..7a5192e0c5 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -24,7 +24,28 @@ public void printList(TaskList taskList) { } } + public void printAdd(Task task, TaskList taskList) { + System.out.println("Got it. I've added this task:"); + System.out.println(task.toString()); + System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); + } + + public void printDelete(Task task, int size) { + System.out.println("Noted. I've removed this task:"); + System.out.println(task.toString()); + System.out.println("Now you have " + size + " tasks in the list."); + } + + public void printMark(Task task) { + System.out.println("Nice! I've marked this task as done:\n" + task.toString()); + } + + public void printUnmark(Task task) { + System.out.println("Nice! I've marked this task as not done yet:\n" + task.toString()); + } + public void printError(String message) { System.out.println("Chacha error: " + message); } + } diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java index 619d02d95c..9deab40960 100644 --- a/src/main/java/chacha/commands/AddCommand.java +++ b/src/main/java/chacha/commands/AddCommand.java @@ -1,7 +1,5 @@ package chacha.commands; -import java.util.ArrayList; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; @@ -17,9 +15,7 @@ public AddCommand(Task task) { @Override public void execute(TaskList taskList, Ui ui) { taskList.add(task); - System.out.println("Got it. I've added this task:"); - System.out.println(task.toString()); - System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); + ui.printAdd(task, taskList); } @Override diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index 68b817084b..4bba7898ca 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -1,11 +1,9 @@ package chacha.commands; -import java.util.ArrayList; import chacha.Storage; import chacha.TaskList; import chacha.Ui; -import chacha.tasks.Task; public abstract class Command { diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index 55ed425bb1..fe0992613c 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -1,8 +1,6 @@ package chacha.commands; -import java.util.ArrayList; -import chacha.ChachaException; import chacha.Storage; import chacha.TaskList; import chacha.Ui; @@ -15,15 +13,12 @@ public DeleteCommand(int taskIndex) { this.taskIndex = taskIndex; } - - @Override public void execute(TaskList taskList, Ui ui) { Task task = taskList.get(taskIndex); - System.out.println("Noted. I've removed this task:"); - System.out.println(task.toString()); taskList.remove(taskIndex); - System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); + int size = taskList.getSize(); + ui.printDelete(task, size); } @Override diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java index 0038d4bf26..a1c478c453 100644 --- a/src/main/java/chacha/commands/ExitCommand.java +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -1,6 +1,6 @@ package chacha.commands; -import java.util.ArrayList; + import chacha.TaskList; import chacha.Ui; diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index fcc438b9d0..9199dd1094 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -1,11 +1,11 @@ package chacha.commands; -import java.util.ArrayList; + import chacha.Storage; import chacha.TaskList; import chacha.Ui; -import chacha.tasks.Task; + public class ListCommand extends Command { diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index fee189fe7d..0777ef9fea 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -1,6 +1,5 @@ package chacha.commands; -import java.util.ArrayList; import chacha.Storage; import chacha.TaskList; @@ -16,9 +15,9 @@ public MarkCommand(int taskIndex) { @Override public void execute(TaskList taskList, Ui ui) { - Task task = taskList.get(taskIndex); - task.markAsDone(); - System.out.println("Nice! I've marked this task as done:\n" + task.toString()); + Task task = taskList.get(taskIndex); + task.markAsDone(); + ui.printMark(task); } @Override diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index ce50558f3d..fc830bec0c 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -1,7 +1,5 @@ package chacha.commands; -import java.util.ArrayList; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; @@ -18,7 +16,7 @@ public UnmarkCommand(int taskIndex) { public void execute(TaskList taskList, Ui ui) { Task task = taskList.get(taskIndex); task.unmarkAsDone(); - System.out.println("OK, I've marked this task as not done yet:\n" + task.toString()); + ui.printUnmark(task); } @Override From d93075865a8fe6b820aea866e468315b4710a490 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 09:42:18 +0800 Subject: [PATCH 20/48] fix storage logic --- .gitignore | 2 + src/main/java/chacha/Chacha.java | 42 ++++++---- src/main/java/chacha/Storage.java | 83 ++++++++++++++++++- src/main/java/chacha/commands/AddCommand.java | 2 +- src/main/java/chacha/commands/Command.java | 2 +- .../java/chacha/commands/DeleteCommand.java | 2 +- .../java/chacha/commands/ExitCommand.java | 5 +- .../java/chacha/commands/ListCommand.java | 2 +- .../java/chacha/commands/MarkCommand.java | 2 +- .../java/chacha/commands/UnmarkCommand.java | 2 +- src/main/java/chacha/tasks/Deadline.java | 2 +- src/main/java/chacha/tasks/Event.java | 10 +-- src/main/java/chacha/tasks/Task.java | 12 +++ 13 files changed, 138 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index f69985ef1f..1443929432 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ bin/ /text-ui-test/ACTUAL.txt text-ui-test/EXPECTED-UNIX.TXT + +data/tasks.txt diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index d79fa84120..e8f6577ae2 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -8,33 +8,47 @@ import java.util.ArrayList; import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; public class Chacha { + + private Storage storage; + private TaskList taskList; + private Ui ui; + + public Chacha(String filePath) { + + ui = new Ui(); + storage = new Storage("data/tasks.txt"); + try { + taskList = new TaskList(storage.load()); + } catch (IOException e) { + ui.printError("making new file"); + taskList = new TaskList(); + } + } public static void main(String[] args) { - boolean isExit = false; - Ui ui = new Ui(); + new Chacha("data/tasks.txt").run(); + } + + public void run() { System.out.println(ui.printWelcome()); - - TaskList taskList = new TaskList(); + boolean isExit = false; while (!isExit) { try { String fullCommand = ui.readInput(); Command command = Parser.parse(fullCommand); - command.execute(taskList, ui); + command.execute(taskList, ui, storage); isExit = command.isExit(); } catch (ChachaException e) { ui.printError(e.getMessage()); } } - System.out.println("Bye. Hope to see you again soon!"); - } - - private static void loadData(String filePath) throws FileNotFoundException { - File f = new File(filePath); // create a File for the given file path - Scanner s = new Scanner(f); // create a Scanner using the File as the source - while (s.hasNext()) { - //load task objects into array - System.out.println(s.nextLine()); + try { + storage.saveToFile(taskList); + } catch (IOException e) { + System.out.println("Unable to save file"); } + System.out.println("Bye. Hope to see you again soon!"); } } diff --git a/src/main/java/chacha/Storage.java b/src/main/java/chacha/Storage.java index 7c0dcb2ee3..76871e9386 100644 --- a/src/main/java/chacha/Storage.java +++ b/src/main/java/chacha/Storage.java @@ -1,4 +1,83 @@ package chacha; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.io.BufferedReader; +import chacha.tasks.Deadline; +import chacha.tasks.Event; +import chacha.tasks.Task; +import chacha.tasks.Todo; + public class Storage { - -} + private Path path; + + public Storage(String path) { + this.path = Paths.get(path); + } + + public void saveToFile(TaskList tasks) throws IOException { + BufferedWriter writer = Files.newBufferedWriter(path); + for (int i = 0; i < tasks.getSize(); i++) { + Task task = tasks.get(i); + writer.write(taskToText(task)); + writer.newLine(); + } + writer.close(); + } + + public ArrayList load() throws IOException { + Path parent = path.getParent(); + if (!Files.isDirectory(parent)) { + Files.createDirectories(parent); + } + if (!Files.isRegularFile(path)) { + Files.createFile(path); + } + + ArrayList tasks = new ArrayList<>(); + BufferedReader reader = Files.newBufferedReader(path); + String line = reader.readLine(); + while (line != null) { + tasks.add(textToTask(line)); + line = reader.readLine(); + } + reader.close(); + return tasks; + } + + private String taskToText(Task task) { + return task.getType() + " , " + task.getStatusIcon() + " , " + task.getDescription() + " , " + task.getDate(); + } + + private Task textToTask(String text) { + String[] textArray = text.split(" , "); + String type = textArray[0]; + String isDone = textArray[1]; + String description = textArray[2]; + String date = textArray[3]; + Task task = new Task(); + switch (type) { + case "T": + task = new Todo(description); + break; + case "D": + task = new Deadline(description, date); + break; + case "E": + task = new Event(description, date); + break; + default: + break; + } + if (isDone.contains("X")) { + System.out.println("marking as done"); + task.markAsDone(); + + } + return task; + } +} \ No newline at end of file diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java index 9deab40960..db00848bd8 100644 --- a/src/main/java/chacha/commands/AddCommand.java +++ b/src/main/java/chacha/commands/AddCommand.java @@ -13,7 +13,7 @@ public AddCommand(Task task) { } @Override - public void execute(TaskList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui, Storage storage) { taskList.add(task); ui.printAdd(task, taskList); } diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index 4bba7898ca..4d8d973ab5 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -7,7 +7,7 @@ public abstract class Command { - public abstract void execute(TaskList taskList, Ui ui); + public abstract void execute(TaskList taskList, Ui ui, Storage storage); public abstract boolean isExit(); diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index fe0992613c..56a9ffda0f 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -14,7 +14,7 @@ public DeleteCommand(int taskIndex) { } @Override - public void execute(TaskList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); taskList.remove(taskIndex); int size = taskList.getSize(); diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java index a1c478c453..d3a3411bc0 100644 --- a/src/main/java/chacha/commands/ExitCommand.java +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -2,14 +2,15 @@ +import chacha.Storage; import chacha.TaskList; import chacha.Ui; -import chacha.tasks.Task; + public class ExitCommand extends Command { @Override - public void execute(TaskList taskList, Ui ui) {} + public void execute(TaskList taskList, Ui ui, Storage storage) {} @Override public boolean isExit() { diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 9199dd1094..58a4cf8b85 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -10,7 +10,7 @@ public class ListCommand extends Command { @Override - public void execute(TaskList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printList(taskList); } diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index 0777ef9fea..e30c272766 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -14,7 +14,7 @@ public MarkCommand(int taskIndex) { } @Override - public void execute(TaskList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); task.markAsDone(); ui.printMark(task); diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index fc830bec0c..698d75b1ae 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -13,7 +13,7 @@ public UnmarkCommand(int taskIndex) { } @Override - public void execute(TaskList taskList, Ui ui) { + public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); task.unmarkAsDone(); ui.printUnmark(task); diff --git a/src/main/java/chacha/tasks/Deadline.java b/src/main/java/chacha/tasks/Deadline.java index 44f74a5a3b..cffa4f25f1 100644 --- a/src/main/java/chacha/tasks/Deadline.java +++ b/src/main/java/chacha/tasks/Deadline.java @@ -42,7 +42,7 @@ public String getDate() { @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(by: " + date + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (by: " + date + ")"; } } diff --git a/src/main/java/chacha/tasks/Event.java b/src/main/java/chacha/tasks/Event.java index d4c1e857a8..b47e00d97b 100644 --- a/src/main/java/chacha/tasks/Event.java +++ b/src/main/java/chacha/tasks/Event.java @@ -6,13 +6,13 @@ public class Event extends Task { private String description; - private String range; + private String date; private boolean isDone; private String type; - public Event(String description, String range) { + public Event(String description, String date) { this.description = description; - this.range = range; + this.date = date; this.type = "E"; } @@ -37,12 +37,12 @@ public String getType() { } public String getDate() { - return range; + return date; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + "(at: " + range + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (at: " + date + ")"; } } diff --git a/src/main/java/chacha/tasks/Task.java b/src/main/java/chacha/tasks/Task.java index 43fa2f24cd..449c27e12e 100644 --- a/src/main/java/chacha/tasks/Task.java +++ b/src/main/java/chacha/tasks/Task.java @@ -2,10 +2,14 @@ public class Task { private String description; private boolean isDone; + private String type; + private String date; public Task(String description) { this.description = description; this.isDone = false; + this.type = ""; + this.date = ""; } public Task() { @@ -26,5 +30,13 @@ public String getStatusIcon() { public String getDescription() { return description; } + + public String getType() { + return type; + } + + public String getDate() { + return date; + } } From ddbd5f6bfffff971ae35a378d63293dfad60c9f1 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 15:31:02 +0800 Subject: [PATCH 21/48] clean up packages add storage logic fix parser --- src/main/java/chacha/Chacha.java | 7 ------ src/main/java/chacha/Parser.java | 27 +++++++++++++++++------- src/main/java/chacha/Storage.java | 25 +++++++++++++++++++--- src/main/java/chacha/TaskList.java | 3 --- src/main/java/chacha/Ui.java | 3 +++ src/main/java/chacha/tasks/Deadline.java | 14 ++++++------ src/main/java/chacha/tasks/Event.java | 13 ++++++------ src/main/java/chacha/tasks/Task.java | 9 +++++--- 8 files changed, 63 insertions(+), 38 deletions(-) diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index e8f6577ae2..3fefbd77aa 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -1,13 +1,6 @@ package chacha; -import java.util.Scanner; - import chacha.commands.Command; -import chacha.tasks.Task; - -import java.util.ArrayList; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; public class Chacha { diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index cf2e2137cf..4e2dc054c7 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -1,5 +1,9 @@ package chacha; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + import chacha.commands.AddCommand; import chacha.commands.Command; import chacha.commands.DeleteCommand; @@ -27,27 +31,34 @@ public static Command parse(String userInput) throws ChachaException { } case "deadline": try { - String description = userInput.substring(0, userInput.indexOf("/")); + String description = userInput.substring(0, userInput.indexOf("/") - 1); description = description.substring(userInput.indexOf("deadline ") + 9); description.trim(); String date = userInput.substring(userInput.indexOf("/by ") + 4); date.trim(); - - Deadline deadline = new Deadline(description, date); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + LocalDateTime dateTime = LocalDateTime.parse(date, formatter); + Deadline deadline = new Deadline(description, dateTime); return new AddCommand(deadline); - + } catch(DateTimeParseException e) { + throw new ChachaException("Date should be in this format: yyyy-MM-dd HH:mm"); } catch(Exception e) { throw new ChachaException("The description of a deadline cannot be empty.\n" + "Please enter again with a description."); } case "event": try { - String description = userInput.substring(0, userInput.indexOf("/")); + String description = userInput.substring(0, userInput.indexOf("/") - 1); description = description.substring(userInput.indexOf("event ") + 6); + System.out.println(description + "here"); description.trim(); - String range = userInput.substring(userInput.indexOf("/at ") + 4); - range.trim(); - Event event = new Event(description, range); + String date = userInput.substring(userInput.indexOf("/at ") + 4); + date.trim(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + LocalDateTime dateTime = LocalDateTime.parse(date, formatter); + Event event = new Event(description, dateTime); return new AddCommand(event); + } catch(DateTimeParseException e) { + throw new ChachaException("Date should be in this format: yyyy-MM-dd HH:mm"); } catch(Exception e) { throw new ChachaException("The description of an event cannot be empty.\n" + "Please enter again with a description."); } diff --git a/src/main/java/chacha/Storage.java b/src/main/java/chacha/Storage.java index 76871e9386..adc9dc6869 100644 --- a/src/main/java/chacha/Storage.java +++ b/src/main/java/chacha/Storage.java @@ -5,6 +5,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.io.BufferedReader; import chacha.tasks.Deadline; @@ -50,7 +52,16 @@ public ArrayList load() throws IOException { } private String taskToText(Task task) { - return task.getType() + " , " + task.getStatusIcon() + " , " + task.getDescription() + " , " + task.getDate(); + DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME; + String date; + if (task.getDate() != null) { + date = task.getDate().format(formatter); + date = date.replace("T", " "); + date = date.substring(0, 16); + } else { + date = "no date"; + } + return task.getType() + " , " + task.getStatusIcon() + " , " + task.getDescription() + " , " + date; } private Task textToTask(String text) { @@ -59,16 +70,24 @@ private Task textToTask(String text) { String isDone = textArray[1]; String description = textArray[2]; String date = textArray[3]; + LocalDateTime dateTime = null; + System.out.println(date + "date"); + if (!date.contains("no date")) { + System.out.println("entered this if block"); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + dateTime = LocalDateTime.parse(date, formatter); + } Task task = new Task(); switch (type) { case "T": task = new Todo(description); break; case "D": - task = new Deadline(description, date); + task = new Deadline(description, dateTime); break; case "E": - task = new Event(description, date); + task = new Event(description, dateTime); break; default: break; diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index cc40e9b506..bf9a7cf852 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -1,6 +1,5 @@ package chacha; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import chacha.tasks.Task; @@ -8,8 +7,6 @@ public class TaskList { private List tasks; - private HashMap> descriptionToTaskMap; - public TaskList() { this.tasks = new ArrayList<>(); diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 7a5192e0c5..2bd1ebb679 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -8,6 +8,9 @@ public class Ui { public String readInput() { Scanner input = new Scanner(System.in); String s = input.nextLine(); + if (s == "exit") { + input.close(); + } return s; } diff --git a/src/main/java/chacha/tasks/Deadline.java b/src/main/java/chacha/tasks/Deadline.java index cffa4f25f1..97d9d5a447 100644 --- a/src/main/java/chacha/tasks/Deadline.java +++ b/src/main/java/chacha/tasks/Deadline.java @@ -1,16 +1,16 @@ package chacha.tasks; -import java.text.DateFormat; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; + public class Deadline extends Task { private String description; - private String date; + private LocalDateTime date; private boolean isDone; private String type; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); - public Deadline(String description, String date) { + public Deadline(String description, LocalDateTime date) { this.description = description; this.date = date; this.type = "D"; @@ -36,13 +36,13 @@ public String getType() { return type; } - public String getDate() { + public LocalDateTime getDate() { return date; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (by: " + date + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (by: " + date.format(formatter) + ")"; } } diff --git a/src/main/java/chacha/tasks/Event.java b/src/main/java/chacha/tasks/Event.java index b47e00d97b..7da851ee25 100644 --- a/src/main/java/chacha/tasks/Event.java +++ b/src/main/java/chacha/tasks/Event.java @@ -1,16 +1,15 @@ package chacha.tasks; -import java.text.DateFormat; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; public class Event extends Task { private String description; - private String date; + private LocalDateTime date; private boolean isDone; private String type; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); - public Event(String description, String date) { + public Event(String description, LocalDateTime date) { this.description = description; this.date = date; this.type = "E"; @@ -36,13 +35,13 @@ public String getType() { return type; } - public String getDate() { + public LocalDateTime getDate() { return date; } @Override public String toString() { - return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (at: " + date + ")"; + return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (at: " + date.format(formatter) + ")"; } } diff --git a/src/main/java/chacha/tasks/Task.java b/src/main/java/chacha/tasks/Task.java index 449c27e12e..08b90846be 100644 --- a/src/main/java/chacha/tasks/Task.java +++ b/src/main/java/chacha/tasks/Task.java @@ -1,15 +1,18 @@ package chacha.tasks; + +import java.time.LocalDateTime; + public class Task { private String description; private boolean isDone; private String type; - private String date; + private LocalDateTime date; public Task(String description) { this.description = description; this.isDone = false; this.type = ""; - this.date = ""; + this.date = null; } public Task() { @@ -35,7 +38,7 @@ public String getType() { return type; } - public String getDate() { + public LocalDateTime getDate() { return date; } From b055c54c4121992c45aaed6b652c78f31033c08c Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 17:27:34 +0800 Subject: [PATCH 22/48] add gradle support --- .gitignore | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1443929432..a1c9245d1c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,5 @@ bin/ /text-ui-test/ACTUAL.txt text-ui-test/EXPECTED-UNIX.TXT - +.vscode/ data/tasks.txt diff --git a/build.gradle b/build.gradle index 885198fcfa..34fa020265 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,11 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "chacha.Chacha" } shadowJar { - archiveBaseName = "duke" + archiveBaseName = "chacha" archiveClassifier = null } From c22525026d5023fc15e23563df8f3576c7b78e02 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Sun, 4 Sep 2022 18:30:41 +0800 Subject: [PATCH 23/48] add junit tests --- src/test/java/Chacha/TaskListTest.java | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/test/java/Chacha/TaskListTest.java diff --git a/src/test/java/Chacha/TaskListTest.java b/src/test/java/Chacha/TaskListTest.java new file mode 100644 index 0000000000..8da8354b48 --- /dev/null +++ b/src/test/java/Chacha/TaskListTest.java @@ -0,0 +1,29 @@ +package Chacha; + +import org.junit.jupiter.api.Test; + +import chacha.TaskList; +import chacha.tasks.Task; +import chacha.tasks.Todo; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskListTest { + @Test + public void addTaskTest() { + TaskList tasks = new TaskList(); + Task testTask = new Todo("testTask"); + tasks.add(testTask); + Task task = tasks.get(0); + assertEquals("testTask", task.getDescription()); + } + + @Test + public void getTaskTest() { + TaskList tasks = new TaskList(); + Task testTask = new Todo("testTask"); + tasks.add(testTask); + Task task = tasks.get(0); + assertEquals("testTask", task.getDescription()); + } +} From d2722ef3f32eaf746ca9a580aef5175079c984a2 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Thu, 8 Sep 2022 23:04:43 +0800 Subject: [PATCH 24/48] Add javadocs for TaskList --- src/main/java/chacha/TaskList.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index bf9a7cf852..eba1edfea2 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -20,18 +20,35 @@ public TaskList(ArrayList inputTasks) { } } + + /** + * @return int + */ public int getSize() { return tasks.size(); } + + /** + * @param taskIndex + * @return Task + */ public Task get(int taskIndex) { return tasks.get(taskIndex); } + + /** + * @param task + */ public void add(Task task) { tasks.add(task); } + + /** + * @param taskIndex + */ public void remove(int taskIndex) { tasks.remove(taskIndex); } From d88c342894912a1e2af17682a6c7f09787214d82 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 9 Sep 2022 02:21:37 +0800 Subject: [PATCH 25/48] Add javadocs to all classes --- src/main/java/chacha/Chacha.java | 20 +++++++ src/main/java/chacha/ChachaException.java | 9 +++- src/main/java/chacha/Parser.java | 11 ++++ src/main/java/chacha/Storage.java | 22 ++++++++ src/main/java/chacha/TaskList.java | 32 ++++++++--- src/main/java/chacha/Ui.java | 54 +++++++++++++++++-- src/main/java/chacha/commands/AddCommand.java | 22 +++++++- src/main/java/chacha/commands/Command.java | 16 +++++- .../java/chacha/commands/DeleteCommand.java | 20 ++++++- .../java/chacha/commands/ExitCommand.java | 16 ++++-- .../java/chacha/commands/ListCommand.java | 18 +++++-- .../java/chacha/commands/MarkCommand.java | 19 ++++++- .../java/chacha/commands/UnmarkCommand.java | 18 +++++++ src/main/java/chacha/tasks/Deadline.java | 52 +++++++++++++++--- src/main/java/chacha/tasks/Event.java | 41 ++++++++++++++ src/main/java/chacha/tasks/Task.java | 42 +++++++++++++-- src/main/java/chacha/tasks/Todo.java | 36 +++++++++++++ 17 files changed, 414 insertions(+), 34 deletions(-) diff --git a/src/main/java/chacha/Chacha.java b/src/main/java/chacha/Chacha.java index 3fefbd77aa..52ba496f5b 100644 --- a/src/main/java/chacha/Chacha.java +++ b/src/main/java/chacha/Chacha.java @@ -3,12 +3,23 @@ import chacha.commands.Command; import java.io.IOException; + +/** + * Chatbot for task tracking. + * + * @author Singh Abdullah Alexander + */ public class Chacha { private Storage storage; private TaskList taskList; private Ui ui; + /** + * Constructor for Chacha. + * + * @param filePath File path to save data to and load data from. + */ public Chacha(String filePath) { ui = new Ui(); @@ -20,10 +31,19 @@ public Chacha(String filePath) { taskList = new TaskList(); } } + + /** + * Main class to initialise Chacha. + * + * @param args Command line arguments. + */ public static void main(String[] args) { new Chacha("data/tasks.txt").run(); } + /** + * Runs an instantiated Chacha. + */ public void run() { System.out.println(ui.printWelcome()); boolean isExit = false; diff --git a/src/main/java/chacha/ChachaException.java b/src/main/java/chacha/ChachaException.java index 8e09c05bae..3a63aec159 100644 --- a/src/main/java/chacha/ChachaException.java +++ b/src/main/java/chacha/ChachaException.java @@ -1,7 +1,14 @@ package chacha; +/** + * Handles all Chacha exceptions. + */ public class ChachaException extends Exception { - + /** + * Constructor for ChachaException with custom message. + * + * @param message Custom error message to be printed. + */ public ChachaException(String message) { super(message); } diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index 4e2dc054c7..d99012ab61 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -15,7 +15,18 @@ import chacha.tasks.Event; import chacha.tasks.Todo; +/** + * Parser to parse user input into Chacha commands. + */ public class Parser { + + /** + * Parses user input into command. + * + * @param userInput User input from user interaction with Chacha. + * @return Chacha command. + * @throws ChachaException If user input cannot be parsed. + */ public static Command parse(String userInput) throws ChachaException { String[] inputArray = userInput.split(" "); String command = inputArray[0]; diff --git a/src/main/java/chacha/Storage.java b/src/main/java/chacha/Storage.java index adc9dc6869..3b760a3566 100644 --- a/src/main/java/chacha/Storage.java +++ b/src/main/java/chacha/Storage.java @@ -14,6 +14,9 @@ import chacha.tasks.Task; import chacha.tasks.Todo; +/** + * Storage class to handle saving and loading data. + */ public class Storage { private Path path; @@ -21,6 +24,13 @@ public Storage(String path) { this.path = Paths.get(path); } + + /** + * Saves task list of tasks to a file. + * + * @param tasks Tasks to save. + * @throws IOException If the file does not exist. + */ public void saveToFile(TaskList tasks) throws IOException { BufferedWriter writer = Files.newBufferedWriter(path); for (int i = 0; i < tasks.getSize(); i++) { @@ -31,6 +41,13 @@ public void saveToFile(TaskList tasks) throws IOException { writer.close(); } + /** + * Loads tasks from file into task list of tasks. + * Creates new file if path does not exist. + * + * @return List of tasks. + * @throws IOException If error when reading file. + */ public ArrayList load() throws IOException { Path parent = path.getParent(); if (!Files.isDirectory(parent)) { @@ -64,6 +81,11 @@ private String taskToText(Task task) { return task.getType() + " , " + task.getStatusIcon() + " , " + task.getDescription() + " , " + date; } + + /** + * @param text + * @return Task + */ private Task textToTask(String text) { String[] textArray = text.split(" , "); String type = textArray[0]; diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index eba1edfea2..29403a57a8 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -1,18 +1,28 @@ package chacha; + import java.util.ArrayList; import java.util.List; - import chacha.tasks.Task; +/** + * Task list containing tasks. + */ public class TaskList { private List tasks; + /** + * Constructor for new task list. + */ public TaskList() { this.tasks = new ArrayList<>(); } - + /** + * Constructor for task list with tasks. + * + * @param inputTasks List of tasks to input into task list. + */ public TaskList(ArrayList inputTasks) { this.tasks = new ArrayList<>(); for(Task task : inputTasks) { @@ -22,7 +32,9 @@ public TaskList(ArrayList inputTasks) { /** - * @return int + * Gets the length of task list. + * + * @return Length of task list. */ public int getSize() { return tasks.size(); @@ -30,8 +42,10 @@ public int getSize() { /** - * @param taskIndex - * @return Task + * Gets the task at a certain index. + * + * @param taskIndex Index of task in task list to get. + * @return Task at given index. */ public Task get(int taskIndex) { return tasks.get(taskIndex); @@ -39,7 +53,9 @@ public Task get(int taskIndex) { /** - * @param task + * Adds a task to task list. + * + * @param task To be added to task list. */ public void add(Task task) { tasks.add(task); @@ -47,7 +63,9 @@ public void add(Task task) { /** - * @param taskIndex + * Removes task at a certain index. + * + * @param taskIndex Task at a given index. */ public void remove(int taskIndex) { tasks.remove(taskIndex); diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 2bd1ebb679..ee456b0c8c 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -1,10 +1,18 @@ package chacha; -import java.util.Scanner; +import java.util.Scanner; import chacha.tasks.Task; +/** + * Handles all user interaction. + */ public class Ui { - + + /** + * Takes in user typed input as a string. + * + * @return User input as string. + */ public String readInput() { Scanner input = new Scanner(System.in); String s = input.nextLine(); @@ -14,10 +22,20 @@ public String readInput() { return s; } + /** + * Prints Chacha welcome message. + * + * @return Welcome message as a string. + */ public String printWelcome() { return "Welcome! I'm Chacha.\n" + "How may I assist you?"; } + /** + * Prints each task in given task list. + * + * @param taskList Task list to print tasks from. + */ public void printList(TaskList taskList) { for (int i = 0; i < taskList.getSize();i++) { Task t = taskList.get(i); @@ -27,26 +45,54 @@ public void printList(TaskList taskList) { } } + /** + * Prints tasks that has been added to task list. + * + * @param task Task to add into given task list. + * @param taskList Task list to add given task to. + */ public void printAdd(Task task, TaskList taskList) { System.out.println("Got it. I've added this task:"); System.out.println(task.toString()); System.out.println("Now you have " + taskList.getSize() + " tasks in the list."); } + /** + * Prints tasks that has been deleted from task list. + * + * @param task Task to be deleted from task list. + * @param size Number of remaining tasks in task list. + */ public void printDelete(Task task, int size) { System.out.println("Noted. I've removed this task:"); System.out.println(task.toString()); System.out.println("Now you have " + size + " tasks in the list."); } - + + /** + * Prints tasks that has been marked as done. + * + * @param task Task to be marked. + */ public void printMark(Task task) { System.out.println("Nice! I've marked this task as done:\n" + task.toString()); } + + /** + * Prints task that has been unmarked as done. + * + * @param task Task to be unmarked. + */ public void printUnmark(Task task) { System.out.println("Nice! I've marked this task as not done yet:\n" + task.toString()); } - + + /** + * Prints given error message. + * + * @param message Given error message. + */ public void printError(String message) { System.out.println("Chacha error: " + message); } diff --git a/src/main/java/chacha/commands/AddCommand.java b/src/main/java/chacha/commands/AddCommand.java index db00848bd8..9f9f4f9f4b 100644 --- a/src/main/java/chacha/commands/AddCommand.java +++ b/src/main/java/chacha/commands/AddCommand.java @@ -5,19 +5,37 @@ import chacha.Ui; import chacha.tasks.Task; +/** + * Command to add task. + */ public class AddCommand extends Command { private Task task; + /** + * Constructor with input task to add. + * + * @param task Task to be added. + */ public AddCommand(Task task) { this.task = task; } - + + /** + * Adds task to task list and saves to storage. + * + * @param taskList Task list to add task to. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { taskList.add(task); ui.printAdd(task, taskList); } - + + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return false; diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index 4d8d973ab5..a858ced69b 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -1,14 +1,28 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; +/** + * Represents a Chacha command. + */ public abstract class Command { + /** + * Execute command. + * + * @param taskList Task list to perform command on. + * @param ui Ui to print output message. + * @param storage Storage. + */ public abstract void execute(TaskList taskList, Ui ui, Storage storage); + /** + * Check if Chacha can exit. + * + * @return Boolean if Chacha can exit. + */ public abstract boolean isExit(); } diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index 56a9ffda0f..dcad7c416b 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -1,18 +1,32 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; import chacha.tasks.Task; +/** + * Command to delete task. + */ public class DeleteCommand extends Command { private int taskIndex; + /** + * Constructor with input index to delete. + * + * @param taskIndex Task to be added. + */ public DeleteCommand(int taskIndex) { this.taskIndex = taskIndex; } + /** + * Deletes task from task list and saves to storage. + * + * @param taskList Task list to delete task from. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); @@ -21,6 +35,10 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printDelete(task, size); } + + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return false; diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java index d3a3411bc0..92fddb43a8 100644 --- a/src/main/java/chacha/commands/ExitCommand.java +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -1,17 +1,27 @@ package chacha.commands; - - import chacha.Storage; import chacha.TaskList; import chacha.Ui; - +/** + * Command to exit Chacha. + */ public class ExitCommand extends Command { + /** + * Executes exit command. + * + * @param taskList Task list. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) {} + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return true; diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 58a4cf8b85..8b77f1ecd6 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -1,19 +1,29 @@ package chacha.commands; - - import chacha.Storage; import chacha.TaskList; import chacha.Ui; - +/** + * Command to list tasks from task list. + */ public class ListCommand extends Command { - + + /** + * Lists all tasks in given task list. + * + * @param taskList Task list to print tasks from. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printList(taskList); } + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return false; diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index e30c272766..c608927339 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -1,18 +1,32 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; import chacha.tasks.Task; +/** + * Command to mark task. + */ public class MarkCommand extends Command { private int taskIndex; + /** + * Constructor with task index to mark. + * + * @param task Task index of task to mark. + */ public MarkCommand(int taskIndex) { this.taskIndex = taskIndex; } + /** + * Marks task from task list. + * + * @param taskList Task list to mark task from. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); @@ -20,6 +34,9 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printMark(task); } + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return false; diff --git a/src/main/java/chacha/commands/UnmarkCommand.java b/src/main/java/chacha/commands/UnmarkCommand.java index 698d75b1ae..84f4148bcd 100644 --- a/src/main/java/chacha/commands/UnmarkCommand.java +++ b/src/main/java/chacha/commands/UnmarkCommand.java @@ -5,13 +5,28 @@ import chacha.Ui; import chacha.tasks.Task; +/** + * Command to unmark task. + */ public class UnmarkCommand extends Command { private int taskIndex; + /** + * Constructor with task index to unmark. + * + * @param task Task index of task to unmark. + */ public UnmarkCommand(int taskIndex) { this.taskIndex = taskIndex; } + /** + * Unmarks task from task list. + * + * @param taskList Task list to unmark task from. + * @param ui Ui to handle printing message. + * @param storage Storage. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(taskIndex); @@ -19,6 +34,9 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printUnmark(task); } + /** + * {@inheritDoc} + */ @Override public boolean isExit() { return false; diff --git a/src/main/java/chacha/tasks/Deadline.java b/src/main/java/chacha/tasks/Deadline.java index 97d9d5a447..16bc279c2f 100644 --- a/src/main/java/chacha/tasks/Deadline.java +++ b/src/main/java/chacha/tasks/Deadline.java @@ -1,8 +1,11 @@ package chacha.tasks; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; - +/** + * Represents a deadline task. + */ public class Deadline extends Task { private String description; private LocalDateTime date; @@ -10,36 +13,73 @@ public class Deadline extends Task { private String type; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); + /** + * Constructor for deadline. + * + * @param description Description of the deadline. + * @param date Date of the deadline. + */ public Deadline(String description, LocalDateTime date) { this.description = description; this.date = date; this.type = "D"; } + /** + * Marks deadline as done. + */ public void markAsDone() { this.isDone = true; } + /** + * Unmarks deadline as done. + */ public void unmarkAsDone() { this.isDone = false; } + /** + * Gets status icon of deadline. + * + * @return X if done and empty string if not done. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X - } - + } + + /** + * Gets description of deadline. + * + * @return Description of deadline. + */ public String getDescription() { return description; } - + + /** + * Gets type of task. + * + * @return Type of task. + */ public String getType() { return type; } - + + /** + * Gets date of deadline. + * + * @return Date of deadline. + */ public LocalDateTime getDate() { return date; } - + + /** + * Formats deadline into a readable string. + * + * @return Deadline as a string. + */ @Override public String toString() { return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (by: " + date.format(formatter) + ")"; diff --git a/src/main/java/chacha/tasks/Event.java b/src/main/java/chacha/tasks/Event.java index 7da851ee25..c0cb067cf6 100644 --- a/src/main/java/chacha/tasks/Event.java +++ b/src/main/java/chacha/tasks/Event.java @@ -1,7 +1,11 @@ package chacha.tasks; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +/** + * Represents an event task. + */ public class Event extends Task { private String description; private LocalDateTime date; @@ -9,36 +13,73 @@ public class Event extends Task { private String type; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); + /** + * Constructor for event. + * + * @param description Description of the event. + * @param date Date of the event. + */ public Event(String description, LocalDateTime date) { this.description = description; this.date = date; this.type = "E"; } + /** + * Marks event as done. + */ public void markAsDone() { this.isDone = true; } + /** + * Unmarks event as done. + */ public void unmarkAsDone() { this.isDone = false; } + /** + * Gets status icon of event. + * + * @return X if done and empty string if not done. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Gets description of event. + * + * @return Description of event. + */ public String getDescription() { return description; } + /** + * Gets type of task. + * + * @return Type of task. + */ public String getType() { return type; } + /** + * Gets date of event. + * + * @return Date of event. + */ public LocalDateTime getDate() { return date; } + /** + * Formats event into a readable string. + * + * @return Event as a string. + */ @Override public String toString() { return "[" + type + "]" + "[" + getStatusIcon() + "] " + description + " (at: " + date.format(formatter) + ")"; diff --git a/src/main/java/chacha/tasks/Task.java b/src/main/java/chacha/tasks/Task.java index 08b90846be..455065ddc1 100644 --- a/src/main/java/chacha/tasks/Task.java +++ b/src/main/java/chacha/tasks/Task.java @@ -2,12 +2,20 @@ import java.time.LocalDateTime; +/** + * Represents a task. + */ public class Task { private String description; private boolean isDone; private String type; private LocalDateTime date; + /** + * Constructor for a task. + * + * @param description Description of task. + */ public Task(String description) { this.description = description; this.isDone = false; @@ -18,26 +26,52 @@ public Task(String description) { public Task() { } + /** + * Mark task as done. + */ public void markAsDone() { this.isDone = true; } - + + /** + * Unmark task as done. + */ public void unmarkAsDone() { this.isDone = false; } - + + /** + * Gets status icon of task. + * + * @return X if done and empty string if not done. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } - + + /** + * Gets description of task. + * + * @return Description of task. + */ public String getDescription() { return description; } + /** + * Gets type of task. + * + * @return Type of task. + */ public String getType() { return type; } - + + /** + * Gets date of task. + * + * @return Date of task. + */ public LocalDateTime getDate() { return date; } diff --git a/src/main/java/chacha/tasks/Todo.java b/src/main/java/chacha/tasks/Todo.java index bae1d1a931..328cd48003 100644 --- a/src/main/java/chacha/tasks/Todo.java +++ b/src/main/java/chacha/tasks/Todo.java @@ -1,34 +1,70 @@ package chacha.tasks; + +/** + * Represents a todo task. + */ public class Todo extends Task { private String description; private boolean isDone; private String type; + /** + * Constructor for todo. + * + * @param description Description of the todo. + * @param date Date of the todo. + */ public Todo(String description) { this.description = description; this.type = "T"; } + /** + * Marks todo as done. + */ public void markAsDone() { this.isDone = true; } + /** + * Unmarks todo as done. + */ public void unmarkAsDone() { this.isDone = false; } + /** + * Gets status icon of todo. + * + * @return X if done and empty string if not done. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Gets description of todo. + * + * @return Description of todo. + */ public String getDescription() { return description; } + /** + * Gets type of task. + * + * @return Type of task. + */ public String getType() { return type; } + /** + * Formats todo into a readable string. + * + * @return Todo as a string. + */ @Override public String toString() { return "[" + type + "]" + "[" + getStatusIcon() + "] " + description; From a5e7b67dd363fe7f57d8ed1f8068f871498d9d3b Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 9 Sep 2022 02:28:20 +0800 Subject: [PATCH 26/48] Fix code to comply with coding standard --- src/main/java/chacha/Parser.java | 1 - src/main/java/chacha/TaskList.java | 7 +------ src/main/java/chacha/Ui.java | 2 +- src/main/java/chacha/commands/Command.java | 1 - src/main/java/chacha/commands/DeleteCommand.java | 1 - src/main/java/chacha/commands/ExitCommand.java | 3 --- src/main/java/chacha/commands/ListCommand.java | 3 --- src/main/java/chacha/commands/MarkCommand.java | 1 - src/main/java/chacha/tasks/Deadline.java | 6 +++--- src/main/java/chacha/tasks/Event.java | 5 +++-- src/main/java/chacha/tasks/Task.java | 2 +- src/main/java/chacha/tasks/Todo.java | 3 ++- 12 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index 4e2dc054c7..99cb912359 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -3,7 +3,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; - import chacha.commands.AddCommand; import chacha.commands.Command; import chacha.commands.DeleteCommand; diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index eba1edfea2..eebb36a018 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -1,7 +1,7 @@ package chacha; + import java.util.ArrayList; import java.util.List; - import chacha.tasks.Task; public class TaskList { @@ -11,7 +11,6 @@ public class TaskList { public TaskList() { this.tasks = new ArrayList<>(); } - public TaskList(ArrayList inputTasks) { this.tasks = new ArrayList<>(); @@ -20,14 +19,12 @@ public TaskList(ArrayList inputTasks) { } } - /** * @return int */ public int getSize() { return tasks.size(); } - /** * @param taskIndex @@ -37,14 +34,12 @@ public Task get(int taskIndex) { return tasks.get(taskIndex); } - /** * @param task */ public void add(Task task) { tasks.add(task); } - /** * @param taskIndex diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 2bd1ebb679..e58d38d21d 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -1,6 +1,6 @@ package chacha; -import java.util.Scanner; +import java.util.Scanner; import chacha.tasks.Task; public class Ui { diff --git a/src/main/java/chacha/commands/Command.java b/src/main/java/chacha/commands/Command.java index 4d8d973ab5..de8569d5aa 100644 --- a/src/main/java/chacha/commands/Command.java +++ b/src/main/java/chacha/commands/Command.java @@ -1,6 +1,5 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; diff --git a/src/main/java/chacha/commands/DeleteCommand.java b/src/main/java/chacha/commands/DeleteCommand.java index 56a9ffda0f..fe82be7b55 100644 --- a/src/main/java/chacha/commands/DeleteCommand.java +++ b/src/main/java/chacha/commands/DeleteCommand.java @@ -1,6 +1,5 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; diff --git a/src/main/java/chacha/commands/ExitCommand.java b/src/main/java/chacha/commands/ExitCommand.java index d3a3411bc0..32a28cd86f 100644 --- a/src/main/java/chacha/commands/ExitCommand.java +++ b/src/main/java/chacha/commands/ExitCommand.java @@ -1,12 +1,9 @@ package chacha.commands; - - import chacha.Storage; import chacha.TaskList; import chacha.Ui; - public class ExitCommand extends Command { @Override diff --git a/src/main/java/chacha/commands/ListCommand.java b/src/main/java/chacha/commands/ListCommand.java index 58a4cf8b85..5e634f4604 100644 --- a/src/main/java/chacha/commands/ListCommand.java +++ b/src/main/java/chacha/commands/ListCommand.java @@ -1,12 +1,9 @@ package chacha.commands; - - import chacha.Storage; import chacha.TaskList; import chacha.Ui; - public class ListCommand extends Command { @Override diff --git a/src/main/java/chacha/commands/MarkCommand.java b/src/main/java/chacha/commands/MarkCommand.java index e30c272766..11b063522a 100644 --- a/src/main/java/chacha/commands/MarkCommand.java +++ b/src/main/java/chacha/commands/MarkCommand.java @@ -1,6 +1,5 @@ package chacha.commands; - import chacha.Storage; import chacha.TaskList; import chacha.Ui; diff --git a/src/main/java/chacha/tasks/Deadline.java b/src/main/java/chacha/tasks/Deadline.java index 97d9d5a447..90d0f8fa57 100644 --- a/src/main/java/chacha/tasks/Deadline.java +++ b/src/main/java/chacha/tasks/Deadline.java @@ -1,14 +1,14 @@ package chacha.tasks; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; - public class Deadline extends Task { private String description; private LocalDateTime date; private boolean isDone; private String type; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); public Deadline(String description, LocalDateTime date) { this.description = description; @@ -25,7 +25,7 @@ public void unmarkAsDone() { } public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X + return (isDone ? "X" : " "); } public String getDescription() { diff --git a/src/main/java/chacha/tasks/Event.java b/src/main/java/chacha/tasks/Event.java index 7da851ee25..e35dd0d80a 100644 --- a/src/main/java/chacha/tasks/Event.java +++ b/src/main/java/chacha/tasks/Event.java @@ -1,4 +1,5 @@ package chacha.tasks; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -7,7 +8,7 @@ public class Event extends Task { private LocalDateTime date; private boolean isDone; private String type; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy HH:mm"); public Event(String description, LocalDateTime date) { this.description = description; @@ -24,7 +25,7 @@ public void unmarkAsDone() { } public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X + return (isDone ? "X" : " "); } public String getDescription() { diff --git a/src/main/java/chacha/tasks/Task.java b/src/main/java/chacha/tasks/Task.java index 08b90846be..9c328bb5a3 100644 --- a/src/main/java/chacha/tasks/Task.java +++ b/src/main/java/chacha/tasks/Task.java @@ -27,7 +27,7 @@ public void unmarkAsDone() { } public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X + return (isDone ? "X" : " "); } public String getDescription() { diff --git a/src/main/java/chacha/tasks/Todo.java b/src/main/java/chacha/tasks/Todo.java index bae1d1a931..5e95445f29 100644 --- a/src/main/java/chacha/tasks/Todo.java +++ b/src/main/java/chacha/tasks/Todo.java @@ -1,4 +1,5 @@ package chacha.tasks; + public class Todo extends Task { private String description; private boolean isDone; @@ -18,7 +19,7 @@ public void unmarkAsDone() { } public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X + return (isDone ? "X" : " "); } public String getDescription() { From 56ab4d6341cc0aa38641925fa91a1da802b308c4 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 9 Sep 2022 03:42:05 +0800 Subject: [PATCH 27/48] Add find function --- src/main/java/chacha/Parser.java | 9 ++++ src/main/java/chacha/TaskList.java | 16 +++++++ src/main/java/chacha/Ui.java | 19 ++++++++ .../java/chacha/commands/FindCommand.java | 43 +++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 src/main/java/chacha/commands/FindCommand.java diff --git a/src/main/java/chacha/Parser.java b/src/main/java/chacha/Parser.java index 4e2dc054c7..7c13242d76 100644 --- a/src/main/java/chacha/Parser.java +++ b/src/main/java/chacha/Parser.java @@ -8,6 +8,7 @@ import chacha.commands.Command; import chacha.commands.DeleteCommand; import chacha.commands.ExitCommand; +import chacha.commands.FindCommand; import chacha.commands.ListCommand; import chacha.commands.MarkCommand; import chacha.commands.UnmarkCommand; @@ -98,6 +99,14 @@ public static Command parse(String userInput) throws ChachaException { } else { throw new ChachaException("Sorry, I don't recognise this command."); } + case "find": + if (inputArray.length == 2) { + String[] split = userInput.split("\\s+"); + String keyword = split[1]; + return new FindCommand(keyword); + } else { + throw new ChachaException("Please enter valid keyword."); + } default: throw new ChachaException("Invalid input."); diff --git a/src/main/java/chacha/TaskList.java b/src/main/java/chacha/TaskList.java index eba1edfea2..a4c3601c22 100644 --- a/src/main/java/chacha/TaskList.java +++ b/src/main/java/chacha/TaskList.java @@ -53,5 +53,21 @@ public void remove(int taskIndex) { tasks.remove(taskIndex); } + /** + * Finds all tasks with keyword in description. + * + * @param keyword Input keyword to search for. + * @return New task list with tasks containing keyword. + */ + public TaskList find(String keyword) { + TaskList newTasks = new TaskList(); + for (Task task : tasks) { + if (task.getDescription().contains(keyword)) { + newTasks.add(task); + } + } + return newTasks; + } + } diff --git a/src/main/java/chacha/Ui.java b/src/main/java/chacha/Ui.java index 2bd1ebb679..5326179623 100644 --- a/src/main/java/chacha/Ui.java +++ b/src/main/java/chacha/Ui.java @@ -47,6 +47,25 @@ public void printUnmark(Task task) { System.out.println("Nice! I've marked this task as not done yet:\n" + task.toString()); } + /** + * Prints tasks from task list containing certain keyword. + * + * @param taskList TaskList with tasks containing certain keyword. + */ + public void printFind(TaskList taskList) { + if (taskList.getSize() == 0) { + System.out.println("There are no matching tasks in your list."); + } else { + System.out.println("Here are the matching tasks in your list:"); + for (int i = 0; i < taskList.getSize();i++) { + Task t = taskList.get(i); + System.out.println(i + 1 + + "." + + t.toString()); + } + } + } + public void printError(String message) { System.out.println("Chacha error: " + message); } diff --git a/src/main/java/chacha/commands/FindCommand.java b/src/main/java/chacha/commands/FindCommand.java new file mode 100644 index 0000000000..78f16e7778 --- /dev/null +++ b/src/main/java/chacha/commands/FindCommand.java @@ -0,0 +1,43 @@ +package chacha.commands; + +import chacha.Storage; +import chacha.TaskList; +import chacha.Ui; + +/** + * Represents Find Command. + */ +public class FindCommand extends Command { + private String keyword; + + /** + * Constructor for FindCommand with keyword to find. + * + * @param keyword Keyword to use in find. + */ + public FindCommand(String keyword) { + this.keyword = keyword; + } + + /** + * Executes command to find keyword in task list. + * + * @param tasks Task list to find keyword in. + * @param ui Ui to print output message. + * @param storage Storage. + */ + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) { + TaskList newTasks = taskList.find(keyword); + ui.printFind(newTasks); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean isExit() { + return false; + } + +} \ No newline at end of file From 4da3212e00bbb44bacf1a784dc43c7695a186d98 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 9 Sep 2022 04:07:55 +0800 Subject: [PATCH 28/48] Add checkstyle --- build.gradle | 5 + config/checkstyle/checkstyle_checks.xml | 915 ++++++++++++++++++++++++ config/checkstyle/suppressions.xml | 175 +++++ 3 files changed, 1095 insertions(+) create mode 100644 config/checkstyle/checkstyle_checks.xml create mode 100644 config/checkstyle/suppressions.xml diff --git a/build.gradle b/build.gradle index 34fa020265..59739e7d96 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,11 @@ plugins { id 'java' id 'application' id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'checkstyle' +} + +checkstyle { + toolVersion = '10.2' } repositories { diff --git a/config/checkstyle/checkstyle_checks.xml b/config/checkstyle/checkstyle_checks.xml new file mode 100644 index 0000000000..3e919ba382 --- /dev/null +++ b/config/checkstyle/checkstyle_checks.xml @@ -0,0 +1,915 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 0000000000..1e1ff016d2 --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fd0c3579752a5cd5af00a4156a660f610184f0b4 Mon Sep 17 00:00:00 2001 From: alexandermula Date: Fri, 9 Sep 2022 04:39:44 +0800 Subject: [PATCH 29/48] Add view and image resources --- build.gradle | 15 +++++++++++++++ src/main/resources/images/DaChacha.png | Bin 0 -> 28911 bytes src/main/resources/images/DaUser.png | Bin 0 -> 23424 bytes src/main/resources/view/DialogBox.FXML | 16 ++++++++++++++++ src/main/resources/view/MainWindow.FXML | 19 +++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 src/main/resources/images/DaChacha.png create mode 100644 src/main/resources/images/DaUser.png create mode 100644 src/main/resources/view/DialogBox.FXML create mode 100644 src/main/resources/view/MainWindow.FXML diff --git a/build.gradle b/build.gradle index 59739e7d96..9f0b314fd8 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,23 @@ repositories { } dependencies { + String javaFxVersion = '11' + 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' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { diff --git a/src/main/resources/images/DaChacha.png b/src/main/resources/images/DaChacha.png new file mode 100644 index 0000000000000000000000000000000000000000..8331f2a5446e53aa9b74026daca21b126314bb80 GIT binary patch literal 28911 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 Tx9QB3 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 dQRJxD4PMhe`9~OTi!1vdP|r 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 XWyG + + + + + + + + + + + + + \ 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..6f988e7544 --- /dev/null +++ b/src/main/resources/view/MainWindow.FXML @@ -0,0 +1,19 @@ + + + + + + + + + + + +