From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/27] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..20c0521cc7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.29' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From 4d0258b633f7432214bd9f1d2bacc8219d26775f Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 11:59:19 +0800 Subject: [PATCH 02/27] Finished Level-1 --- src/main/java/Duke.java | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..ec26a70a38 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,12 @@ +import java.util.*; + +class Client { + public String input() { + Scanner scan = new Scanner(System.in); + return scan.nextLine(); + } +} + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -5,6 +14,19 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + //System.out.println("Hello from\n" + logo); + System.out.println("Hello! This is Duke, your very own chat bot."); + System.out.println("What can I help you with ?"); + Client client = new Client(); + while (true) { + String input = client.input(); + if (input.equals("bye")) { + System.out.println("It's sad to see you go :("); + System.out.println("Goodbye, hope to you another day!"); + break; + } else { + System.out.println(input); + } + } } } From 916e1a4f3abb85d5ba87e13d003eaa215d3e5d9f Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 15:23:33 +0800 Subject: [PATCH 03/27] Finished Level-2 --- src/main/java/Duke.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ec26a70a38..7f9da1f255 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -14,19 +14,24 @@ public static void main(String[] args) { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - //System.out.println("Hello from\n" + logo); System.out.println("Hello! This is Duke, your very own chat bot."); System.out.println("What can I help you with ?"); Client client = new Client(); + ArrayList list = new ArrayList(); while (true) { String input = client.input(); if (input.equals("bye")) { System.out.println("It's sad to see you go :("); System.out.println("Goodbye, hope to you another day!"); break; - } else { - System.out.println(input); - } + } else if (input.equals("list")) { + for (int i = 0; i < list.size(); i++) { + System.out.println(i+1 + ". " + list.get(i)); + } + } else { + list.add(input); + System.out.println("added: " + input); + } } } } From 9ee21584d2fa2dfb2ed027a94d961a4e5bf75279 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 16:09:50 +0800 Subject: [PATCH 04/27] Finished Level-3 --- src/main/java/Duke.java | 14 ++++++++++---- src/main/java/Task.java | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7f9da1f255..e1c26bc564 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,19 +17,25 @@ public static void main(String[] args) { System.out.println("Hello! This is Duke, your very own chat bot."); System.out.println("What can I help you with ?"); Client client = new Client(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); while (true) { String input = client.input(); + Task taskInput = new Task(input); if (input.equals("bye")) { System.out.println("It's sad to see you go :("); System.out.println("Goodbye, hope to you another day!"); break; } else if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + ". " + list.get(i)); + System.out.println(i+1 + ".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); } - } else { - list.add(input); + } else if (input.startsWith("done") && input.length() < 9) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + list.get(value - 1).markAsDone(); + System.out.println("Nice! I've marked this task as done: "); + System.out.println("[X] " + list.get(value-1).description); + } else { + list.add(new Task(input)); System.out.println("added: " + input); } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..0e1d775a0f --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,17 @@ +public class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public void markAsDone() { + this.isDone = true; + } +} \ No newline at end of file From 6a59fbed7a6b97d7513e7675d9fcb8529de85650 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 22:17:03 +0800 Subject: [PATCH 05/27] Finished Level-4 --- src/main/java/Deadline.java | 14 ++++++++++++++ src/main/java/Duke.java | 25 ++++++++++++++++++++++++- src/main/java/Event.java | 13 +++++++++++++ src/main/java/Task.java | 4 ++++ src/main/java/Todo.java | 11 +++++++++++ text-ui-test/EXPECTED.TXT | 7 ------- text-ui-test/runtest.bat | 4 ++-- text-ui-test/runtest.sh | 10 +++------- 8 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..2de70b7540 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,14 @@ +public class Deadline extends Task { + + protected String by; + + public Deadline(String description, String by) { + super(description); + this.by = by; + } + + @Override + public String toString() { + return "[D]" + super.toString() + " (by: " + by + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e1c26bc564..7c7c09ec57 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -27,17 +27,40 @@ public static void main(String[] args) { break; } else if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + ".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); + System.out.println(i+1 + "." + list.get(i).toString()); //".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); } } else if (input.startsWith("done") && input.length() < 9) { int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); list.get(value - 1).markAsDone(); System.out.println("Nice! I've marked this task as done: "); System.out.println("[X] " + list.get(value-1).description); + } else if (input.startsWith("todo")) { + String firstTodo = input.substring(5); + list.add(new Todo(firstTodo)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Todo(firstTodo)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } else if (input.startsWith("deadline")) { + String[] temp = input.split("/"); + String firstDeadline = temp[0].substring(9); + String secondDeadline = temp[1].substring(3); + list.add(new Deadline(firstDeadline,secondDeadline)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Deadline(firstDeadline,secondDeadline)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } else if (input.startsWith("event")) { + String[] tempEvent = input.split("/"); + String firstEvent = tempEvent[0].substring(6); + String secondEvent = tempEvent[1].substring(3); + list.add(new Event(firstEvent,secondEvent)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Event(firstEvent,secondEvent)); + System.out.println("Now you have " + list.size() + " tasks in the list"); } else { list.add(new Task(input)); System.out.println("added: " + input); } } + } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..8827bef91e --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,13 @@ +public class Event extends Task{ + protected String at; + + public Event(String description, String at) { + super(description); + this.at = at; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (at: " + at + ")"; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 0e1d775a0f..8969515121 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -7,6 +7,10 @@ public Task(String description) { this.isDone = false; } + public String toString() { + return "[" + this.getStatusIcon() + "] " + this.description; + } + public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..2f23e1d5cd --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,11 @@ +public class Todo extends Task{ + + public Todo(String description) { + super(description); + } + + @Override + public String toString() { + return "[T]" + super.toString() ; + } +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..e69de29bb2 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +0,0 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..0b643f82e4 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -4,7 +4,7 @@ REM create bin directory if it doesn't exist if not exist ..\bin mkdir ..\bin REM delete output from previous run -if exist ACTUAL.TXT del ACTUAL.TXT +del ACTUAL.TXT REM compile the code into the bin folder javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java @@ -18,4 +18,4 @@ REM run the program, feed commands from input.txt file and redirect the output t java -classpath ..\bin Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output -FC ACTUAL.TXT EXPECTED.TXT +FC ACTUAL.TXT EXPECTED.TXT \ No newline at end of file diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index c9ec870033..ba1355decf 100644 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -13,21 +13,17 @@ then fi # compile the code into the bin folder, terminates if error occurred -if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/*.java +if ! javac -cp D:/National University of Singapore/Notes/AY21-22_Sem1/CS2103T/Individual-project/ip/src/main/java -Xlint:none -d ../bin ../src/main/java/*.java then echo "********** BUILD FAILURE **********" exit 1 fi # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ../bin Duke < input.txt > ACTUAL.TXT - -# convert to UNIX format -cp EXPECTED.TXT EXPECTED-UNIX.TXT -dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT +java -classpath D:/National University of Singapore/Notes/AY21-22_Sem1/CS2103T/Individual-project/ip/bin Duke < input.txt > ACTUAL.TXT # compare the output to the expected output -diff ACTUAL.TXT EXPECTED-UNIX.TXT +diff ACTUAL.TXT EXPECTED.TXT if [ $? -eq 0 ] then echo "Test result: PASSED" From ad750b7befd89592dc9ba034f91ee171e3b9e4bc Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 23:02:35 +0800 Subject: [PATCH 06/27] Finished A-TextUiTesting --- src/main/java/Duke.java | 11 +++++++++-- text-ui-test/EXPECTED.TXT | 34 ++++++++++++++++++++++++++++++++++ text-ui-test/input.txt | 11 +++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7c7c09ec57..ed48d62534 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,9 +1,13 @@ import java.util.*; class Client { + Scanner scan = new Scanner(System.in); public String input() { - Scanner scan = new Scanner(System.in); - return scan.nextLine(); + if (scan.hasNextLine()) { + String str = scan.nextLine(); + return str; + } + return ""; } } @@ -20,6 +24,9 @@ public static void main(String[] args) { ArrayList list = new ArrayList(); while (true) { String input = client.input(); + if (input.equals("")) { + break; + } Task taskInput = new Task(input); if (input.equals("bye")) { System.out.println("It's sad to see you go :("); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index e69de29bb2..6248975c1c 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -0,0 +1,34 @@ +Hello! This is Duke, your very own chat bot. +What can I help you with ? +Got it. I've added this task: +[D][ ] return book (by: Monday) +Now you have 1 tasks in the list +Got it. I've added this task: +[D][ ] meet Mark (by: Tuesday) +Now you have 2 tasks in the list +1.[D][ ] return book (by: Monday) +2.[D][ ] meet Mark (by: Tuesday) +Got it. I've added this task: +[E][ ] project meeting (at: Mon 2-4pm) +Now you have 3 tasks in the list +Got it. I've added this task: +[E][ ] project call (at: Tue 2-4pm) +Now you have 4 tasks in the list +1.[D][ ] return book (by: Monday) +2.[D][ ] meet Mark (by: Tuesday) +3.[E][ ] project meeting (at: Mon 2-4pm) +4.[E][ ] project call (at: Tue 2-4pm) +Nice! I've marked this task as done: +[X] project meeting +1.[D][ ] return book (by: Monday) +2.[D][ ] meet Mark (by: Tuesday) +3.[E][X] project meeting (at: Mon 2-4pm) +4.[E][ ] project call (at: Tue 2-4pm) +Nice! I've marked this task as done: +[X] project call +1.[D][ ] return book (by: Monday) +2.[D][ ] meet Mark (by: Tuesday) +3.[E][X] project meeting (at: Mon 2-4pm) +4.[E][X] project call (at: Tue 2-4pm) +It's sad to see you go :( +Goodbye, hope to you another day! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..02c18b45d7 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,11 @@ +deadline return book /by Monday +deadline meet Mark /by Tuesday +list +event project meeting /at Mon 2-4pm +event project call /at Tue 2-4pm +list +done 3 +list +done 4 +list +bye \ No newline at end of file From 35ab331329c82c9695936a95f52a8e07ebace1b8 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Thu, 19 Aug 2021 23:47:07 +0800 Subject: [PATCH 07/27] Finished Level-5 --- src/main/java/Duke.java | 57 +++++++++++++++++++------------- src/main/java/DukeException.java | 29 ++++++++++++++++ 2 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ed48d62534..ddd5a96649 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -42,32 +42,43 @@ public static void main(String[] args) { System.out.println("Nice! I've marked this task as done: "); System.out.println("[X] " + list.get(value-1).description); } else if (input.startsWith("todo")) { - String firstTodo = input.substring(5); - list.add(new Todo(firstTodo)); - System.out.println("Got it. I've added this task: "); - System.out.println(new Todo(firstTodo)); - System.out.println("Now you have " + list.size() + " tasks in the list"); + if (input.length() < 6) { + System.out.println(new NullTaskError().getMsg("todo")); + } else { + String firstTodo = input.substring(5); + list.add(new Todo(firstTodo)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Todo(firstTodo)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } } else if (input.startsWith("deadline")) { - String[] temp = input.split("/"); - String firstDeadline = temp[0].substring(9); - String secondDeadline = temp[1].substring(3); - list.add(new Deadline(firstDeadline,secondDeadline)); - System.out.println("Got it. I've added this task: "); - System.out.println(new Deadline(firstDeadline,secondDeadline)); - System.out.println("Now you have " + list.size() + " tasks in the list"); + if (input.length() < 10) { + System.out.println(new NullTaskError().getMsg("deadline")); + } else { + String[] temp = input.split("/"); + String firstDeadline = temp[0].substring(9); + String secondDeadline = temp[1].substring(3); + list.add(new Deadline(firstDeadline, secondDeadline)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Deadline(firstDeadline, secondDeadline)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } } else if (input.startsWith("event")) { - String[] tempEvent = input.split("/"); - String firstEvent = tempEvent[0].substring(6); - String secondEvent = tempEvent[1].substring(3); - list.add(new Event(firstEvent,secondEvent)); - System.out.println("Got it. I've added this task: "); - System.out.println(new Event(firstEvent,secondEvent)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } else { - list.add(new Task(input)); - System.out.println("added: " + input); + if (input.length() < 7) { + System.out.println(new NullTaskError().getMsg("event")); + } else { + String[] tempEvent = input.split("/"); + String firstEvent = tempEvent[0].substring(6); + String secondEvent = tempEvent[1].substring(3); + list.add(new Event(firstEvent, secondEvent)); + System.out.println("Got it. I've added this task: "); + System.out.println(new Event(firstEvent, secondEvent)); + System.out.println("Now you have " + list.size() + " tasks in the list"); } + } else { + DukeException e = new NonExistentKeyword(); + System.out.println(e.getMsg()); + } } - } } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..15b633677b --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,29 @@ +public abstract class DukeException extends RuntimeException { + public DukeException(String message) { + super(message); + } + + public String getMsg() { + return ""; + } +} + +class NullTaskError extends DukeException { + public NullTaskError() { + super("OOPS!!! The description of a todo cannot be empty."); + } + + public String getMsg(String type) { + return "OOPS!!! The description of a " + type + " cannot be empty."; + } +} + +class NonExistentKeyword extends DukeException { + public NonExistentKeyword() { + super("OOPS!!! I'm sorry, but I don't know what that means :-("); + } + + public String getMsg() { + return "OOPS!!! I'm sorry, but I don't know what that means :-("; + } +} From 32dfefdb3a0a534184b707d01c0f2209c8ca38de Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Fri, 20 Aug 2021 00:00:08 +0800 Subject: [PATCH 08/27] Finished Level-6 --- src/main/java/Duke.java | 7 +++++++ text-ui-test/EXPECTED.TXT | 12 +++++++++++- text-ui-test/input.txt | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ddd5a96649..c64a629441 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -75,6 +75,13 @@ public static void main(String[] args) { System.out.println(new Event(firstEvent, secondEvent)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + } else if (input.startsWith("delete") && input.length() < 11) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + Task removedTask = list.get(value - 1); + list.remove(value - 1); + System.out.println("Noted. I've removed this task:"); + System.out.println(removedTask.toString()); + System.out.println("Now you have " + list.size() + " tasks in the list."); } else { DukeException e = new NonExistentKeyword(); System.out.println(e.getMsg()); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 6248975c1c..cf3ec06071 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -30,5 +30,15 @@ Nice! I've marked this task as done: 2.[D][ ] meet Mark (by: Tuesday) 3.[E][X] project meeting (at: Mon 2-4pm) 4.[E][X] project call (at: Tue 2-4pm) +Noted. I've removed this task: +[E][X] project meeting (at: Mon 2-4pm) +Now you have 3 tasks in the list. +Nice! I've marked this task as done: +[X] meet Mark +Noted. I've removed this task: +[D][X] meet Mark (by: Tuesday) +Now you have 2 tasks in the list. +1.[D][ ] return book (by: Monday) +2.[E][X] project call (at: Tue 2-4pm) It's sad to see you go :( -Goodbye, hope to you another day! +Goodbye, hope to you another day! \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 02c18b45d7..14a4c65f5e 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -8,4 +8,8 @@ done 3 list done 4 list +delete 3 +done 2 +delete 2 +list bye \ No newline at end of file From e5200af6ce8382ce1f87ce04124a77820c8ae3f6 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Sat, 28 Aug 2021 19:22:04 +0800 Subject: [PATCH 09/27] Finished Level-7 --- data/duke.txt | 2 ++ src/main/java/Deadline.java | 1 + src/main/java/Duke.java | 69 +++++++++++++++++++++++++++++++++++-- src/main/java/Event.java | 2 ++ text-ui-test/input.txt | 2 ++ 5 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 data/duke.txt diff --git a/data/duke.txt b/data/duke.txt new file mode 100644 index 0000000000..7f9a9ed953 --- /dev/null +++ b/data/duke.txt @@ -0,0 +1,2 @@ +[D][ ] meet Mark (by: Tuesday) +[D][ ] return book (by: Monday) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 2de70b7540..8b8c9a741f 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,3 +1,4 @@ + public class Deadline extends Task { protected String by; diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c64a629441..c4bc9a664c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,14 @@ -import java.util.*; +import java.util.ArrayList; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Scanner; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; class Client { Scanner scan = new Scanner(System.in); @@ -22,6 +32,39 @@ public static void main(String[] args) { System.out.println("What can I help you with ?"); Client client = new Client(); ArrayList list = new ArrayList(); + + try { + String filePath = "./data/duke.txt"; + File savedData = new File(filePath); + Scanner r = new Scanner(savedData); + while (r.hasNextLine()) { + String userInput = r.nextLine(); + String[] split = userInput.split(" "); + String description = ""; + for (int i = 2; i < split.length - 2; i++) { + description = description + split[i] + " "; + } + String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); + if (userInput.substring(0,3).equals("[X]")) { + list.add(new Todo(description)); + } else if (userInput.substring(0,3).equals("[D]")) { + list.add(new Deadline(description, day)); + } else if (userInput.substring(0,3).equals("[E]")) { + list.add(new Event(description, day)); + } + } + r.close(); + } catch (FileNotFoundException e) { + try { + String path = "data/"; + File makeFile = new File("data/duke.txt"); + Files.createDirectories(Paths.get(path)); + makeFile.createNewFile(); + } catch (IOException a) { + System.out.println("Error encountered"); + } + } + while (true) { String input = client.input(); if (input.equals("")) { @@ -41,6 +84,7 @@ public static void main(String[] args) { list.get(value - 1).markAsDone(); System.out.println("Nice! I've marked this task as done: "); System.out.println("[X] " + list.get(value-1).description); + appendListToFile(list); } else if (input.startsWith("todo")) { if (input.length() < 6) { System.out.println(new NullTaskError().getMsg("todo")); @@ -51,6 +95,7 @@ public static void main(String[] args) { System.out.println(new Todo(firstTodo)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("deadline")) { if (input.length() < 10) { System.out.println(new NullTaskError().getMsg("deadline")); @@ -58,23 +103,27 @@ public static void main(String[] args) { String[] temp = input.split("/"); String firstDeadline = temp[0].substring(9); String secondDeadline = temp[1].substring(3); + String[] splitDate = temp[1].split(" "); list.add(new Deadline(firstDeadline, secondDeadline)); System.out.println("Got it. I've added this task: "); System.out.println(new Deadline(firstDeadline, secondDeadline)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("event")) { if (input.length() < 7) { System.out.println(new NullTaskError().getMsg("event")); } else { - String[] tempEvent = input.split("/"); + String[] tempEvent = input.split("/at"); String firstEvent = tempEvent[0].substring(6); String secondEvent = tempEvent[1].substring(3); + String[] splitDate = tempEvent[1].split(" "); list.add(new Event(firstEvent, secondEvent)); System.out.println("Got it. I've added this task: "); System.out.println(new Event(firstEvent, secondEvent)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("delete") && input.length() < 11) { int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); Task removedTask = list.get(value - 1); @@ -82,10 +131,26 @@ public static void main(String[] args) { System.out.println("Noted. I've removed this task:"); System.out.println(removedTask.toString()); System.out.println("Now you have " + list.size() + " tasks in the list."); + appendListToFile(list); } else { DukeException e = new NonExistentKeyword(); System.out.println(e.getMsg()); } + appendListToFile(list); + } + } + public static void appendListToFile(ArrayList listOfTasks) { + try { + File fileStorage = new File("data/duke.txt"); + FileWriter w = new FileWriter(fileStorage); + String str = ""; + for (Task t : listOfTasks) { + str += t.toString() + "\n"; + } + w.write(str); + w.close(); + } catch (IOException e) { + System.out.println("File does not exist"); } } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 8827bef91e..850834b395 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,3 +1,5 @@ +import java.time.LocalDate; + public class Event extends Task{ protected String at; diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 14a4c65f5e..f6a0c1afaa 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,5 +1,7 @@ deadline return book /by Monday deadline meet Mark /by Tuesday +deadline return book /by 2/12/2019 1800 +event test code /at 3/11/2018 1400 list event project meeting /at Mon 2-4pm event project call /at Tue 2-4pm From 2fa7e3c4b0a396d8ceedee979f1dcf0aba66a719 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Sat, 28 Aug 2021 22:46:01 +0800 Subject: [PATCH 10/27] Finished Level-8 --- data/duke.txt | 2 + src/main/java/Deadline.java | 12 ++- src/main/java/Duke.java | 145 ++++++++++++++++++++++++++++++++---- src/main/java/Event.java | 11 ++- text-ui-test/input.txt | 2 +- 5 files changed, 151 insertions(+), 21 deletions(-) create mode 100644 data/duke.txt diff --git a/data/duke.txt b/data/duke.txt new file mode 100644 index 0000000000..669cdc780b --- /dev/null +++ b/data/duke.txt @@ -0,0 +1,2 @@ +[E][ ] project meeting (at: Oct 15 2015) +[E][X] project call (at: Nov 16 2015) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 2de70b7540..dc0ed8581a 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,14 +1,18 @@ -public class Deadline extends Task { +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; - protected String by; +public class Deadline extends Task { + protected LocalDate by; + private String dateForObject; - public Deadline(String description, String by) { + public Deadline(String description, LocalDate by) { super(description); this.by = by; + this.dateForObject = by.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by + ")"; + return "[D]" + super.toString() + " (by: " + this.dateForObject + ")"; } } \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c64a629441..4e0e96235e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,14 @@ -import java.util.*; +import java.util.ArrayList; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Scanner; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; class Client { Scanner scan = new Scanner(System.in); @@ -22,6 +32,69 @@ public static void main(String[] args) { System.out.println("What can I help you with ?"); Client client = new Client(); ArrayList list = new ArrayList(); + + try { + String filePath = "./data/duke.txt"; + File savedData = new File(filePath); + Scanner r = new Scanner(savedData); + while (r.hasNextLine()) { + String userInput = r.nextLine(); + String[] split = userInput.split(" "); + String description = ""; + for (int i = 2; i < split.length - 2; i++) { + description = description + split[i] + " "; + } + String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); + System.out.println(day); + if (userInput.substring(0,3).equals("[X]")) { + list.add(new Todo(description)); + } else if (userInput.substring(0,3).equals("[D]")) { + String[] temp = userInput.split("/by"); + String firstDeadline = temp[0].substring(9); + String[] splitDate = temp[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + System.out.println(date1); + list.add(new Deadline(description, date1)); + } else if (userInput.substring(0,3).equals("[E]")) { + String[] tempEvent = userInput.split("/at"); + String firstEvent = tempEvent[0].substring(6); + String[] splitDate = tempEvent[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + list.add(new Event(description, date1)); + } + } + r.close(); + } catch (FileNotFoundException e) { + try { + String path = "data/"; + File makeFile = new File("data/duke.txt"); + Files.createDirectories(Paths.get(path)); + makeFile.createNewFile(); + } catch (IOException a) { + System.out.println("Error encountered"); + } + } + while (true) { String input = client.input(); if (input.equals("")) { @@ -33,14 +106,15 @@ public static void main(String[] args) { System.out.println("Goodbye, hope to you another day!"); break; } else if (input.equals("list")) { - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i).toString()); //".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); - } - } else if (input.startsWith("done") && input.length() < 9) { + for (int i = 0; i < list.size(); i++) { + System.out.println(i+1 + "." + list.get(i).toString()); //".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); + } + } else if (input.startsWith("done") && input.length() < 9) { int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); list.get(value - 1).markAsDone(); System.out.println("Nice! I've marked this task as done: "); System.out.println("[X] " + list.get(value-1).description); + appendListToFile(list); } else if (input.startsWith("todo")) { if (input.length() < 6) { System.out.println(new NullTaskError().getMsg("todo")); @@ -51,30 +125,58 @@ public static void main(String[] args) { System.out.println(new Todo(firstTodo)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("deadline")) { if (input.length() < 10) { System.out.println(new NullTaskError().getMsg("deadline")); } else { - String[] temp = input.split("/"); + String[] temp = input.split("/by"); String firstDeadline = temp[0].substring(9); - String secondDeadline = temp[1].substring(3); - list.add(new Deadline(firstDeadline, secondDeadline)); + String[] splitDate = temp[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + list.add(new Deadline(firstDeadline, date1)); System.out.println("Got it. I've added this task: "); - System.out.println(new Deadline(firstDeadline, secondDeadline)); + System.out.println(new Deadline(firstDeadline, date1)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("event")) { if (input.length() < 7) { System.out.println(new NullTaskError().getMsg("event")); } else { - String[] tempEvent = input.split("/"); + String[] tempEvent = input.split("/at"); String firstEvent = tempEvent[0].substring(6); - String secondEvent = tempEvent[1].substring(3); - list.add(new Event(firstEvent, secondEvent)); + System.out.println(firstEvent); + String[] splitDate = tempEvent[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + System.out.println(date1); + list.add(new Event(firstEvent, date1)); System.out.println("Got it. I've added this task: "); - System.out.println(new Event(firstEvent, secondEvent)); + System.out.println(new Event(firstEvent, date1)); System.out.println("Now you have " + list.size() + " tasks in the list"); } + appendListToFile(list); } else if (input.startsWith("delete") && input.length() < 11) { int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); Task removedTask = list.get(value - 1); @@ -82,10 +184,27 @@ public static void main(String[] args) { System.out.println("Noted. I've removed this task:"); System.out.println(removedTask.toString()); System.out.println("Now you have " + list.size() + " tasks in the list."); + appendListToFile(list); } else { DukeException e = new NonExistentKeyword(); System.out.println(e.getMsg()); } + appendListToFile(list); + } + } + public static void appendListToFile(ArrayList listOfTasks) { + try { + File fileStorage = new File("data/duke.txt"); + FileWriter w = new FileWriter(fileStorage); + String str = ""; + for (Task t : listOfTasks) { + str += t.toString() + "\n"; + } + w.write(str); + w.close(); + } catch (IOException e) { + System.out.println("File does not exist"); } } } + diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 8827bef91e..d7e356cd02 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,13 +1,18 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public class Event extends Task{ - protected String at; + protected LocalDate at; + private String dateForObject; - public Event(String description, String at) { + public Event(String description, LocalDate at) { super(description); this.at = at; + this.dateForObject = at.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } @Override public String toString() { - return "[E]" + super.toString() + " (at: " + at + ")"; + return "[E]" + super.toString() + " (at: " + this.dateForObject + ")"; } } diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 14a4c65f5e..34d0c4ca49 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,7 +1,7 @@ deadline return book /by Monday deadline meet Mark /by Tuesday list -event project meeting /at Mon 2-4pm +event project meeting /at 15/10/2015 1600 event project call /at Tue 2-4pm list done 3 From 0879b677cbe7e4bd4b519fcffdb481b3504bfee1 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Sun, 29 Aug 2021 17:27:49 +0800 Subject: [PATCH 11/27] Finished A-More-OOP --- data/duke.txt | 11 +- data/tasks.txt | 0 src/main/java/Duke.java | 103 +++++++---- src/main/java/duke/Command.java | 11 ++ src/main/java/{ => duke}/Deadline.java | 4 +- src/main/java/{ => duke}/DukeException.java | 2 + src/main/java/{ => duke}/Event.java | 4 +- src/main/java/duke/Parser.java | 186 ++++++++++++++++++++ src/main/java/duke/Storage.java | 34 ++++ src/main/java/{ => duke}/Task.java | 2 + src/main/java/duke/TaskList.java | 114 ++++++++++++ src/main/java/{ => duke}/Todo.java | 2 + src/main/java/duke/Ui.java | 27 +++ 13 files changed, 453 insertions(+), 47 deletions(-) create mode 100644 data/tasks.txt create mode 100644 src/main/java/duke/Command.java rename src/main/java/{ => duke}/Deadline.java (84%) rename src/main/java/{ => duke}/DukeException.java (98%) rename src/main/java/{ => duke}/Event.java (83%) create mode 100644 src/main/java/duke/Parser.java create mode 100644 src/main/java/duke/Storage.java rename src/main/java/{ => duke}/Task.java (96%) create mode 100644 src/main/java/duke/TaskList.java rename src/main/java/{ => duke}/Todo.java (93%) create mode 100644 src/main/java/duke/Ui.java diff --git a/data/duke.txt b/data/duke.txt index 24af89dd01..5a13d8d075 100644 --- a/data/duke.txt +++ b/data/duke.txt @@ -1,7 +1,4 @@ -<<<<<<< HEAD -[D][ ] meet Mark (by: Tuesday) -[D][ ] return book (by: Monday) -======= -[E][ ] project meeting (at: Oct 15 2015) -[E][X] project call (at: Nov 16 2015) ->>>>>>> branch-Level-8 +[D][ ] return book by: 2019-12-02 +[E][ ] test code at: 2018-11-03 +[E][ ] meeting at: 2015-10-15 +[E][X] project meeting at: 2015-10-15 diff --git a/data/tasks.txt b/data/tasks.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4e0e96235e..dc050af18f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,27 +1,53 @@ -import java.util.ArrayList; +import duke.*; + import java.io.File; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Scanner; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -class Client { - Scanner scan = new Scanner(System.in); - public String input() { - if (scan.hasNextLine()) { - String str = scan.nextLine(); - return str; +public class Duke { + private Storage storage; + private TaskList tasks; + private File + file; + private Parser p; + private Ui ui; + + public Duke(String filePath) { + storage = new Storage(filePath); + try { + tasks = new TaskList(filePath); + } catch (DukeException e) { + ui.showLoadingError(); + tasks = new TaskList(filePath); } - return ""; + ui = new Ui(tasks, storage); + p = new Parser(); + this.file = new File(filePath); + tasks.readFromFile(); } -} -public class Duke { + public void run() { + System.out.println("Hello! This is Duke, your very own chat bot."); + System.out.println("What can I help you with ?"); + while (true) { + String fullCommand = ui.input(); + if (!fullCommand.equals("bye")) { + try { + p.parse(fullCommand, tasks, storage, file); + } catch (DukeException e) { + System.out.println(e.getMsg()); + } + } else { + System.out.println("It's sad to see you go :("); + System.out.println("Goodbye, hope to you another day!"); + break; + } + } + } + + public static void main(String[] args) { + new Duke("./data/duke.txt").run(); + } + + /** public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -31,7 +57,7 @@ public static void main(String[] args) { System.out.println("Hello! This is Duke, your very own chat bot."); System.out.println("What can I help you with ?"); Client client = new Client(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); try { String filePath = "./data/duke.txt"; @@ -46,8 +72,8 @@ public static void main(String[] args) { } String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); System.out.println(day); - if (userInput.substring(0,3).equals("[X]")) { - list.add(new Todo(description)); + if (userInput.substring(0,3).equals("[T]")) { + list.add(new duke.Todo(description)); } else if (userInput.substring(0,3).equals("[D]")) { String[] temp = userInput.split("/by"); String firstDeadline = temp[0].substring(9); @@ -64,7 +90,7 @@ public static void main(String[] args) { String finalDateFormat = year + "-" + month + "-" + currentDate; LocalDate date1 = LocalDate.parse(finalDateFormat); System.out.println(date1); - list.add(new Deadline(description, date1)); + list.add(new duke.Deadline(description, date1)); } else if (userInput.substring(0,3).equals("[E]")) { String[] tempEvent = userInput.split("/at"); String firstEvent = tempEvent[0].substring(6); @@ -80,7 +106,7 @@ public static void main(String[] args) { } String finalDateFormat = year + "-" + month + "-" + currentDate; LocalDate date1 = LocalDate.parse(finalDateFormat); - list.add(new Event(description, date1)); + list.add(new duke.Event(description, date1)); } } r.close(); @@ -100,7 +126,7 @@ public static void main(String[] args) { if (input.equals("")) { break; } - Task taskInput = new Task(input); + duke.Task taskInput = new duke.Task(input); if (input.equals("bye")) { System.out.println("It's sad to see you go :("); System.out.println("Goodbye, hope to you another day!"); @@ -117,18 +143,18 @@ public static void main(String[] args) { appendListToFile(list); } else if (input.startsWith("todo")) { if (input.length() < 6) { - System.out.println(new NullTaskError().getMsg("todo")); + System.out.println(new duke.NullTaskError().getMsg("todo")); } else { String firstTodo = input.substring(5); - list.add(new Todo(firstTodo)); + list.add(new duke.Todo(firstTodo)); System.out.println("Got it. I've added this task: "); - System.out.println(new Todo(firstTodo)); + System.out.println(new duke.Todo(firstTodo)); System.out.println("Now you have " + list.size() + " tasks in the list"); } appendListToFile(list); } else if (input.startsWith("deadline")) { if (input.length() < 10) { - System.out.println(new NullTaskError().getMsg("deadline")); + System.out.println(new duke.NullTaskError().getMsg("deadline")); } else { String[] temp = input.split("/by"); String firstDeadline = temp[0].substring(9); @@ -145,15 +171,15 @@ public static void main(String[] args) { String finalDateFormat = year + "-" + month + "-" + currentDate; LocalDate date1 = LocalDate.parse(finalDateFormat); String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - list.add(new Deadline(firstDeadline, date1)); + list.add(new duke.Deadline(firstDeadline, date1)); System.out.println("Got it. I've added this task: "); - System.out.println(new Deadline(firstDeadline, date1)); + System.out.println(new duke.Deadline(firstDeadline, date1)); System.out.println("Now you have " + list.size() + " tasks in the list"); } appendListToFile(list); } else if (input.startsWith("event")) { if (input.length() < 7) { - System.out.println(new NullTaskError().getMsg("event")); + System.out.println(new duke.NullTaskError().getMsg("event")); } else { String[] tempEvent = input.split("/at"); String firstEvent = tempEvent[0].substring(6); @@ -171,33 +197,33 @@ public static void main(String[] args) { String finalDateFormat = year + "-" + month + "-" + currentDate; LocalDate date1 = LocalDate.parse(finalDateFormat); System.out.println(date1); - list.add(new Event(firstEvent, date1)); + list.add(new duke.Event(firstEvent, date1)); System.out.println("Got it. I've added this task: "); - System.out.println(new Event(firstEvent, date1)); + System.out.println(new duke.Event(firstEvent, date1)); System.out.println("Now you have " + list.size() + " tasks in the list"); } appendListToFile(list); } else if (input.startsWith("delete") && input.length() < 11) { int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - Task removedTask = list.get(value - 1); + duke.Task removedTask = list.get(value - 1); list.remove(value - 1); System.out.println("Noted. I've removed this task:"); System.out.println(removedTask.toString()); System.out.println("Now you have " + list.size() + " tasks in the list."); appendListToFile(list); } else { - DukeException e = new NonExistentKeyword(); + duke.DukeException e = new duke.NonExistentKeyword(); System.out.println(e.getMsg()); } appendListToFile(list); } } - public static void appendListToFile(ArrayList listOfTasks) { + public static void appendListToFile(ArrayList listOfTasks) { try { File fileStorage = new File("data/duke.txt"); FileWriter w = new FileWriter(fileStorage); String str = ""; - for (Task t : listOfTasks) { + for (duke.Task t : listOfTasks) { str += t.toString() + "\n"; } w.write(str); @@ -206,5 +232,6 @@ public static void appendListToFile(ArrayList listOfTasks) { System.out.println("File does not exist"); } } + */ } diff --git a/src/main/java/duke/Command.java b/src/main/java/duke/Command.java new file mode 100644 index 0000000000..3c1740e46a --- /dev/null +++ b/src/main/java/duke/Command.java @@ -0,0 +1,11 @@ +package duke; + +public abstract class Command { + private String input; + + public Command(String input) { + this.input = input; + } + + public abstract void execute(TaskList t, Storage s); +} diff --git a/src/main/java/Deadline.java b/src/main/java/duke/Deadline.java similarity index 84% rename from src/main/java/Deadline.java rename to src/main/java/duke/Deadline.java index dc0ed8581a..1e55aae60b 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -1,3 +1,5 @@ +package duke; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -13,6 +15,6 @@ public Deadline(String description, LocalDate by) { @Override public String toString() { - return "[D]" + super.toString() + " (by: " + this.dateForObject + ")"; + return "[D]" + super.toString() + " by: " + this.by; } } \ No newline at end of file diff --git a/src/main/java/DukeException.java b/src/main/java/duke/DukeException.java similarity index 98% rename from src/main/java/DukeException.java rename to src/main/java/duke/DukeException.java index 15b633677b..ee8b3fe173 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/duke/DukeException.java @@ -1,3 +1,5 @@ +package duke; + public abstract class DukeException extends RuntimeException { public DukeException(String message) { super(message); diff --git a/src/main/java/Event.java b/src/main/java/duke/Event.java similarity index 83% rename from src/main/java/Event.java rename to src/main/java/duke/Event.java index d7e356cd02..14241d7283 100644 --- a/src/main/java/Event.java +++ b/src/main/java/duke/Event.java @@ -1,3 +1,5 @@ +package duke; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -13,6 +15,6 @@ public Event(String description, LocalDate at) { @Override public String toString() { - return "[E]" + super.toString() + " (at: " + this.dateForObject + ")"; + return "[E]" + super.toString() + " at: " + this.at; } } diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java new file mode 100644 index 0000000000..4da75d53e0 --- /dev/null +++ b/src/main/java/duke/Parser.java @@ -0,0 +1,186 @@ +package duke; + +import java.io.File; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class Parser { + + public static void parse(String input, TaskList t, Storage s, File file) { + if (input.equals("list")) { + for (int i = 0; i < t.size(); i++) { + System.out.println(i + 1 + "." + t.get(i).toString()); + } + } else if (input.startsWith("done") && Character.isDigit(input.charAt(input.length() - 1)) + && input.length() <= 8 && !Character.isAlphabetic(input.charAt(input.length() - 2)) + && Character.isDigit(input.charAt(5))) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + t.get(value - 1).markAsDone(); + System.out.println("Nice! I've marked this task as done: "); + System.out.println("[X] " + t.get(value-1).description); + s.appendListToFile(t); + } else if (input.startsWith("todo")) { + if (input.length() < 6) { + System.out.println(new NullTaskError().getMsg("todo")); + } else { + String firstTodo = input.substring(5); + t.addTodo(firstTodo); + System.out.println("Got it. I've added this task: "); + System.out.println(new Todo(firstTodo)); + System.out.println("Now you have " + t.size() + " tasks in the list"); + s.appendListToFile(t); + } + } else if (input.startsWith("deadline")) { + if (input.length() < 10) { + System.out.println(new NullTaskError().getMsg("deadline")); + } else { + String[] temp = input.split("/by"); + String firstDeadline = temp[0].substring(9); + String[] splitDate = temp[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + t.addDeadline(firstDeadline, date1); + System.out.println("Got it. I've added this task: "); + System.out.println(new Deadline(firstDeadline, date1)); + System.out.println("Now you have " + t.size() + " tasks in the list"); + s.appendListToFile(t); + } + } else if (input.startsWith("event")) { + if (input.length() < 7) { + System.out.println(new NullTaskError().getMsg("event")); + } else { + String[] tempEvent = input.split("/at"); + String firstEvent = tempEvent[0].substring(6); + System.out.println(firstEvent); + String[] splitDate = tempEvent[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + System.out.println(date1); + t.addEvent(firstEvent, date1); + System.out.println("Got it. I've added this task: "); + System.out.println(new Event(firstEvent, date1)); + System.out.println("Now you have " + t.size() + " tasks in the list"); + s.appendListToFile(t); + } + } else if (input.startsWith("delete") && input.length() < 11) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + Task removedTask = t.get(value - 1); + t.delete(value - 1); + System.out.println("Noted. I've removed this task:"); + System.out.println(removedTask.toString()); + System.out.println("Now you have " + t.size() + " tasks in the list."); + s.appendListToFile(t); + } else { + DukeException e = new NonExistentKeyword(); + System.out.println(e.getMsg()); + } + } +} + +/** + if (this.input.equals("bye")) { + System.out.println("It's sad to see you go :("); + System.out.println("Goodbye, hope to you another day!"); + break; + } else if (input.equals("list")) { + for (int i = 0; i < list.size(); i++) { + System.out.println(i+1 + "." + list.get(i).toString()); + } + } else if (input.startsWith("done") && input.length() < 9) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + list.get(value - 1).markAsDone(); + System.out.println("Nice! I've marked this task as done: "); + System.out.println("[X] " + list.get(value-1).description); + } else if (input.startsWith("todo")) { + if (input.length() < 6) { + System.out.println(new duke.NullTaskError().getMsg("todo")); + } else { + String firstTodo = input.substring(5); + list.add(new duke.Todo(firstTodo)); + System.out.println("Got it. I've added this task: "); + System.out.println(new duke.Todo(firstTodo)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } + } else if (input.startsWith("deadline")) { + if (input.length() < 10) { + System.out.println(new duke.NullTaskError().getMsg("deadline")); + } else { + String[] temp = input.split("/by"); + String firstDeadline = temp[0].substring(9); + String[] splitDate = temp[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); + tasks.addDeadline(firstDeadline, date1); + System.out.println("Got it. I've added this task: "); + System.out.println(new duke.Deadline(firstDeadline, date1)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } + } else if (input.startsWith("event")) { + if (input.length() < 7) { + System.out.println(new duke.NullTaskError().getMsg("event")); + } else { + String[] tempEvent = input.split("/at"); + String firstEvent = tempEvent[0].substring(6); + System.out.println(firstEvent); + String[] splitDate = tempEvent[1].split(" "); + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + System.out.println(date1); + tasks.addEvent(firstEvent, date1, list); + list.add(new duke.Event(firstEvent, date1)); + System.out.println("Got it. I've added this task: "); + System.out.println(new duke.Event(firstEvent, date1)); + System.out.println("Now you have " + list.size() + " tasks in the list"); + } + } else if (input.startsWith("delete") && input.length() < 11) { + int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); + duke.Task removedTask = list.get(value - 1); + list.remove(value - 1); + System.out.println("Noted. I've removed this task:"); + System.out.println(removedTask.toString()); + System.out.println("Now you have " + list.size() + " tasks in the list."); + } else { + duke.DukeException e = new duke.NonExistentKeyword(); + System.out.println(e.getMsg()); + } + appendListToFile(list); +} +*/ \ No newline at end of file diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java new file mode 100644 index 0000000000..b32bc87db9 --- /dev/null +++ b/src/main/java/duke/Storage.java @@ -0,0 +1,34 @@ +package duke; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +public class Storage { + private String filePath; + private File file; + + public Storage(String filePath) { + this.filePath = filePath; + File file = new File(filePath); + this.file = file; + + } + + public static void appendListToFile(TaskList listOfTasks) { + try { + File fileStorage = new File("data/duke.txt"); + FileWriter w = new FileWriter(fileStorage); + String str = ""; + for (Task t : listOfTasks.getTaskList()) { + str += t.toString() + "\n"; + } + w.write(str); + w.close(); + } catch (IOException e) { + System.out.println("File does not exist"); + } + } +} + + diff --git a/src/main/java/Task.java b/src/main/java/duke/Task.java similarity index 96% rename from src/main/java/Task.java rename to src/main/java/duke/Task.java index 8969515121..f839790a35 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/Task.java @@ -1,3 +1,5 @@ +package duke; + public class Task { protected String description; protected boolean isDone; diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java new file mode 100644 index 0000000000..97a4cbd9ca --- /dev/null +++ b/src/main/java/duke/TaskList.java @@ -0,0 +1,114 @@ +package duke; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Scanner; + +public class TaskList { + private ArrayList tasks; + private File file; + + public TaskList(String filePath) { + tasks = new ArrayList(); + this.file = new File(filePath); + } + + + public int size() { + return tasks.size(); + } + + public void addTodo(String description) { + tasks.add(new Todo(description)); + } + + public Task get(int index) { + return tasks.get(index); + } + + public void addDeadline(String description, LocalDate date) { + tasks.add(new Deadline(description, date)); + } + + public void addEvent(String description, LocalDate date) { + tasks.add(new Event(description, date)); + } + + public void delete(int index) { + tasks.remove(index); + } + + public ArrayList getTaskList() { + return this.tasks; + } + + public void readFromFile() { + try { + Scanner r = new Scanner(this.file); + while (r.hasNextLine()) { + String userInput = r.nextLine(); + String[] split = userInput.split(" "); + String description = ""; + for (int i = 2; i < split.length - 2; i++) { + description = description + split[i] + " "; + } + String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); + if (userInput.substring(0,3).equals("[T]")) { + this.addTodo(description); + } else if (userInput.substring(0,3).equals("[D]")) { + String[] temp = userInput.split("by"); + String firstDeadline = temp[0].substring(9); + String[] splitDate = temp[1].split(":"); + System.out.println(splitDate[0]); + LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); + /** + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + */ + this.addDeadline(description, date1); + } else if (userInput.substring(0,3).equals("[E]")) { + String[] tempEvent = userInput.split("at"); + String firstEvent = tempEvent[0].substring(6); + String[] splitDate = tempEvent[1].split(":"); + System.out.println(splitDate[0]); + LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); + /** + String date = splitDate[1]; + String[] breakingDate = date.split("/"); + String year = breakingDate[2]; + String month = breakingDate[1]; + String currentDate = breakingDate[0]; + int i = Integer.parseInt(currentDate); + if (i < 10) { + currentDate = "0" + currentDate; + } + String finalDateFormat = year + "-" + month + "-" + currentDate; + LocalDate date1 = LocalDate.parse(finalDateFormat); + */ + this.addEvent(description, date1); + } + } + r.close(); + } catch (FileNotFoundException e) { + try { + String path = "data/"; + File makeFile = new File("data/duke.txt"); + Files.createDirectories(Paths.get(path)); + makeFile.createNewFile(); + } catch (IOException a) { + System.out.println("Error encountered"); + } + } + } +} diff --git a/src/main/java/Todo.java b/src/main/java/duke/Todo.java similarity index 93% rename from src/main/java/Todo.java rename to src/main/java/duke/Todo.java index 2f23e1d5cd..3f277348fa 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/duke/Todo.java @@ -1,3 +1,5 @@ +package duke; + public class Todo extends Task{ public Todo(String description) { diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java new file mode 100644 index 0000000000..aae8cdaf5c --- /dev/null +++ b/src/main/java/duke/Ui.java @@ -0,0 +1,27 @@ +package duke; + +import java.util.Scanner; + +public class Ui { + Scanner scan; + private static TaskList listOfTasks; + private static Storage storage; + + public Ui(TaskList t, Storage s) { + scan = new Scanner(System.in); + this.listOfTasks = t; + this.storage = s; + } + + public String input() { + if (scan.hasNextLine()) { + String str = scan.nextLine(); + return str; + } + return ""; + } + + public String showLoadingError() { + return "There has been a loading error"; + } +} From ae519f82f0ecc08c5e2d39583f1c4ed970a00864 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Sun, 29 Aug 2021 17:31:42 +0800 Subject: [PATCH 12/27] Finished A-Packages --- src/main/java/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index dc050af18f..6b72ddf908 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,5 @@ import duke.*; - +//included package import java.io.File; public class Duke { From 86b986871e70761464b26e60bd7904e83f6d0ed6 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Sun, 29 Aug 2021 23:40:22 +0800 Subject: [PATCH 13/27] Finished JUnit Testing --- src/main/java/duke/Ui.java | 7 ++++++- src/test/java/duke/TaskListTest.java | 30 ++++++++++++++++++++++++++++ src/test/java/duke/UiTest.java | 12 +++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/test/java/duke/TaskListTest.java create mode 100644 src/test/java/duke/UiTest.java diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index aae8cdaf5c..ba942f35d1 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -4,6 +4,7 @@ public class Ui { Scanner scan; + private String str; private static TaskList listOfTasks; private static Storage storage; @@ -13,6 +14,10 @@ public Ui(TaskList t, Storage s) { this.storage = s; } + public Ui() { + str = "There has been a loading error"; + } + public String input() { if (scan.hasNextLine()) { String str = scan.nextLine(); @@ -22,6 +27,6 @@ public String input() { } public String showLoadingError() { - return "There has been a loading error"; + return this.str; } } diff --git a/src/test/java/duke/TaskListTest.java b/src/test/java/duke/TaskListTest.java new file mode 100644 index 0000000000..73e5dde96a --- /dev/null +++ b/src/test/java/duke/TaskListTest.java @@ -0,0 +1,30 @@ +import duke.TaskList; +import duke.Task; +import org.junit.Test; + +import java.time.LocalDate; + +import static org.junit.jupiter.api.Assertions.assertEquals; + + +public class TaskListTest { + @Test + public void confirmTaskAdded() { + TaskList temp = new TaskList("./test/junit.txt"); + LocalDate d = LocalDate.parse("2015-10-20"); + String desc = "read a book"; + temp.addDeadline(desc, d); + Task task = temp.get(0); + assertEquals("[D][ ] read a book by: 2015-10-20", task.toString()); + } + + @Test + public void checkNumberOfTasks() { + TaskList temp = new TaskList("./test/junit.txt"); + LocalDate d1 = LocalDate.parse("2015-10-20"); + for (int i = 0; i < 10; i++) { + temp.addDeadline("read a book", d1); + } + assertEquals(10 , temp.size()); + } +} \ No newline at end of file diff --git a/src/test/java/duke/UiTest.java b/src/test/java/duke/UiTest.java new file mode 100644 index 0000000000..7d796b0b81 --- /dev/null +++ b/src/test/java/duke/UiTest.java @@ -0,0 +1,12 @@ +import duke.Ui; +import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class UiTest { + @Test + public void showErrorTest() { + Ui u = new Ui(); + assertEquals("There has been a loading error", u.showLoadingError()); + } +} From 3281b26591d8ba7540b33c8c41d3ef400bd9e439 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Mon, 30 Aug 2021 01:59:03 +0800 Subject: [PATCH 14/27] Finished A-Jar --- src/main/java/META-INF/MANIFEST.MF | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/java/META-INF/MANIFEST.MF diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..9f37e4e0aa --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Duke + From b087b2613349745ae97d3c42912870322cd84321 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Mon, 30 Aug 2021 12:09:30 +0800 Subject: [PATCH 15/27] Finish branch-A-JavaDoc --- src/main/java/Duke.java | 192 +------------------------------ src/main/java/duke/Deadline.java | 5 + src/main/java/duke/Parser.java | 99 ++-------------- src/main/java/duke/Storage.java | 9 ++ src/main/java/duke/Task.java | 11 ++ src/main/java/duke/TaskList.java | 69 +++++++---- src/main/java/duke/Ui.java | 6 + 7 files changed, 92 insertions(+), 299 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6b72ddf908..4ac301064f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -24,6 +24,11 @@ public Duke(String filePath) { tasks.readFromFile(); } + /** + * Method that runs the Duke by asking for user input + * + * @return void + */ public void run() { System.out.println("Hello! This is Duke, your very own chat bot."); System.out.println("What can I help you with ?"); @@ -46,192 +51,5 @@ public void run() { public static void main(String[] args) { new Duke("./data/duke.txt").run(); } - - /** - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello! This is Duke, your very own chat bot."); - System.out.println("What can I help you with ?"); - Client client = new Client(); - ArrayList list = new ArrayList(); - - try { - String filePath = "./data/duke.txt"; - File savedData = new File(filePath); - Scanner r = new Scanner(savedData); - while (r.hasNextLine()) { - String userInput = r.nextLine(); - String[] split = userInput.split(" "); - String description = ""; - for (int i = 2; i < split.length - 2; i++) { - description = description + split[i] + " "; - } - String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); - System.out.println(day); - if (userInput.substring(0,3).equals("[T]")) { - list.add(new duke.Todo(description)); - } else if (userInput.substring(0,3).equals("[D]")) { - String[] temp = userInput.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - list.add(new duke.Deadline(description, date1)); - } else if (userInput.substring(0,3).equals("[E]")) { - String[] tempEvent = userInput.split("/at"); - String firstEvent = tempEvent[0].substring(6); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - list.add(new duke.Event(description, date1)); - } - } - r.close(); - } catch (FileNotFoundException e) { - try { - String path = "data/"; - File makeFile = new File("data/duke.txt"); - Files.createDirectories(Paths.get(path)); - makeFile.createNewFile(); - } catch (IOException a) { - System.out.println("Error encountered"); - } - } - - while (true) { - String input = client.input(); - if (input.equals("")) { - break; - } - duke.Task taskInput = new duke.Task(input); - if (input.equals("bye")) { - System.out.println("It's sad to see you go :("); - System.out.println("Goodbye, hope to you another day!"); - break; - } else if (input.equals("list")) { - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i).toString()); //".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); - } - } else if (input.startsWith("done") && input.length() < 9) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - list.get(value - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done: "); - System.out.println("[X] " + list.get(value-1).description); - appendListToFile(list); - } else if (input.startsWith("todo")) { - if (input.length() < 6) { - System.out.println(new duke.NullTaskError().getMsg("todo")); - } else { - String firstTodo = input.substring(5); - list.add(new duke.Todo(firstTodo)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Todo(firstTodo)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("deadline")) { - if (input.length() < 10) { - System.out.println(new duke.NullTaskError().getMsg("deadline")); - } else { - String[] temp = input.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - list.add(new duke.Deadline(firstDeadline, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Deadline(firstDeadline, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("event")) { - if (input.length() < 7) { - System.out.println(new duke.NullTaskError().getMsg("event")); - } else { - String[] tempEvent = input.split("/at"); - String firstEvent = tempEvent[0].substring(6); - System.out.println(firstEvent); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - list.add(new duke.Event(firstEvent, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Event(firstEvent, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("delete") && input.length() < 11) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - duke.Task removedTask = list.get(value - 1); - list.remove(value - 1); - System.out.println("Noted. I've removed this task:"); - System.out.println(removedTask.toString()); - System.out.println("Now you have " + list.size() + " tasks in the list."); - appendListToFile(list); - } else { - duke.DukeException e = new duke.NonExistentKeyword(); - System.out.println(e.getMsg()); - } - appendListToFile(list); - } - } - public static void appendListToFile(ArrayList listOfTasks) { - try { - File fileStorage = new File("data/duke.txt"); - FileWriter w = new FileWriter(fileStorage); - String str = ""; - for (duke.Task t : listOfTasks) { - str += t.toString() + "\n"; - } - w.write(str); - w.close(); - } catch (IOException e) { - System.out.println("File does not exist"); - } - } - */ } diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index 1e55aae60b..bee32baa9e 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -13,6 +13,11 @@ public Deadline(String description, LocalDate by) { this.dateForObject = by.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } + /** + * toString() method for deadline object + * + * @return String The task printed in the correct format + */ @Override public String toString() { return "[D]" + super.toString() + " by: " + this.by; diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 4da75d53e0..aa16e3ffb7 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -6,6 +6,16 @@ public class Parser { + /** + * Method that adds a Deadline task onto TaskList + * + * @param input The string that contains the user input + * @param t The TaskList that contains the tasks to be added + * @param s The Storage that handles the reading and writing to a text file + * @param file The file that gets written to and read from + * + * @return void + */ public static void parse(String input, TaskList t, Storage s, File file) { if (input.equals("list")) { for (int i = 0; i < t.size(); i++) { @@ -95,92 +105,3 @@ public static void parse(String input, TaskList t, Storage s, File file) { } } } - -/** - if (this.input.equals("bye")) { - System.out.println("It's sad to see you go :("); - System.out.println("Goodbye, hope to you another day!"); - break; - } else if (input.equals("list")) { - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i).toString()); - } - } else if (input.startsWith("done") && input.length() < 9) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - list.get(value - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done: "); - System.out.println("[X] " + list.get(value-1).description); - } else if (input.startsWith("todo")) { - if (input.length() < 6) { - System.out.println(new duke.NullTaskError().getMsg("todo")); - } else { - String firstTodo = input.substring(5); - list.add(new duke.Todo(firstTodo)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Todo(firstTodo)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("deadline")) { - if (input.length() < 10) { - System.out.println(new duke.NullTaskError().getMsg("deadline")); - } else { - String[] temp = input.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - tasks.addDeadline(firstDeadline, date1); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Deadline(firstDeadline, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("event")) { - if (input.length() < 7) { - System.out.println(new duke.NullTaskError().getMsg("event")); - } else { - String[] tempEvent = input.split("/at"); - String firstEvent = tempEvent[0].substring(6); - System.out.println(firstEvent); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - tasks.addEvent(firstEvent, date1, list); - list.add(new duke.Event(firstEvent, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Event(firstEvent, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("delete") && input.length() < 11) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - duke.Task removedTask = list.get(value - 1); - list.remove(value - 1); - System.out.println("Noted. I've removed this task:"); - System.out.println(removedTask.toString()); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } else { - duke.DukeException e = new duke.NonExistentKeyword(); - System.out.println(e.getMsg()); - } - appendListToFile(list); -} -*/ \ No newline at end of file diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index b32bc87db9..7fe967422d 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -15,6 +15,15 @@ public Storage(String filePath) { } + + + /** + * Method that adds the Tasklist arraylist into the text file + * + * @param listOfTasks The TaskList that contains all the tasks added + * + * @return void + */ public static void appendListToFile(TaskList listOfTasks) { try { File fileStorage = new File("data/duke.txt"); diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index f839790a35..e08b1ea472 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -13,10 +13,21 @@ public String toString() { return "[" + this.getStatusIcon() + "] " + this.description; } + /** + * Method that returns the status icon of the task based on whether it is completed. + * or not + * + * @return String Either "X" or " " based on the status + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Method that marks a task as done. + * + * @return void + */ public void markAsDone() { this.isDone = true; } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 97a4cbd9ca..f86f5c11f9 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -23,22 +23,60 @@ public int size() { return tasks.size(); } + /** + * Method that adds a To-Do task onto TaskList + * + * @param description The string that contains the description of the task. + * + * @return void + */ public void addTodo(String description) { tasks.add(new Todo(description)); } + /** + * Method that returns the particular element of the list of tasks + * + * @param index The index of the task that needs to be got + * + * @return Task The task object that is required + */ public Task get(int index) { return tasks.get(index); } + /** + * Method that adds a Deadline task onto TaskList + * + * @param description The string that contains the description of the task. + * @param date The date mentioned in the task initialization. + * + * @return void + */ public void addDeadline(String description, LocalDate date) { tasks.add(new Deadline(description, date)); } + /** + * Method that adds an Event onto TaskList + * + * @param description The string that contains the description of the task. + * @param date The date mentioned in the task initialization. + * + * + * @return void + */ public void addEvent(String description, LocalDate date) { tasks.add(new Event(description, date)); } + /** + * Method that deletes a task from the TaskList + * + * @param index The index of the task that needs to be deleted + * + * @return void + */ public void delete(int index) { tasks.remove(index); } @@ -47,6 +85,14 @@ public ArrayList getTaskList() { return this.tasks; } + /** + * Method that runs the Duke by asking for user input + * + * @param + * + * @return void + */ + public void readFromFile() { try { Scanner r = new Scanner(this.file); @@ -66,16 +112,6 @@ public void readFromFile() { String[] splitDate = temp[1].split(":"); System.out.println(splitDate[0]); LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); - /** - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - */ this.addDeadline(description, date1); } else if (userInput.substring(0,3).equals("[E]")) { String[] tempEvent = userInput.split("at"); @@ -83,19 +119,6 @@ public void readFromFile() { String[] splitDate = tempEvent[1].split(":"); System.out.println(splitDate[0]); LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); - /** - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - */ this.addEvent(description, date1); } } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index ba942f35d1..a3990d46a5 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -26,6 +26,12 @@ public String input() { return ""; } + + /** + * Method that adds a Deadline task onto TaskList + * + * @return void + */ public String showLoadingError() { return this.str; } From c907c92055be4dd4c3d2862f640ab5ddaeacee24 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Mon, 30 Aug 2021 12:54:38 +0800 Subject: [PATCH 16/27] Finish A-CodingStandard --- src/main/java/Duke.java | 191 +------------------------------ src/main/java/duke/Parser.java | 89 -------------- src/main/java/duke/TaskList.java | 23 ---- 3 files changed, 1 insertion(+), 302 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6b72ddf908..b6246c9f22 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,4 @@ import duke.*; -//included package import java.io.File; public class Duke { @@ -46,192 +45,4 @@ public void run() { public static void main(String[] args) { new Duke("./data/duke.txt").run(); } - - /** - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello! This is Duke, your very own chat bot."); - System.out.println("What can I help you with ?"); - Client client = new Client(); - ArrayList list = new ArrayList(); - - try { - String filePath = "./data/duke.txt"; - File savedData = new File(filePath); - Scanner r = new Scanner(savedData); - while (r.hasNextLine()) { - String userInput = r.nextLine(); - String[] split = userInput.split(" "); - String description = ""; - for (int i = 2; i < split.length - 2; i++) { - description = description + split[i] + " "; - } - String day = split[split.length - 1].substring(0, split[split.length - 1].length() - 1); - System.out.println(day); - if (userInput.substring(0,3).equals("[T]")) { - list.add(new duke.Todo(description)); - } else if (userInput.substring(0,3).equals("[D]")) { - String[] temp = userInput.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - list.add(new duke.Deadline(description, date1)); - } else if (userInput.substring(0,3).equals("[E]")) { - String[] tempEvent = userInput.split("/at"); - String firstEvent = tempEvent[0].substring(6); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - list.add(new duke.Event(description, date1)); - } - } - r.close(); - } catch (FileNotFoundException e) { - try { - String path = "data/"; - File makeFile = new File("data/duke.txt"); - Files.createDirectories(Paths.get(path)); - makeFile.createNewFile(); - } catch (IOException a) { - System.out.println("Error encountered"); - } - } - - while (true) { - String input = client.input(); - if (input.equals("")) { - break; - } - duke.Task taskInput = new duke.Task(input); - if (input.equals("bye")) { - System.out.println("It's sad to see you go :("); - System.out.println("Goodbye, hope to you another day!"); - break; - } else if (input.equals("list")) { - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i).toString()); //".[" + list.get(i).getStatusIcon() + "] " + list.get(i).description); - } - } else if (input.startsWith("done") && input.length() < 9) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - list.get(value - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done: "); - System.out.println("[X] " + list.get(value-1).description); - appendListToFile(list); - } else if (input.startsWith("todo")) { - if (input.length() < 6) { - System.out.println(new duke.NullTaskError().getMsg("todo")); - } else { - String firstTodo = input.substring(5); - list.add(new duke.Todo(firstTodo)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Todo(firstTodo)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("deadline")) { - if (input.length() < 10) { - System.out.println(new duke.NullTaskError().getMsg("deadline")); - } else { - String[] temp = input.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - list.add(new duke.Deadline(firstDeadline, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Deadline(firstDeadline, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("event")) { - if (input.length() < 7) { - System.out.println(new duke.NullTaskError().getMsg("event")); - } else { - String[] tempEvent = input.split("/at"); - String firstEvent = tempEvent[0].substring(6); - System.out.println(firstEvent); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - list.add(new duke.Event(firstEvent, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Event(firstEvent, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - appendListToFile(list); - } else if (input.startsWith("delete") && input.length() < 11) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - duke.Task removedTask = list.get(value - 1); - list.remove(value - 1); - System.out.println("Noted. I've removed this task:"); - System.out.println(removedTask.toString()); - System.out.println("Now you have " + list.size() + " tasks in the list."); - appendListToFile(list); - } else { - duke.DukeException e = new duke.NonExistentKeyword(); - System.out.println(e.getMsg()); - } - appendListToFile(list); - } - } - public static void appendListToFile(ArrayList listOfTasks) { - try { - File fileStorage = new File("data/duke.txt"); - FileWriter w = new FileWriter(fileStorage); - String str = ""; - for (duke.Task t : listOfTasks) { - str += t.toString() + "\n"; - } - w.write(str); - w.close(); - } catch (IOException e) { - System.out.println("File does not exist"); - } - } - */ -} - +} \ No newline at end of file diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 4da75d53e0..df30945e9e 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -95,92 +95,3 @@ public static void parse(String input, TaskList t, Storage s, File file) { } } } - -/** - if (this.input.equals("bye")) { - System.out.println("It's sad to see you go :("); - System.out.println("Goodbye, hope to you another day!"); - break; - } else if (input.equals("list")) { - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i).toString()); - } - } else if (input.startsWith("done") && input.length() < 9) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - list.get(value - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done: "); - System.out.println("[X] " + list.get(value-1).description); - } else if (input.startsWith("todo")) { - if (input.length() < 6) { - System.out.println(new duke.NullTaskError().getMsg("todo")); - } else { - String firstTodo = input.substring(5); - list.add(new duke.Todo(firstTodo)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Todo(firstTodo)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("deadline")) { - if (input.length() < 10) { - System.out.println(new duke.NullTaskError().getMsg("deadline")); - } else { - String[] temp = input.split("/by"); - String firstDeadline = temp[0].substring(9); - String[] splitDate = temp[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); - tasks.addDeadline(firstDeadline, date1); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Deadline(firstDeadline, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("event")) { - if (input.length() < 7) { - System.out.println(new duke.NullTaskError().getMsg("event")); - } else { - String[] tempEvent = input.split("/at"); - String firstEvent = tempEvent[0].substring(6); - System.out.println(firstEvent); - String[] splitDate = tempEvent[1].split(" "); - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - System.out.println(date1); - tasks.addEvent(firstEvent, date1, list); - list.add(new duke.Event(firstEvent, date1)); - System.out.println("Got it. I've added this task: "); - System.out.println(new duke.Event(firstEvent, date1)); - System.out.println("Now you have " + list.size() + " tasks in the list"); - } - } else if (input.startsWith("delete") && input.length() < 11) { - int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); - duke.Task removedTask = list.get(value - 1); - list.remove(value - 1); - System.out.println("Noted. I've removed this task:"); - System.out.println(removedTask.toString()); - System.out.println("Now you have " + list.size() + " tasks in the list."); - } else { - duke.DukeException e = new duke.NonExistentKeyword(); - System.out.println(e.getMsg()); - } - appendListToFile(list); -} -*/ \ No newline at end of file diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 97a4cbd9ca..7db21e10db 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -66,16 +66,6 @@ public void readFromFile() { String[] splitDate = temp[1].split(":"); System.out.println(splitDate[0]); LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); - /** - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - */ this.addDeadline(description, date1); } else if (userInput.substring(0,3).equals("[E]")) { String[] tempEvent = userInput.split("at"); @@ -83,19 +73,6 @@ public void readFromFile() { String[] splitDate = tempEvent[1].split(":"); System.out.println(splitDate[0]); LocalDate date1 = LocalDate.parse(splitDate[1].substring(1)); - /** - String date = splitDate[1]; - String[] breakingDate = date.split("/"); - String year = breakingDate[2]; - String month = breakingDate[1]; - String currentDate = breakingDate[0]; - int i = Integer.parseInt(currentDate); - if (i < 10) { - currentDate = "0" + currentDate; - } - String finalDateFormat = year + "-" + month + "-" + currentDate; - LocalDate date1 = LocalDate.parse(finalDateFormat); - */ this.addEvent(description, date1); } } From 333305836b465f31f70962a1280104278f56da58 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Mon, 30 Aug 2021 13:25:13 +0800 Subject: [PATCH 17/27] Finish branch-Level-9 --- src/main/java/duke/Parser.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 4da75d53e0..243c2a848b 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -3,6 +3,7 @@ import java.io.File; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; public class Parser { @@ -89,6 +90,23 @@ public static void parse(String input, TaskList t, Storage s, File file) { System.out.println(removedTask.toString()); System.out.println("Now you have " + t.size() + " tasks in the list."); s.appendListToFile(t); + } else if (input.startsWith("find")) { + String keyword = input.substring(5); + ArrayList output = new ArrayList<>(); + int count = 0; + for (Task task: t.getTaskList()) { + String desc = task.description.substring(0,task.description.length()-4); + String[] splitDesc = desc.split(" "); + for (String str: splitDesc) { + if (str.equals(keyword)) { + System.out.println(task.toString()); + count = count + 1; + } + } + } + if (count == 0) { + System.out.println("OOPS! The task does not exist"); + } } else { DukeException e = new NonExistentKeyword(); System.out.println(e.getMsg()); From e13fa9f67e0614b173bdc9db9564ad57f6c6f8f6 Mon Sep 17 00:00:00 2001 From: loose-bus-change Date: Tue, 7 Sep 2021 23:53:01 +0800 Subject: [PATCH 18/27] Finish Level-10 --- build.gradle | 16 ++++++- data/duke.txt | 10 ++-- src/main/java/DialogBox.java | 59 ++++++++++++++++++++++++ src/main/java/Duke.java | 51 ++++++++++++++++---- src/main/java/Launcher.java | 10 ++++ src/main/java/Main.java | 29 ++++++++++++ src/main/java/MainWindow.java | 52 +++++++++++++++++++++ src/main/java/duke/Parser.java | 54 ++++++++++++++++++---- src/main/java/duke/Storage.java | 1 + src/main/java/duke/Task.java | 2 +- src/main/resources/images/DaDuke.png | Bin 0 -> 35810 bytes src/main/resources/images/DaUser.png | Bin 0 -> 24038 bytes src/main/resources/view/DialogBox.fxml | 16 +++++++ src/main/resources/view/MainWindow.fxml | 19 ++++++++ src/test/java/duke/TaskListTest.java | 2 + src/test/java/duke/UiTest.java | 2 + text-ui-test/input.txt | 1 + 17 files changed, 301 insertions(+), 23 deletions(-) create mode 100644 src/main/java/DialogBox.java create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/java/Main.java create mode 100644 src/main/java/MainWindow.java create mode 100644 src/main/resources/images/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 diff --git a/build.gradle b/build.gradle index 20c0521cc7..d2f1892437 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,20 @@ 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 +43,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.duke" } shadowJar { diff --git a/data/duke.txt b/data/duke.txt index 5a13d8d075..cc467d5e8c 100644 --- a/data/duke.txt +++ b/data/duke.txt @@ -1,4 +1,6 @@ -[D][ ] return book by: 2019-12-02 -[E][ ] test code at: 2018-11-03 -[E][ ] meeting at: 2015-10-15 -[E][X] project meeting at: 2015-10-15 +[E][ ] at: 2015-10-15 +[E][ ] at: 2015-10-15 +[E][ ] project chicken at: 2015-10-15 +[E][X] project weed at: 2015-10-15 +[E][ ] project double weed at: 2015-10-15 +[D][ ] project meeting by: 2015-10-15 diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..60636ac988 --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,59 @@ +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 21e5687831..ad8dbd3dfd 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,26 +1,43 @@ import duke.*; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; + + import java.io.File; public class Duke { + private Storage storage; private TaskList tasks; - private File - file; + private File file; private Parser p; private Ui ui; + public Duke() { + + } + public Duke(String filePath) { - storage = new Storage(filePath); + this.storage = new Storage(filePath); try { - tasks = new TaskList(filePath); + this.tasks = new TaskList(filePath); } catch (DukeException e) { ui.showLoadingError(); - tasks = new TaskList(filePath); + this.tasks = new TaskList(filePath); } - ui = new Ui(tasks, storage); + ui = new Ui(this.tasks, this.storage); p = new Parser(); this.file = new File(filePath); - tasks.readFromFile(); + this.tasks.readFromFile(); } /** @@ -35,7 +52,7 @@ public void run() { String fullCommand = ui.input(); if (!fullCommand.equals("bye")) { try { - p.parse(fullCommand, tasks, storage, file); + p.parse(fullCommand, this.tasks, this.storage); } catch (DukeException e) { System.out.println(e.getMsg()); } @@ -50,4 +67,22 @@ public void run() { public static void main(String[] args) { new Duke("./data/duke.txt").run(); } + + /** + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. + */ + public String getResponse(String input) { + while (!input.equals("bye")) { + try { + this.tasks = new TaskList("./data/duke.txt"); + } catch (DukeException e) { + ui.showLoadingError(); + this.tasks = new TaskList("./data/duke.txt"); + } + this.tasks.readFromFile(); + return p.parse(input, this.tasks, this.storage); + } + return "It's sad to see you go :("; + } } diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..11dbf00c62 --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,10 @@ +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..5bbcf5d55c --- /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); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 0000000000..3d9f69766a --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,52 @@ +//package duke; + +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; +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 6f2a2faf72..04c28f2de9 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -13,37 +13,52 @@ public class Parser { * @param input The string that contains the user input * @param t The TaskList that contains the tasks to be added * @param s The Storage that handles the reading and writing to a text file - * @param file The file that gets written to and read from * * @return void */ - public static void parse(String input, TaskList t, Storage s, File file) { + public static String parse(String input, TaskList t, Storage s) { if (input.equals("list")) { + String returnString = ""; for (int i = 0; i < t.size(); i++) { System.out.println(i + 1 + "." + t.get(i).toString()); + returnString = returnString + String.valueOf(i + 1) + "." + t.get(i).toString() + "\n"; } + return returnString; } else if (input.startsWith("done") && Character.isDigit(input.charAt(input.length() - 1)) && input.length() <= 8 && !Character.isAlphabetic(input.charAt(input.length() - 2)) && Character.isDigit(input.charAt(5))) { + String returnString = ""; int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); t.get(value - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done: "); - System.out.println("[X] " + t.get(value-1).description); + System.out.println(t.get(value - 1).toString()); s.appendListToFile(t); + returnString = returnString + "Nice! I've marked this task as done: " + "\n"; + returnString = returnString + "[X] " + t.get(value - 1).description + "\n"; + System.out.println("Nice! I've marked this task as done: "); + System.out.println("[X] " + t.get(value - 1).description); + return returnString; } else if (input.startsWith("todo")) { + String returnString = ""; if (input.length() < 6) { System.out.println(new NullTaskError().getMsg("todo")); + return new NullTaskError().getMsg("todo"); } else { String firstTodo = input.substring(5); t.addTodo(firstTodo); + s.appendListToFile(t); System.out.println("Got it. I've added this task: "); System.out.println(new Todo(firstTodo)); System.out.println("Now you have " + t.size() + " tasks in the list"); - s.appendListToFile(t); + returnString = returnString + "Got it. I've added this task: " + "\n"; + returnString = returnString + new Todo(firstTodo).toString() + "\n"; + returnString = returnString + "Now you have " + t.size() + " tasks in the list" + "\n"; + return returnString; } } else if (input.startsWith("deadline")) { + String returnString = ""; if (input.length() < 10) { System.out.println(new NullTaskError().getMsg("deadline")); + return "no chicken"; } else { String[] temp = input.split("/by"); String firstDeadline = temp[0].substring(9); @@ -61,14 +76,20 @@ public static void parse(String input, TaskList t, Storage s, File file) { LocalDate date1 = LocalDate.parse(finalDateFormat); String dateForObject = date1.format(DateTimeFormatter.ofPattern("MMM d yyyy")); t.addDeadline(firstDeadline, date1); + s.appendListToFile(t); + returnString = returnString + "Got it. I've added this task: " + "\n"; + returnString = returnString + new Deadline(firstDeadline, date1).toString() + "\n"; + returnString = returnString + "Now you have " + t.size() + " tasks in the list" + "\n"; System.out.println("Got it. I've added this task: "); System.out.println(new Deadline(firstDeadline, date1)); System.out.println("Now you have " + t.size() + " tasks in the list"); - s.appendListToFile(t); + return returnString; } } else if (input.startsWith("event")) { + String returnString = ""; if (input.length() < 7) { System.out.println(new NullTaskError().getMsg("event")); + return "no chicken"; } else { String[] tempEvent = input.split("/at"); String firstEvent = tempEvent[0].substring(6); @@ -90,36 +111,51 @@ public static void parse(String input, TaskList t, Storage s, File file) { System.out.println("Got it. I've added this task: "); System.out.println(new Event(firstEvent, date1)); System.out.println("Now you have " + t.size() + " tasks in the list"); + returnString = returnString + "Got it. I've added this task: " + "\n"; + returnString = returnString + new Event(firstEvent, date1).toString() + "\n"; + returnString = returnString + "Now you have " + t.size() + " tasks in the list" + "\n"; s.appendListToFile(t); + return returnString; } } else if (input.startsWith("delete") && input.length() < 11) { + String returnString = ""; int value = Integer.parseInt(input.replaceAll("[^0-9]", "")); Task removedTask = t.get(value - 1); t.delete(value - 1); System.out.println("Noted. I've removed this task:"); System.out.println(removedTask.toString()); System.out.println("Now you have " + t.size() + " tasks in the list."); + returnString = returnString + "Noted. I've removed this task: " + "\n"; + returnString = returnString + removedTask.toString() + "\n"; + returnString = returnString + "Now you have " + t.size() + " tasks in the list" + "\n"; s.appendListToFile(t); + return returnString; } else if (input.startsWith("find")) { String keyword = input.substring(5); + String returnString = ""; ArrayList output = new ArrayList<>(); int count = 0; - for (Task task: t.getTaskList()) { - String desc = task.description.substring(0,task.description.length()-4); + for (Task task : t.getTaskList()) { + String desc = task.description.substring(0, task.description.length() - 4); String[] splitDesc = desc.split(" "); - for (String str: splitDesc) { + for (String str : splitDesc) { if (str.equals(keyword)) { System.out.println(task.toString()); + returnString = returnString + task.toString() + "\n"; count = count + 1; } } } if (count == 0) { System.out.println("OOPS! The task does not exist"); + return returnString + "\n" + "OOPS! The task does not exist"; + } else { + return returnString; } } else { DukeException e = new NonExistentKeyword(); System.out.println(e.getMsg()); + return e.getMsg(); } } } diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index 7fe967422d..fb0af1df93 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -30,6 +30,7 @@ public static void appendListToFile(TaskList listOfTasks) { FileWriter w = new FileWriter(fileStorage); String str = ""; for (Task t : listOfTasks.getTaskList()) { + //System.out.println(t.toString()); str += t.toString() + "\n"; } w.write(str); diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index e08b1ea472..68562eda9a 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -10,7 +10,7 @@ public Task(String description) { } public String toString() { - return "[" + this.getStatusIcon() + "] " + this.description; + return "[" + this.getStatusIcon() + "] " + this.description; } /** diff --git a/src/main/resources/images/DaDuke.png b/src/main/resources/images/DaDuke.png new file mode 100644 index 0000000000000000000000000000000000000000..f4a7841e27cb8c678d657f1dc73a19c068f66b7f GIT binary patch literal 35810 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 X4;${m;$p!c;NPnk($5hhI$r-D9))78 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..faf352e17c94d360694b183a36947af95557a2ce GIT binary patch literal 24038 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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 0000000000..435f3ce0d8 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +