From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/37] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..20c0521c --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.29' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b7c8c5db --- /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 00000000..2fe81a7d --- /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 00000000..62bd9b9c --- /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 8090993044bb2f77c008d632b865834b0499a2b5 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Mon, 30 Aug 2021 19:51:00 +0800 Subject: [PATCH 02/37] Level-1 --- src/main/java/Duke.java | 42 +++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334..6e0674be 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,40 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + String text; + Scanner in = new Scanner(System.in); + + System.out.println("Hello I'm Alice\nWhat can i do for you?"); + System.out.println("======================================================="); + + text = in.nextLine(); + + while(text != null){ + if (text.equals("bye")){ + System.out.println("Bye, i will miss you."); + System.out.println("=========================END==========================="); + return; + } else { + System.out.println(text); + System.out.println("======================================================="); + text = in.nextLine(); + } + } } + + /* can i create a method called Echo rather than Echo inside main()? + public static void Echo(Scanner args){ + while(text != null){ + if (text.equals("bye")){ + System.out.println("Bye, i will miss you."); + return; + } else { + System.out.println(text); + text = in.nextLine(); + } + } + } + */ + } From 2cbd0da1b4ab0765444d1bfcfa84a16736f73f50 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Mon, 30 Aug 2021 20:55:08 +0800 Subject: [PATCH 03/37] Level-1 Version 2.0 --- src/main/java/Duke.java | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6e0674be..7cb7dcbe 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -11,30 +11,23 @@ public static void main(String[] args) { text = in.nextLine(); while(text != null){ - if (text.equals("bye")){ - System.out.println("Bye, i will miss you."); - System.out.println("=========================END==========================="); - return; - } else { - System.out.println(text); - System.out.println("======================================================="); - text = in.nextLine(); - } + Echo(text); + text = in.nextLine(); } } - /* can i create a method called Echo rather than Echo inside main()? - public static void Echo(Scanner args){ - while(text != null){ - if (text.equals("bye")){ - System.out.println("Bye, i will miss you."); - return; - } else { - System.out.println(text); - text = in.nextLine(); + public static void Echo(String text){ + if (text.equals("bye")){ + System.out.println("Bye, i will miss you."); + System.out.println("=========================END==========================="); + return; + } else { + System.out.println(text); + System.out.println("======================================================="); } - } } - */ + + + } From b072e1e03c97288f424ed2989512157102f6a954 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Mon, 30 Aug 2021 23:15:01 +0800 Subject: [PATCH 04/37] Level-2 --- src/main/java/Duke.java | 47 ++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7cb7dcbe..55b75545 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,33 +1,64 @@ import java.util.Scanner; +import java.util.Arrays; public class Duke { + + //define class-level variables using static + static int list_count = 0; + static String[] list = new String[100]; + public static void main(String[] args) { String text; Scanner in = new Scanner(System.in); - System.out.println("Hello I'm Alice\nWhat can i do for you?"); + System.out.println("Yo, I'm Alice!\nHow can i help you?"); System.out.println("======================================================="); + //takes in user input text = in.nextLine(); - + + //use while loop to program running while(text != null){ - Echo(text); + //print the current list by calling printList method, if user inputs "list" + if (text.equalsIgnoreCase("list")) { + printList(list); + } else { + //every other words will be added to the list by calling addToList method + addToList(text); + } text = in.nextLine(); } } - public static void Echo(String text){ - if (text.equals("bye")){ + public static void echo(String text){ + //terminate the program if user inputs "bye" + if (text.equalsIgnoreCase("bye")){ System.out.println("Bye, i will miss you."); System.out.println("=========================END==========================="); - return; + System.exit(0); } else { - System.out.println(text); + System.out.println("added: " + text); System.out.println("======================================================="); } } + public static String[] addToList(String text){ + //print out added: text by calling Echo method + echo(text); + list[list_count] = text; + list_count++; + + //return an array of first n elements + return Arrays.copyOf(list, list_count); + } - + public static void printList (String[] s){ + //print out every element in the array + for (int i =0; i < s.length; i ++){ + if (s[i] != null){ + System.out.println(i+1 + ". " + s[i]); + } + } + } } From 1bbcb6eab5eba3fe1df259ecf3ce9cb4a5b72dab Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Fri, 10 Sep 2021 16:42:42 +0800 Subject: [PATCH 05/37] Level 3 --- src/main/java/Duke.java | 54 ++++++++++---------------------------- src/main/java/Task.java | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 55b75545..07257f51 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,64 +1,38 @@ import java.util.Scanner; -import java.util.Arrays; public class Duke { - //define class-level variables using static - static int list_count = 0; - static String[] list = new String[100]; - public static void main(String[] args) { String text; Scanner in = new Scanner(System.in); + Task[] tasks = new Task[100]; + int task_count = 0; System.out.println("Yo, I'm Alice!\nHow can i help you?"); System.out.println("======================================================="); //takes in user input text = in.nextLine(); - + tasks[task_count] = new Task(text); + //use while loop to program running while(text != null){ //print the current list by calling printList method, if user inputs "list" if (text.equalsIgnoreCase("list")) { - printList(list); + Task.printList(tasks); + System.out.println("======================================================="); + } else if(text.contains("done")){ + String[] word = text.split(" "); + int i = Integer.parseInt(word[1]) - 1; + tasks[i].setDone(true); + System.out.println("Nice! I've marked this task as done:"); + System.out.println("[" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); + System.out.println("======================================================="); } else { //every other words will be added to the list by calling addToList method - addToList(text); + Task.addToList(text, tasks); } text = in.nextLine(); } } - - public static void echo(String text){ - //terminate the program if user inputs "bye" - if (text.equalsIgnoreCase("bye")){ - System.out.println("Bye, i will miss you."); - System.out.println("=========================END==========================="); - System.exit(0); - } else { - System.out.println("added: " + text); - System.out.println("======================================================="); - } - } - - public static String[] addToList(String text){ - //print out added: text by calling Echo method - echo(text); - list[list_count] = text; - list_count++; - - //return an array of first n elements - return Arrays.copyOf(list, list_count); - } - - public static void printList (String[] s){ - //print out every element in the array - for (int i =0; i < s.length; i ++){ - if (s[i] != null){ - System.out.println(i+1 + ". " + s[i]); - } - } - } - } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 00000000..6992b09e --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,58 @@ +import java.util.Arrays; + +public class Task { + protected String description; + protected boolean isDone; + protected static int task_count =0; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + //description.Getter + public String getDescription() {return description;} + + //isDone.Setter + public void setDone(boolean isDone) { + this.isDone = isDone; + } + + //isDone.Getter + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + + public static void echo(String text){ + //terminate the program if user inputs "bye" + if (text.equalsIgnoreCase("bye")){ + System.out.println("Bye, i will miss you."); + System.out.println("=========================END==========================="); + System.exit(0); + } else { + System.out.println("added: " + text); + System.out.println("======================================================="); + } + } + + public static Task[] addToList (String text, Task[] tasks){ + //print out added: text by calling Echo method + echo(text); + tasks[task_count] = new Task(text); + task_count++; + + //return an array of first n elements + return Arrays.copyOf(tasks, task_count); + } + + public static void printList (Task[] tasks){ + //print out every element in the array + System.out.println("Here are the tasks in your list:"); + for (int i =0; i < tasks.length; i ++){ + if (tasks[i] != null){ + System.out.println(i+1 + "." + "[" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); + } + } + } +} From daa871d8f34ef674417d5423d1522f74cf7fc6ed Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 12 Sep 2021 00:44:43 +0800 Subject: [PATCH 06/37] Level 4 --- src/main/java/Deadline.java | 26 ++++++++++++++++++++ src/main/java/Duke.java | 13 ++++++---- src/main/java/Event.java | 22 +++++++++++++++++ src/main/java/Task.java | 47 +++++++++++++++++++++---------------- src/main/java/Todo.java | 15 ++++++++++++ 5 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 00000000..09d68530 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,26 @@ +public class Deadline extends Task{ + protected String datetime; + + public Deadline(String description){ + super(description); + super.type = "D"; + } + + @Override + public String getDescription() {return description.substring(9,description.indexOf('/'));} + + public String getDatetime(){ + return description.substring(description.indexOf('/')+3); + } + + public static void print(Task[] tasks){ + System.out.println("Got it. I've added this task: "); + System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription() + "(by:" + tasks[task_count].getDatetime() + ")"); + System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("======================================================="); + } + + public static void printTask(Task s){ + System.out.println("." + "[" + s.getType() +"]" + "[" + s.getStatusIcon() +"] " + s.getDescription() + "(by: " + s.getDatetime() + ")"); + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 07257f51..083f78cb 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.util.Arrays; import java.util.Scanner; public class Duke { @@ -13,7 +14,6 @@ public static void main(String[] args) { //takes in user input text = in.nextLine(); - tasks[task_count] = new Task(text); //use while loop to program running while(text != null){ @@ -21,15 +21,18 @@ public static void main(String[] args) { if (text.equalsIgnoreCase("list")) { Task.printList(tasks); System.out.println("======================================================="); - } else if(text.contains("done")){ + } else if(text.contains("done")){ // String[] word = text.split(" "); int i = Integer.parseInt(word[1]) - 1; tasks[i].setDone(true); System.out.println("Nice! I've marked this task as done:"); - System.out.println("[" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); + System.out.println(" [" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); System.out.println("======================================================="); - } else { - //every other words will be added to the list by calling addToList method + } else if(text.contains("bye")) { + System.out.println("Bye, i will miss you."); + System.out.println("=========================END==========================="); + System.exit(0); + } else { //every other words will be added to the list by calling addToList method Task.addToList(text, tasks); } text = in.nextLine(); diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 00000000..4f9153e6 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,22 @@ +public class Event extends Task{ + protected String datetime; + + public Event(String description){ + super(description); + super.type = "E"; + } + + @Override + public String getDescription() {return description.substring(6,description.indexOf('/'));} + + public String getDatetime(){ + return description.substring(description.indexOf('/')+3); + } + + public static void print(Task[] tasks){ + System.out.println("Got it. I've added this task: "); + System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " +""+tasks[task_count].getDescription() + "(at:" + tasks[task_count].getDatetime() + ")"); + System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("======================================================="); + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 6992b09e..f4c58492 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -4,6 +4,8 @@ public class Task { protected String description; protected boolean isDone; protected static int task_count =0; + protected String type; + protected String datetime; public Task(String description) { this.description = description; @@ -14,45 +16,50 @@ public Task(String description) { public String getDescription() {return description;} //isDone.Setter - public void setDone(boolean isDone) { - this.isDone = isDone; - } + public void setDone(boolean isDone) {this.isDone = isDone;} //isDone.Getter public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + public String getType(){return type;} - public static void echo(String text){ - //terminate the program if user inputs "bye" - if (text.equalsIgnoreCase("bye")){ - System.out.println("Bye, i will miss you."); - System.out.println("=========================END==========================="); - System.exit(0); - } else { - System.out.println("added: " + text); - System.out.println("======================================================="); - } + public String getDatetime(){ + return datetime; } + public static Task[] addToList (String text, Task[] tasks){ //print out added: text by calling Echo method - echo(text); - tasks[task_count] = new Task(text); + //echo(text); + if (text.contains("todo")) { + tasks[task_count] = new Todo(text); + Todo.print(tasks); + } else if (text.contains("event")) { + tasks[task_count] = new Event(text); + Event.print(tasks); + } else if (text.contains("deadline")) { + tasks[task_count] = new Deadline(text); + Deadline.print(tasks); + } else { + System.out.println("Sorry! I can't recognise the command, please reenter!"); + System.out.println("======================================================="); + } task_count++; //return an array of first n elements return Arrays.copyOf(tasks, task_count); } - public static void printList (Task[] tasks){ + public static void printList (Task[] s){ //print out every element in the array System.out.println("Here are the tasks in your list:"); - for (int i =0; i < tasks.length; i ++){ - if (tasks[i] != null){ - System.out.println(i+1 + "." + "[" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); + for (int i =0; i < s.length; i ++){ + if (s[i] != null){ + System.out.println(i+1 + "." + "[" + s[i].getType() +"]" + "[" + s[i].getStatusIcon() +"] " + s[i].getDescription() + "(by:" + s[i].getDatetime() + ")"); } } } -} + +} \ No newline at end of file diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 00000000..ed3fc08e --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,15 @@ +public class Todo extends Task{ + public Todo(String description){ + super(description); + super.type = "T"; + } + + public String getDescription() {return description.substring(5);} + + public static void print(Task[] tasks){ + System.out.println("Got it. I've added this task: "); + System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription()); + System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("======================================================="); + } +} From 656fd65787b070b2c53a031469e57eaf760d75f5 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 19 Sep 2021 18:43:41 +0800 Subject: [PATCH 07/37] Level 4 small fixes --- src/main/java/Deadline.java | 10 +++++----- src/main/java/Duke.java | 21 +++++++++++---------- src/main/java/Event.java | 12 ++++++++---- src/main/java/Task.java | 17 +++-------------- src/main/java/Todo.java | 7 ++++++- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 09d68530..e29a9eb7 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,9 +1,7 @@ public class Deadline extends Task{ - protected String datetime; - public Deadline(String description){ super(description); - super.type = "D"; + this.type = "D"; } @Override @@ -20,7 +18,9 @@ public static void print(Task[] tasks){ System.out.println("======================================================="); } - public static void printTask(Task s){ - System.out.println("." + "[" + s.getType() +"]" + "[" + s.getStatusIcon() +"] " + s.getDescription() + "(by: " + s.getDatetime() + ")"); + public String printList (){ + //print out every element in the array + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; } + } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 083f78cb..ea5a27aa 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,13 +1,11 @@ -import java.util.Arrays; +//import java.util.Arrays; import java.util.Scanner; public class Duke { - public static void main(String[] args) { String text; Scanner in = new Scanner(System.in); Task[] tasks = new Task[100]; - int task_count = 0; System.out.println("Yo, I'm Alice!\nHow can i help you?"); System.out.println("======================================================="); @@ -16,26 +14,29 @@ public static void main(String[] args) { text = in.nextLine(); //use while loop to program running - while(text != null){ + while(!text.equalsIgnoreCase("bye")){ //print the current list by calling printList method, if user inputs "list" if (text.equalsIgnoreCase("list")) { - Task.printList(tasks); + System.out.println("Here are the tasks in your list:"); + for (int i=0; i < Task.task_count; i++) { + System.out.println(i+1 + "." + tasks[i].printList()); + } System.out.println("======================================================="); } else if(text.contains("done")){ // String[] word = text.split(" "); int i = Integer.parseInt(word[1]) - 1; - tasks[i].setDone(true); + tasks[i].setDone(); System.out.println("Nice! I've marked this task as done:"); System.out.println(" [" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); System.out.println("======================================================="); - } else if(text.contains("bye")) { - System.out.println("Bye, i will miss you."); - System.out.println("=========================END==========================="); - System.exit(0); } else { //every other words will be added to the list by calling addToList method Task.addToList(text, tasks); } text = in.nextLine(); } + + System.out.println("Bye, i will miss you."); + System.out.println("=========================END==========================="); + System.exit(0); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 4f9153e6..5fb4d2f6 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,15 +1,13 @@ public class Event extends Task{ - protected String datetime; - public Event(String description){ super(description); - super.type = "E"; + this.type = "E"; } @Override public String getDescription() {return description.substring(6,description.indexOf('/'));} - public String getDatetime(){ + public String getDatetime(){ return description.substring(description.indexOf('/')+3); } @@ -19,4 +17,10 @@ public static void print(Task[] tasks){ System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } + + @Override + public String printList (){ + //print out every element in the array + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; + } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f4c58492..a3f95390 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -13,10 +13,10 @@ public Task(String description) { } //description.Getter - public String getDescription() {return description;} + public String getDescription() {return description;} //isDone.Setter - public void setDone(boolean isDone) {this.isDone = isDone;} + public void setDone() {isDone = true;} //isDone.Getter public String getStatusIcon() { @@ -29,10 +29,7 @@ public String getDatetime(){ return datetime; } - public static Task[] addToList (String text, Task[] tasks){ - //print out added: text by calling Echo method - //echo(text); if (text.contains("todo")) { tasks[task_count] = new Todo(text); Todo.print(tasks); @@ -52,14 +49,6 @@ public static Task[] addToList (String text, Task[] tasks){ return Arrays.copyOf(tasks, task_count); } - public static void printList (Task[] s){ - //print out every element in the array - System.out.println("Here are the tasks in your list:"); - for (int i =0; i < s.length; i ++){ - if (s[i] != null){ - System.out.println(i+1 + "." + "[" + s[i].getType() +"]" + "[" + s[i].getStatusIcon() +"] " + s[i].getDescription() + "(by:" + s[i].getDatetime() + ")"); - } - } - } + public String printList (){return "";} } \ No newline at end of file diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index ed3fc08e..ac167c9d 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,7 +1,7 @@ public class Todo extends Task{ public Todo(String description){ super(description); - super.type = "T"; + this.type = "T"; } public String getDescription() {return description.substring(5);} @@ -12,4 +12,9 @@ public static void print(Task[] tasks){ System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } + + public String printList (){ + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); + } + } From 38b97167bfd8de77b77b9f7bb59d398beb437ad9 Mon Sep 17 00:00:00 2001 From: "Damith C. Rajapakse" Date: Tue, 12 Oct 2021 17:02:55 +0800 Subject: [PATCH 08/37] Add license info --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8715d4d9..d4047fc1 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,4 @@ Prerequisites: JDK 11, update Intellij to the most recent version. | |_| | |_| | < __/ |____/ \__,_|_|\_\___| ``` +4. Duke is released under an MIT license. From 8469194969b7fb8dd1f726e12cf9097fc39c74a8 Mon Sep 17 00:00:00 2001 From: "Damith C. Rajapakse" Date: Tue, 12 Oct 2021 17:04:47 +0800 Subject: [PATCH 09/37] Mention se-education.org --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8715d4d9..1347ae67 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,4 @@ Prerequisites: JDK 11, update Intellij to the most recent version. | |_| | |_| | < __/ |____/ \__,_|_|\_\___| ``` +4. Duke is part of https://se-education.org From 0dec650e75bfffa268f925453bb04a01b0ce062d Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 31 Oct 2021 18:52:42 +0800 Subject: [PATCH 10/37] Level-5 Handle Errors --- src/main/java/Deadline.java | 4 +- src/main/java/Duke.java | 23 +++------- src/main/java/DukeException.java | 5 +++ src/main/java/Event.java | 4 +- src/main/java/Task.java | 75 +++++++++++++++++++++++++------- src/main/java/Todo.java | 2 +- 6 files changed, 76 insertions(+), 37 deletions(-) create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index e29a9eb7..7c7667cf 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -7,13 +7,13 @@ public Deadline(String description){ @Override public String getDescription() {return description.substring(9,description.indexOf('/'));} - public String getDatetime(){ + public String getDatetime() throws DukeException{ return description.substring(description.indexOf('/')+3); } public static void print(Task[] tasks){ System.out.println("Got it. I've added this task: "); - System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription() + "(by:" + tasks[task_count].getDatetime() + ")"); + System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription() + "(by:" + tasks[task_count].getDatetime() + ")"); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ea5a27aa..08988324 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -7,7 +7,7 @@ public static void main(String[] args) { Scanner in = new Scanner(System.in); Task[] tasks = new Task[100]; - System.out.println("Yo, I'm Alice!\nHow can i help you?"); + System.out.println("Hi. I'm A.L.I.C.E.\nHow can i help you?"); System.out.println("======================================================="); //takes in user input @@ -16,23 +16,14 @@ public static void main(String[] args) { //use while loop to program running while(!text.equalsIgnoreCase("bye")){ //print the current list by calling printList method, if user inputs "list" - if (text.equalsIgnoreCase("list")) { - System.out.println("Here are the tasks in your list:"); - for (int i=0; i < Task.task_count; i++) { - System.out.println(i+1 + "." + tasks[i].printList()); - } + try { + Task.tasks(text, tasks); + } catch (DukeException e){ + System.err.println("\t" + e); System.out.println("======================================================="); - } else if(text.contains("done")){ // - String[] word = text.split(" "); - int i = Integer.parseInt(word[1]) - 1; - tasks[i].setDone(); - System.out.println("Nice! I've marked this task as done:"); - System.out.println(" [" + tasks[i].getStatusIcon() +"] " + tasks[i].getDescription()); - System.out.println("======================================================="); - } else { //every other words will be added to the list by calling addToList method - Task.addToList(text, tasks); + } finally { + text = in.nextLine(); } - text = in.nextLine(); } System.out.println("Bye, i will miss you."); diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 00000000..4144634b --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,5 @@ +public class DukeException extends IllegalArgumentException{ + DukeException(String s) { + super(s); + } +} \ No newline at end of file diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 5fb4d2f6..af4e05a9 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -7,13 +7,13 @@ public Event(String description){ @Override public String getDescription() {return description.substring(6,description.indexOf('/'));} - public String getDatetime(){ + public String getDatetime() throws DukeException { return description.substring(description.indexOf('/')+3); } public static void print(Task[] tasks){ System.out.println("Got it. I've added this task: "); - System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " +""+tasks[task_count].getDescription() + "(at:" + tasks[task_count].getDatetime() + ")"); + System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " +""+tasks[task_count].getDescription() + "(at:" + tasks[task_count].getDatetime() + ")"); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index a3f95390..1d225433 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,4 +1,4 @@ -import java.util.Arrays; +//import java.util.Arrays; public class Task { protected String description; @@ -29,24 +29,67 @@ public String getDatetime(){ return datetime; } - public static Task[] addToList (String text, Task[] tasks){ - if (text.contains("todo")) { - tasks[task_count] = new Todo(text); - Todo.print(tasks); - } else if (text.contains("event")) { - tasks[task_count] = new Event(text); - Event.print(tasks); - } else if (text.contains("deadline")) { - tasks[task_count] = new Deadline(text); - Deadline.print(tasks); - } else { - System.out.println("Sorry! I can't recognise the command, please reenter!"); - System.out.println("======================================================="); + public static void tasks (String text, Task[] tasks){ + String[] command = text.split(" ", 2); + switch (command[0]) { + case "event": + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); + } else if (!text.contains("/at")) { + throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); + } + tasks[task_count] = new Event(text); + Event.print(tasks); + task_count++; + break; + case "todo": + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty. Please re-enter:"); + } + tasks[task_count] = new Todo(text); + Todo.print(tasks); + task_count++; + break; + case "deadline": + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a deadline cannot be empty. Please re-enter:"); + } else if (!text.contains("/by")) { + throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); + } + tasks[task_count] = new Deadline(text); + Deadline.print(tasks); + task_count++; + break; + case "list": + if (task_count ==0) { + System.out.println("\tList is empty."); + System.out.println("======================================================="); + break; + } + System.out.println("Here are the tasks in your list:"); + for (int i=0; i < task_count; i++) { + System.out.println("\t"+ (i+1) + "." + tasks[i].printList()); + } + System.out.println("======================================================="); + break; + case "done": + int whichTask = Integer.parseInt(command[1]); + if (whichTask > task_count) { + throw new DukeException("☹ There is no such task."); + } + String[] word = text.split(" "); + int i = Integer.parseInt(word[1]) - 1; + tasks[i].setDone(); + System.out.println("Nice! I've marked this task as done:"); + System.out.println("\t[" + tasks[i].getStatusIcon() + "] " + tasks[i].getDescription()); + System.out.println("======================================================="); + break; + default: + throw new DukeException("\t☹ Sorry! I don't know what that means :-(\n\tPlease re-enter:"); } - task_count++; //return an array of first n elements - return Arrays.copyOf(tasks, task_count); + //return Arrays.copyOf(tasks, task_count); } public String printList (){return "";} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index ac167c9d..6dacb875 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -8,7 +8,7 @@ public Todo(String description){ public static void print(Task[] tasks){ System.out.println("Got it. I've added this task: "); - System.out.println(" [" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription()); + System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription()); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } From 101d7d36f3b8fd627d7b8bc46577a82a2696dbee Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 31 Oct 2021 21:17:20 +0800 Subject: [PATCH 11/37] Level - 6 Delete && Changed Array type to Arraylist type --- src/main/java/Deadline.java | 6 ++-- src/main/java/Duke.java | 63 +++++++++++++++++++++++++++++++++---- src/main/java/Event.java | 6 ++-- src/main/java/Task.java | 51 +++++++++++++++++++----------- src/main/java/Todo.java | 6 ++-- 5 files changed, 102 insertions(+), 30 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 7c7667cf..32d6e570 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,3 +1,5 @@ +import java.util.ArrayList; + public class Deadline extends Task{ public Deadline(String description){ super(description); @@ -11,9 +13,9 @@ public String getDatetime() throws DukeException{ return description.substring(description.indexOf('/')+3); } - public static void print(Task[] tasks){ + public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription() + "(by:" + tasks[task_count].getDatetime() + ")"); + System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " + tasks.get(task_count).getDescription() + "(by:" + tasks.get(task_count).getDatetime() + ")"); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 08988324..493ac867 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,14 +1,32 @@ -//import java.util.Arrays; import java.util.Scanner; +import java.util.ArrayList; public class Duke { public static void main(String[] args) { String text; Scanner in = new Scanner(System.in); - Task[] tasks = new Task[100]; + //Task[] tasks = new Task[100]; + ArrayList tasks = new ArrayList<>(); - System.out.println("Hi. I'm A.L.I.C.E.\nHow can i help you?"); - System.out.println("======================================================="); + + System.out.println(" _..._\n" + + " .' '. _\n" + + " / .-\"\"-\\ _/ \\\n" + + " .-| /:. | | |\n" + + " | \\ |:. /.-'-./\n" + + " | .-'-;:__.' =/\n" + + " .'= *=|DUKE _.='\n" + + " / _. | ;\n" + + " ;-.-'| \\ |\n" + + "/ | \\ _\\ _\\\n" + + "\\__/'._;. ==' ==\\\n" + + " \\ \\ |\n" + + " / / /\n" + + " /-._/-._/\n" + + " \\ `\\ \\" + "\t\tAye there. I'm DUKE.\n" + + " `-._/._/" + "\t\tHow can i help you?"); + System.out.println("___^/\\___^--____/\\____O______________/\\/\\---/\\___________---______________ \n" + + " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- \n"); //takes in user input text = in.nextLine(); @@ -26,8 +44,41 @@ public static void main(String[] args) { } } - System.out.println("Bye, i will miss you."); - System.out.println("=========================END==========================="); + System.out.println(" ,:\n" + + " ,' |\n" + + " / :\n" + + " --' /\n" + + " \\/ />/\n" + + " / /_\\\n" + + " __/ /\n" + + " )'-. /\n" + + " ./ :\\\n" + + " /.' '\n" + + " '/'\n" + + " +\n" + + " '\n" + + " `.\n" + + " .-\"-\n" + + " ( |\n" + + " . .-' '.\n" + + " ( (. )8:\n" + + " .' / (_ )\n" + + " _. :(. )8P `\n" + + " . ( `-' ( `. .\n" + + " . : ( .a8a)\n" + + " /_`( \"a `a. )\"'\n" + + " ( (/ . ' )=='\n" + + " ( ( ) .8\" +\n" + + " (`'8a.( _( (\n" + + " ..-. `8P ) ` ) +\n" + + " -' ( -ab: )\n" + + " ' _ ` (8P\"Ya\n" + + " _( ( )b -`. ) +\n" + + " ( 8) ( _.aP\" _a \\( \\ *\n" + + " + )/ (8P (88 ) )\n" + + " (a:f \" `\" `\n" + + "Bye, i will miss you.\n"); + System.out.println("=========================TERMINATED==========================="); System.exit(0); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index af4e05a9..1e7f7261 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,3 +1,5 @@ +import java.util.ArrayList; + public class Event extends Task{ public Event(String description){ super(description); @@ -11,9 +13,9 @@ public String getDatetime() throws DukeException { return description.substring(description.indexOf('/')+3); } - public static void print(Task[] tasks){ + public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " +""+tasks[task_count].getDescription() + "(at:" + tasks[task_count].getDatetime() + ")"); + System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " +""+tasks.get(task_count).getDescription() + "(at:" + tasks.get(task_count).getDatetime() + ")"); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 1d225433..7e7d9393 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,4 +1,4 @@ -//import java.util.Arrays; +import java.util.ArrayList; public class Task { protected String description; @@ -29,8 +29,9 @@ public String getDatetime(){ return datetime; } - public static void tasks (String text, Task[] tasks){ - String[] command = text.split(" ", 2); + public static void tasks (String text, ArrayList tasks){ + String[] command = text.split(" "); + int taskNumber; switch (command[0]) { case "event": if (command.length < 2) { @@ -38,7 +39,7 @@ public static void tasks (String text, Task[] tasks){ } else if (!text.contains("/at")) { throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); } - tasks[task_count] = new Event(text); + tasks.add(new Event(text)); Event.print(tasks); task_count++; break; @@ -46,7 +47,7 @@ public static void tasks (String text, Task[] tasks){ if (command.length < 2) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty. Please re-enter:"); } - tasks[task_count] = new Todo(text); + tasks.add(new Todo(text)); Todo.print(tasks); task_count++; break; @@ -56,40 +57,54 @@ public static void tasks (String text, Task[] tasks){ } else if (!text.contains("/by")) { throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); } - tasks[task_count] = new Deadline(text); + tasks.add(new Deadline(text)); Deadline.print(tasks); task_count++; break; case "list": - if (task_count ==0) { - System.out.println("\tList is empty."); + if (tasks.size() == 0) { + System.out.println("\tList is empty. Please add new task."); System.out.println("======================================================="); break; } System.out.println("Here are the tasks in your list:"); for (int i=0; i < task_count; i++) { - System.out.println("\t"+ (i+1) + "." + tasks[i].printList()); + System.out.println("\t"+ (i+1) + "." + tasks.get(i).printList()); } System.out.println("======================================================="); break; case "done": - int whichTask = Integer.parseInt(command[1]); - if (whichTask > task_count) { + if (command.length < 2) { + throw new DukeException("☹ Please state task number."); + } + taskNumber = Integer.parseInt(command[1]) - 1; + if (taskNumber >= tasks.size()) { throw new DukeException("☹ There is no such task."); } - String[] word = text.split(" "); - int i = Integer.parseInt(word[1]) - 1; - tasks[i].setDone(); + tasks.get(taskNumber).setDone(); System.out.println("Nice! I've marked this task as done:"); - System.out.println("\t[" + tasks[i].getStatusIcon() + "] " + tasks[i].getDescription()); + System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" +tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); + System.out.println("You have total " + (task_count) +" tasks in the list."); + System.out.println("======================================================="); + break; + case "delete": + if (command.length < 2) { + throw new DukeException("☹ Please state task number."); + } + taskNumber = Integer.parseInt(command[1]) -1; + if (taskNumber >= tasks.size()) { + throw new DukeException("☹ There is no such task."); + } + System.out.println("Noted. I've removed this task: "); + System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" + tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); + tasks.remove(taskNumber); + task_count--; + System.out.println("Now you have " + (task_count) +" tasks in the list."); System.out.println("======================================================="); break; default: throw new DukeException("\t☹ Sorry! I don't know what that means :-(\n\tPlease re-enter:"); } - - //return an array of first n elements - //return Arrays.copyOf(tasks, task_count); } public String printList (){return "";} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 6dacb875..1034339f 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,3 +1,5 @@ +import java.util.ArrayList; + public class Todo extends Task{ public Todo(String description){ super(description); @@ -6,9 +8,9 @@ public Todo(String description){ public String getDescription() {return description.substring(5);} - public static void print(Task[] tasks){ + public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks[task_count].getType() +"]" + "[" + tasks[task_count].getStatusIcon() +"] " + tasks[task_count].getDescription()); + System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " + tasks.get(task_count).getDescription()); System.out.println("Now you have " + (task_count+1) +" tasks in the list."); System.out.println("======================================================="); } From ee4c8c9178126fe80abd41f21dcb961e86aa5805 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 31 Oct 2021 23:56:21 +0800 Subject: [PATCH 12/37] Refactor Classes and Add Packages --- src/main/duke/Duke.java | 35 +++++++ src/main/duke/command/Command.java | 5 + .../exception}/DukeException.java | 0 src/main/duke/parser/Parser.java | 6 ++ .../{java => duke/tasklist}/Deadline.java | 4 +- src/main/{java => duke/tasklist}/Event.java | 0 src/main/{java => duke/tasklist}/Task.java | 31 ++----- src/main/{java => duke/tasklist}/Todo.java | 2 +- src/main/duke/ui/Ui.java | 92 +++++++++++++++++++ src/main/java/Duke.java | 84 ----------------- 10 files changed, 150 insertions(+), 109 deletions(-) create mode 100644 src/main/duke/Duke.java create mode 100644 src/main/duke/command/Command.java rename src/main/{java => duke/exception}/DukeException.java (100%) create mode 100644 src/main/duke/parser/Parser.java rename src/main/{java => duke/tasklist}/Deadline.java (91%) rename src/main/{java => duke/tasklist}/Event.java (100%) rename src/main/{java => duke/tasklist}/Task.java (71%) rename src/main/{java => duke/tasklist}/Todo.java (89%) create mode 100644 src/main/duke/ui/Ui.java delete mode 100644 src/main/java/Duke.java diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java new file mode 100644 index 00000000..497186cd --- /dev/null +++ b/src/main/duke/Duke.java @@ -0,0 +1,35 @@ +package duke; + +import java.util.Scanner; +import java.util.ArrayList; + +public class Duke { + private Ui ui; + + public static void main(String[] args) { + String text; + Scanner in = new Scanner(System.in); + + ArrayList tasks = new ArrayList<>(); + + Ui.Welcome(); + + //takes in user input + text = in.nextLine(); + + //use while loop to program running + while(!text.equalsIgnoreCase("bye")){ + //print the current list by calling printList method, if user inputs "list" + try { + Task.tasks(text, tasks); + } catch (DukeException e){ + Ui.errorMessage(e); + } finally { + text = in.nextLine(); + } + } + + Ui.goodBye(); + System.exit(0); + } +} diff --git a/src/main/duke/command/Command.java b/src/main/duke/command/Command.java new file mode 100644 index 00000000..348d285a --- /dev/null +++ b/src/main/duke/command/Command.java @@ -0,0 +1,5 @@ +package duke.command; + +public class Command { + public static +} diff --git a/src/main/java/DukeException.java b/src/main/duke/exception/DukeException.java similarity index 100% rename from src/main/java/DukeException.java rename to src/main/duke/exception/DukeException.java diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java new file mode 100644 index 00000000..465a82ac --- /dev/null +++ b/src/main/duke/parser/Parser.java @@ -0,0 +1,6 @@ +public class Parser { + + public static String[] commandToArray(String text){ + return text.split(" "); + } +} diff --git a/src/main/java/Deadline.java b/src/main/duke/tasklist/Deadline.java similarity index 91% rename from src/main/java/Deadline.java rename to src/main/duke/tasklist/Deadline.java index 32d6e570..21958511 100644 --- a/src/main/java/Deadline.java +++ b/src/main/duke/tasklist/Deadline.java @@ -1,3 +1,5 @@ +import duke.exception.DukeException; + import java.util.ArrayList; public class Deadline extends Task{ @@ -9,7 +11,7 @@ public Deadline(String description){ @Override public String getDescription() {return description.substring(9,description.indexOf('/'));} - public String getDatetime() throws DukeException{ + public String getDatetime() throws DukeException { return description.substring(description.indexOf('/')+3); } diff --git a/src/main/java/Event.java b/src/main/duke/tasklist/Event.java similarity index 100% rename from src/main/java/Event.java rename to src/main/duke/tasklist/Event.java diff --git a/src/main/java/Task.java b/src/main/duke/tasklist/Task.java similarity index 71% rename from src/main/java/Task.java rename to src/main/duke/tasklist/Task.java index 7e7d9393..f80dcaf0 100644 --- a/src/main/java/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -3,7 +3,6 @@ public class Task { protected String description; protected boolean isDone; - protected static int task_count =0; protected String type; protected String datetime; @@ -13,7 +12,7 @@ public Task(String description) { } //description.Getter - public String getDescription() {return description;} + public String getDescription() {return description;} //isDone.Setter public void setDone() {isDone = true;} @@ -30,36 +29,23 @@ public String getDatetime(){ } public static void tasks (String text, ArrayList tasks){ - String[] command = text.split(" "); + String[] command = Parser.commandToArray(text); int taskNumber; switch (command[0]) { case "event": - if (command.length < 2) { - throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); - } else if (!text.contains("/at")) { - throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); - } + Ui.validateEventCommand(command); tasks.add(new Event(text)); Event.print(tasks); - task_count++; break; case "todo": - if (command.length < 2) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty. Please re-enter:"); - } + Ui.validateTodoCommand(command); tasks.add(new Todo(text)); Todo.print(tasks); - task_count++; break; case "deadline": - if (command.length < 2) { - throw new DukeException("☹ OOPS!!! The description of a deadline cannot be empty. Please re-enter:"); - } else if (!text.contains("/by")) { - throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); - } + Ui.validateDeadlineCommand(command); tasks.add(new Deadline(text)); Deadline.print(tasks); - task_count++; break; case "list": if (tasks.size() == 0) { @@ -68,7 +54,7 @@ public static void tasks (String text, ArrayList tasks){ break; } System.out.println("Here are the tasks in your list:"); - for (int i=0; i < task_count; i++) { + for (int i=0; i < tasks.size(); i++) { System.out.println("\t"+ (i+1) + "." + tasks.get(i).printList()); } System.out.println("======================================================="); @@ -84,7 +70,7 @@ public static void tasks (String text, ArrayList tasks){ tasks.get(taskNumber).setDone(); System.out.println("Nice! I've marked this task as done:"); System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" +tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); - System.out.println("You have total " + (task_count) +" tasks in the list."); + System.out.println("You have total " + (tasks.size()) +" tasks in the list."); System.out.println("======================================================="); break; case "delete": @@ -98,8 +84,7 @@ public static void tasks (String text, ArrayList tasks){ System.out.println("Noted. I've removed this task: "); System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" + tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); tasks.remove(taskNumber); - task_count--; - System.out.println("Now you have " + (task_count) +" tasks in the list."); + System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); System.out.println("======================================================="); break; default: diff --git a/src/main/java/Todo.java b/src/main/duke/tasklist/Todo.java similarity index 89% rename from src/main/java/Todo.java rename to src/main/duke/tasklist/Todo.java index 1034339f..13326fa7 100644 --- a/src/main/java/Todo.java +++ b/src/main/duke/tasklist/Todo.java @@ -16,7 +16,7 @@ public static void print(ArrayList tasks){ } public String printList (){ - return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); } } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java new file mode 100644 index 00000000..ff424754 --- /dev/null +++ b/src/main/duke/ui/Ui.java @@ -0,0 +1,92 @@ +package duke.Ui; + +import java.util.Arrays; + +public class Ui { + public static void Welcome (){ + System.out.println(" _..._\n" + + " .' '. _\n" + + " / .-\"\"-\\ _/ \\\n" + + " .-| /:. | | |\n" + + " | \\ |:. /.-'-./\n" + + " | .-'-;:__.' =/\n" + + " .'= *=|DUKE _.='\n" + + " / _. | ;\n" + + " ;-.-'| \\ |\n" + + "/ | \\ _\\ _\\\n" + + "\\__/'._;. ==' ==\\\n" + + " \\ \\ |\n" + + " / / /\n" + + " /-._/-._/\n" + + " \\ `\\ \\" + "\t\tAye there. I'm DUKE.\n" + + " `-._/._/" + "\t\tHow can i help you?"); + System.out.println("___^/\\___^--____/\\____O______________/\\/\\---/\\___________---______________ \n" + + " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- \n"); + } + + public static void goodBye (){ + System.out.println(" ,:\n" + + " ,' |\n" + + " / :\n" + + " --' /\n" + + " \\/ />/\n" + + " / /_\\\n" + + " __/ /\n" + + " )'-. /\n" + + " ./ :\\\n" + + " /.' '\n" + + " '/'\n" + + " +\n" + + " '\n" + + " `.\n" + + " .-\"-\n" + + " ( |\n" + + " . .-' '.\n" + + " ( (. )8:\n" + + " .' / (_ )\n" + + " _. :(. )8P `\n" + + " . ( `-' ( `. .\n" + + " . : ( .a8a)\n" + + " /_`( \"a `a. )\"'\n" + + " ( (/ . ' )=='\n" + + " ( ( ) .8\" +\n" + + " (`'8a.( _( (\n" + + " ..-. `8P ) ` ) +\n" + + " -' ( -ab: )\n" + + " ' _ ` (8P\"Ya\n" + + " _( ( )b -`. ) +\n" + + " ( 8) ( _.aP\" _a \\( \\ *\n" + + " + )/ (8P (88 ) )\n" + + " (a:f \" `\" `\n" + + "Bye, i will miss you.\n"); + System.out.println("=========================TERMINATED==========================="); + } + + public static void errorMessage (DukeException e) { + System.err.println("\t" + e); + System.out.println("======================================================="); + } + + public static void validateEventCommand(String[] command) { + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); + } else if (!Arrays.asList(command).contains("/at")) { + throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); + } + } + + public static void validateDeadlineCommand(String[] command) { + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a deadline cannot be empty. Please re-enter:"); + } else if (!Arrays.asList(command).contains("/by")) { + throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); + } + } + + public static void validateTodoCommand(String[] command) { + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty. Please re-enter:"); + } + } + +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index 493ac867..00000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,84 +0,0 @@ -import java.util.Scanner; -import java.util.ArrayList; - -public class Duke { - public static void main(String[] args) { - String text; - Scanner in = new Scanner(System.in); - //Task[] tasks = new Task[100]; - ArrayList tasks = new ArrayList<>(); - - - System.out.println(" _..._\n" + - " .' '. _\n" + - " / .-\"\"-\\ _/ \\\n" + - " .-| /:. | | |\n" + - " | \\ |:. /.-'-./\n" + - " | .-'-;:__.' =/\n" + - " .'= *=|DUKE _.='\n" + - " / _. | ;\n" + - " ;-.-'| \\ |\n" + - "/ | \\ _\\ _\\\n" + - "\\__/'._;. ==' ==\\\n" + - " \\ \\ |\n" + - " / / /\n" + - " /-._/-._/\n" + - " \\ `\\ \\" + "\t\tAye there. I'm DUKE.\n" + - " `-._/._/" + "\t\tHow can i help you?"); - System.out.println("___^/\\___^--____/\\____O______________/\\/\\---/\\___________---______________ \n" + - " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- \n"); - - //takes in user input - text = in.nextLine(); - - //use while loop to program running - while(!text.equalsIgnoreCase("bye")){ - //print the current list by calling printList method, if user inputs "list" - try { - Task.tasks(text, tasks); - } catch (DukeException e){ - System.err.println("\t" + e); - System.out.println("======================================================="); - } finally { - text = in.nextLine(); - } - } - - System.out.println(" ,:\n" + - " ,' |\n" + - " / :\n" + - " --' /\n" + - " \\/ />/\n" + - " / /_\\\n" + - " __/ /\n" + - " )'-. /\n" + - " ./ :\\\n" + - " /.' '\n" + - " '/'\n" + - " +\n" + - " '\n" + - " `.\n" + - " .-\"-\n" + - " ( |\n" + - " . .-' '.\n" + - " ( (. )8:\n" + - " .' / (_ )\n" + - " _. :(. )8P `\n" + - " . ( `-' ( `. .\n" + - " . : ( .a8a)\n" + - " /_`( \"a `a. )\"'\n" + - " ( (/ . ' )=='\n" + - " ( ( ) .8\" +\n" + - " (`'8a.( _( (\n" + - " ..-. `8P ) ` ) +\n" + - " -' ( -ab: )\n" + - " ' _ ` (8P\"Ya\n" + - " _( ( )b -`. ) +\n" + - " ( 8) ( _.aP\" _a \\( \\ *\n" + - " + )/ (8P (88 ) )\n" + - " (a:f \" `\" `\n" + - "Bye, i will miss you.\n"); - System.out.println("=========================TERMINATED==========================="); - System.exit(0); - } -} From fd1ec165eff7ae88ce95f65fb12842f090b547ce Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sun, 31 Oct 2021 23:57:05 +0800 Subject: [PATCH 13/37] Refactor and Packages --- src/main/duke/Duke.java | 4 ++++ src/main/duke/command/Command.java | 2 +- src/main/duke/exception/DukeException.java | 5 ++++- src/main/duke/parser/Parser.java | 2 ++ src/main/duke/tasklist/Deadline.java | 9 ++++++--- src/main/duke/tasklist/Event.java | 9 ++++++--- src/main/duke/tasklist/Task.java | 6 ++++++ src/main/duke/tasklist/Todo.java | 6 ++++-- src/main/duke/ui/Ui.java | 8 ++++++-- 9 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index 497186cd..d156cc2c 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -3,6 +3,10 @@ import java.util.Scanner; import java.util.ArrayList; +import duke.ui.*; +import duke.tasklist.*; +import duke.exception.*; + public class Duke { private Ui ui; diff --git a/src/main/duke/command/Command.java b/src/main/duke/command/Command.java index 348d285a..66e7c708 100644 --- a/src/main/duke/command/Command.java +++ b/src/main/duke/command/Command.java @@ -1,5 +1,5 @@ package duke.command; public class Command { - public static + } diff --git a/src/main/duke/exception/DukeException.java b/src/main/duke/exception/DukeException.java index 4144634b..cf7460d5 100644 --- a/src/main/duke/exception/DukeException.java +++ b/src/main/duke/exception/DukeException.java @@ -1,5 +1,8 @@ +package duke.exception; + + public class DukeException extends IllegalArgumentException{ - DukeException(String s) { + public DukeException(String s) { super(s); } } \ No newline at end of file diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java index 465a82ac..335cf9bc 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/duke/parser/Parser.java @@ -1,3 +1,5 @@ +package duke.parser; + public class Parser { public static String[] commandToArray(String text){ diff --git a/src/main/duke/tasklist/Deadline.java b/src/main/duke/tasklist/Deadline.java index 21958511..3f14b06f 100644 --- a/src/main/duke/tasklist/Deadline.java +++ b/src/main/duke/tasklist/Deadline.java @@ -1,8 +1,11 @@ +package duke.tasklist; + import duke.exception.DukeException; +import duke.tasklist.Task; import java.util.ArrayList; -public class Deadline extends Task{ +public class Deadline extends Task { public Deadline(String description){ super(description); this.type = "D"; @@ -17,8 +20,8 @@ public String getDatetime() throws DukeException { public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " + tasks.get(task_count).getDescription() + "(by:" + tasks.get(task_count).getDatetime() + ")"); - System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " + tasks.get(tasks.size()-1).getDescription() + "(by:" + tasks.get(tasks.size()-1).getDatetime() + ")"); + System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/duke/tasklist/Event.java b/src/main/duke/tasklist/Event.java index 1e7f7261..561f9c30 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/duke/tasklist/Event.java @@ -1,5 +1,8 @@ +package duke.tasklist; + import java.util.ArrayList; + public class Event extends Task{ public Event(String description){ super(description); @@ -9,14 +12,14 @@ public Event(String description){ @Override public String getDescription() {return description.substring(6,description.indexOf('/'));} - public String getDatetime() throws DukeException { + public String getDatetime() { return description.substring(description.indexOf('/')+3); } public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " +""+tasks.get(task_count).getDescription() + "(at:" + tasks.get(task_count).getDatetime() + ")"); - System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " +""+tasks.get(tasks.size()-1).getDescription() + "(at:" + tasks.get(tasks.size()-1).getDatetime() + ")"); + System.out.println("Now you have " + tasks.size() +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/duke/tasklist/Task.java b/src/main/duke/tasklist/Task.java index f80dcaf0..754a5d10 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -1,5 +1,11 @@ +package duke.tasklist; + import java.util.ArrayList; +import duke.parser.*; +import duke.ui.*; +import duke.exception.*; + public class Task { protected String description; protected boolean isDone; diff --git a/src/main/duke/tasklist/Todo.java b/src/main/duke/tasklist/Todo.java index 13326fa7..514de56a 100644 --- a/src/main/duke/tasklist/Todo.java +++ b/src/main/duke/tasklist/Todo.java @@ -1,3 +1,5 @@ +package duke.tasklist; + import java.util.ArrayList; public class Todo extends Task{ @@ -10,8 +12,8 @@ public Todo(String description){ public static void print(ArrayList tasks){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(task_count).getType() +"]" + "[" + tasks.get(task_count).getStatusIcon() +"] " + tasks.get(task_count).getDescription()); - System.out.println("Now you have " + (task_count+1) +" tasks in the list."); + System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " + tasks.get(tasks.size()-1).getDescription()); + System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); System.out.println("======================================================="); } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index ff424754..30d90955 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -1,8 +1,12 @@ -package duke.Ui; +package duke.ui; import java.util.Arrays; +import java.util.Scanner; + +import duke.exception.*; public class Ui { + public static void Welcome (){ System.out.println(" _..._\n" + " .' '. _\n" + @@ -58,7 +62,7 @@ public static void goodBye (){ " ( 8) ( _.aP\" _a \\( \\ *\n" + " + )/ (8P (88 ) )\n" + " (a:f \" `\" `\n" + - "Bye, i will miss you.\n"); + "\nBye, i will miss you."); System.out.println("=========================TERMINATED==========================="); } From 6b939a4764751e1cd78425839aadc076e278bcbb Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 02:06:18 +0800 Subject: [PATCH 14/37] A-MoreOOP && A-Packages --- src/main/data/tasks.txt | 2 + src/main/duke/Duke.java | 58 +++++++----- src/main/duke/command/AddCommand.java | 33 +++++++ src/main/duke/command/ByeCommand.java | 12 +++ src/main/duke/command/Command.java | 24 ++++- src/main/duke/command/CommandCollections.java | 5 ++ src/main/duke/command/DeleteCommand.java | 21 +++++ src/main/duke/command/DoneCommand.java | 22 +++++ src/main/duke/command/InvalidCommand.java | 18 ++++ src/main/duke/command/ListCommand.java | 17 ++++ src/main/duke/exception/DukeException.java | 1 - src/main/duke/parser/Parser.java | 49 +++++++++++ src/main/duke/storage/Storage.java | 65 ++++++++++++++ src/main/duke/tasklist/Deadline.java | 18 +--- src/main/duke/tasklist/Event.java | 12 +-- src/main/duke/tasklist/Task.java | 78 ++-------------- src/main/duke/tasklist/TaskList.java | 39 ++++++++ src/main/duke/tasklist/Todo.java | 12 +-- src/main/duke/ui/Ui.java | 88 +++++++++++++++++-- 19 files changed, 438 insertions(+), 136 deletions(-) create mode 100644 src/main/data/tasks.txt create mode 100644 src/main/duke/command/AddCommand.java create mode 100644 src/main/duke/command/ByeCommand.java create mode 100644 src/main/duke/command/CommandCollections.java create mode 100644 src/main/duke/command/DeleteCommand.java create mode 100644 src/main/duke/command/DoneCommand.java create mode 100644 src/main/duke/command/InvalidCommand.java create mode 100644 src/main/duke/command/ListCommand.java create mode 100644 src/main/duke/storage/Storage.java create mode 100644 src/main/duke/tasklist/TaskList.java diff --git a/src/main/data/tasks.txt b/src/main/data/tasks.txt new file mode 100644 index 00000000..97df2bb6 --- /dev/null +++ b/src/main/data/tasks.txt @@ -0,0 +1,2 @@ +T | 0 | 1 +T | 0 | 2 diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index d156cc2c..ddfe8e9a 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -1,39 +1,55 @@ package duke; -import java.util.Scanner; -import java.util.ArrayList; - import duke.ui.*; import duke.tasklist.*; import duke.exception.*; +import duke.parser.*; +import duke.storage.*; +import duke.command.*; + +import java.io.FileNotFoundException; +import java.io.IOException; public class Duke { - private Ui ui; - public static void main(String[] args) { - String text; - Scanner in = new Scanner(System.in); + private TaskList taskList; + private Storage storage; + private Ui ui; - ArrayList tasks = new ArrayList<>(); + public Duke(String filePath) { + + ui = new Ui(); + storage = new Storage(filePath); + try { + taskList = new TaskList(storage.load()); + } catch (DukeException e) { + ui.errorMessage(e); + taskList = new TaskList(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + public void run() { + taskList = new TaskList(); Ui.Welcome(); - - //takes in user input - text = in.nextLine(); - - //use while loop to program running - while(!text.equalsIgnoreCase("bye")){ - //print the current list by calling printList method, if user inputs "list" + boolean isExit = false; + while(!isExit){ try { - Task.tasks(text, tasks); - } catch (DukeException e){ - Ui.errorMessage(e); + String userInput = ui.userInput(); + ui.Separator(); + Command c = Parser.parse(userInput, taskList); + c.execute(taskList, ui, storage); + isExit = c.isExit(); + } catch (DukeException | IOException e){ + ui.errorMessage((DukeException) e); } finally { - text = in.nextLine(); + ui.Separator(); } } + } - Ui.goodBye(); - System.exit(0); + public static void main(String[] args){ + new Duke("data/tasks.txt").run(); } } diff --git a/src/main/duke/command/AddCommand.java b/src/main/duke/command/AddCommand.java new file mode 100644 index 00000000..55078052 --- /dev/null +++ b/src/main/duke/command/AddCommand.java @@ -0,0 +1,33 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.Task; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +public class AddCommand extends Command{ + Task task; + + public AddCommand(Task task){ + this.task = task; + } + + public void execute(TaskList taskList, Ui ui, Storage storage) { + taskList.addTask(task); + ui.printAdd(task); + String taskType = task.getType(); + switch (taskType){ + case "T": + ui.printTodo(taskList); + break; + case "E": + ui.printEvent(taskList); + break; + case "D": + ui.printDeadline(taskList); + break; + } + } + + +} diff --git a/src/main/duke/command/ByeCommand.java b/src/main/duke/command/ByeCommand.java new file mode 100644 index 00000000..ad5aeb48 --- /dev/null +++ b/src/main/duke/command/ByeCommand.java @@ -0,0 +1,12 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +public class ByeCommand extends Command{ + public void execute(TaskList taskList, Ui ui, Storage storage) { + ui.goodBye(); + super.setExit(true); + } +} diff --git a/src/main/duke/command/Command.java b/src/main/duke/command/Command.java index 66e7c708..1bf84a03 100644 --- a/src/main/duke/command/Command.java +++ b/src/main/duke/command/Command.java @@ -1,5 +1,27 @@ package duke.command; -public class Command { +import java.io.*; +import duke.exception.*; +import duke.ui.*; +import duke.storage.*; +import duke.tasklist.*; + +public abstract class Command { + + protected boolean isExit = false; + + public Command(){} + + public Command(String str){ System.out.println(str);} + + public abstract void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException, IOException; + + public void setExit(boolean exit){ + isExit = exit; + } + + public boolean isExit(){ + return isExit; + } } diff --git a/src/main/duke/command/CommandCollections.java b/src/main/duke/command/CommandCollections.java new file mode 100644 index 00000000..ff1fd5ff --- /dev/null +++ b/src/main/duke/command/CommandCollections.java @@ -0,0 +1,5 @@ +package duke.command; + +public enum CommandCollections { + LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE +} diff --git a/src/main/duke/command/DeleteCommand.java b/src/main/duke/command/DeleteCommand.java new file mode 100644 index 00000000..af5b85a8 --- /dev/null +++ b/src/main/duke/command/DeleteCommand.java @@ -0,0 +1,21 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +import java.io.IOException; + +public class DeleteCommand extends Command{ + String[] command; + + public DeleteCommand(String[] command){ + this.command = command; + } + + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + int taskNumber = Integer.parseInt(command[1]) - 1; + taskList.removeTask(taskNumber); + ui.printTaskCount(taskList); + } +} diff --git a/src/main/duke/command/DoneCommand.java b/src/main/duke/command/DoneCommand.java new file mode 100644 index 00000000..24edbec3 --- /dev/null +++ b/src/main/duke/command/DoneCommand.java @@ -0,0 +1,22 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +import java.io.IOException; + +public class DoneCommand extends Command{ + String[] command; + + public DoneCommand(String[] command){ + this.command = command; + } + + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + int taskNumber = Integer.parseInt(command[1]) - 1; + taskList.get(taskNumber).setDone(); + ui.printTaskCount(taskList); + } + +} diff --git a/src/main/duke/command/InvalidCommand.java b/src/main/duke/command/InvalidCommand.java new file mode 100644 index 00000000..9a585fa8 --- /dev/null +++ b/src/main/duke/command/InvalidCommand.java @@ -0,0 +1,18 @@ +package duke.command; + +import duke.exception.DukeException; +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +public class InvalidCommand extends Command{ + private final String errorMsg; + + public InvalidCommand(String errorMsg){ + this.errorMsg = errorMsg; + } + + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + throw new DukeException(errorMsg); + } +} diff --git a/src/main/duke/command/ListCommand.java b/src/main/duke/command/ListCommand.java new file mode 100644 index 00000000..a7ca27b0 --- /dev/null +++ b/src/main/duke/command/ListCommand.java @@ -0,0 +1,17 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.*; +import duke.ui.Ui; + +public class ListCommand extends Command { + + public ListCommand (){} + + public ListCommand (boolean valid) {} + + public void execute(TaskList taskList, Ui ui, Storage storage) { + ui.printTaskList(taskList); + ui.printTaskCount(taskList); + } +} diff --git a/src/main/duke/exception/DukeException.java b/src/main/duke/exception/DukeException.java index cf7460d5..53fe8b0f 100644 --- a/src/main/duke/exception/DukeException.java +++ b/src/main/duke/exception/DukeException.java @@ -1,6 +1,5 @@ package duke.exception; - public class DukeException extends IllegalArgumentException{ public DukeException(String s) { super(s); diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java index 335cf9bc..de8d1646 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/duke/parser/Parser.java @@ -1,8 +1,57 @@ package duke.parser; +import duke.tasklist.*; +import duke.ui.Ui; +import duke.command.*; + public class Parser { + + public static String[] commandToArray(String text){ return text.split(" "); } + + public static Command parse(String text, TaskList taskList) throws IllegalArgumentException{ + assert text != null : "Command be null"; + + String[] command = commandToArray(text); + String keyword = command[0].toUpperCase(); + + CommandCollections commandCollections; + + try { + commandCollections = CommandCollections.valueOf(keyword); + } catch (IllegalArgumentException e) { + return new InvalidCommand("☹ The command in not valid! Please re-enter:"); + } + + switch (commandCollections) { + case EVENT: + Ui.validateEventCommand(command); + return new AddCommand(new Event(text)); + case TODO: + Ui.validateTodoCommand(command); + return new AddCommand(new Todo(text)); + case DEADLINE: + Ui.validateDeadlineCommand(command); + return new AddCommand(new Deadline(text)); + case LIST: + return new ListCommand(); + case DONE: + Ui.validateDoneCommand(command, taskList); + Ui.printDone(command, taskList); + return new DoneCommand(command); + case DELETE: + Ui.validateDoneCommand(command, taskList); + Command delete = new DeleteCommand(command); + Ui.printDelete(command, taskList); + return delete; + case BYE: + return new ByeCommand(); + default: + return new InvalidCommand("☹ The command in not valid! Please re-enter:"); + } + + } } diff --git a/src/main/duke/storage/Storage.java b/src/main/duke/storage/Storage.java new file mode 100644 index 00000000..811faf95 --- /dev/null +++ b/src/main/duke/storage/Storage.java @@ -0,0 +1,65 @@ +package duke.storage; + +import duke.tasklist.*; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + + public static String filePath; + + public Storage (String filePath){ + this.filePath = filePath; + } + + public void store(TaskList taskList) throws IOException { + File file = new File(filePath); + File dir = file.getParentFile(); + if(!file.exists()){ + if(!dir.exists()){ + dir.mkdirs(); + } + file.createNewFile(); + } + FileWriter fw = new FileWriter(file); + for(int i = 0; i < taskList.size(); i++){ + fw.write(taskList.get(i).printTask()); + } + fw.close(); + } + + + /** + * load task list from selected file + * @return + * @throws FileNotFoundException + */ + public ArrayList load() throws FileNotFoundException { + ArrayList tasks = new ArrayList<>(); + File file = new File(filePath); + Scanner sc = new Scanner(file); + while(sc.hasNext()){ + String text = sc.nextLine(); + String[] keyword = text.split(" \\| "); + //boolean isDone = keyword[1].equals("1") ? true : false; + Task task; + if(keyword[0].equals("T")){ + task = new Todo(text); + } + else if(keyword[0].equals("D")){ + task = new Deadline(text); + } + else{ + task = new Event(text); + } + tasks.add(task); + } + return tasks; + } + +} diff --git a/src/main/duke/tasklist/Deadline.java b/src/main/duke/tasklist/Deadline.java index 3f14b06f..80de0705 100644 --- a/src/main/duke/tasklist/Deadline.java +++ b/src/main/duke/tasklist/Deadline.java @@ -1,32 +1,20 @@ package duke.tasklist; -import duke.exception.DukeException; -import duke.tasklist.Task; - -import java.util.ArrayList; - public class Deadline extends Task { public Deadline(String description){ super(description); this.type = "D"; + this.isDone = false; } @Override public String getDescription() {return description.substring(9,description.indexOf('/'));} - public String getDatetime() throws DukeException { + public String getDatetime() { return description.substring(description.indexOf('/')+3); } - public static void print(ArrayList tasks){ - System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " + tasks.get(tasks.size()-1).getDescription() + "(by:" + tasks.get(tasks.size()-1).getDatetime() + ")"); - System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); - System.out.println("======================================================="); - } - - public String printList (){ - //print out every element in the array + public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; } diff --git a/src/main/duke/tasklist/Event.java b/src/main/duke/tasklist/Event.java index 561f9c30..22c82258 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/duke/tasklist/Event.java @@ -1,12 +1,10 @@ package duke.tasklist; -import java.util.ArrayList; - - public class Event extends Task{ public Event(String description){ super(description); this.type = "E"; + this.isDone = false; } @Override @@ -16,15 +14,9 @@ public String getDatetime() { return description.substring(description.indexOf('/')+3); } - public static void print(ArrayList tasks){ - System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " +""+tasks.get(tasks.size()-1).getDescription() + "(at:" + tasks.get(tasks.size()-1).getDatetime() + ")"); - System.out.println("Now you have " + tasks.size() +" tasks in the list."); - System.out.println("======================================================="); - } @Override - public String printList (){ + public String printTask (){ //print out every element in the array return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; } diff --git a/src/main/duke/tasklist/Task.java b/src/main/duke/tasklist/Task.java index 754a5d10..946293da 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -1,17 +1,12 @@ package duke.tasklist; -import java.util.ArrayList; - -import duke.parser.*; -import duke.ui.*; -import duke.exception.*; - public class Task { protected String description; protected boolean isDone; protected String type; protected String datetime; + public Task(String description) { this.description = description; this.isDone = false; @@ -23,6 +18,8 @@ public Task(String description) { //isDone.Setter public void setDone() {isDone = true;} + public boolean isDone() { return isDone; } + //isDone.Getter public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X @@ -30,74 +27,13 @@ public String getStatusIcon() { public String getType(){return type;} - public String getDatetime(){ + public String getDatetime(){ return datetime; } - public static void tasks (String text, ArrayList tasks){ - String[] command = Parser.commandToArray(text); - int taskNumber; - switch (command[0]) { - case "event": - Ui.validateEventCommand(command); - tasks.add(new Event(text)); - Event.print(tasks); - break; - case "todo": - Ui.validateTodoCommand(command); - tasks.add(new Todo(text)); - Todo.print(tasks); - break; - case "deadline": - Ui.validateDeadlineCommand(command); - tasks.add(new Deadline(text)); - Deadline.print(tasks); - break; - case "list": - if (tasks.size() == 0) { - System.out.println("\tList is empty. Please add new task."); - System.out.println("======================================================="); - break; - } - System.out.println("Here are the tasks in your list:"); - for (int i=0; i < tasks.size(); i++) { - System.out.println("\t"+ (i+1) + "." + tasks.get(i).printList()); - } - System.out.println("======================================================="); - break; - case "done": - if (command.length < 2) { - throw new DukeException("☹ Please state task number."); - } - taskNumber = Integer.parseInt(command[1]) - 1; - if (taskNumber >= tasks.size()) { - throw new DukeException("☹ There is no such task."); - } - tasks.get(taskNumber).setDone(); - System.out.println("Nice! I've marked this task as done:"); - System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" +tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); - System.out.println("You have total " + (tasks.size()) +" tasks in the list."); - System.out.println("======================================================="); - break; - case "delete": - if (command.length < 2) { - throw new DukeException("☹ Please state task number."); - } - taskNumber = Integer.parseInt(command[1]) -1; - if (taskNumber >= tasks.size()) { - throw new DukeException("☹ There is no such task."); - } - System.out.println("Noted. I've removed this task: "); - System.out.println("\t[" + tasks.get(taskNumber).getType() + "] "+ "[" + tasks.get(taskNumber).getStatusIcon() + "] " + tasks.get(taskNumber).getDescription()); - tasks.remove(taskNumber); - System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); - System.out.println("======================================================="); - break; - default: - throw new DukeException("\t☹ Sorry! I don't know what that means :-(\n\tPlease re-enter:"); - } - } + public String printTask(){return "";} + + - public String printList (){return "";} } \ No newline at end of file diff --git a/src/main/duke/tasklist/TaskList.java b/src/main/duke/tasklist/TaskList.java new file mode 100644 index 00000000..59e9c4ac --- /dev/null +++ b/src/main/duke/tasklist/TaskList.java @@ -0,0 +1,39 @@ +package duke.tasklist; + +import java.util.ArrayList; + + +public class TaskList { + private ArrayList taskList; + + public TaskList() { + taskList = new ArrayList<>(); + } + + public TaskList(ArrayList taskList) { + this.taskList = taskList; + } + + public void addTask (Task t) { + taskList.add(t); + } + + public void removeTask (int i) { + taskList.remove(i); + } + + public void reset() { + taskList = new ArrayList<>(); + } + + public int size() { + return taskList.size(); + } + + public Task get(int i) { + return taskList.get(i); + } + + + +} diff --git a/src/main/duke/tasklist/Todo.java b/src/main/duke/tasklist/Todo.java index 514de56a..f8b9019e 100644 --- a/src/main/duke/tasklist/Todo.java +++ b/src/main/duke/tasklist/Todo.java @@ -1,23 +1,15 @@ package duke.tasklist; -import java.util.ArrayList; - public class Todo extends Task{ public Todo(String description){ super(description); this.type = "T"; + this.isDone = false; } public String getDescription() {return description.substring(5);} - public static void print(ArrayList tasks){ - System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + tasks.get(tasks.size()-1).getType() +"]" + "[" + tasks.get(tasks.size()-1).getStatusIcon() +"] " + tasks.get(tasks.size()-1).getDescription()); - System.out.println("Now you have " + (tasks.size()) +" tasks in the list."); - System.out.println("======================================================="); - } - - public String printList (){ + public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index 30d90955..4e4de353 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -1,12 +1,22 @@ package duke.ui; +import duke.exception.DukeException; +import duke.tasklist.Task; +import duke.tasklist.TaskList; + import java.util.Arrays; import java.util.Scanner; -import duke.exception.*; - public class Ui { + private static final String SEPARATOR = + "________________________________________________________________________________"; + + private final Scanner in = new Scanner(System.in); + + public String userInput(){ + return in.nextLine(); + } public static void Welcome (){ System.out.println(" _..._\n" + " .' '. _\n" + @@ -25,7 +35,8 @@ public static void Welcome (){ " \\ `\\ \\" + "\t\tAye there. I'm DUKE.\n" + " `-._/._/" + "\t\tHow can i help you?"); System.out.println("___^/\\___^--____/\\____O______________/\\/\\---/\\___________---______________ \n" + - " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- \n"); + " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- "); + System.out.println(SEPARATOR); } public static void goodBye (){ @@ -63,12 +74,10 @@ public static void goodBye (){ " + )/ (8P (88 ) )\n" + " (a:f \" `\" `\n" + "\nBye, i will miss you."); - System.out.println("=========================TERMINATED==========================="); } - public static void errorMessage (DukeException e) { + public void errorMessage (DukeException e) { System.err.println("\t" + e); - System.out.println("======================================================="); } public static void validateEventCommand(String[] command) { @@ -93,4 +102,69 @@ public static void validateTodoCommand(String[] command) { } } -} + public void Separator() {System.out.println(SEPARATOR);} + + public void printAdd(Task task){ + task.printTask(); + } + + public void printDeadline(TaskList taskList){ + System.out.println("Got it. I've added this task: "); + System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(by:" + taskList.get(taskList.size()-1).getDatetime() + ")"); + System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); + } + + public void printEvent(TaskList taskList){ + System.out.println("Got it. I've added this task: "); + System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(at:" + taskList.get(taskList.size()-1).getDatetime() + ")"); + System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); + } + + public void printTodo(TaskList taskList){ + System.out.println("Got it. I've added this task: "); + System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription()); + System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); + } + + public void printTaskList(TaskList taskList){ + if (taskList.size() == 0) { + System.out.println("\tList is empty. Please add new task."); + } else { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < taskList.size(); i++) { + System.out.println("\t" + (i + 1) + "." + taskList.get(i).printTask()); + } + } + } + + + public static void validateDoneCommand(String[] command, TaskList taskList){ + if (command.length < 2) { + throw new DukeException("☹ Please state task number."); + } + int taskNumber = Integer.parseInt(command[1]) - 1; + if (taskNumber >= taskList.size()) { + throw new DukeException("☹ There is no such task."); + } + + } + + public static void printDone(String[] command, TaskList taskList){ + int taskNumber = Integer.parseInt(command[1]) - 1; + System.out.println("Nice! I've marked this task as done:"); + System.out.println("\t[" + taskList.get(taskNumber).getType() + "]"+ "[X] " + taskList.get(taskNumber).getDescription()); + } + + public static void printDelete(String[] command, TaskList taskList){ + int taskNumber = Integer.parseInt(command[1]) - 1; + System.out.println("Noted. I've removed this task: "); + System.out.println("\t[" + taskList.get(taskNumber).getType() + "]"+ "[" + taskList.get(taskNumber).getStatusIcon() + "] " + taskList.get(taskNumber).getDescription()); + } + + public void printTaskCount(TaskList taskList){ + System.out.println("You have total " + (taskList.size()) +" tasks in the list."); + } + + public void showExit() { + } +} \ No newline at end of file From 0556d5cf589fa38772ccd2941ab37c0c07c44efb Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 03:28:35 +0800 Subject: [PATCH 15/37] Level-7 Save --- src/data/tasks.txt | 3 +++ src/main/data/tasks.txt | 2 -- src/main/duke/Duke.java | 6 ++---- src/main/duke/command/AddCommand.java | 5 ++++- src/main/duke/command/DeleteCommand.java | 1 + src/main/duke/command/DoneCommand.java | 1 + src/main/duke/storage/Storage.java | 22 ++++++++-------------- src/main/duke/ui/Ui.java | 4 ++-- 8 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 src/data/tasks.txt delete mode 100644 src/main/data/tasks.txt diff --git a/src/data/tasks.txt b/src/data/tasks.txt new file mode 100644 index 00000000..f3b757c7 --- /dev/null +++ b/src/data/tasks.txt @@ -0,0 +1,3 @@ +[T][ ] borrow book +[D][ ] return book (by: Sunday) +[E][ ] project meeting (by: Mon 2-4pm) diff --git a/src/main/data/tasks.txt b/src/main/data/tasks.txt deleted file mode 100644 index 97df2bb6..00000000 --- a/src/main/data/tasks.txt +++ /dev/null @@ -1,2 +0,0 @@ -T | 0 | 1 -T | 0 | 2 diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index ddfe8e9a..aa23a78c 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -17,7 +17,6 @@ public class Duke { private Ui ui; public Duke(String filePath) { - ui = new Ui(); storage = new Storage(filePath); try { @@ -31,7 +30,6 @@ public Duke(String filePath) { } public void run() { - taskList = new TaskList(); Ui.Welcome(); boolean isExit = false; while(!isExit){ @@ -42,7 +40,7 @@ public void run() { c.execute(taskList, ui, storage); isExit = c.isExit(); } catch (DukeException | IOException e){ - ui.errorMessage((DukeException) e); + ui.errorMessage(e); } finally { ui.Separator(); } @@ -50,6 +48,6 @@ public void run() { } public static void main(String[] args){ - new Duke("data/tasks.txt").run(); + new Duke("src/data/tasks.txt").run(); } } diff --git a/src/main/duke/command/AddCommand.java b/src/main/duke/command/AddCommand.java index 55078052..eb2b4ea1 100644 --- a/src/main/duke/command/AddCommand.java +++ b/src/main/duke/command/AddCommand.java @@ -5,6 +5,8 @@ import duke.tasklist.TaskList; import duke.ui.Ui; +import java.io.IOException; + public class AddCommand extends Command{ Task task; @@ -12,10 +14,11 @@ public AddCommand(Task task){ this.task = task; } - public void execute(TaskList taskList, Ui ui, Storage storage) { + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { taskList.addTask(task); ui.printAdd(task); String taskType = task.getType(); + storage.saveTask(taskList); switch (taskType){ case "T": ui.printTodo(taskList); diff --git a/src/main/duke/command/DeleteCommand.java b/src/main/duke/command/DeleteCommand.java index af5b85a8..7a18c970 100644 --- a/src/main/duke/command/DeleteCommand.java +++ b/src/main/duke/command/DeleteCommand.java @@ -17,5 +17,6 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOExceptio int taskNumber = Integer.parseInt(command[1]) - 1; taskList.removeTask(taskNumber); ui.printTaskCount(taskList); + storage.saveTask(taskList); } } diff --git a/src/main/duke/command/DoneCommand.java b/src/main/duke/command/DoneCommand.java index 24edbec3..718fdee8 100644 --- a/src/main/duke/command/DoneCommand.java +++ b/src/main/duke/command/DoneCommand.java @@ -17,6 +17,7 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOExceptio int taskNumber = Integer.parseInt(command[1]) - 1; taskList.get(taskNumber).setDone(); ui.printTaskCount(taskList); + storage.saveTask(taskList); } } diff --git a/src/main/duke/storage/Storage.java b/src/main/duke/storage/Storage.java index 811faf95..767134d7 100644 --- a/src/main/duke/storage/Storage.java +++ b/src/main/duke/storage/Storage.java @@ -17,7 +17,7 @@ public Storage (String filePath){ this.filePath = filePath; } - public void store(TaskList taskList) throws IOException { + public void saveTask(TaskList taskList) throws IOException { File file = new File(filePath); File dir = file.getParentFile(); if(!file.exists()){ @@ -28,38 +28,32 @@ public void store(TaskList taskList) throws IOException { } FileWriter fw = new FileWriter(file); for(int i = 0; i < taskList.size(); i++){ - fw.write(taskList.get(i).printTask()); + fw.write(taskList.get(i).printTask()+ System.getProperty("line.separator")); } fw.close(); } - /** - * load task list from selected file - * @return - * @throws FileNotFoundException - */ public ArrayList load() throws FileNotFoundException { - ArrayList tasks = new ArrayList<>(); + ArrayList taskList = new ArrayList<>(); File file = new File(filePath); Scanner sc = new Scanner(file); while(sc.hasNext()){ String text = sc.nextLine(); - String[] keyword = text.split(" \\| "); - //boolean isDone = keyword[1].equals("1") ? true : false; + String keyword = Character.toString(text.charAt(1)); Task task; - if(keyword[0].equals("T")){ + if(keyword.equals("T")){ task = new Todo(text); } - else if(keyword[0].equals("D")){ + else if(keyword.equals("D")){ task = new Deadline(text); } else{ task = new Event(text); } - tasks.add(task); + taskList.add(task); } - return tasks; + return taskList; } } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index 4e4de353..b6a005c8 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -76,7 +76,7 @@ public static void goodBye (){ "\nBye, i will miss you."); } - public void errorMessage (DukeException e) { + public void errorMessage (Exception e) { System.err.println("\t" + e); } @@ -162,7 +162,7 @@ public static void printDelete(String[] command, TaskList taskList){ } public void printTaskCount(TaskList taskList){ - System.out.println("You have total " + (taskList.size()) +" tasks in the list."); + System.out.println("\tYou have total " + (taskList.size()) +" tasks in the list."); } public void showExit() { From e6337b834f2bd82a4d5de9859cbfc07788c52545 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 20:08:19 +0800 Subject: [PATCH 16/37] Level-7 Fixed Bug --- src/data/tasks.txt | 7 ++-- src/main/duke/command/AddCommand.java | 2 +- src/main/duke/command/DeleteCommand.java | 2 +- src/main/duke/command/DoneCommand.java | 4 +-- src/main/duke/command/ListCommand.java | 2 -- src/main/duke/storage/Storage.java | 46 ++++++++++++++++++------ src/main/duke/tasklist/Event.java | 1 - src/main/duke/tasklist/Task.java | 2 +- src/main/duke/tasklist/TaskList.java | 4 ++- src/main/duke/tasklist/Todo.java | 1 + src/main/duke/ui/Ui.java | 4 +-- 11 files changed, 49 insertions(+), 26 deletions(-) diff --git a/src/data/tasks.txt b/src/data/tasks.txt index f3b757c7..1d7ad173 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1,3 +1,4 @@ -[T][ ] borrow book -[D][ ] return book (by: Sunday) -[E][ ] project meeting (by: Mon 2-4pm) +todo [ ] borrow book +deadline [ ] return book /by Sunday +event [√] project meeting /at Mon 2-4pm +todo [√] do excercise diff --git a/src/main/duke/command/AddCommand.java b/src/main/duke/command/AddCommand.java index eb2b4ea1..64776179 100644 --- a/src/main/duke/command/AddCommand.java +++ b/src/main/duke/command/AddCommand.java @@ -18,7 +18,7 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOExceptio taskList.addTask(task); ui.printAdd(task); String taskType = task.getType(); - storage.saveTask(taskList); + storage.saveTask(taskList.getTasks()); switch (taskType){ case "T": ui.printTodo(taskList); diff --git a/src/main/duke/command/DeleteCommand.java b/src/main/duke/command/DeleteCommand.java index 7a18c970..70fce9c8 100644 --- a/src/main/duke/command/DeleteCommand.java +++ b/src/main/duke/command/DeleteCommand.java @@ -17,6 +17,6 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOExceptio int taskNumber = Integer.parseInt(command[1]) - 1; taskList.removeTask(taskNumber); ui.printTaskCount(taskList); - storage.saveTask(taskList); + storage.saveTask(taskList.getTasks()); } } diff --git a/src/main/duke/command/DoneCommand.java b/src/main/duke/command/DoneCommand.java index 718fdee8..9b5ea185 100644 --- a/src/main/duke/command/DoneCommand.java +++ b/src/main/duke/command/DoneCommand.java @@ -15,9 +15,9 @@ public DoneCommand(String[] command){ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { int taskNumber = Integer.parseInt(command[1]) - 1; - taskList.get(taskNumber).setDone(); + taskList.get(taskNumber).setDone(true); ui.printTaskCount(taskList); - storage.saveTask(taskList); + storage.saveTask(taskList.getTasks()); } } diff --git a/src/main/duke/command/ListCommand.java b/src/main/duke/command/ListCommand.java index a7ca27b0..0a0732ac 100644 --- a/src/main/duke/command/ListCommand.java +++ b/src/main/duke/command/ListCommand.java @@ -8,8 +8,6 @@ public class ListCommand extends Command { public ListCommand (){} - public ListCommand (boolean valid) {} - public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printTaskList(taskList); ui.printTaskCount(taskList); diff --git a/src/main/duke/storage/Storage.java b/src/main/duke/storage/Storage.java index 767134d7..e2cf01a9 100644 --- a/src/main/duke/storage/Storage.java +++ b/src/main/duke/storage/Storage.java @@ -9,15 +9,17 @@ import java.util.ArrayList; import java.util.Scanner; +import static duke.parser.Parser.commandToArray; + public class Storage { - public static String filePath; + protected String filePath; public Storage (String filePath){ this.filePath = filePath; } - public void saveTask(TaskList taskList) throws IOException { + public void saveTask(ArrayList taskList) throws IOException { File file = new File(filePath); File dir = file.getParentFile(); if(!file.exists()){ @@ -27,8 +29,25 @@ public void saveTask(TaskList taskList) throws IOException { file.createNewFile(); } FileWriter fw = new FileWriter(file); - for(int i = 0; i < taskList.size(); i++){ - fw.write(taskList.get(i).printTask()+ System.getProperty("line.separator")); + for(Task task : taskList){ + String type = task.getType(); + String toText = null; + String isDone = task.isDone() ? "√" : " "; + String description = task.getDescription(); + + switch (type){ + case "T": + toText = "todo [" + isDone + "] " + description + System.getProperty("line.separator"); + break; + case "D": + toText = "deadline [" + isDone + "] " + description +"/by" + task.getDatetime() + System.getProperty("line.separator"); + break; + case "E": + toText = "event [" + isDone + "] " + description +"/at" + task.getDatetime()+ System.getProperty("line.separator"); + break; + } + assert toText != null; + fw.write(toText); } fw.close(); } @@ -40,20 +59,25 @@ public ArrayList load() throws FileNotFoundException { Scanner sc = new Scanner(file); while(sc.hasNext()){ String text = sc.nextLine(); - String keyword = Character.toString(text.charAt(1)); + String parseText = text.replaceAll(" \\[.*?\\] ", " "); + boolean isDone = text.contains("√"); + String[] command = commandToArray(text); + String keyword = command[0]; Task task; - if(keyword.equals("T")){ - task = new Todo(text); + if(keyword.equals("todo")){ + task = new Todo(parseText); + task.setDone(isDone); } - else if(keyword.equals("D")){ - task = new Deadline(text); + else if(keyword.equals("deadline")){ + task = new Deadline(parseText); + task.setDone(isDone); } else{ - task = new Event(text); + task = new Event(parseText); + task.setDone(isDone); } taskList.add(task); } return taskList; } - } diff --git a/src/main/duke/tasklist/Event.java b/src/main/duke/tasklist/Event.java index 22c82258..ee55da3a 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/duke/tasklist/Event.java @@ -14,7 +14,6 @@ public String getDatetime() { return description.substring(description.indexOf('/')+3); } - @Override public String printTask (){ //print out every element in the array diff --git a/src/main/duke/tasklist/Task.java b/src/main/duke/tasklist/Task.java index 946293da..2f0b73d7 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -16,7 +16,7 @@ public Task(String description) { public String getDescription() {return description;} //isDone.Setter - public void setDone() {isDone = true;} + public void setDone(boolean isDone) {this.isDone = isDone;} public boolean isDone() { return isDone; } diff --git a/src/main/duke/tasklist/TaskList.java b/src/main/duke/tasklist/TaskList.java index 59e9c4ac..4c6ac427 100644 --- a/src/main/duke/tasklist/TaskList.java +++ b/src/main/duke/tasklist/TaskList.java @@ -34,6 +34,8 @@ public Task get(int i) { return taskList.get(i); } - + public ArrayList getTasks() { + return taskList; + } } diff --git a/src/main/duke/tasklist/Todo.java b/src/main/duke/tasklist/Todo.java index f8b9019e..5977d0ea 100644 --- a/src/main/duke/tasklist/Todo.java +++ b/src/main/duke/tasklist/Todo.java @@ -13,4 +13,5 @@ public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); } + } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index b6a005c8..78447b71 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -10,7 +10,7 @@ public class Ui { private static final String SEPARATOR = - "________________________________________________________________________________"; + "___________________________________________________________________________"; private final Scanner in = new Scanner(System.in); @@ -165,6 +165,4 @@ public void printTaskCount(TaskList taskList){ System.out.println("\tYou have total " + (taskList.size()) +" tasks in the list."); } - public void showExit() { - } } \ No newline at end of file From e8de287094dad62779a98ee1a0e0a5817b938b44 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 21:06:47 +0800 Subject: [PATCH 17/37] small ui fixes --- src/main/duke/Duke.java | 4 ++-- src/main/duke/parser/Parser.java | 6 +++--- src/main/duke/ui/Ui.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index aa23a78c..1c42b343 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -22,7 +22,7 @@ public Duke(String filePath) { try { taskList = new TaskList(storage.load()); } catch (DukeException e) { - ui.errorMessage(e); + ui.errorMessage(e.getMessage()); taskList = new TaskList(); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -40,7 +40,7 @@ public void run() { c.execute(taskList, ui, storage); isExit = c.isExit(); } catch (DukeException | IOException e){ - ui.errorMessage(e); + ui.errorMessage(e.getMessage()); } finally { ui.Separator(); } diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java index de8d1646..a6179c83 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/duke/parser/Parser.java @@ -9,7 +9,7 @@ public class Parser { public static String[] commandToArray(String text){ - return text.split(" "); + return text.split(" ",2); } public static Command parse(String text, TaskList taskList) throws IllegalArgumentException{ @@ -23,7 +23,7 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume try { commandCollections = CommandCollections.valueOf(keyword); } catch (IllegalArgumentException e) { - return new InvalidCommand("☹ The command in not valid! Please re-enter:"); + return new InvalidCommand("☹ The command <"+ command[0] +"> is not valid! Please re-enter:"); } switch (commandCollections) { @@ -50,7 +50,7 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume case BYE: return new ByeCommand(); default: - return new InvalidCommand("☹ The command in not valid! Please re-enter:"); + return new InvalidCommand("☹ Sorry, I don't know what it means :-("); } } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index 78447b71..c6ec613d 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -76,8 +76,8 @@ public static void goodBye (){ "\nBye, i will miss you."); } - public void errorMessage (Exception e) { - System.err.println("\t" + e); + public void errorMessage (String massage) { + System.out.println(massage); } public static void validateEventCommand(String[] command) { From 060251f2f874564560417de7e456af8c9accf98f Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 21:35:16 +0800 Subject: [PATCH 18/37] Level - 7 bug fixes: Nullpointerexception when no file in the data directory --- src/data/tasks.txt | 5 +---- src/main/duke/Duke.java | 6 +++--- src/main/duke/ui/Ui.java | 8 ++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/data/tasks.txt b/src/data/tasks.txt index 1d7ad173..177d3a53 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1,4 +1 @@ -todo [ ] borrow book -deadline [ ] return book /by Sunday -event [√] project meeting /at Mon 2-4pm -todo [√] do excercise +todo [ ] buy books diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index 1c42b343..47b28959 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -22,10 +22,10 @@ public Duke(String filePath) { try { taskList = new TaskList(storage.load()); } catch (DukeException e) { - ui.errorMessage(e.getMessage()); - taskList = new TaskList(); + ui.exceptionMessage(e); } catch (FileNotFoundException e) { - e.printStackTrace(); + ui.exceptionMessage(e); + taskList = new TaskList(); } } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index c6ec613d..fd5a4d1d 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -76,10 +76,14 @@ public static void goodBye (){ "\nBye, i will miss you."); } - public void errorMessage (String massage) { + public void errorMessage (String massage) { System.out.println(massage); } + public void exceptionMessage (Exception e) { + System.err.println(e); + } + public static void validateEventCommand(String[] command) { if (command.length < 2) { throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); @@ -126,7 +130,7 @@ public void printTodo(TaskList taskList){ System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); } - public void printTaskList(TaskList taskList){ + public void printTaskList(TaskList taskList) throws NullPointerException{ if (taskList.size() == 0) { System.out.println("\tList is empty. Please add new task."); } else { From 12af3ec18b3db1f7b24cb3b088be154bb690c80f Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Thu, 4 Nov 2021 21:51:31 +0800 Subject: [PATCH 19/37] Level-7 bug fixes --- src/data/tasks.txt | 3 +++ src/main/duke/Duke.java | 2 +- src/main/duke/ui/Ui.java | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/data/tasks.txt b/src/data/tasks.txt index 177d3a53..5b77050b 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1 +1,4 @@ todo [ ] buy books +event [ ] project meeting /at Mon 2-4pm +deadline [ ] return book /by Sunday +deadline [√] do homework /by no idea :-p diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index 47b28959..1bbe1e40 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -40,7 +40,7 @@ public void run() { c.execute(taskList, ui, storage); isExit = c.isExit(); } catch (DukeException | IOException e){ - ui.errorMessage(e.getMessage()); + ui.errorMessage(e); } finally { ui.Separator(); } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index fd5a4d1d..5aed9d39 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -76,18 +76,18 @@ public static void goodBye (){ "\nBye, i will miss you."); } - public void errorMessage (String massage) { - System.out.println(massage); + public void errorMessage (Exception e) { + System.out.println(e.getMessage()); } public void exceptionMessage (Exception e) { - System.err.println(e); + System.err.println(e.getMessage()); } public static void validateEventCommand(String[] command) { if (command.length < 2) { throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); - } else if (!Arrays.asList(command).contains("/at")) { + } else if (!command[1].contains("/at")) { throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); } } @@ -95,7 +95,7 @@ public static void validateEventCommand(String[] command) { public static void validateDeadlineCommand(String[] command) { if (command.length < 2) { throw new DukeException("☹ OOPS!!! The description of a deadline cannot be empty. Please re-enter:"); - } else if (!Arrays.asList(command).contains("/by")) { + } else if (!command[1].contains("/by")) { throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); } } From 9d2c2d4152fa59b7fb0c329d7453a8b9a07361c2 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Fri, 5 Nov 2021 01:49:43 +0800 Subject: [PATCH 20/37] Level-8 Dates and Times --- src/data/tasks.txt | 6 +- src/main/duke/Duke.java | 4 +- src/main/duke/command/CommandCollections.java | 2 +- src/main/duke/command/ViewCommand.java | 20 ++++++ src/main/duke/parser/Parser.java | 71 +++++++++++++++++-- src/main/duke/storage/Storage.java | 21 ++++-- src/main/duke/tasklist/Deadline.java | 18 +++-- src/main/duke/tasklist/Event.java | 18 +++-- src/main/duke/tasklist/Task.java | 26 ++++--- src/main/duke/tasklist/TaskList.java | 12 +++- src/main/duke/ui/Ui.java | 18 ++++- 11 files changed, 176 insertions(+), 40 deletions(-) create mode 100644 src/main/duke/command/ViewCommand.java diff --git a/src/data/tasks.txt b/src/data/tasks.txt index 5b77050b..185b7f26 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1,4 +1,2 @@ -todo [ ] buy books -event [ ] project meeting /at Mon 2-4pm -deadline [ ] return book /by Sunday -deadline [√] do homework /by no idea :-p +deadline [ ] return book /by 2 Dec 2019, 18:00 +event [√] meeting /at 2 Dec 2119, 18:00 diff --git a/src/main/duke/Duke.java b/src/main/duke/Duke.java index 1bbe1e40..f75b4a09 100644 --- a/src/main/duke/Duke.java +++ b/src/main/duke/Duke.java @@ -13,8 +13,8 @@ public class Duke { private TaskList taskList; - private Storage storage; - private Ui ui; + private final Storage storage; + private final Ui ui; public Duke(String filePath) { ui = new Ui(); diff --git a/src/main/duke/command/CommandCollections.java b/src/main/duke/command/CommandCollections.java index ff1fd5ff..0ef8b5d8 100644 --- a/src/main/duke/command/CommandCollections.java +++ b/src/main/duke/command/CommandCollections.java @@ -1,5 +1,5 @@ package duke.command; public enum CommandCollections { - LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE + LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW } diff --git a/src/main/duke/command/ViewCommand.java b/src/main/duke/command/ViewCommand.java new file mode 100644 index 00000000..55e609ab --- /dev/null +++ b/src/main/duke/command/ViewCommand.java @@ -0,0 +1,20 @@ +package duke.command; + +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +import java.time.LocalDate; + +public class ViewCommand extends Command { + LocalDate date; + + public ViewCommand(LocalDate date){ + this.date = date; + } + + public void execute(TaskList taskList, Ui ui, Storage storage) { + ui.printTaskList(taskList.getTaskByDate(date)); + ui.printTaskCount(taskList.getTaskByDate(date)); + } +} diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java index a6179c83..aa2f12d6 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/duke/parser/Parser.java @@ -1,41 +1,90 @@ package duke.parser; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.time.format.FormatStyle; + import duke.tasklist.*; import duke.ui.Ui; import duke.command.*; +/** + * A Parser object deals with making sense of the user command. + */ public class Parser { + /** + * commandToArray method splits user input to an array of Strings. + * @param text is the user input + * @return an array of Strings + */ + public static String[] commandToArray(String text){ + return text.split(" ",2); + } + public static LocalDateTime parseDate(String[] command){ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy"); + LocalDateTime date; + date = LocalDateTime.parse(command[1], formatter); + return date; + } + public static LocalDateTime parseDateTime(String[] command) throws DateTimeParseException{ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"); + LocalDateTime dateTime; + dateTime = LocalDateTime.parse(command[1].split(" /by | /at ")[1], formatter); + return dateTime; + } - public static String[] commandToArray(String text){ - return text.split(" ",2); + public static LocalDateTime parseDateTimeFromFile(String[] command) throws DateTimeParseException{ + DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT); + LocalDateTime dateTimeFromFile; + dateTimeFromFile = LocalDateTime.parse(command[1].split(" /by | /at ")[1], formatter); + return dateTimeFromFile; } + /** + * parse method parses user input to corresponding functions of the program + * @param text is the user input + * @param taskList is the list of tasks + * @return a command object for corresponding functions of the program + * @throws IllegalArgumentException when user command is not included in the CommandCollection Enum Class + */ public static Command parse(String text, TaskList taskList) throws IllegalArgumentException{ assert text != null : "Command be null"; String[] command = commandToArray(text); String keyword = command[0].toUpperCase(); + LocalDateTime dateTime; CommandCollections commandCollections; - try { commandCollections = CommandCollections.valueOf(keyword); } catch (IllegalArgumentException e) { return new InvalidCommand("☹ The command <"+ command[0] +"> is not valid! Please re-enter:"); } + switch (commandCollections) { case EVENT: - Ui.validateEventCommand(command); - return new AddCommand(new Event(text)); + try{ + Ui.validateEventCommand(command); + dateTime = parseDateTime(command); + return new AddCommand(new Event(text,dateTime)); + }catch (DateTimeParseException e) { + return new InvalidCommand(Ui.validateDateTime()); + } case TODO: Ui.validateTodoCommand(command); return new AddCommand(new Todo(text)); case DEADLINE: - Ui.validateDeadlineCommand(command); - return new AddCommand(new Deadline(text)); + try{ + Ui.validateDeadlineCommand(command); + dateTime = parseDateTime(command); + return new AddCommand(new Deadline(text,dateTime)); + }catch (DateTimeParseException e) { + return new InvalidCommand(Ui.validateDateTime()); + } case LIST: return new ListCommand(); case DONE: @@ -47,6 +96,14 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume Command delete = new DeleteCommand(command); Ui.printDelete(command, taskList); return delete; + case VIEW: + try{ + Ui.validateViewCommand(command); + dateTime = parseDate(command); + return new ViewCommand(dateTime.toLocalDate()); + }catch (DateTimeParseException e) { + return new InvalidCommand(Ui.validateDateTime()); + } case BYE: return new ByeCommand(); default: diff --git a/src/main/duke/storage/Storage.java b/src/main/duke/storage/Storage.java index e2cf01a9..63b709ab 100644 --- a/src/main/duke/storage/Storage.java +++ b/src/main/duke/storage/Storage.java @@ -1,11 +1,16 @@ package duke.storage; -import duke.tasklist.*; +import duke.parser.Parser; +import duke.tasklist.Deadline; +import duke.tasklist.Event; +import duke.tasklist.Task; +import duke.tasklist.Todo; import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Scanner; @@ -40,10 +45,10 @@ public void saveTask(ArrayList taskList) throws IOException { toText = "todo [" + isDone + "] " + description + System.getProperty("line.separator"); break; case "D": - toText = "deadline [" + isDone + "] " + description +"/by" + task.getDatetime() + System.getProperty("line.separator"); + toText = "deadline [" + isDone + "] " + description +"/by " + task.getDateTimeStr() + System.getProperty("line.separator"); break; case "E": - toText = "event [" + isDone + "] " + description +"/at" + task.getDatetime()+ System.getProperty("line.separator"); + toText = "event [" + isDone + "] " + description +"/at " + task.getDateTimeStr()+ System.getProperty("line.separator"); break; } assert toText != null; @@ -61,19 +66,23 @@ public ArrayList load() throws FileNotFoundException { String text = sc.nextLine(); String parseText = text.replaceAll(" \\[.*?\\] ", " "); boolean isDone = text.contains("√"); - String[] command = commandToArray(text); + String[] command = commandToArray(parseText); String keyword = command[0]; + LocalDateTime dateTime; Task task; + if(keyword.equals("todo")){ task = new Todo(parseText); task.setDone(isDone); } else if(keyword.equals("deadline")){ - task = new Deadline(parseText); + dateTime = Parser.parseDateTimeFromFile(command); + task = new Deadline(parseText, dateTime); task.setDone(isDone); } else{ - task = new Event(parseText); + dateTime = Parser.parseDateTimeFromFile(command); + task = new Event(parseText, dateTime); task.setDone(isDone); } taskList.add(task); diff --git a/src/main/duke/tasklist/Deadline.java b/src/main/duke/tasklist/Deadline.java index 80de0705..a1ce359f 100644 --- a/src/main/duke/tasklist/Deadline.java +++ b/src/main/duke/tasklist/Deadline.java @@ -1,21 +1,31 @@ package duke.tasklist; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; + +/** + * Deadline class is the deadline type of task which are date sensitive + */ public class Deadline extends Task { - public Deadline(String description){ + protected LocalDateTime dateTime; + + public Deadline(String description, LocalDateTime dateTime){ super(description); this.type = "D"; this.isDone = false; + this.dateTime = dateTime; } @Override public String getDescription() {return description.substring(9,description.indexOf('/'));} - public String getDatetime() { - return description.substring(description.indexOf('/')+3); + public String getDateTimeStr() { + return dateTime.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)); } public String printTask (){ - return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by: " + getDateTimeStr() + ")"; } } diff --git a/src/main/duke/tasklist/Event.java b/src/main/duke/tasklist/Event.java index ee55da3a..6050b8f1 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/duke/tasklist/Event.java @@ -1,22 +1,32 @@ package duke.tasklist; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; + public class Event extends Task{ - public Event(String description){ + + protected LocalDateTime dateTime; + + public Event(String description, LocalDateTime dateTime){ super(description); this.type = "E"; this.isDone = false; + this.dateTime = dateTime; } @Override public String getDescription() {return description.substring(6,description.indexOf('/'));} - public String getDatetime() { - return description.substring(description.indexOf('/')+3); + public String getDateTimeStr() { + return dateTime.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)); } + public LocalDateTime getDateTime(){return dateTime;} + @Override public String printTask (){ //print out every element in the array - return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by:" + getDatetime() + ")"; + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by: " + getDateTimeStr() + ")"; } } diff --git a/src/main/duke/tasklist/Task.java b/src/main/duke/tasklist/Task.java index 2f0b73d7..807a86df 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -1,18 +1,29 @@ package duke.tasklist; +import java.time.LocalDateTime; + +/** + * A Task class is the parent class of all types of tasks + */ public class Task { protected String description; protected boolean isDone; protected String type; - protected String datetime; - + protected LocalDateTime dateTime; + /** + * Default task + * @param description parses from user input + */ public Task(String description) { this.description = description; this.isDone = false; } - //description.Getter + /** + * Returns description of the task + * @return task description in String + */ public String getDescription() {return description;} //isDone.Setter @@ -27,13 +38,12 @@ public String getStatusIcon() { public String getType(){return type;} - public String getDatetime(){ - return datetime; + public String getDateTimeStr(){ + return ""; } - public String printTask(){return "";} - - + public LocalDateTime getDateTime(){return dateTime;} + public String printTask(){return "";} } \ No newline at end of file diff --git a/src/main/duke/tasklist/TaskList.java b/src/main/duke/tasklist/TaskList.java index 4c6ac427..9996136e 100644 --- a/src/main/duke/tasklist/TaskList.java +++ b/src/main/duke/tasklist/TaskList.java @@ -1,8 +1,8 @@ package duke.tasklist; +import java.time.LocalDate; import java.util.ArrayList; - public class TaskList { private ArrayList taskList; @@ -38,4 +38,14 @@ public ArrayList getTasks() { return taskList; } + public TaskList getTaskByDate(LocalDate date) { + TaskList taskByDate = new TaskList(); + for (int i = 0; i < taskList.size(); i++) { + while (taskList.get(i).getType().equals("E") | taskList.get(i).getType().equals("D")) { + while (taskList.get(i).getDateTime().toLocalDate().equals(date)) + taskByDate.addTask(taskList.get(i)); + } + } + return taskByDate; + } } diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index 5aed9d39..50c8f557 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -4,7 +4,6 @@ import duke.tasklist.Task; import duke.tasklist.TaskList; -import java.util.Arrays; import java.util.Scanner; public class Ui { @@ -114,13 +113,13 @@ public void printAdd(Task task){ public void printDeadline(TaskList taskList){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(by:" + taskList.get(taskList.size()-1).getDatetime() + ")"); + System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(by:" + taskList.get(taskList.size()-1).getDateTimeStr() + ")"); System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); } public void printEvent(TaskList taskList){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(at:" + taskList.get(taskList.size()-1).getDatetime() + ")"); + System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(at:" + taskList.get(taskList.size()-1).getDateTimeStr() + ")"); System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); } @@ -169,4 +168,17 @@ public void printTaskCount(TaskList taskList){ System.out.println("\tYou have total " + (taskList.size()) +" tasks in the list."); } + public static String validateDateTime(){ + return "Task cannot be added. \n" + + "Please enter datetime in the format of 'dd/MM/yyyy HHmm'"; + } + + public static void validateViewCommand(String[] command){ + if (command.length < 2) { + throw new DukeException("☹ OOPS!!! The date cannot be empty. Please re-enter:"); + } else if (!command[1].contains("/")) { + throw new DukeException("☹ Please enter datetime in the format of 'dd/MM/yyyy'"); + } + } + } \ No newline at end of file From a93fdba5f5401aac82bd27908a6dd045ffc34ab0 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Fri, 5 Nov 2021 14:12:16 +0800 Subject: [PATCH 21/37] Level-8 Stretch goal: view task of given date --- src/data/tasks.txt | 12 ++++++- src/main/duke/command/AddCommand.java | 15 ++------- src/main/duke/command/ListCommand.java | 2 +- src/main/duke/command/ViewCommand.java | 4 +-- src/main/duke/parser/Parser.java | 17 +++++----- src/main/duke/tasklist/Deadline.java | 2 ++ src/main/duke/tasklist/Event.java | 2 +- src/main/duke/tasklist/Task.java | 2 +- src/main/duke/tasklist/TaskList.java | 7 ++-- src/main/duke/ui/Ui.java | 45 ++++++++++++-------------- 10 files changed, 53 insertions(+), 55 deletions(-) diff --git a/src/data/tasks.txt b/src/data/tasks.txt index 185b7f26..c77d9b2f 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1,2 +1,12 @@ -deadline [ ] return book /by 2 Dec 2019, 18:00 +deadline [√] return book /by 2 Dec 2019, 18:00 event [√] meeting /at 2 Dec 2119, 18:00 +todo [ ] buy bookes +event [ ] Historical Show /at 19 Feb 1995, 18:00 +event [ ] test123 /at 1 Feb 1995, 18:00 +event [ ] test 456 /at 2 Feb 2007, 19:00 +todo [√] test 678 +todo [ ] test 5 +event [ ] test902 /at 2 Feb 2020, 20:00 +deadline [√] test21 /by 3 Mar 2029, 20:00 +todo [ ] 23 +event [ ] look at you /at 2 Feb 2020, 22:22 diff --git a/src/main/duke/command/AddCommand.java b/src/main/duke/command/AddCommand.java index 64776179..605c4fcf 100644 --- a/src/main/duke/command/AddCommand.java +++ b/src/main/duke/command/AddCommand.java @@ -16,20 +16,9 @@ public AddCommand(Task task){ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { taskList.addTask(task); - ui.printAdd(task); - String taskType = task.getType(); storage.saveTask(taskList.getTasks()); - switch (taskType){ - case "T": - ui.printTodo(taskList); - break; - case "E": - ui.printEvent(taskList); - break; - case "D": - ui.printDeadline(taskList); - break; - } + ui.printAddCommand(taskList); + ui.printTaskCount(taskList); } diff --git a/src/main/duke/command/ListCommand.java b/src/main/duke/command/ListCommand.java index 0a0732ac..1b4ce02b 100644 --- a/src/main/duke/command/ListCommand.java +++ b/src/main/duke/command/ListCommand.java @@ -10,6 +10,6 @@ public ListCommand (){} public void execute(TaskList taskList, Ui ui, Storage storage) { ui.printTaskList(taskList); - ui.printTaskCount(taskList); + ui.printTaskListStr(taskList); } } diff --git a/src/main/duke/command/ViewCommand.java b/src/main/duke/command/ViewCommand.java index 55e609ab..42a7e104 100644 --- a/src/main/duke/command/ViewCommand.java +++ b/src/main/duke/command/ViewCommand.java @@ -14,7 +14,7 @@ public ViewCommand(LocalDate date){ } public void execute(TaskList taskList, Ui ui, Storage storage) { - ui.printTaskList(taskList.getTaskByDate(date)); - ui.printTaskCount(taskList.getTaskByDate(date)); + ui.printTaskList(taskList.getTaskByDate(date, taskList)); + ui.printTaskOfDate(taskList.getTaskByDate(date, taskList), date); } } diff --git a/src/main/duke/parser/Parser.java b/src/main/duke/parser/Parser.java index aa2f12d6..75b80d03 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/duke/parser/Parser.java @@ -1,6 +1,7 @@ package duke.parser; import java.time.LocalDateTime; +import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.time.format.FormatStyle; @@ -22,15 +23,15 @@ public static String[] commandToArray(String text){ return text.split(" ",2); } - public static LocalDateTime parseDate(String[] command){ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy"); - LocalDateTime date; - date = LocalDateTime.parse(command[1], formatter); + public static LocalDate parseDate(String[] command) throws DateTimeParseException{ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy"); + LocalDate date; + date = LocalDate.parse(command[1], formatter); return date; } public static LocalDateTime parseDateTime(String[] command) throws DateTimeParseException{ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy HHmm"); LocalDateTime dateTime; dateTime = LocalDateTime.parse(command[1].split(" /by | /at ")[1], formatter); return dateTime; @@ -99,10 +100,10 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume case VIEW: try{ Ui.validateViewCommand(command); - dateTime = parseDate(command); - return new ViewCommand(dateTime.toLocalDate()); + LocalDate date = parseDate(command); + return new ViewCommand(date); }catch (DateTimeParseException e) { - return new InvalidCommand(Ui.validateDateTime()); + return new InvalidCommand("☹ Please enter datetime in the format of 'd/M/yyyy'"); } case BYE: return new ByeCommand(); diff --git a/src/main/duke/tasklist/Deadline.java b/src/main/duke/tasklist/Deadline.java index a1ce359f..0f693e03 100644 --- a/src/main/duke/tasklist/Deadline.java +++ b/src/main/duke/tasklist/Deadline.java @@ -24,6 +24,8 @@ public String getDateTimeStr() { return dateTime.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)); } + public LocalDateTime getDateTime(){return dateTime;} + public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by: " + getDateTimeStr() + ")"; } diff --git a/src/main/duke/tasklist/Event.java b/src/main/duke/tasklist/Event.java index 6050b8f1..6f46bb8c 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/duke/tasklist/Event.java @@ -27,6 +27,6 @@ public String getDateTimeStr() { @Override public String printTask (){ //print out every element in the array - return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by: " + getDateTimeStr() + ")"; + return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(at: " + getDateTimeStr() + ")"; } } diff --git a/src/main/duke/tasklist/Task.java b/src/main/duke/tasklist/Task.java index 807a86df..b10bff13 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/duke/tasklist/Task.java @@ -33,7 +33,7 @@ public Task(String description) { //isDone.Getter public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X + return (isDone ? "√" : " "); // mark done task with X } public String getType(){return type;} diff --git a/src/main/duke/tasklist/TaskList.java b/src/main/duke/tasklist/TaskList.java index 9996136e..d07d1e42 100644 --- a/src/main/duke/tasklist/TaskList.java +++ b/src/main/duke/tasklist/TaskList.java @@ -38,12 +38,13 @@ public ArrayList getTasks() { return taskList; } - public TaskList getTaskByDate(LocalDate date) { + public TaskList getTaskByDate(LocalDate date, TaskList taskList) { TaskList taskByDate = new TaskList(); for (int i = 0; i < taskList.size(); i++) { - while (taskList.get(i).getType().equals("E") | taskList.get(i).getType().equals("D")) { - while (taskList.get(i).getDateTime().toLocalDate().equals(date)) + if (taskList.get(i).getType().equals("E") | taskList.get(i).getType().equals("D")) { + if (taskList.get(i).getDateTime().toLocalDate().equals(date)) { taskByDate.addTask(taskList.get(i)); + } } } return taskByDate; diff --git a/src/main/duke/ui/Ui.java b/src/main/duke/ui/Ui.java index 50c8f557..1cdba073 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/duke/ui/Ui.java @@ -1,11 +1,15 @@ package duke.ui; import duke.exception.DukeException; -import duke.tasklist.Task; import duke.tasklist.TaskList; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.Scanner; +import static duke.parser.Parser.parseDate; + public class Ui { private static final String SEPARATOR = @@ -107,26 +111,9 @@ public static void validateTodoCommand(String[] command) { public void Separator() {System.out.println(SEPARATOR);} - public void printAdd(Task task){ - task.printTask(); - } - - public void printDeadline(TaskList taskList){ - System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(by:" + taskList.get(taskList.size()-1).getDateTimeStr() + ")"); - System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); - } - - public void printEvent(TaskList taskList){ - System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription() + "(at:" + taskList.get(taskList.size()-1).getDateTimeStr() + ")"); - System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); - } - - public void printTodo(TaskList taskList){ + public void printAddCommand(TaskList taskList){ System.out.println("Got it. I've added this task: "); - System.out.println("\t[" + taskList.get(taskList.size()-1).getType() +"]" + "[" + taskList.get(taskList.size()-1).getStatusIcon() +"] " + taskList.get(taskList.size()-1).getDescription()); - System.out.println("Now you have " + (taskList.size()) +" tasks in the list."); + System.out.println("\t"+taskList.get(taskList.size()-1).printTask()); } public void printTaskList(TaskList taskList) throws NullPointerException{ @@ -136,6 +123,7 @@ public void printTaskList(TaskList taskList) throws NullPointerException{ System.out.println("Here are the tasks in your list:"); for (int i = 0; i < taskList.size(); i++) { System.out.println("\t" + (i + 1) + "." + taskList.get(i).printTask()); + } } } @@ -155,17 +143,25 @@ public static void validateDoneCommand(String[] command, TaskList taskList){ public static void printDone(String[] command, TaskList taskList){ int taskNumber = Integer.parseInt(command[1]) - 1; System.out.println("Nice! I've marked this task as done:"); - System.out.println("\t[" + taskList.get(taskNumber).getType() + "]"+ "[X] " + taskList.get(taskNumber).getDescription()); + System.out.println("\t"+taskList.get(taskNumber).printTask()); } public static void printDelete(String[] command, TaskList taskList){ int taskNumber = Integer.parseInt(command[1]) - 1; System.out.println("Noted. I've removed this task: "); - System.out.println("\t[" + taskList.get(taskNumber).getType() + "]"+ "[" + taskList.get(taskNumber).getStatusIcon() + "] " + taskList.get(taskNumber).getDescription()); + System.out.println("\t"+taskList.get(taskNumber).printTask()); } public void printTaskCount(TaskList taskList){ - System.out.println("\tYou have total " + (taskList.size()) +" tasks in the list."); + System.out.println("Now you have total " + (taskList.size()) +" tasks in the list."); + } + + public void printTaskListStr(TaskList taskList) { + System.out.println("You have total " + (taskList.size()) + " tasks in the list."); + } + + public void printTaskOfDate(TaskList taskList, LocalDate date){ + System.out.println("You have total " + (taskList.size()) +" tasks on " + date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))); } public static String validateDateTime(){ @@ -174,10 +170,9 @@ public static String validateDateTime(){ } public static void validateViewCommand(String[] command){ + LocalDate dateTime = parseDate(command); if (command.length < 2) { throw new DukeException("☹ OOPS!!! The date cannot be empty. Please re-enter:"); - } else if (!command[1].contains("/")) { - throw new DukeException("☹ Please enter datetime in the format of 'dd/MM/yyyy'"); } } From 4f6567b617974c133fb9a85126d7097625bb60e9 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Fri, 5 Nov 2021 19:30:41 +0800 Subject: [PATCH 22/37] Level-9-Find tasks with matching keyword --- build.gradle | 2 +- src/main/duke/command/CommandCollections.java | 5 ----- src/main/{ => java}/duke/Duke.java | 0 .../{ => java}/duke/command/AddCommand.java | 0 .../{ => java}/duke/command/ByeCommand.java | 0 src/main/{ => java}/duke/command/Command.java | 0 .../java/duke/command/CommandCollections.java | 5 +++++ .../duke/command/DeleteCommand.java | 0 .../{ => java}/duke/command/DoneCommand.java | 0 .../duke/command/InvalidCommand.java | 0 .../{ => java}/duke/command/ListCommand.java | 0 src/main/java/duke/command/SearchCommand.java | 20 +++++++++++++++++ .../{ => java}/duke/command/ViewCommand.java | 5 +++-- .../duke/exception/DukeException.java | 0 src/main/{ => java}/duke/parser/Parser.java | 8 +++++-- src/main/{ => java}/duke/storage/Storage.java | 0 .../{ => java}/duke/tasklist/Deadline.java | 3 +++ src/main/{ => java}/duke/tasklist/Event.java | 4 ++++ src/main/{ => java}/duke/tasklist/Task.java | 4 ++++ .../{ => java}/duke/tasklist/TaskList.java | 11 ++++++++++ src/main/{ => java}/duke/tasklist/Todo.java | 4 +++- src/main/{ => java}/duke/ui/Ui.java | 22 ++++++++++++++----- 22 files changed, 76 insertions(+), 17 deletions(-) delete mode 100644 src/main/duke/command/CommandCollections.java rename src/main/{ => java}/duke/Duke.java (100%) rename src/main/{ => java}/duke/command/AddCommand.java (100%) rename src/main/{ => java}/duke/command/ByeCommand.java (100%) rename src/main/{ => java}/duke/command/Command.java (100%) create mode 100644 src/main/java/duke/command/CommandCollections.java rename src/main/{ => java}/duke/command/DeleteCommand.java (100%) rename src/main/{ => java}/duke/command/DoneCommand.java (100%) rename src/main/{ => java}/duke/command/InvalidCommand.java (100%) rename src/main/{ => java}/duke/command/ListCommand.java (100%) create mode 100644 src/main/java/duke/command/SearchCommand.java rename src/main/{ => java}/duke/command/ViewCommand.java (69%) rename src/main/{ => java}/duke/exception/DukeException.java (100%) rename src/main/{ => java}/duke/parser/Parser.java (93%) rename src/main/{ => java}/duke/storage/Storage.java (100%) rename src/main/{ => java}/duke/tasklist/Deadline.java (92%) rename src/main/{ => java}/duke/tasklist/Event.java (92%) rename src/main/{ => java}/duke/tasklist/Task.java (93%) rename src/main/{ => java}/duke/tasklist/TaskList.java (75%) rename src/main/{ => java}/duke/tasklist/Todo.java (82%) rename src/main/{ => java}/duke/ui/Ui.java (90%) diff --git a/build.gradle b/build.gradle index 20c0521c..dda93802 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.Duke" } shadowJar { diff --git a/src/main/duke/command/CommandCollections.java b/src/main/duke/command/CommandCollections.java deleted file mode 100644 index 0ef8b5d8..00000000 --- a/src/main/duke/command/CommandCollections.java +++ /dev/null @@ -1,5 +0,0 @@ -package duke.command; - -public enum CommandCollections { - LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW -} diff --git a/src/main/duke/Duke.java b/src/main/java/duke/Duke.java similarity index 100% rename from src/main/duke/Duke.java rename to src/main/java/duke/Duke.java diff --git a/src/main/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java similarity index 100% rename from src/main/duke/command/AddCommand.java rename to src/main/java/duke/command/AddCommand.java diff --git a/src/main/duke/command/ByeCommand.java b/src/main/java/duke/command/ByeCommand.java similarity index 100% rename from src/main/duke/command/ByeCommand.java rename to src/main/java/duke/command/ByeCommand.java diff --git a/src/main/duke/command/Command.java b/src/main/java/duke/command/Command.java similarity index 100% rename from src/main/duke/command/Command.java rename to src/main/java/duke/command/Command.java diff --git a/src/main/java/duke/command/CommandCollections.java b/src/main/java/duke/command/CommandCollections.java new file mode 100644 index 00000000..cfd40e77 --- /dev/null +++ b/src/main/java/duke/command/CommandCollections.java @@ -0,0 +1,5 @@ +package duke.command; + +public enum CommandCollections { + LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW, SEARCH, HELP +} diff --git a/src/main/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java similarity index 100% rename from src/main/duke/command/DeleteCommand.java rename to src/main/java/duke/command/DeleteCommand.java diff --git a/src/main/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java similarity index 100% rename from src/main/duke/command/DoneCommand.java rename to src/main/java/duke/command/DoneCommand.java diff --git a/src/main/duke/command/InvalidCommand.java b/src/main/java/duke/command/InvalidCommand.java similarity index 100% rename from src/main/duke/command/InvalidCommand.java rename to src/main/java/duke/command/InvalidCommand.java diff --git a/src/main/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java similarity index 100% rename from src/main/duke/command/ListCommand.java rename to src/main/java/duke/command/ListCommand.java diff --git a/src/main/java/duke/command/SearchCommand.java b/src/main/java/duke/command/SearchCommand.java new file mode 100644 index 00000000..8ba5ee0f --- /dev/null +++ b/src/main/java/duke/command/SearchCommand.java @@ -0,0 +1,20 @@ +package duke.command; + +import duke.exception.DukeException; +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +public class SearchCommand extends Command{ + + String keyword; + + public SearchCommand(String keyword){ this.keyword = keyword;} + + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + TaskList taskByKeyword = taskList.getTaskByKeyword(keyword, taskList); + ui.printTaskList(taskByKeyword); + ui.printTaskByKeyword(taskByKeyword,keyword); + } + +} diff --git a/src/main/duke/command/ViewCommand.java b/src/main/java/duke/command/ViewCommand.java similarity index 69% rename from src/main/duke/command/ViewCommand.java rename to src/main/java/duke/command/ViewCommand.java index 42a7e104..3326ae54 100644 --- a/src/main/duke/command/ViewCommand.java +++ b/src/main/java/duke/command/ViewCommand.java @@ -14,7 +14,8 @@ public ViewCommand(LocalDate date){ } public void execute(TaskList taskList, Ui ui, Storage storage) { - ui.printTaskList(taskList.getTaskByDate(date, taskList)); - ui.printTaskOfDate(taskList.getTaskByDate(date, taskList), date); + TaskList taskByDate = taskList.getTaskByDate(date, taskList); + ui.printTaskList(taskByDate); + ui.printTaskOfDate(taskByDate, date); } } diff --git a/src/main/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java similarity index 100% rename from src/main/duke/exception/DukeException.java rename to src/main/java/duke/exception/DukeException.java diff --git a/src/main/duke/parser/Parser.java b/src/main/java/duke/parser/Parser.java similarity index 93% rename from src/main/duke/parser/Parser.java rename to src/main/java/duke/parser/Parser.java index 75b80d03..2859cdcc 100644 --- a/src/main/duke/parser/Parser.java +++ b/src/main/java/duke/parser/Parser.java @@ -55,12 +55,12 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume assert text != null : "Command be null"; String[] command = commandToArray(text); - String keyword = command[0].toUpperCase(); + String instruction = command[0].toUpperCase(); LocalDateTime dateTime; CommandCollections commandCollections; try { - commandCollections = CommandCollections.valueOf(keyword); + commandCollections = CommandCollections.valueOf(instruction); } catch (IllegalArgumentException e) { return new InvalidCommand("☹ The command <"+ command[0] +"> is not valid! Please re-enter:"); } @@ -105,6 +105,10 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume }catch (DateTimeParseException e) { return new InvalidCommand("☹ Please enter datetime in the format of 'd/M/yyyy'"); } + case SEARCH: + Ui.validateSearchCommand(command); + String keyword = command[1]; + return new SearchCommand(keyword); case BYE: return new ByeCommand(); default: diff --git a/src/main/duke/storage/Storage.java b/src/main/java/duke/storage/Storage.java similarity index 100% rename from src/main/duke/storage/Storage.java rename to src/main/java/duke/storage/Storage.java diff --git a/src/main/duke/tasklist/Deadline.java b/src/main/java/duke/tasklist/Deadline.java similarity index 92% rename from src/main/duke/tasklist/Deadline.java rename to src/main/java/duke/tasklist/Deadline.java index 0f693e03..83bac033 100644 --- a/src/main/duke/tasklist/Deadline.java +++ b/src/main/java/duke/tasklist/Deadline.java @@ -29,5 +29,8 @@ public String getDateTimeStr() { public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(by: " + getDateTimeStr() + ")"; } + public String[] getKeyword (){ + return description.split(" "); + } } diff --git a/src/main/duke/tasklist/Event.java b/src/main/java/duke/tasklist/Event.java similarity index 92% rename from src/main/duke/tasklist/Event.java rename to src/main/java/duke/tasklist/Event.java index 6f46bb8c..8c83f6a7 100644 --- a/src/main/duke/tasklist/Event.java +++ b/src/main/java/duke/tasklist/Event.java @@ -29,4 +29,8 @@ public String printTask (){ //print out every element in the array return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription() + "(at: " + getDateTimeStr() + ")"; } + + public String[] getKeyword (){ + return description.split(" "); + } } diff --git a/src/main/duke/tasklist/Task.java b/src/main/java/duke/tasklist/Task.java similarity index 93% rename from src/main/duke/tasklist/Task.java rename to src/main/java/duke/tasklist/Task.java index b10bff13..89e2b002 100644 --- a/src/main/duke/tasklist/Task.java +++ b/src/main/java/duke/tasklist/Task.java @@ -46,4 +46,8 @@ public String getDateTimeStr(){ public String printTask(){return "";} + public String[] getKeyword(){ + return description.split(" "); + } + } \ No newline at end of file diff --git a/src/main/duke/tasklist/TaskList.java b/src/main/java/duke/tasklist/TaskList.java similarity index 75% rename from src/main/duke/tasklist/TaskList.java rename to src/main/java/duke/tasklist/TaskList.java index d07d1e42..e0363c6d 100644 --- a/src/main/duke/tasklist/TaskList.java +++ b/src/main/java/duke/tasklist/TaskList.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.util.ArrayList; +import java.util.Arrays; public class TaskList { private ArrayList taskList; @@ -49,4 +50,14 @@ public TaskList getTaskByDate(LocalDate date, TaskList taskList) { } return taskByDate; } + + public TaskList getTaskByKeyword (String keyword, TaskList taskList) { + TaskList taskByKeyword = new TaskList(); + for (int i = 0; i < taskList.size(); i++){ + if (Arrays.asList(taskList.get(i).getKeyword()).contains(keyword)){ + taskByKeyword.addTask(taskList.get(i)); + } + } + return taskByKeyword; + } } diff --git a/src/main/duke/tasklist/Todo.java b/src/main/java/duke/tasklist/Todo.java similarity index 82% rename from src/main/duke/tasklist/Todo.java rename to src/main/java/duke/tasklist/Todo.java index 5977d0ea..c6ccaccc 100644 --- a/src/main/duke/tasklist/Todo.java +++ b/src/main/java/duke/tasklist/Todo.java @@ -13,5 +13,7 @@ public String printTask (){ return "[" + getType() +"]" + "[" + getStatusIcon() +"] " + getDescription(); } - + public String[] getKeyword (){ + return description.split(" "); + } } diff --git a/src/main/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java similarity index 90% rename from src/main/duke/ui/Ui.java rename to src/main/java/duke/ui/Ui.java index 1cdba073..0b3e0773 100644 --- a/src/main/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -88,7 +88,7 @@ public void exceptionMessage (Exception e) { } public static void validateEventCommand(String[] command) { - if (command.length < 2) { + if (command.length < 2 || command[1].equals("")) { throw new DukeException("☹ OOPS!!! The description of a event cannot be empty. Please re-enter:"); } else if (!command[1].contains("/at")) { throw new DukeException("☹ OOPS!!! The date of a event cannot be empty. Please re-enter:"); @@ -96,7 +96,7 @@ public static void validateEventCommand(String[] command) { } public static void validateDeadlineCommand(String[] command) { - if (command.length < 2) { + if (command.length < 2 || command[1].equals("")) { throw new DukeException("☹ OOPS!!! The description of a deadline cannot be empty. Please re-enter:"); } else if (!command[1].contains("/by")) { throw new DukeException("☹ OOPS!!! The date of a deadline cannot be empty. Please re-enter:"); @@ -104,7 +104,7 @@ public static void validateDeadlineCommand(String[] command) { } public static void validateTodoCommand(String[] command) { - if (command.length < 2) { + if (command.length < 2 || command[1].equals("")) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty. Please re-enter:"); } } @@ -118,7 +118,7 @@ public void printAddCommand(TaskList taskList){ public void printTaskList(TaskList taskList) throws NullPointerException{ if (taskList.size() == 0) { - System.out.println("\tList is empty. Please add new task."); + System.out.println("List is empty. Please add new task."); } else { System.out.println("Here are the tasks in your list:"); for (int i = 0; i < taskList.size(); i++) { @@ -130,7 +130,7 @@ public void printTaskList(TaskList taskList) throws NullPointerException{ public static void validateDoneCommand(String[] command, TaskList taskList){ - if (command.length < 2) { + if (command.length < 2 || command[1].equals("")) { throw new DukeException("☹ Please state task number."); } int taskNumber = Integer.parseInt(command[1]) - 1; @@ -161,7 +161,7 @@ public void printTaskListStr(TaskList taskList) { } public void printTaskOfDate(TaskList taskList, LocalDate date){ - System.out.println("You have total " + (taskList.size()) +" tasks on " + date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))); + System.out.println("You have total " + (taskList.size()) +" tasks on " + date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))+"."); } public static String validateDateTime(){ @@ -176,4 +176,14 @@ public static void validateViewCommand(String[] command){ } } + public static void validateSearchCommand(String[] command){ + if (command.length < 2 || command[1].equals("")) { + throw new DukeException("☹ OOPS!!! Please specify keyword:"); + } + } + + public void printTaskByKeyword(TaskList taskList, String keyword){ + System.out.println("You have total " + (taskList.size()) +" tasks related to <" + keyword +">."); + } + } \ No newline at end of file From 62af281dd35bd6c03e5f761632efb2610729a4a7 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Fri, 5 Nov 2021 21:57:40 +0800 Subject: [PATCH 23/37] Added Individual Feature [C - Better Search] --- src/main/java/duke/tasklist/TaskList.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/duke/tasklist/TaskList.java b/src/main/java/duke/tasklist/TaskList.java index e0363c6d..4d4f87d1 100644 --- a/src/main/java/duke/tasklist/TaskList.java +++ b/src/main/java/duke/tasklist/TaskList.java @@ -2,7 +2,6 @@ import java.time.LocalDate; import java.util.ArrayList; -import java.util.Arrays; public class TaskList { private ArrayList taskList; @@ -54,8 +53,11 @@ public TaskList getTaskByDate(LocalDate date, TaskList taskList) { public TaskList getTaskByKeyword (String keyword, TaskList taskList) { TaskList taskByKeyword = new TaskList(); for (int i = 0; i < taskList.size(); i++){ - if (Arrays.asList(taskList.get(i).getKeyword()).contains(keyword)){ - taskByKeyword.addTask(taskList.get(i)); + String[] keywordInTask = taskList.get(i).getKeyword(); + for (String s : keywordInTask){ + if (s.contains(keyword) || keyword.contains(s)) { + taskByKeyword.addTask(taskList.get(i)); + } } } return taskByKeyword; From 8591e026127b2fe9464b5efea4aba4e5e3987776 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sat, 6 Nov 2021 15:51:52 +0800 Subject: [PATCH 24/37] Added Reset and Help command --- src/data/tasks.txt | 7 +-- .../java/duke/command/CommandCollections.java | 2 +- src/main/java/duke/command/DeleteCommand.java | 1 + src/main/java/duke/command/DoneCommand.java | 1 + src/main/java/duke/command/HelpCommand.java | 15 +++++++ src/main/java/duke/command/ResetCommand.java | 19 ++++++++ src/main/java/duke/command/ViewCommand.java | 3 ++ src/main/java/duke/parser/Parser.java | 13 ++++-- src/main/java/duke/tasklist/TaskList.java | 2 +- src/main/java/duke/ui/Ui.java | 45 ++++++++++++++++--- 10 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 src/main/java/duke/command/HelpCommand.java create mode 100644 src/main/java/duke/command/ResetCommand.java diff --git a/src/data/tasks.txt b/src/data/tasks.txt index c77d9b2f..2b380ab0 100644 --- a/src/data/tasks.txt +++ b/src/data/tasks.txt @@ -1,12 +1,9 @@ deadline [√] return book /by 2 Dec 2019, 18:00 event [√] meeting /at 2 Dec 2119, 18:00 -todo [ ] buy bookes -event [ ] Historical Show /at 19 Feb 1995, 18:00 +event [√] Historical Show /at 19 Feb 1995, 18:00 event [ ] test123 /at 1 Feb 1995, 18:00 event [ ] test 456 /at 2 Feb 2007, 19:00 todo [√] test 678 -todo [ ] test 5 event [ ] test902 /at 2 Feb 2020, 20:00 deadline [√] test21 /by 3 Mar 2029, 20:00 -todo [ ] 23 -event [ ] look at you /at 2 Feb 2020, 22:22 +event [√] look at you /at 2 Feb 2020, 22:22 diff --git a/src/main/java/duke/command/CommandCollections.java b/src/main/java/duke/command/CommandCollections.java index cfd40e77..e4069d4b 100644 --- a/src/main/java/duke/command/CommandCollections.java +++ b/src/main/java/duke/command/CommandCollections.java @@ -1,5 +1,5 @@ package duke.command; public enum CommandCollections { - LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW, SEARCH, HELP + LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW, SEARCH, HELP, RESET } diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java index 70fce9c8..af651eee 100644 --- a/src/main/java/duke/command/DeleteCommand.java +++ b/src/main/java/duke/command/DeleteCommand.java @@ -15,6 +15,7 @@ public DeleteCommand(String[] command){ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { int taskNumber = Integer.parseInt(command[1]) - 1; + ui.printDelete(taskNumber,taskList); taskList.removeTask(taskNumber); ui.printTaskCount(taskList); storage.saveTask(taskList.getTasks()); diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java index 9b5ea185..786e6bc8 100644 --- a/src/main/java/duke/command/DoneCommand.java +++ b/src/main/java/duke/command/DoneCommand.java @@ -16,6 +16,7 @@ public DoneCommand(String[] command){ public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { int taskNumber = Integer.parseInt(command[1]) - 1; taskList.get(taskNumber).setDone(true); + ui.printDone(taskNumber, taskList); ui.printTaskCount(taskList); storage.saveTask(taskList.getTasks()); } diff --git a/src/main/java/duke/command/HelpCommand.java b/src/main/java/duke/command/HelpCommand.java new file mode 100644 index 00000000..8776136a --- /dev/null +++ b/src/main/java/duke/command/HelpCommand.java @@ -0,0 +1,15 @@ +package duke.command; + +import duke.exception.DukeException; +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +import java.io.IOException; + +public class HelpCommand extends Command{ + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException, IOException { + ui.howToUse(); + } +} diff --git a/src/main/java/duke/command/ResetCommand.java b/src/main/java/duke/command/ResetCommand.java new file mode 100644 index 00000000..c180dd72 --- /dev/null +++ b/src/main/java/duke/command/ResetCommand.java @@ -0,0 +1,19 @@ +package duke.command; + +import duke.exception.DukeException; +import duke.storage.Storage; +import duke.tasklist.TaskList; +import duke.ui.Ui; + +import java.io.IOException; + +public class ResetCommand extends Command{ + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException, IOException { + taskList.reset(); + ui.reset(); + ui.printTaskCount(taskList); + storage.saveTask(taskList.getTasks()); + } +} diff --git a/src/main/java/duke/command/ViewCommand.java b/src/main/java/duke/command/ViewCommand.java index 3326ae54..7871c966 100644 --- a/src/main/java/duke/command/ViewCommand.java +++ b/src/main/java/duke/command/ViewCommand.java @@ -6,6 +6,9 @@ import java.time.LocalDate; +/** + * The viewCommand class + */ public class ViewCommand extends Command { LocalDate date; diff --git a/src/main/java/duke/parser/Parser.java b/src/main/java/duke/parser/Parser.java index 2859cdcc..dca28f46 100644 --- a/src/main/java/duke/parser/Parser.java +++ b/src/main/java/duke/parser/Parser.java @@ -90,13 +90,10 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume return new ListCommand(); case DONE: Ui.validateDoneCommand(command, taskList); - Ui.printDone(command, taskList); return new DoneCommand(command); case DELETE: Ui.validateDoneCommand(command, taskList); - Command delete = new DeleteCommand(command); - Ui.printDelete(command, taskList); - return delete; + return new DeleteCommand(command); case VIEW: try{ Ui.validateViewCommand(command); @@ -109,6 +106,14 @@ public static Command parse(String text, TaskList taskList) throws IllegalArgume Ui.validateSearchCommand(command); String keyword = command[1]; return new SearchCommand(keyword); + case HELP: + return new HelpCommand(); + case RESET: + if(Ui.validateResetCommand()){ + return new ResetCommand(); + } else { + return new InvalidCommand("No worries, your task list remain unchanged."); + } case BYE: return new ByeCommand(); default: diff --git a/src/main/java/duke/tasklist/TaskList.java b/src/main/java/duke/tasklist/TaskList.java index 4d4f87d1..207cc1b0 100644 --- a/src/main/java/duke/tasklist/TaskList.java +++ b/src/main/java/duke/tasklist/TaskList.java @@ -23,7 +23,7 @@ public void removeTask (int i) { } public void reset() { - taskList = new ArrayList<>(); + taskList.clear(); } public int size() { diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index 0b3e0773..0c44009e 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -15,11 +15,12 @@ public class Ui { private static final String SEPARATOR = "___________________________________________________________________________"; - private final Scanner in = new Scanner(System.in); + private static final Scanner in = new Scanner(System.in); public String userInput(){ return in.nextLine(); } + public static void Welcome (){ System.out.println(" _..._\n" + " .' '. _\n" + @@ -39,9 +40,26 @@ public static void Welcome (){ " `-._/._/" + "\t\tHow can i help you?"); System.out.println("___^/\\___^--____/\\____O______________/\\/\\---/\\___________---______________ \n" + " /\\^ ^ ^ ^ ^^ ^ '\\ ^ ^ --- "); + howToUse(); System.out.println(SEPARATOR); } + public static void howToUse(){ + System.out.println("How to interact with Duke:\n"); + System.out.println("\tFunction: Command:"); + System.out.println("\tView all existing tasks: list"); + System.out.println("\tAdd a new to-do: todo {description}"); + System.out.println("\tAdd a new deadline: deadline {description} /by {d/M/yyyy HHmm}"); + System.out.println("\tAdd a new event: event {description} /at {d/M/yyyy HHmm}"); + System.out.println("\tMark a task as completed: done {taskId}"); + System.out.println("\tDelete a task: delete {taskId}"); + System.out.println("\tSearch task by keyword: search {keyword}"); + System.out.println("\tCheck schedule of a date: view {yyyy-MM-dd}"); + System.out.println("\tShow help message: help"); + System.out.println("\tDelete all tasks: reset"); + System.out.println("\tExit the program: bye"); + } + public static void goodBye (){ System.out.println(" ,:\n" + " ,' |\n" + @@ -140,16 +158,14 @@ public static void validateDoneCommand(String[] command, TaskList taskList){ } - public static void printDone(String[] command, TaskList taskList){ - int taskNumber = Integer.parseInt(command[1]) - 1; + public void printDone(int i, TaskList taskList){ System.out.println("Nice! I've marked this task as done:"); - System.out.println("\t"+taskList.get(taskNumber).printTask()); + System.out.println("\t"+taskList.get(i).printTask()); } - public static void printDelete(String[] command, TaskList taskList){ - int taskNumber = Integer.parseInt(command[1]) - 1; + public void printDelete(int i, TaskList taskList){ System.out.println("Noted. I've removed this task: "); - System.out.println("\t"+taskList.get(taskNumber).printTask()); + System.out.println("\t"+taskList.get(i).printTask()); } public void printTaskCount(TaskList taskList){ @@ -186,4 +202,19 @@ public void printTaskByKeyword(TaskList taskList, String keyword){ System.out.println("You have total " + (taskList.size()) +" tasks related to <" + keyword +">."); } + public void reset(){ + System.out.println("Your task list has been reset. Please add new task."); + } + + public static boolean validateResetCommand(){ + boolean b = false; + System.out.println("Heads up! You are about to reset your task list. Type \"confirm\" to continue."); + String confirm = in.nextLine(); + if (confirm.equalsIgnoreCase("confirm")){ + b = true; + } + return b; + } + + } \ No newline at end of file From 7d2f7420ade7a9db22ab603af4dec3357a185d70 Mon Sep 17 00:00:00 2001 From: Gu Bicheng Date: Sat, 6 Nov 2021 23:13:28 +0800 Subject: [PATCH 25/37] Level-10-GUI --- build.gradle | 18 +++- src/main/java/DialogBox.java | 80 ++++++++++++++++++ src/main/java/Duke.java | 80 ++++++++++++++++++ src/main/java/Launcher.java | 11 +++ src/main/java/Main.java | 29 +++++++ src/main/java/MainWindow.java | 64 ++++++++++++++ .../java/{duke => }/command/AddCommand.java | 10 +-- .../java/{duke => }/command/ByeCommand.java | 8 +- src/main/java/{duke => }/command/Command.java | 11 +-- .../command/CommandCollections.java | 2 +- .../{duke => }/command/DeleteCommand.java | 8 +- .../java/{duke => }/command/DoneCommand.java | 8 +- .../java/{duke => }/command/HelpCommand.java | 10 +-- .../{duke => }/command/InvalidCommand.java | 10 +-- .../java/{duke => }/command/ListCommand.java | 8 +- .../java/{duke => }/command/ResetCommand.java | 10 +-- .../{duke => }/command/SearchCommand.java | 10 +-- .../java/{duke => }/command/ViewCommand.java | 8 +- src/main/java/duke/Duke.java | 53 ------------ .../{duke => }/exception/DukeException.java | 2 +- src/main/java/{duke => }/parser/Parser.java | 25 ++++-- src/main/java/{duke => }/storage/Storage.java | 14 +-- .../java/{duke => }/tasklist/Deadline.java | 2 +- src/main/java/{duke => }/tasklist/Event.java | 2 +- src/main/java/{duke => }/tasklist/Task.java | 2 +- .../java/{duke => }/tasklist/TaskList.java | 8 +- src/main/java/{duke => }/tasklist/Todo.java | 2 +- src/main/java/{duke => }/ui/Ui.java | 37 ++++---- .../resources/fonts/AidaSerifaCondensed.ttf | Bin 0 -> 49936 bytes src/main/resources/fonts/UniversCondensed.ttf | Bin 0 -> 45516 bytes src/main/resources/images/DaDuke.png | Bin 0 -> 21831 bytes src/main/resources/images/DaUser.png | Bin 0 -> 18533 bytes src/main/resources/view/DialogBox.fxml | 24 ++++++ src/main/resources/view/MainWindow.fxml | 23 +++++ src/main/resources/view/backgroud.jpeg | Bin 0 -> 99131 bytes src/main/resources/view/background.css | 4 + 36 files changed, 434 insertions(+), 149 deletions(-) create mode 100644 src/main/java/DialogBox.java create mode 100644 src/main/java/Duke.java create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/java/Main.java create mode 100644 src/main/java/MainWindow.java rename src/main/java/{duke => }/command/AddCommand.java (76%) rename src/main/java/{duke => }/command/ByeCommand.java (62%) rename src/main/java/{duke => }/command/Command.java (78%) rename src/main/java/{duke => }/command/CommandCollections.java (83%) rename src/main/java/{duke => }/command/DeleteCommand.java (83%) rename src/main/java/{duke => }/command/DoneCommand.java (83%) rename src/main/java/{duke => }/command/HelpCommand.java (61%) rename src/main/java/{duke => }/command/InvalidCommand.java (69%) rename src/main/java/{duke => }/command/ListCommand.java (70%) rename src/main/java/{duke => }/command/ResetCommand.java (70%) rename src/main/java/{duke => }/command/SearchCommand.java (74%) rename src/main/java/{duke => }/command/ViewCommand.java (81%) delete mode 100644 src/main/java/duke/Duke.java rename src/main/java/{duke => }/exception/DukeException.java (83%) rename src/main/java/{duke => }/parser/Parser.java (93%) rename src/main/java/{duke => }/storage/Storage.java (92%) rename src/main/java/{duke => }/tasklist/Deadline.java (97%) rename src/main/java/{duke => }/tasklist/Event.java (97%) rename src/main/java/{duke => }/tasklist/Task.java (98%) rename src/main/java/{duke => }/tasklist/TaskList.java (86%) rename src/main/java/{duke => }/tasklist/Todo.java (95%) rename src/main/java/{duke => }/ui/Ui.java (87%) create mode 100644 src/main/resources/fonts/AidaSerifaCondensed.ttf create mode 100644 src/main/resources/fonts/UniversCondensed.ttf create mode 100644 src/main/resources/images/DaDuke.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 create mode 100644 src/main/resources/view/backgroud.jpeg create mode 100644 src/main/resources/view/background.css diff --git a/build.gradle b/build.gradle index dda93802..5ec66890 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,21 @@ repositories { dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' + + String javaFxVersion = '11' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { @@ -29,7 +44,7 @@ test { } application { - mainClassName = "duke.Duke" + mainClassName = "Duke" } shadowJar { @@ -42,5 +57,6 @@ checkstyle { } run{ + enableAssertions = true standardInput = System.in } diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 00000000..2d8cb957 --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,80 @@ +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import java.io.InputStream; +import javafx.scene.text.Font; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + this.setMinHeight(this.dialog.getMinHeight()); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + /** + * Retrieves font. + */ + public void getFont(String fontName, int size) { + InputStream is = Main.class.getResourceAsStream(fontName); + Font font = Font.loadFont(getClass().getResourceAsStream(fontName), 20); + this.dialog.setFont(font); + } + + /** + * Gets the dialog box. + */ + public static DialogBox getUserDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.getFont("fonts/AidaSerifaCondensed.ttf", 20); + return db; + } + + /** + * Gets the dialog box. + */ + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + db.getFont("fonts/UniversCondensed.ttf", 20); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java new file mode 100644 index 00000000..5ed1d336 --- /dev/null +++ b/src/main/java/Duke.java @@ -0,0 +1,80 @@ +import command.Command; +import exception.DukeException; +import parser.Parser; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; + +import java.io.*; + +public class Duke { + + private TaskList taskList; + private final Storage storage; + private final Ui ui; + + public Duke() { + String filePath = "src/data/tasks.txt"; + ui = new Ui(); + storage = new Storage(filePath); + try { + taskList = new TaskList(storage.load()); + } catch (DukeException e) { + ui.exceptionMessage(e); + } catch (FileNotFoundException e) { + ui.exceptionMessage(e); + taskList = new TaskList(); + } + } + + public Duke(String filePath) { + ui = new Ui(); + storage = new Storage(filePath); + try { + taskList = new TaskList(storage.load()); + } catch (DukeException e) { + ui.exceptionMessage(e); + } catch (FileNotFoundException e) { + ui.exceptionMessage(e); + taskList = new TaskList(); + } + } + + public void run() { + Ui.Welcome(); + boolean isExit = false; + while(!isExit){ + try { + String userInput = ui.userInput(); + ui.Separator(); + Command c = Parser.parse(userInput, taskList); + c.execute(taskList, ui, storage); + isExit = c.isExit(); + } catch (DukeException | IOException e){ + ui.errorMessage(e); + } finally { + ui.Separator(); + } + } + } + + public String dukeReply(String input) { + try { + Command c = Parser.parse(input, taskList); + ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + System.setOut(new PrintStream(outContent)); + c.execute(taskList, ui, storage); + return outContent.toString(); + } catch (DukeException | IOException e) { + return e.getMessage(); + } catch (NullPointerException e) { + StringWriter errors = new StringWriter(); + e.printStackTrace(new PrintWriter(errors)); + return errors.toString(); + } + } + + public static void main(String[] args){ + new Duke("src/data/tasks.txt").run(); + } +} diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 00000000..8b31d13e --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,11 @@ +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 00000000..5110b608 --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1,29 @@ +import java.io.IOException; +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + stage.setTitle("Duke, the Task Manager"); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 00000000..535e906e --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,64 @@ +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +import javafx.animation.PauseTransition; +import javafx.application.Platform; +import javafx.util.Duration; + +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + /** + * Controller for MainWindow. Provides the layout for the other controls. + */ + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + VBox.setVgrow(scrollPane, javafx.scene.layout.Priority.ALWAYS); + dialogContainer.getChildren().addAll(DialogBox.getDukeDialog("Hello! I'm Duke. " + + "How may I help you?", dukeImage)); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.dukeReply(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + if (input.equals("bye")) { + PauseTransition pause = new PauseTransition(Duration.seconds(1)); + pause.setOnFinished(event -> Platform.exit()); + pause.play(); + } + } +} \ No newline at end of file diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/command/AddCommand.java similarity index 76% rename from src/main/java/duke/command/AddCommand.java rename to src/main/java/command/AddCommand.java index 605c4fcf..7cd4484f 100644 --- a/src/main/java/duke/command/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -1,9 +1,9 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.Task; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import storage.Storage; +import tasklist.Task; +import tasklist.TaskList; +import ui.Ui; import java.io.IOException; diff --git a/src/main/java/duke/command/ByeCommand.java b/src/main/java/command/ByeCommand.java similarity index 62% rename from src/main/java/duke/command/ByeCommand.java rename to src/main/java/command/ByeCommand.java index ad5aeb48..d2892ad4 100644 --- a/src/main/java/duke/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -1,8 +1,8 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; public class ByeCommand extends Command{ public void execute(TaskList taskList, Ui ui, Storage storage) { diff --git a/src/main/java/duke/command/Command.java b/src/main/java/command/Command.java similarity index 78% rename from src/main/java/duke/command/Command.java rename to src/main/java/command/Command.java index 1bf84a03..90f2ffb5 100644 --- a/src/main/java/duke/command/Command.java +++ b/src/main/java/command/Command.java @@ -1,10 +1,11 @@ -package duke.command; +package command; + +import exception.DukeException; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.io.*; -import duke.exception.*; -import duke.ui.*; -import duke.storage.*; -import duke.tasklist.*; public abstract class Command { diff --git a/src/main/java/duke/command/CommandCollections.java b/src/main/java/command/CommandCollections.java similarity index 83% rename from src/main/java/duke/command/CommandCollections.java rename to src/main/java/command/CommandCollections.java index e4069d4b..a50d41cd 100644 --- a/src/main/java/duke/command/CommandCollections.java +++ b/src/main/java/command/CommandCollections.java @@ -1,4 +1,4 @@ -package duke.command; +package command; public enum CommandCollections { LIST, TODO, DEADLINE, EVENT, DONE, DELETE, BYE, VIEW, SEARCH, HELP, RESET diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java similarity index 83% rename from src/main/java/duke/command/DeleteCommand.java rename to src/main/java/command/DeleteCommand.java index af651eee..49489160 100644 --- a/src/main/java/duke/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,8 +1,8 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.io.IOException; diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/command/DoneCommand.java similarity index 83% rename from src/main/java/duke/command/DoneCommand.java rename to src/main/java/command/DoneCommand.java index 786e6bc8..9e4c383a 100644 --- a/src/main/java/duke/command/DoneCommand.java +++ b/src/main/java/command/DoneCommand.java @@ -1,8 +1,8 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.io.IOException; diff --git a/src/main/java/duke/command/HelpCommand.java b/src/main/java/command/HelpCommand.java similarity index 61% rename from src/main/java/duke/command/HelpCommand.java rename to src/main/java/command/HelpCommand.java index 8776136a..26d5415a 100644 --- a/src/main/java/duke/command/HelpCommand.java +++ b/src/main/java/command/HelpCommand.java @@ -1,9 +1,9 @@ -package duke.command; +package command; -import duke.exception.DukeException; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import exception.DukeException; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.io.IOException; diff --git a/src/main/java/duke/command/InvalidCommand.java b/src/main/java/command/InvalidCommand.java similarity index 69% rename from src/main/java/duke/command/InvalidCommand.java rename to src/main/java/command/InvalidCommand.java index 9a585fa8..b6629ae1 100644 --- a/src/main/java/duke/command/InvalidCommand.java +++ b/src/main/java/command/InvalidCommand.java @@ -1,9 +1,9 @@ -package duke.command; +package command; -import duke.exception.DukeException; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import exception.DukeException; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; public class InvalidCommand extends Command{ private final String errorMsg; diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/command/ListCommand.java similarity index 70% rename from src/main/java/duke/command/ListCommand.java rename to src/main/java/command/ListCommand.java index 1b4ce02b..d36f53fe 100644 --- a/src/main/java/duke/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -1,8 +1,8 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.*; -import duke.ui.Ui; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; public class ListCommand extends Command { diff --git a/src/main/java/duke/command/ResetCommand.java b/src/main/java/command/ResetCommand.java similarity index 70% rename from src/main/java/duke/command/ResetCommand.java rename to src/main/java/command/ResetCommand.java index c180dd72..aef001e2 100644 --- a/src/main/java/duke/command/ResetCommand.java +++ b/src/main/java/command/ResetCommand.java @@ -1,9 +1,9 @@ -package duke.command; +package command; -import duke.exception.DukeException; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import exception.DukeException; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.io.IOException; diff --git a/src/main/java/duke/command/SearchCommand.java b/src/main/java/command/SearchCommand.java similarity index 74% rename from src/main/java/duke/command/SearchCommand.java rename to src/main/java/command/SearchCommand.java index 8ba5ee0f..0754fc4a 100644 --- a/src/main/java/duke/command/SearchCommand.java +++ b/src/main/java/command/SearchCommand.java @@ -1,9 +1,9 @@ -package duke.command; +package command; -import duke.exception.DukeException; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import exception.DukeException; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; public class SearchCommand extends Command{ diff --git a/src/main/java/duke/command/ViewCommand.java b/src/main/java/command/ViewCommand.java similarity index 81% rename from src/main/java/duke/command/ViewCommand.java rename to src/main/java/command/ViewCommand.java index 7871c966..3511c891 100644 --- a/src/main/java/duke/command/ViewCommand.java +++ b/src/main/java/command/ViewCommand.java @@ -1,8 +1,8 @@ -package duke.command; +package command; -import duke.storage.Storage; -import duke.tasklist.TaskList; -import duke.ui.Ui; +import storage.Storage; +import tasklist.TaskList; +import ui.Ui; import java.time.LocalDate; diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java deleted file mode 100644 index f75b4a09..00000000 --- a/src/main/java/duke/Duke.java +++ /dev/null @@ -1,53 +0,0 @@ -package duke; - -import duke.ui.*; -import duke.tasklist.*; -import duke.exception.*; -import duke.parser.*; -import duke.storage.*; -import duke.command.*; - -import java.io.FileNotFoundException; -import java.io.IOException; - -public class Duke { - - private TaskList taskList; - private final Storage storage; - private final Ui ui; - - public Duke(String filePath) { - ui = new Ui(); - storage = new Storage(filePath); - try { - taskList = new TaskList(storage.load()); - } catch (DukeException e) { - ui.exceptionMessage(e); - } catch (FileNotFoundException e) { - ui.exceptionMessage(e); - taskList = new TaskList(); - } - } - - public void run() { - Ui.Welcome(); - boolean isExit = false; - while(!isExit){ - try { - String userInput = ui.userInput(); - ui.Separator(); - Command c = Parser.parse(userInput, taskList); - c.execute(taskList, ui, storage); - isExit = c.isExit(); - } catch (DukeException | IOException e){ - ui.errorMessage(e); - } finally { - ui.Separator(); - } - } - } - - public static void main(String[] args){ - new Duke("src/data/tasks.txt").run(); - } -} diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/exception/DukeException.java similarity index 83% rename from src/main/java/duke/exception/DukeException.java rename to src/main/java/exception/DukeException.java index 53fe8b0f..329d5a49 100644 --- a/src/main/java/duke/exception/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,4 +1,4 @@ -package duke.exception; +package exception; public class DukeException extends IllegalArgumentException{ public DukeException(String s) { diff --git a/src/main/java/duke/parser/Parser.java b/src/main/java/parser/Parser.java similarity index 93% rename from src/main/java/duke/parser/Parser.java rename to src/main/java/parser/Parser.java index dca28f46..1cfb8164 100644 --- a/src/main/java/duke/parser/Parser.java +++ b/src/main/java/parser/Parser.java @@ -1,14 +1,14 @@ -package duke.parser; +package parser; -import java.time.LocalDateTime; +import command.*; +import tasklist.*; +import ui.Ui; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.time.format.FormatStyle; -import duke.tasklist.*; -import duke.ui.Ui; -import duke.command.*; /** * A Parser object deals with making sense of the user command. @@ -16,28 +16,35 @@ public class Parser { /** * commandToArray method splits user input to an array of Strings. + * * @param text is the user input * @return an array of Strings */ - public static String[] commandToArray(String text){ + public static String[] commandToArray(String text) { return text.split(" ",2); } - public static LocalDate parseDate(String[] command) throws DateTimeParseException{ + /** + * + * @param command + * @return + * @throws DateTimeParseException + */ + public static LocalDate parseDate(String[] command) throws DateTimeParseException { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy"); LocalDate date; date = LocalDate.parse(command[1], formatter); return date; } - public static LocalDateTime parseDateTime(String[] command) throws DateTimeParseException{ + public static LocalDateTime parseDateTime(String[] command) throws DateTimeParseException { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy HHmm"); LocalDateTime dateTime; dateTime = LocalDateTime.parse(command[1].split(" /by | /at ")[1], formatter); return dateTime; } - public static LocalDateTime parseDateTimeFromFile(String[] command) throws DateTimeParseException{ + public static LocalDateTime parseDateTimeFromFile(String[] command) throws DateTimeParseException { DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT); LocalDateTime dateTimeFromFile; dateTimeFromFile = LocalDateTime.parse(command[1].split(" /by | /at ")[1], formatter); diff --git a/src/main/java/duke/storage/Storage.java b/src/main/java/storage/Storage.java similarity index 92% rename from src/main/java/duke/storage/Storage.java rename to src/main/java/storage/Storage.java index 63b709ab..99997b44 100644 --- a/src/main/java/duke/storage/Storage.java +++ b/src/main/java/storage/Storage.java @@ -1,10 +1,10 @@ -package duke.storage; +package storage; -import duke.parser.Parser; -import duke.tasklist.Deadline; -import duke.tasklist.Event; -import duke.tasklist.Task; -import duke.tasklist.Todo; +import parser.Parser; +import tasklist.Deadline; +import tasklist.Event; +import tasklist.Task; +import tasklist.Todo; import java.io.File; import java.io.FileNotFoundException; @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Scanner; -import static duke.parser.Parser.commandToArray; +import static parser.Parser.commandToArray; public class Storage { diff --git a/src/main/java/duke/tasklist/Deadline.java b/src/main/java/tasklist/Deadline.java similarity index 97% rename from src/main/java/duke/tasklist/Deadline.java rename to src/main/java/tasklist/Deadline.java index 83bac033..a5ae39b6 100644 --- a/src/main/java/duke/tasklist/Deadline.java +++ b/src/main/java/tasklist/Deadline.java @@ -1,4 +1,4 @@ -package duke.tasklist; +package tasklist; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/duke/tasklist/Event.java b/src/main/java/tasklist/Event.java similarity index 97% rename from src/main/java/duke/tasklist/Event.java rename to src/main/java/tasklist/Event.java index 8c83f6a7..f88e611f 100644 --- a/src/main/java/duke/tasklist/Event.java +++ b/src/main/java/tasklist/Event.java @@ -1,4 +1,4 @@ -package duke.tasklist; +package tasklist; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/duke/tasklist/Task.java b/src/main/java/tasklist/Task.java similarity index 98% rename from src/main/java/duke/tasklist/Task.java rename to src/main/java/tasklist/Task.java index 89e2b002..c180523b 100644 --- a/src/main/java/duke/tasklist/Task.java +++ b/src/main/java/tasklist/Task.java @@ -1,4 +1,4 @@ -package duke.tasklist; +package tasklist; import java.time.LocalDateTime; diff --git a/src/main/java/duke/tasklist/TaskList.java b/src/main/java/tasklist/TaskList.java similarity index 86% rename from src/main/java/duke/tasklist/TaskList.java rename to src/main/java/tasklist/TaskList.java index 207cc1b0..1d69ef60 100644 --- a/src/main/java/duke/tasklist/TaskList.java +++ b/src/main/java/tasklist/TaskList.java @@ -1,4 +1,4 @@ -package duke.tasklist; +package tasklist; import java.time.LocalDate; import java.util.ArrayList; @@ -38,6 +38,8 @@ public ArrayList getTasks() { return taskList; } + public boolean contains(Task t){return taskList.contains(t);} + public TaskList getTaskByDate(LocalDate date, TaskList taskList) { TaskList taskByDate = new TaskList(); for (int i = 0; i < taskList.size(); i++) { @@ -56,7 +58,9 @@ public TaskList getTaskByKeyword (String keyword, TaskList taskList) { String[] keywordInTask = taskList.get(i).getKeyword(); for (String s : keywordInTask){ if (s.contains(keyword) || keyword.contains(s)) { - taskByKeyword.addTask(taskList.get(i)); + if (!taskByKeyword.contains(taskList.get(i))){ + taskByKeyword.addTask(taskList.get(i)); + } } } } diff --git a/src/main/java/duke/tasklist/Todo.java b/src/main/java/tasklist/Todo.java similarity index 95% rename from src/main/java/duke/tasklist/Todo.java rename to src/main/java/tasklist/Todo.java index c6ccaccc..e71b9cd4 100644 --- a/src/main/java/duke/tasklist/Todo.java +++ b/src/main/java/tasklist/Todo.java @@ -1,4 +1,4 @@ -package duke.tasklist; +package tasklist; public class Todo extends Task{ public Todo(String description){ diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/ui/Ui.java similarity index 87% rename from src/main/java/duke/ui/Ui.java rename to src/main/java/ui/Ui.java index 0c44009e..99267767 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/ui/Ui.java @@ -1,15 +1,13 @@ -package duke.ui; +package ui; -import duke.exception.DukeException; -import duke.tasklist.TaskList; +import exception.DukeException; +import tasklist.TaskList; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; import java.util.Scanner; -import static duke.parser.Parser.parseDate; - public class Ui { private static final String SEPARATOR = @@ -46,18 +44,18 @@ public static void Welcome (){ public static void howToUse(){ System.out.println("How to interact with Duke:\n"); - System.out.println("\tFunction: Command:"); - System.out.println("\tView all existing tasks: list"); - System.out.println("\tAdd a new to-do: todo {description}"); - System.out.println("\tAdd a new deadline: deadline {description} /by {d/M/yyyy HHmm}"); - System.out.println("\tAdd a new event: event {description} /at {d/M/yyyy HHmm}"); - System.out.println("\tMark a task as completed: done {taskId}"); - System.out.println("\tDelete a task: delete {taskId}"); - System.out.println("\tSearch task by keyword: search {keyword}"); - System.out.println("\tCheck schedule of a date: view {yyyy-MM-dd}"); - System.out.println("\tShow help message: help"); - System.out.println("\tDelete all tasks: reset"); - System.out.println("\tExit the program: bye"); + System.out.println("\tFunction: Command:"); + System.out.println("\tView all existing tasks: list"); + System.out.println("\tAdd a new to-do: todo {description}"); + System.out.println("\tAdd a new deadline: deadline {description} /by {d/M/yyyy HHmm}"); + System.out.println("\tAdd a new event: event {description} /at {d/M/yyyy HHmm}"); + System.out.println("\tMark a task as completed [√]: done {taskId}"); + System.out.println("\tDelete a task: delete {taskId}"); + System.out.println("\tSearch tasks by keyword: search {keyword}"); + System.out.println("\tCheck schedule of a date: view {yyyy-MM-dd}"); + System.out.println("\tShow help message: help"); + System.out.println("\tDelete all tasks: reset"); + System.out.println("\tExit the program: bye"); } public static void goodBye (){ @@ -94,7 +92,7 @@ public static void goodBye (){ " ( 8) ( _.aP\" _a \\( \\ *\n" + " + )/ (8P (88 ) )\n" + " (a:f \" `\" `\n" + - "\nBye, i will miss you."); + "\nBye, i will go back to space."); } public void errorMessage (Exception e) { @@ -186,7 +184,6 @@ public static String validateDateTime(){ } public static void validateViewCommand(String[] command){ - LocalDate dateTime = parseDate(command); if (command.length < 2) { throw new DukeException("☹ OOPS!!! The date cannot be empty. Please re-enter:"); } @@ -215,6 +212,4 @@ public static boolean validateResetCommand(){ } return b; } - - } \ No newline at end of file diff --git a/src/main/resources/fonts/AidaSerifaCondensed.ttf b/src/main/resources/fonts/AidaSerifaCondensed.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e5b98b121e10817c7f70a94065d13c630e4d301a GIT binary patch literal 49936 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/images/DaUser.png b/src/main/resources/images/DaUser.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1d45e89e7dc30b49885a35512cd9a938dc4b63 GIT binary patch literal 18533 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 + + + + + + + + + + + + + + + + + + + + \ 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 00000000..11726a3e --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + +