From 556af3f47a96b32898ab4cdbd65b16486a4871e8 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/35] Add Gradle support --- build.gradle | 41 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 332 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..885198fcfa --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'application' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From c053b7165a2b0ddb5a47bd437dc86181eff9a09d Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Wed, 17 Aug 2022 20:59:14 +0800 Subject: [PATCH 02/35] Level-1 --- src/main/java/Duke.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..0d61a571ee 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,16 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + Scanner reply = new Scanner(System.in); + System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); + + String currreply = reply.nextLine(); + + while (!currreply.equals("bye")) { + System.out.println(currreply + "\n"); + currreply = reply.nextLine(); + } + System.out.println("Bye. Hope to see you again soon!"); } } From a4b55e753b8901ea31fb60fd452f9805d0aab8b8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Wed, 17 Aug 2022 21:42:09 +0800 Subject: [PATCH 03/35] Level-2 --- src/main/java/Duke.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 0d61a571ee..c465b1b397 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.util.ArrayList; import java.util.Scanner; public class Duke { @@ -6,10 +7,18 @@ public static void main(String[] args) { System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); String currreply = reply.nextLine(); + ArrayList list = new ArrayList<>(100); while (!currreply.equals("bye")) { - System.out.println(currreply + "\n"); - currreply = reply.nextLine(); + if (currreply.equals("list")) { + list.forEach(n -> System.out.println((list.indexOf(n) + 1) + ". " + n)); + System.out.println("\n"); + currreply = reply.nextLine(); + } else { + list.add(currreply); + System.out.println("added: " + currreply + "\n"); + currreply = reply.nextLine(); + } } System.out.println("Bye. Hope to see you again soon!"); } From fd5961d017d4fcc1d25e268a83fdca9b227934a3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Wed, 17 Aug 2022 22:34:07 +0800 Subject: [PATCH 04/35] Level-3 --- src/main/java/Duke.java | 57 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c465b1b397..54c6fd15d0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,20 +6,69 @@ public static void main(String[] args) { Scanner reply = new Scanner(System.in); System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); + class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public void isMark(boolean bool) { + this.isDone = bool; + } + + public String getDescription() { + return this.description; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + } + String currreply = reply.nextLine(); - ArrayList list = new ArrayList<>(100); + Task currtask = new Task(currreply); + ArrayList list = new ArrayList<>(100); while (!currreply.equals("bye")) { if (currreply.equals("list")) { - list.forEach(n -> System.out.println((list.indexOf(n) + 1) + ". " + n)); - System.out.println("\n"); + System.out.println("Here are the tasks in your list:"); + list.forEach(n -> System.out.println((list.indexOf(n) + 1) + ".[" + + n.getStatusIcon() + "] " + n.getDescription())); + System.out.println(); + currreply = reply.nextLine(); + } else if (currreply.startsWith("mark")) { + int index = Integer.parseInt(currreply.substring(5)) - 1; + if (index > list.size() - 1) { + System.out.println("You have no such tasks.\n"); + } else { + Task task = list.get(index); + task.isMark(true); + System.out.println("Nice! I've marked this task as done:\n" + + " [X] " + task.getDescription() + "\n"); + } + currreply = reply.nextLine(); + } else if (currreply.startsWith("unmark")) { + int index = Integer.parseInt(currreply.substring(7)) - 1; + if (index > list.size() - 1) { + System.out.println("You have no such tasks.\n"); + } else { + Task task = list.get(index); + task.isMark(false); + System.out.println("OK, I've marked this task as not done yet:\n" + + " [ ] " + task.getDescription() + "\n"); + } currreply = reply.nextLine(); } else { - list.add(currreply); + list.add(currtask); System.out.println("added: " + currreply + "\n"); currreply = reply.nextLine(); + currtask = new Task(currreply); } } System.out.println("Bye. Hope to see you again soon!"); } + } From d21e760da9d2616755be168e54b45685b99635f9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Thu, 18 Aug 2022 00:12:25 +0800 Subject: [PATCH 05/35] Level-4 --- src/main/java/Duke.java | 79 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 9 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 54c6fd15d0..9fb72518ef 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -9,34 +9,71 @@ public static void main(String[] args) { class Task { protected String description; protected boolean isDone; + protected int type; + protected String date; - public Task(String description) { + public Task(String description, int type) { this.description = description; this.isDone = false; + this.type = type; } public void isMark(boolean bool) { this.isDone = bool; } + public String getType() { + if (this.type == 0) { + return "[T]"; + } else if (this.type == 1) { + return "[D]"; + } else { + return "[E]"; + } + } + public String getDescription() { return this.description; } + public void setDate(String str) { + this.date = str; + } + + public String getDate() { + if (this.type == 0) { + String str = "There is no date."; + return str; + } + return this.date; + } + public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + + public String toString() { + if (type == 0) { + return "[T][" + this.getStatusIcon() + "] " + + this.description; + } else if (type == 1) { + return "[D][" + this.getStatusIcon() + "] " + + this.description + " (by: " + this.date + ")"; + } else { + return "[E][" + this.getStatusIcon() + "] " + + this.description + " (at: " + this.date + ")"; + } + } } String currreply = reply.nextLine(); - Task currtask = new Task(currreply); ArrayList list = new ArrayList<>(100); while (!currreply.equals("bye")) { if (currreply.equals("list")) { System.out.println("Here are the tasks in your list:"); - list.forEach(n -> System.out.println((list.indexOf(n) + 1) + ".[" - + n.getStatusIcon() + "] " + n.getDescription())); + list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." + + n.toString())); System.out.println(); currreply = reply.nextLine(); } else if (currreply.startsWith("mark")) { @@ -47,7 +84,7 @@ public String getStatusIcon() { Task task = list.get(index); task.isMark(true); System.out.println("Nice! I've marked this task as done:\n" + - " [X] " + task.getDescription() + "\n"); + " " + task.getType() + "[X] " + task.getDescription() + "\n"); } currreply = reply.nextLine(); } else if (currreply.startsWith("unmark")) { @@ -58,14 +95,38 @@ public String getStatusIcon() { Task task = list.get(index); task.isMark(false); System.out.println("OK, I've marked this task as not done yet:\n" + - " [ ] " + task.getDescription() + "\n"); + " " + task.getType() + "[ ] " + task.getDescription() + "\n"); } currreply = reply.nextLine(); } else { - list.add(currtask); - System.out.println("added: " + currreply + "\n"); + if (currreply.startsWith("todo")) { + String acttask = currreply.substring(5); + Task currtask = new Task(acttask, 0); + currtask.setDate(null); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } else if (currreply.startsWith("deadline")) { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(9, slashindex - 1); + Task currtask = new Task(acttask, 1); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } else if (currreply.startsWith("event")) { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(6, slashindex - 1); + Task currtask = new Task(acttask, 2); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } currreply = reply.nextLine(); - currtask = new Task(currreply); } } System.out.println("Bye. Hope to see you again soon!"); From 5397e2ca117e4bc07af1cb55c02fe10036dc5c28 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Thu, 18 Aug 2022 02:12:38 +0800 Subject: [PATCH 06/35] A-TextUiTesting --- text-ui-test/EXPECTED.TXT | 32 ++++++++++++++++++++++++++------ text-ui-test/input.txt | 7 +++++++ text-ui-test/runtest.bat | 2 +- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..ac86c3fe7f 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,27 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| +Hello! I'm Duke +What can I do for you? +Got it. I've added this task: + [T][ ] borrow book +Now you have 1 tasks in the list. + +Got it. I've added this task: + [D][ ] return book (by: Sunday) +Now you have 2 tasks in the list. + +Got it. I've added this task: + [E][ ] project meeting (at: Mon 2-4pm) +Now you have 3 tasks in the list. + +Here are the tasks in your list: +1.[T][ ] borrow book +2.[D][ ] return book (by: Sunday) +3.[E][ ] project meeting (at: Mon 2-4pm) + +Nice! I've marked this task as done: + [T][X] borrow book + +OK, I've marked this task as not done yet: + [T][ ] borrow book + +Bye. Hope to see you again soon! \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..6c165b97ad 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,7 @@ +todo borrow book +deadline return book /by Sunday +event project meeting /at Mon 2-4pm +list +mark 1 +unmark 1 +bye \ No newline at end of file diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..b730857deb 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java +javac -cp ..\src\main\java\Duke -Xlint:none -d ..\bin ..\src\main\java\*.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 From bf91f2efabefa548d64f081dab52740a48782559 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Thu, 18 Aug 2022 02:18:37 +0800 Subject: [PATCH 07/35] Level-5 --- src/main/java/Duke.java | 60 ++++++++++++++++++++++++--------------- text-ui-test/EXPECTED.TXT | 4 +++ text-ui-test/input.txt | 2 ++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9fb72518ef..6b6b30a1f1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -100,31 +100,45 @@ public String toString() { currreply = reply.nextLine(); } else { if (currreply.startsWith("todo")) { - String acttask = currreply.substring(5); - Task currtask = new Task(acttask, 0); - currtask.setDate(null); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (currreply.length() <= 4) { + System.out.println("☹ OOPS!!! The description of a todo cannot be empty.\n"); + } else { + String acttask = currreply.substring(5); + Task currtask = new Task(acttask, 0); + currtask.setDate(null); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } } else if (currreply.startsWith("deadline")) { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(9, slashindex - 1); - Task currtask = new Task(acttask, 1); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (currreply.length() <= 8) { + System.out.println("☹ OOPS!!! The description of a deadline cannot be empty.\n"); + } else { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(9, slashindex - 1); + Task currtask = new Task(acttask, 1); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } } else if (currreply.startsWith("event")) { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(6, slashindex - 1); - Task currtask = new Task(acttask, 2); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (currreply.length() <= 5) { + System.out.println("☹ OOPS!!! The description of a event cannot be empty.\n"); + } else { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(6, slashindex - 1); + Task currtask = new Task(acttask, 2); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } + } else { + System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-(\n"); } currreply = reply.nextLine(); } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index ac86c3fe7f..908b3793f9 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -24,4 +24,8 @@ Nice! I've marked this task as done: OK, I've marked this task as not done yet: [T][ ] borrow book +☹ OOPS!!! The description of a todo cannot be empty. + +☹ OOPS!!! I'm sorry, but I don't know what that means :-( + Bye. Hope to see you again soon! \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 6c165b97ad..f6ddcd389d 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -4,4 +4,6 @@ event project meeting /at Mon 2-4pm list mark 1 unmark 1 +todo +blah bye \ No newline at end of file From 6badea537eb2562ef37937dfc2cde3163d344ee3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Thu, 18 Aug 2022 02:37:44 +0800 Subject: [PATCH 08/35] Level-6 --- src/main/java/Duke.java | 64 +++++++++++++++++++++++++++------------ text-ui-test/EXPECTED.TXT | 4 +++ text-ui-test/input.txt | 1 + 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6b6b30a1f1..4f201d9690 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -71,10 +71,14 @@ public String toString() { while (!currreply.equals("bye")) { if (currreply.equals("list")) { - System.out.println("Here are the tasks in your list:"); - list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." - + n.toString())); - System.out.println(); + if (list.size() == 0) { + System.out.println("There are no tasks in your list. :)"); + } else { + System.out.println("Here are the tasks in your list:"); + list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." + + n.toString())); + System.out.println(); + } currreply = reply.nextLine(); } else if (currreply.startsWith("mark")) { int index = Integer.parseInt(currreply.substring(5)) - 1; @@ -98,6 +102,18 @@ public String toString() { " " + task.getType() + "[ ] " + task.getDescription() + "\n"); } currreply = reply.nextLine(); + } else if (currreply.startsWith("delete")) { + int index = Integer.parseInt(currreply.substring(7)) - 1; + if (index > list.size() - 1) { + System.out.println("You have no such tasks.\n"); + } else { + Task task = list.get(index); + list.remove(index); + System.out.println("Noted. I've removed this task:\n" + + " " + task.toString() + "\n" + "Now you have " + + list.size() + " tasks in the list.\n"); + } + currreply = reply.nextLine(); } else { if (currreply.startsWith("todo")) { if (currreply.length() <= 4) { @@ -115,27 +131,35 @@ public String toString() { if (currreply.length() <= 8) { System.out.println("☹ OOPS!!! The description of a deadline cannot be empty.\n"); } else { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(9, slashindex - 1); - Task currtask = new Task(acttask, 1); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (!currreply.contains("/")) { + System.out.println("There is no date! >:(\n"); + } else { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(9, slashindex - 1); + Task currtask = new Task(acttask, 1); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } } } else if (currreply.startsWith("event")) { if (currreply.length() <= 5) { System.out.println("☹ OOPS!!! The description of a event cannot be empty.\n"); } else { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(6, slashindex - 1); - Task currtask = new Task(acttask, 2); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (!currreply.contains("/")) { + System.out.println("There is no date! >:(\n"); + } else { + int slashindex = currreply.indexOf("/"); + String acttask = currreply.substring(6, slashindex - 1); + Task currtask = new Task(acttask, 2); + currtask.setDate(currreply.substring(slashindex + 4)); + list.add(currtask); + System.out.println("Got it. I've added this task:\n" + + " " + currtask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + } } } else { System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-(\n"); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 908b3793f9..829d932cd0 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -28,4 +28,8 @@ OK, I've marked this task as not done yet: ☹ OOPS!!! I'm sorry, but I don't know what that means :-( +Noted. I've removed this task: + [T][ ] borrow book +Now you have 2 tasks in the list. + Bye. Hope to see you again soon! \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index f6ddcd389d..a11480c663 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -6,4 +6,5 @@ mark 1 unmark 1 todo blah +delete 1 bye \ No newline at end of file From 32ff66321583cd2d6d6ee707ca52632d6fa59a36 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sat, 27 Aug 2022 03:16:58 +0800 Subject: [PATCH 09/35] Amend to OOP new head branch --- src/main/java/Deadline.java | 24 +++ src/main/java/Duke.java | 283 +++++++++++++++---------------- src/main/java/DukeException.java | 12 ++ src/main/java/Event.java | 24 +++ src/main/java/Task.java | 25 +++ src/main/java/Todo.java | 22 +++ 6 files changed, 247 insertions(+), 143 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/DukeException.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Task.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..dcbb82a841 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,24 @@ +public class Deadline extends Task{ + protected String description; + protected boolean isDone; + protected String date; + + public Deadline(String description, String date) { + this.description = description; + this.date = date; + } + + public void isMark(boolean bool) { + this.isDone = bool; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + @Override + public String toString() { + return "[D][" + this.getStatusIcon() + "] " + + this.description + " (by: " + this.date + ")"; + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4f201d9690..9e47d44372 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,165 +6,162 @@ public static void main(String[] args) { Scanner reply = new Scanner(System.in); System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); - class Task { - protected String description; - protected boolean isDone; - protected int type; - protected String date; + String currReply = reply.nextLine(); + ArrayList list = new ArrayList(100); - public Task(String description, int type) { - this.description = description; - this.isDone = false; - this.type = type; - } - - public void isMark(boolean bool) { - this.isDone = bool; - } - - public String getType() { - if (this.type == 0) { - return "[T]"; - } else if (this.type == 1) { - return "[D]"; - } else { - return "[E]"; - } - } - - public String getDescription() { - return this.description; - } - - public void setDate(String str) { - this.date = str; - } - - public String getDate() { - if (this.type == 0) { - String str = "There is no date."; - return str; - } - return this.date; - } - - public String getStatusIcon() { - return (isDone ? "X" : " "); // mark done task with X - } - - public String toString() { - if (type == 0) { - return "[T][" + this.getStatusIcon() + "] " + - this.description; - } else if (type == 1) { - return "[D][" + this.getStatusIcon() + "] " + - this.description + " (by: " + this.date + ")"; - } else { - return "[E][" + this.getStatusIcon() + "] " + - this.description + " (at: " + this.date + ")"; - } - } - } - - String currreply = reply.nextLine(); - ArrayList list = new ArrayList<>(100); - - while (!currreply.equals("bye")) { - if (currreply.equals("list")) { - if (list.size() == 0) { - System.out.println("There are no tasks in your list. :)"); - } else { - System.out.println("Here are the tasks in your list:"); - list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." - + n.toString())); - System.out.println(); - } - currreply = reply.nextLine(); - } else if (currreply.startsWith("mark")) { - int index = Integer.parseInt(currreply.substring(5)) - 1; - if (index > list.size() - 1) { - System.out.println("You have no such tasks.\n"); - } else { - Task task = list.get(index); - task.isMark(true); - System.out.println("Nice! I've marked this task as done:\n" + - " " + task.getType() + "[X] " + task.getDescription() + "\n"); - } - currreply = reply.nextLine(); - } else if (currreply.startsWith("unmark")) { - int index = Integer.parseInt(currreply.substring(7)) - 1; - if (index > list.size() - 1) { - System.out.println("You have no such tasks.\n"); - } else { - Task task = list.get(index); - task.isMark(false); - System.out.println("OK, I've marked this task as not done yet:\n" + - " " + task.getType() + "[ ] " + task.getDescription() + "\n"); + while (!currReply.equals("bye")) { + if (currReply.equals("list")) { + try { + if (list.size() == 0) { + throw new DukeException("There are no tasks in your list. :)"); + } else { + System.out.println("Here are the tasks in your list:"); + list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." + + n.toString())); + System.out.println(); + currReply = reply.nextLine(); + continue; + } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; } - currreply = reply.nextLine(); - } else if (currreply.startsWith("delete")) { - int index = Integer.parseInt(currreply.substring(7)) - 1; - if (index > list.size() - 1) { - System.out.println("You have no such tasks.\n"); - } else { - Task task = list.get(index); - list.remove(index); - System.out.println("Noted. I've removed this task:\n" + - " " + task.toString() + "\n" + "Now you have " + - list.size() + " tasks in the list.\n"); + } else if (currReply.startsWith("mark")) { + int index = Integer.parseInt(currReply.substring(5)) - 1; + try { + if (index > list.size() - 1) { + throw new DukeException("You have no such tasks."); + } else { + Task task = list.get(index); + task.isMark(true); + System.out.println("Nice! I've marked this task as done:\n" + + " " + task.toString() + "\n"); + currReply = reply.nextLine(); + continue; + } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; } - currreply = reply.nextLine(); - } else { - if (currreply.startsWith("todo")) { - if (currreply.length() <= 4) { - System.out.println("☹ OOPS!!! The description of a todo cannot be empty.\n"); + } else if (currReply.startsWith("unmark")) { + int index = Integer.parseInt(currReply.substring(7)) - 1; + try { + if (index > list.size() - 1) { + throw new DukeException("You have no such tasks."); } else { - String acttask = currreply.substring(5); - Task currtask = new Task(acttask, 0); - currtask.setDate(null); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + Task task = list.get(index); + task.isMark(false); + System.out.println("OK, I've marked this task as not done yet:\n" + + " " + task.toString() + "\n"); + currReply = reply.nextLine(); + continue; } - } else if (currreply.startsWith("deadline")) { - if (currreply.length() <= 8) { - System.out.println("☹ OOPS!!! The description of a deadline cannot be empty.\n"); + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; + } + } else if (currReply.startsWith("delete")) { + int index = Integer.parseInt(currReply.substring(7)) - 1; + try { + if (index > list.size() - 1) { + throw new DukeException("You have no such tasks."); } else { - if (!currreply.contains("/")) { - System.out.println("There is no date! >:(\n"); + Task task = list.get(index); + list.remove(index); + System.out.println("Noted. I've removed this task:\n" + + " " + task.toString() + "\n" + "Now you have " + + list.size() + " tasks in the list.\n"); + currReply = reply.nextLine(); + continue; + } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; + } + } else { + if (currReply.startsWith("todo")) { + try { + if (currReply.length() <= 4) { + throw new DukeException("The description of a todo cannot be empty."); } else { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(9, slashindex - 1); - Task currtask = new Task(acttask, 1); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); + String actTask = currReply.substring(5); + Task currTask = new Todo(actTask); + list.add(currTask); System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + + " " + currTask.toString() + "\n" + "Now you have " + list.size() + " tasks in the list.\n"); + currReply = reply.nextLine(); + continue; } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; } - } else if (currreply.startsWith("event")) { - if (currreply.length() <= 5) { - System.out.println("☹ OOPS!!! The description of a event cannot be empty.\n"); - } else { - if (!currreply.contains("/")) { - System.out.println("There is no date! >:(\n"); + } else if (currReply.startsWith("deadline")) { + try { + if (currReply.length() <= 8) { + throw new DukeException("The description of a deadline cannot be empty."); } else { - int slashindex = currreply.indexOf("/"); - String acttask = currreply.substring(6, slashindex - 1); - Task currtask = new Task(acttask, 2); - currtask.setDate(currreply.substring(slashindex + 4)); - list.add(currtask); - System.out.println("Got it. I've added this task:\n" + - " " + currtask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); + if (!currReply.contains("/")) { + System.out.println("There is no date! >:(\n"); + } else { + int slashIndex = currReply.indexOf("/"); + String actTask = currReply.substring(9, slashIndex - 1); + String taskDate = currReply.substring(slashIndex + 4); + Task currTask = new Deadline(actTask, taskDate); + list.add(currTask); + System.out.println("Got it. I've added this task:\n" + + " " + currTask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + currReply = reply.nextLine(); + continue; + } } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; + } + } else if (currReply.startsWith("event")) { + try { + if (currReply.length() <= 5) { + throw new DukeException("The description of a event cannot be empty."); + } else { + if (!currReply.contains("/")) { + throw new DukeException("There is no date! >:("); + } else { + int slashIndex = currReply.indexOf("/"); + String actTask = currReply.substring(6, slashIndex - 1); + String taskDate = currReply.substring(slashIndex + 4); + Task currTask = new Event(actTask, taskDate); + list.add(currTask); + System.out.println("Got it. I've added this task:\n" + + " " + currTask.toString() + "\n" + + "Now you have " + list.size() + " tasks in the list.\n"); + currReply = reply.nextLine(); + continue; + } + } + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; } } else { - System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-(\n"); + try { + throw new DukeException("I'm sorry, but I don't know what that means :-("); + } catch (DukeException e) { + System.out.println(e.toString()); + currReply = reply.nextLine(); + continue; + } } - currreply = reply.nextLine(); + currReply = reply.nextLine(); } } System.out.println("Bye. Hope to see you again soon!"); diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..1bb2316089 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,12 @@ +public class DukeException extends IllegalArgumentException{ + protected String message; + + public DukeException(String message) { + this.message = message; + } + + @Override + public String toString() { + return "☹ OOPS!!! " + this.message + "\n"; + } +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..c290871803 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,24 @@ +public class Event extends Task{ + protected String description; + protected boolean isDone; + protected String date; + + public Event(String description, String date) { + this.description = description; + this.date = date; + } + + public void isMark(boolean bool) { + this.isDone = bool; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + @Override + public String toString() { + return "[E][" + this.getStatusIcon() + "] " + + this.description + " (at: " + this.date + ")"; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..07984cfe63 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,25 @@ +public class Task { + protected String description; + protected boolean isDone; + protected String date; + + public void isMark(boolean bool) { + this.isDone = bool; + } + + public String getDescription() { + return this.description; + } + + public void setDate(String str) { + this.date = str; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public String toString() { + return this.description; + } +} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..95d4590495 --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,22 @@ +public class Todo extends Task { + protected String description; + protected boolean isDone; + + public Todo(String description) { + this.description = description; + } + + public void isMark(boolean bool) { + this.isDone = bool; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + @Override + public String toString() { + return "[T][" + this.getStatusIcon() + "] " + + this.description; + } +} From 5b2ee85a00d27b67428497d210419c8fd3310f41 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sat, 27 Aug 2022 03:22:13 +0800 Subject: [PATCH 10/35] Add save feature --- data/duke.txt | 3 + src/main/java/Duke.java | 11 +++- src/main/java/FileData.java | 122 ++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 data/duke.txt create mode 100644 src/main/java/FileData.java diff --git a/data/duke.txt b/data/duke.txt new file mode 100644 index 0000000000..13ce499d0f --- /dev/null +++ b/data/duke.txt @@ -0,0 +1,3 @@ +[T][ ] read +[D][ ] reaad (by: sun) +[E][ ] read (at: sun) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9e47d44372..5bb465107a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,8 +6,11 @@ public static void main(String[] args) { Scanner reply = new Scanner(System.in); System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); + FileData f = new FileData("data/duke.txt"); + f.toPrint(); + String currReply = reply.nextLine(); - ArrayList list = new ArrayList(100); + ArrayList list = f.allTasks(); while (!currReply.equals("bye")) { if (currReply.equals("list")) { @@ -35,6 +38,7 @@ public static void main(String[] args) { } else { Task task = list.get(index); task.isMark(true); + f.updateData(list); System.out.println("Nice! I've marked this task as done:\n" + " " + task.toString() + "\n"); currReply = reply.nextLine(); @@ -53,6 +57,7 @@ public static void main(String[] args) { } else { Task task = list.get(index); task.isMark(false); + f.updateData(list); System.out.println("OK, I've marked this task as not done yet:\n" + " " + task.toString() + "\n"); currReply = reply.nextLine(); @@ -71,6 +76,7 @@ public static void main(String[] args) { } else { Task task = list.get(index); list.remove(index); + f.updateData(list); System.out.println("Noted. I've removed this task:\n" + " " + task.toString() + "\n" + "Now you have " + list.size() + " tasks in the list.\n"); @@ -91,6 +97,7 @@ public static void main(String[] args) { String actTask = currReply.substring(5); Task currTask = new Todo(actTask); list.add(currTask); + f.updateData(list); System.out.println("Got it. I've added this task:\n" + " " + currTask.toString() + "\n" + "Now you have " + list.size() + " tasks in the list.\n"); @@ -115,6 +122,7 @@ public static void main(String[] args) { String taskDate = currReply.substring(slashIndex + 4); Task currTask = new Deadline(actTask, taskDate); list.add(currTask); + f.updateData(list); System.out.println("Got it. I've added this task:\n" + " " + currTask.toString() + "\n" + "Now you have " + list.size() + " tasks in the list.\n"); @@ -140,6 +148,7 @@ public static void main(String[] args) { String taskDate = currReply.substring(slashIndex + 4); Task currTask = new Event(actTask, taskDate); list.add(currTask); + f.updateData(list); System.out.println("Got it. I've added this task:\n" + " " + currTask.toString() + "\n" + "Now you have " + list.size() + " tasks in the list.\n"); diff --git a/src/main/java/FileData.java b/src/main/java/FileData.java new file mode 100644 index 0000000000..c2b2f77cfa --- /dev/null +++ b/src/main/java/FileData.java @@ -0,0 +1,122 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class FileData { + protected String fileName; + protected File file; + protected ArrayList tasks; + + + public FileData(String fileName) { + this.fileName = fileName; + this.file = new File(fileName); + this.tasks = this.storeArray(); + } + + public boolean exists() { + return this.file.exists(); + } + + private static void writeToFile(String filePath, String textToAdd) throws IOException { + FileWriter fw = new FileWriter(filePath); + fw.write(textToAdd); + fw.close(); + } + + private static void appendToFile(String filePath, String textToAppend) throws IOException { + FileWriter fw = new FileWriter(filePath, true); // create a FileWriter in append mode + fw.write(textToAppend); + fw.close(); + } + + public void updateData(ArrayList tasks) { + int count = 0; + for (int i = 0; i < tasks.size(); i++) { + try { + if (i == 0) { + writeToFile(this.fileName, tasks.get(i).toString() + System.lineSeparator()); + } else { + storeData(tasks.get(i).toString()); + } + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + } + + public ArrayList allTasks() { + return this.tasks; + } + + public ArrayList storeArray() { + ArrayList tasks = new ArrayList<>(100); + try { + if (!this.file.exists()) { + throw new FileNotFoundException(); + } else { + Scanner s = new Scanner(this.file); + while (s.hasNext()) { + String currTask = s.nextLine(); + char currType = currTask.charAt(1); + if (currType == 'T') { + tasks.add(new Todo(currTask.substring(7))); + } else if (currType == 'D') { + int bracketIndex = currTask.indexOf("("); + String taskDate = currTask.substring(bracketIndex + 4); + tasks.add(new Deadline(currTask.substring(7, bracketIndex - 1), taskDate)); + } else { + int bracketIndex = currTask.indexOf("("); + String taskDate = currTask.substring(bracketIndex + 4); + tasks.add(new Event(currTask.substring(7, bracketIndex - 1), taskDate)); + } + } + System.out.println(); + } + } catch (FileNotFoundException e) { + System.out.println("File not found!"); + System.out.println(); + } + return tasks; + } + + public void storeData(String textToStore) { + String file = this.fileName; + try { + appendToFile(file, textToStore + System.lineSeparator()); + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + + public void toPrint() { + try { + if (!this.file.exists()) { + throw new FileNotFoundException(); + } else { + Scanner d = new Scanner(this.file); + while (d.hasNext()) { + System.out.println(d.nextLine()); + } + System.out.println(); + } + } catch (FileNotFoundException e) { + System.out.println("File not found!"); + System.out.println(); + } + } + + + public static void main(String[] args) { + File f = new File("data/duke.txt"); + File f1 = new File("data/tempDuke.txt"); + System.out.println("full path: " + f.getAbsolutePath()); + System.out.println("full path: " + f1.getAbsolutePath()); + System.out.println("file exists?: " + f.exists()); + System.out.println("is Directory?: " + f.isDirectory()); + } + +} From 97694907725c505e865d003523613c95e3066258 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sat, 27 Aug 2022 03:27:47 +0800 Subject: [PATCH 11/35] Add date and time format feature --- data/duke.txt | 3 + src/main/java/DateFormat.java | 287 ++++++++++++++++++++++++++++++++++ src/main/java/Deadline.java | 6 +- src/main/java/Duke.java | 2 +- src/main/java/Event.java | 6 +- 5 files changed, 297 insertions(+), 7 deletions(-) create mode 100644 data/duke.txt create mode 100644 src/main/java/DateFormat.java diff --git a/data/duke.txt b/data/duke.txt new file mode 100644 index 0000000000..13ce499d0f --- /dev/null +++ b/data/duke.txt @@ -0,0 +1,3 @@ +[T][ ] read +[D][ ] reaad (by: sun) +[E][ ] read (at: sun) diff --git a/src/main/java/DateFormat.java b/src/main/java/DateFormat.java new file mode 100644 index 0000000000..cf767bf6d8 --- /dev/null +++ b/src/main/java/DateFormat.java @@ -0,0 +1,287 @@ +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.util.HashMap; +import java.util.Locale; + + +public class DateFormat { + protected String date; + protected LocalDate dateFormatted; + protected String afterBy; + protected LocalTime timeFormatted; + protected String stringDate; + protected String stringTime; + protected LocalDateTime dateAndTime; + protected HashMap months = new HashMap(); + public DateFormat(String date) { + this.afterBy = date; + this.date = date; + this.dateFormatted = null; + this.timeFormatted = null; + + String day; + String month; + String year; + String hour; + String minutes; + String time = ""; + + months.put("JAN", "1"); + months.put("FEB", "2"); + months.put("MAR", "3"); + months.put("APR", "4"); + months.put("MAY", "5"); + months.put("JUN", "6"); + months.put("JUL", "7"); + months.put("AUG", "8"); + months.put("SEP", "9"); + months.put("OCT", "10"); + months.put("NOV", "11"); + months.put("DEC", "12"); + + + if (this.afterBy.contains("/")) { + if (this.afterBy.indexOf("/") < 2) { + int afterDaySlashIndex = afterBy.indexOf("/"); + String afterDay; + if (afterDaySlashIndex == 1) { + day = "0" + afterBy.charAt(0); + afterDay = afterBy.substring(afterDaySlashIndex + 1); + } else { + day = afterBy.substring(0, 2); + afterDay = afterBy.substring(afterDaySlashIndex + 2); + } + int afterMonthSlashIndex = afterDay.indexOf("/"); + String afterMonth; + if (afterMonthSlashIndex == 1) { + month = "0" + afterDay.charAt(0); + afterMonth = afterDay.substring(afterMonthSlashIndex + 1); + } else { + month = afterDay.substring(0, 2); + afterMonth = afterDay.substring(afterMonthSlashIndex + 2); + } + year = afterMonth.substring(0, 4); + if (afterMonth.length() > 4) { + time = afterMonth.substring(5); + } + } else if (afterBy.indexOf("/") == 3) { + month = afterBy.substring(0, 3); + int afterMonthSlashIndex = afterBy.indexOf("/"); + String afterMonth = afterBy.substring(afterMonthSlashIndex + 1); + int afterDaySlashIndex = afterMonth.indexOf("/"); + String afterDay; + if (afterDaySlashIndex == 1) { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + } + year = afterDay.substring(0, 4); + time = afterDay.substring(5); + } else { + year = afterBy.substring(0, 4); + int afterYearSlashIndex = afterBy.indexOf("/"); + String afterYear = afterBy.substring(afterYearSlashIndex + 1); + int afterMonthSlashIndex = afterYear.indexOf("/"); + String afterMonth; + if (afterMonthSlashIndex == 1) { + month = "0" + afterYear.charAt(0); + afterMonth = afterYear.substring(afterMonthSlashIndex + 1); + } else { + month = afterYear.substring(0, 2); + afterMonth = afterYear.substring(afterMonthSlashIndex + 2); + } + String afterDay; + if (afterMonth.charAt(1) == ' ') { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + } + time = afterDay; + } + } else if (this.afterBy.contains("-")) { + if (this.afterBy.indexOf("-") < 2) { + int afterDayDashIndex = afterBy.indexOf("-"); + String afterDay; + if (afterDayDashIndex == 1) { + day = "0" + afterBy.charAt(0); + afterDay = afterBy.substring(afterDayDashIndex + 1); + } else { + day = afterBy.substring(0, 2); + afterDay = afterBy.substring(afterDayDashIndex + 2); + } + int afterMonthDashIndex = afterDay.indexOf("-"); + String afterMonth; + if (afterMonthDashIndex == 1) { + month = "0" + afterDay.charAt(0); + afterMonth = afterDay.substring(afterMonthDashIndex + 1); + } else { + month = afterDay.substring(0, 2); + afterMonth = afterDay.substring(afterMonthDashIndex + 2); + } + year = afterMonth.substring(0, 4); + if (afterMonth.length() > 4) { + time = afterMonth.substring(5); + } + } else if (afterBy.indexOf("-") == 3) { + month = afterBy.substring(0, 3); + int afterMonthSlashIndex = afterBy.indexOf("-"); + String afterMonth = afterBy.substring(afterMonthSlashIndex + 1); + int afterDaySlashIndex = afterMonth.indexOf("-"); + String afterDay; + if (afterDaySlashIndex == 1) { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + } + year = afterDay.substring(0, 4); + time = afterDay.substring(5); + } else { + year = afterBy.substring(0, 4); + int afterYearDashIndex = afterBy.indexOf("-"); + String afterYear = afterBy.substring(afterYearDashIndex + 1); + int afterMonthSpaceIndex = afterYear.indexOf("-"); + String afterMonth; + if (afterMonthSpaceIndex == 1) { + month = "0" + afterYear.charAt(0); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); + } else { + month = afterYear.substring(0, 2); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 2); + } + String afterDay; + if (afterMonth.charAt(1) == ' ') { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 2); + } + if (afterDay.length() != 0) { + time = afterDay; + } + } + } else { + this.afterBy = this.afterBy.substring(1); + if (this.afterBy.indexOf(" ") < 2) { + int afterDaySpaceIndex = afterBy.indexOf(" "); + String afterDay; + if (afterDaySpaceIndex == 1) { + day = "0" + afterBy.charAt(0); + afterDay = afterBy.substring(afterDaySpaceIndex + 1); + } else { + day = afterBy.substring(0, 2); + afterDay = afterBy.substring(afterDaySpaceIndex + 2); + } + int afterMonthSpaceIndex = afterDay.indexOf(" "); + String afterMonth; + if (afterMonthSpaceIndex == 1) { + month = "0" + afterDay.charAt(0); + afterMonth = afterDay.substring(afterMonthSpaceIndex + 1); + } else { + month = afterDay.substring(0, 2); + afterMonth = afterDay.substring(afterMonthSpaceIndex + 2); + } + year = afterMonth.substring(0, 4); + if (afterMonth.length() > 4) { + time = afterMonth.substring(5); + } + month = months.get(month.toUpperCase()); + } else if (afterBy.indexOf(" ") == 3) { + month = afterBy.substring(0, 3); + int afterMonthSpaceIndex = afterBy.indexOf(" "); + String afterMonth = afterBy.substring(afterMonthSpaceIndex + 1); + int afterDaySpaceIndex = afterMonth.indexOf(" "); + String afterDay; + if (afterDaySpaceIndex == 1) { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterDaySpaceIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterDaySpaceIndex + 2); + } + year = afterDay.substring(0, 4); + time = afterDay.substring(5); + month = months.get(month.toUpperCase()); + } else { + year = afterBy.substring(0, 4); + int afterYearSpaceIndex = afterBy.indexOf(" "); + String afterYear = afterBy.substring(afterYearSpaceIndex + 1); + int afterMonthSpaceIndex = afterYear.indexOf(" "); + String afterMonth; + if (afterMonthSpaceIndex == 1) { + month = "0" + afterYear.charAt(0); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); + } else { + month = afterYear.substring(0, 2); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 2); + } + String afterDay; + if (afterMonth.charAt(1) == ' ') { + day = "0" + afterMonth.charAt(0); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); + } else { + day = afterMonth.substring(0, 2); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 2); + } + if (afterDay.length() != 0) { + time = afterDay; + } + month = months.get(month.toUpperCase()); + } + } + if (month.length() == 1) { + month = "0" + month; + } + this.stringDate = year + "-" + month + "-" + day; + this.dateFormatted = LocalDate.parse(year + "-" + month + "-" + day); + if (date.length() > 10 && time.length() != 0) { + if (time.length() <= 3) { + hour = "0" + time.charAt(0); + System.out.println(hour); + minutes = time.substring(1, 3); + } else { + hour = time.substring(0, 2); + minutes = time.substring(2, 4); + } + this.stringTime = hour + ":" + minutes + ":00"; + this.timeFormatted = LocalTime.parse(hour + ":" + minutes + ":" + "00"); + } + if (this.timeFormatted != null) { + this.dateAndTime = LocalDateTime.parse(this.stringDate + "T" + this.stringTime); + } + } + + public String formatDate(String pattern) { + DateTimeFormatter df = new DateTimeFormatterBuilder().parseCaseInsensitive() + .appendPattern(pattern).toFormatter(Locale.ENGLISH); + return this.dateFormatted.format(df); + } + + public String formatTime() { + return this.timeFormatted.format(DateTimeFormatter.ISO_TIME); + } + + @Override + public String toString() { + if (this.timeFormatted == null) { + return this.formatDate("MMM d yyyy"); + } else { + return this.formatDate("MMM d yyyy") + " " + this.formatTime(); + } + } + + public static void main(String args[]) { + DateFormat d4 = new DateFormat("6/7/2021 1800"); + System.out.println(d4.formatDate("MMM d yyyy")); + System.out.println(d4.formatTime()); + } +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index dcbb82a841..13c530a072 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,11 +1,11 @@ public class Deadline extends Task{ protected String description; protected boolean isDone; - protected String date; + protected DateFormat date; public Deadline(String description, String date) { this.description = description; - this.date = date; + this.date = new DateFormat(date); } public void isMark(boolean bool) { @@ -19,6 +19,6 @@ public String getStatusIcon() { @Override public String toString() { return "[D][" + this.getStatusIcon() + "] " + - this.description + " (by: " + this.date + ")"; + this.description + " (by: " + this.date.toString() + ")"; } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9e47d44372..0266d5fbcc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -7,7 +7,7 @@ public static void main(String[] args) { System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); String currReply = reply.nextLine(); - ArrayList list = new ArrayList(100); + ArrayList list = new ArrayList<>(100); while (!currReply.equals("bye")) { if (currReply.equals("list")) { diff --git a/src/main/java/Event.java b/src/main/java/Event.java index c290871803..a6038117db 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,11 +1,11 @@ public class Event extends Task{ protected String description; protected boolean isDone; - protected String date; + protected DateFormat date; public Event(String description, String date) { this.description = description; - this.date = date; + this.date = new DateFormat(date); } public void isMark(boolean bool) { @@ -19,6 +19,6 @@ public String getStatusIcon() { @Override public String toString() { return "[E][" + this.getStatusIcon() + "] " + - this.description + " (at: " + this.date + ")"; + this.description + " (at: " + this.date.toString() + ")"; } } From 3c84725f5cd5a6c2596c6e3a54e01d0e122d7d02 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sun, 28 Aug 2022 04:20:29 +0800 Subject: [PATCH 12/35] Add more OOP --- data/duke.txt | 3 - data/tasks.txt | 0 src/main/java/AddCommand.java | 77 ++++++++++++ src/main/java/ByeCommand.java | 17 +++ src/main/java/Command.java | 4 + src/main/java/DateFormat.java | 3 +- src/main/java/DeleteCommand.java | 31 +++++ src/main/java/Duke.java | 198 +++++-------------------------- src/main/java/EditCommand.java | 47 ++++++++ src/main/java/FalseCommand.java | 22 ++++ src/main/java/FileData.java | 1 - src/main/java/ListCommand.java | 27 +++++ src/main/java/Parser.java | 24 ++++ src/main/java/Storage.java | 64 ++++++++++ src/main/java/TaskList.java | 43 +++++++ src/main/java/Ui.java | 53 +++++++++ text-ui-test/EXPECTED.TXT | 9 +- text-ui-test/input.txt | 4 +- 18 files changed, 450 insertions(+), 177 deletions(-) delete mode 100644 data/duke.txt create mode 100644 data/tasks.txt create mode 100644 src/main/java/AddCommand.java create mode 100644 src/main/java/ByeCommand.java create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DeleteCommand.java create mode 100644 src/main/java/EditCommand.java create mode 100644 src/main/java/FalseCommand.java create mode 100644 src/main/java/ListCommand.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/TaskList.java create mode 100644 src/main/java/Ui.java diff --git a/data/duke.txt b/data/duke.txt deleted file mode 100644 index aaa692f72c..0000000000 --- a/data/duke.txt +++ /dev/null @@ -1,3 +0,0 @@ -[T][ ] read book -[D][ ] read book (by: Feb 2 2222 15:00:00) -[E][ ] read book (at: Feb 2 2222) diff --git a/data/tasks.txt b/data/tasks.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java new file mode 100644 index 0000000000..ab62ae3420 --- /dev/null +++ b/src/main/java/AddCommand.java @@ -0,0 +1,77 @@ +public class AddCommand extends Command { + protected String commandLine; + + public AddCommand(String str) { + this.commandLine = str; + } + + @Override + public boolean isExit() { + return false; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) { + if (commandLine.startsWith("todo")) { + try { + if (commandLine.length() <= 4) { + throw new DukeException("The description of a todo cannot be empty."); + } else { + String actTask = commandLine.substring(5); + Task currTask = new Todo(actTask); + taskList.add(currTask); + storage.updateData(taskList); + System.out.println("Got it. I've added this task:\n" + + " " + currTask + "\n" + + "Now you have " + taskList.size() + " tasks in the list.\n"); + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } else if (commandLine.startsWith("deadline")) { + try { + if (commandLine.length() <= 8) { + throw new DukeException("The description of a deadline cannot be empty."); + } else { + if (!commandLine.contains("/")) { + System.out.println("There is no date! >:(\n"); + } else { + int slashIndex = commandLine.indexOf("/"); + String actTask = commandLine.substring(9, slashIndex - 1); + String taskDate = commandLine.substring(slashIndex + 4); + Task currTask = new Deadline(actTask, taskDate); + taskList.add(currTask); + storage.updateData(taskList); + System.out.println("Got it. I've added this task:\n" + + " " + currTask + "\n" + + "Now you have " + taskList.size() + " tasks in the list.\n"); + } + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } else if (commandLine.startsWith("event")) { + try { + if (commandLine.length() <= 5) { + throw new DukeException("The description of a event cannot be empty."); + } else { + if (!commandLine.contains("/")) { + throw new DukeException("There is no date! >:("); + } else { + int slashIndex = commandLine.indexOf("/"); + String actTask = commandLine.substring(6, slashIndex - 1); + String taskDate = commandLine.substring(slashIndex + 4); + Task currTask = new Event(actTask, taskDate); + taskList.add(currTask); + storage.updateData(taskList); + System.out.println("Got it. I've added this task:\n" + + " " + currTask.toString() + "\n" + + "Now you have " + taskList.size() + " tasks in the list.\n"); + } + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } + } +} diff --git a/src/main/java/ByeCommand.java b/src/main/java/ByeCommand.java new file mode 100644 index 0000000000..c41300f1c2 --- /dev/null +++ b/src/main/java/ByeCommand.java @@ -0,0 +1,17 @@ +public class ByeCommand extends Command { + protected String commandLine; + + public ByeCommand(String commandLine) { + this.commandLine = commandLine; + } + + @Override + public boolean isExit() { + return true; + } + + @Override + public void execute(TaskList task, Ui ui, Storage storage) { + ui.showGoodbye(); + } +} diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..aceda19ca3 --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,4 @@ +public abstract class Command { + public abstract boolean isExit(); + public abstract void execute(TaskList task, Ui ui, Storage storage); +} diff --git a/src/main/java/DateFormat.java b/src/main/java/DateFormat.java index bdd73d4046..f44b6ca32d 100644 --- a/src/main/java/DateFormat.java +++ b/src/main/java/DateFormat.java @@ -15,7 +15,8 @@ public class DateFormat { protected String stringDate; protected String stringTime; protected LocalDateTime dateAndTime; - protected HashMap months = new HashMap(); + protected HashMap months = new HashMap<>(); + public DateFormat(String date) { this.afterBy = date; this.date = date; diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java new file mode 100644 index 0000000000..9ef49ce9ce --- /dev/null +++ b/src/main/java/DeleteCommand.java @@ -0,0 +1,31 @@ +public class DeleteCommand extends Command { + protected String commandLine; + + public DeleteCommand(String commandLine) { + this.commandLine = commandLine; + } + + @Override + public boolean isExit() { + return false; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) { + int index = Integer.parseInt(commandLine.substring(7)) - 1; + try { + if (index > taskList.size() - 1) { + throw new DukeException("You have no such tasks."); + } else { + Task task = taskList.get(index); + taskList.remove(index); + storage.updateData(taskList); + System.out.println("Noted. I've removed this task:\n" + + " " + task.toString() + "\n" + "Now you have " + + taskList.size() + " tasks in the list.\n"); + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5bb465107a..182c6d719e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,178 +2,44 @@ import java.util.Scanner; public class Duke { - public static void main(String[] args) { - Scanner reply = new Scanner(System.in); - System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); - FileData f = new FileData("data/duke.txt"); - f.toPrint(); + private Storage storage; + private TaskList tasks; + private Ui ui; - String currReply = reply.nextLine(); - ArrayList list = f.allTasks(); + public Duke(String filePath) { + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + storage = new Storage(filePath); + try { + tasks = new TaskList(storage.load()); + ui = new Ui(); + } catch (DukeException e) { + ui.showLoadingError(); + tasks = new TaskList(); + } + } - while (!currReply.equals("bye")) { - if (currReply.equals("list")) { - try { - if (list.size() == 0) { - throw new DukeException("There are no tasks in your list. :)"); - } else { - System.out.println("Here are the tasks in your list:"); - list.forEach(n -> System.out.println((list.indexOf(n) + 1) + "." - + n.toString())); - System.out.println(); - currReply = reply.nextLine(); - continue; - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else if (currReply.startsWith("mark")) { - int index = Integer.parseInt(currReply.substring(5)) - 1; - try { - if (index > list.size() - 1) { - throw new DukeException("You have no such tasks."); - } else { - Task task = list.get(index); - task.isMark(true); - f.updateData(list); - System.out.println("Nice! I've marked this task as done:\n" + - " " + task.toString() + "\n"); - currReply = reply.nextLine(); - continue; - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else if (currReply.startsWith("unmark")) { - int index = Integer.parseInt(currReply.substring(7)) - 1; - try { - if (index > list.size() - 1) { - throw new DukeException("You have no such tasks."); - } else { - Task task = list.get(index); - task.isMark(false); - f.updateData(list); - System.out.println("OK, I've marked this task as not done yet:\n" + - " " + task.toString() + "\n"); - currReply = reply.nextLine(); - continue; - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; + public void run() { + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + ui.showLine(); // show the divider line ("_______") + Parser parser = new Parser(fullCommand); + Command c = parser.parse(fullCommand); + c.execute(tasks, ui, storage); + isExit = c.isExit(); + if (!isExit) { + ui.changeCommand(); } - } else if (currReply.startsWith("delete")) { - int index = Integer.parseInt(currReply.substring(7)) - 1; - try { - if (index > list.size() - 1) { - throw new DukeException("You have no such tasks."); - } else { - Task task = list.get(index); - list.remove(index); - f.updateData(list); - System.out.println("Noted. I've removed this task:\n" + - " " + task.toString() + "\n" + "Now you have " + - list.size() + " tasks in the list.\n"); - currReply = reply.nextLine(); - continue; - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else { - if (currReply.startsWith("todo")) { - try { - if (currReply.length() <= 4) { - throw new DukeException("The description of a todo cannot be empty."); - } else { - String actTask = currReply.substring(5); - Task currTask = new Todo(actTask); - list.add(currTask); - f.updateData(list); - System.out.println("Got it. I've added this task:\n" + - " " + currTask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); - currReply = reply.nextLine(); - continue; - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else if (currReply.startsWith("deadline")) { - try { - if (currReply.length() <= 8) { - throw new DukeException("The description of a deadline cannot be empty."); - } else { - if (!currReply.contains("/")) { - System.out.println("There is no date! >:(\n"); - } else { - int slashIndex = currReply.indexOf("/"); - String actTask = currReply.substring(9, slashIndex - 1); - String taskDate = currReply.substring(slashIndex + 4); - Task currTask = new Deadline(actTask, taskDate); - list.add(currTask); - f.updateData(list); - System.out.println("Got it. I've added this task:\n" + - " " + currTask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); - currReply = reply.nextLine(); - continue; - } - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else if (currReply.startsWith("event")) { - try { - if (currReply.length() <= 5) { - throw new DukeException("The description of a event cannot be empty."); - } else { - if (!currReply.contains("/")) { - throw new DukeException("There is no date! >:("); - } else { - int slashIndex = currReply.indexOf("/"); - String actTask = currReply.substring(6, slashIndex - 1); - String taskDate = currReply.substring(slashIndex + 4); - Task currTask = new Event(actTask, taskDate); - list.add(currTask); - f.updateData(list); - System.out.println("Got it. I've added this task:\n" + - " " + currTask.toString() + "\n" + - "Now you have " + list.size() + " tasks in the list.\n"); - currReply = reply.nextLine(); - continue; - } - } - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } else { - try { - throw new DukeException("I'm sorry, but I don't know what that means :-("); - } catch (DukeException e) { - System.out.println(e.toString()); - currReply = reply.nextLine(); - continue; - } - } - currReply = reply.nextLine(); + } catch (DukeException e) { + ui.showError(e.getMessage()); } } - System.out.println("Bye. Hope to see you again soon!"); } + public static void main(String[] args) { + new Duke("data/tasks.txt").run(); + } } + diff --git a/src/main/java/EditCommand.java b/src/main/java/EditCommand.java new file mode 100644 index 0000000000..531ce58d64 --- /dev/null +++ b/src/main/java/EditCommand.java @@ -0,0 +1,47 @@ +public class EditCommand extends Command { + protected String commandLine; + + public EditCommand(String commandLine) { + this.commandLine = commandLine; + } + + @Override + public boolean isExit() { + return false; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) { + if (commandLine.startsWith("mark")) { + int index = Integer.parseInt(commandLine.substring(5)) - 1; + try { + if (index > taskList.size() - 1) { + throw new DukeException("You have no such tasks."); + } else { + Task task = taskList.get(index); + task.isMark(true); + storage.updateData(taskList); + System.out.println("Nice! I've marked this task as done:\n" + + " " + task + "\n"); + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } else { + int index = Integer.parseInt(commandLine.substring(7)) - 1; + try { + if (index > taskList.size() - 1) { + throw new DukeException("You have no such tasks."); + } else { + Task task = taskList.get(index); + task.isMark(false); + storage.updateData(taskList); + System.out.println("OK, I've marked this task as not done yet:\n" + + " " + task + "\n"); + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } + } +} diff --git a/src/main/java/FalseCommand.java b/src/main/java/FalseCommand.java new file mode 100644 index 0000000000..f56a8d9acd --- /dev/null +++ b/src/main/java/FalseCommand.java @@ -0,0 +1,22 @@ +public class FalseCommand extends Command { + protected String commandLine; + + public FalseCommand(String commandLine) { + this.commandLine = commandLine; + } + + @Override + public boolean isExit() { + return false; + } + + @Override + public void execute(TaskList task, Ui ui, Storage storage) throws DukeException { + try { + throw new DukeException("I'm sorry, but I don't know what that means :-(\n"); + } catch (DukeException e) { + System.out.println(e.toString()); + ui.nextCommand(); + } + } +} diff --git a/src/main/java/FileData.java b/src/main/java/FileData.java index c2b2f77cfa..45eb80456a 100644 --- a/src/main/java/FileData.java +++ b/src/main/java/FileData.java @@ -34,7 +34,6 @@ private static void appendToFile(String filePath, String textToAppend) throws IO } public void updateData(ArrayList tasks) { - int count = 0; for (int i = 0; i < tasks.size(); i++) { try { if (i == 0) { diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java new file mode 100644 index 0000000000..ea89b0467f --- /dev/null +++ b/src/main/java/ListCommand.java @@ -0,0 +1,27 @@ +public class ListCommand extends Command { + protected String commandLine; + + public ListCommand(String commandLine) { + this.commandLine = commandLine; + } + + @Override + public boolean isExit() { + return false; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) { + try { + if (taskList.size() == 0) { + throw new DukeException("There are no tasks in your list. :)"); + } else { + System.out.println("Here are the tasks in your list:"); + taskList.forEach(); + System.out.println(); + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } +} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..483198d6d8 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,24 @@ +public class Parser { + protected String fullCommand; + + public Parser(String fullCommand) { + this.fullCommand = fullCommand; + } + + public Command parse(String fullCommand) { + if (fullCommand.isEmpty() || fullCommand.equals("bye")) { + return new ByeCommand(fullCommand); + } else if (fullCommand.equals("list")) { + return new ListCommand(fullCommand); + } else if (fullCommand.startsWith("delete")) { + return new DeleteCommand(fullCommand); + } else if (fullCommand.startsWith("mark") || fullCommand.startsWith("unmark")) { + return new EditCommand(fullCommand); + } else if (fullCommand.startsWith("todo") || fullCommand.startsWith("deadline") || + fullCommand.startsWith("event")) { + return new AddCommand(fullCommand); + } else { + return new FalseCommand(fullCommand); + } + } +} diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..4d3673ec44 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,64 @@ +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; + +public class Storage { + protected String filePath; + protected FileData f; + protected TaskList tasks; + + public Storage(String filePath) { + this.filePath = filePath; + this.f = new FileData(filePath); + this.tasks = new TaskList(this.f.storeArray()); + } + + public ArrayList load() throws DukeException { + this.f.toPrint(); + return tasks.toArray(); + } + + private static void writeToFile(String filePath, String textToAdd) throws IOException { + FileWriter fw = new FileWriter(filePath); + fw.write(textToAdd); + fw.close(); + } + + private static void appendToFile(String filePath, String textToAppend) throws IOException { + FileWriter fw = new FileWriter(filePath, true); // create a FileWriter in append mode + fw.write(textToAppend); + fw.close(); + } + + public void storeData(String textToStore) { + String file = this.filePath; + try { + appendToFile(file, textToStore + System.lineSeparator()); + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + + public void updateData(TaskList taskList) { + f.updateData(taskList.toArray()); + } + + public void save() throws DukeException { + if (!this.f.exists()) { + throw new DukeException("The file does not exist!"); + } else { + for (int i = 0; i < tasks.size(); i++) { + try { + if (i == 0) { + writeToFile(this.filePath, tasks.get(i).toString() + System.lineSeparator()); + } else { + storeData(tasks.get(i).toString()); + } + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + } + } + +} diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..d345da311a --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,43 @@ +import java.util.ArrayList; + +public class TaskList { + protected Task task; + protected ArrayList taskList; + + public TaskList(ArrayList tasks) throws DukeException { + this.taskList = tasks; + } + + public TaskList() { + this.taskList = new ArrayList<>(100); + } + + public Task get(int index) { + return this.taskList.get(index); + } + + public void update() { + + } + + public void add(Task task) { + taskList.add(task); + } + + public void forEach() { + taskList.forEach(n -> System.out.println((taskList.indexOf(n) + 1) + "." + + n.toString())); + } + + public void remove(int index) { + taskList.remove(index); + } + + public ArrayList toArray() { + return this.taskList; + } + + public int size() { + return this.taskList.size(); + } +} diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..95d47f2f4a --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,53 @@ +import java.util.Scanner; + +public class Ui { + protected Scanner in; + protected String nextCommand; + + public Ui() { + this.in = new Scanner(System.in); + this.nextCommand = in.nextLine(); + } + + public Ui(Scanner in) { + this.in = in; + this.nextCommand = in.nextLine(); + } + + public void showWelcome() { + System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); + } + + public void showGoodbye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + public String readCommand() { + return this.nextCommand; + } + + public void changeCommand() { + this.nextCommand = this.in.nextLine(); + } + + public void nextCommand() { + this.in.nextLine(); + } + + public void showLoadingError() throws DukeException { + try { + throw new DukeException("The file is empty!"); + } catch (DukeException e) { + System.out.println(e.toString()); + } + } + + public void showError(String error) { + System.out.println(error); + } + + public void showLine() { + System.out.println("---------------------------------"); + } + +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 829d932cd0..1121ceaa6e 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -5,18 +5,19 @@ Got it. I've added this task: [T][ ] borrow book Now you have 1 tasks in the list. +--------------------------------- Got it. I've added this task: - [D][ ] return book (by: Sunday) + [D][ ] return book (by: Feb 02 2022 18:00:00) Now you have 2 tasks in the list. Got it. I've added this task: - [E][ ] project meeting (at: Mon 2-4pm) + [E][ ] project meeting (at: Feb 01 2022 14:00:00) Now you have 3 tasks in the list. Here are the tasks in your list: 1.[T][ ] borrow book -2.[D][ ] return book (by: Sunday) -3.[E][ ] project meeting (at: Mon 2-4pm) +2.[D][ ] return book (by: Feb 02 2022 18:00:00) +3.[E][ ] project meeting (at: Feb 01 2022 14:00:00) Nice! I've marked this task as done: [T][X] borrow book diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index a11480c663..559cb5f2e2 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,6 +1,6 @@ todo borrow book -deadline return book /by Sunday -event project meeting /at Mon 2-4pm +deadline return book /by 2-2-2022 1800 +event project meeting /at 1/2/2022 1400 list mark 1 unmark 1 From 199fd4dc0ca29210738b7555d7dcfe7cf2894df7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sun, 28 Aug 2022 18:56:30 +0800 Subject: [PATCH 13/35] Organize the classes into suitable java packages --- README.md | 4 ++-- data/tasks.txt | 1 + src/main/java/{ => command}/AddCommand.java | 11 +++++++++++ src/main/java/{ => command}/ByeCommand.java | 6 ++++++ src/main/java/{ => command}/Command.java | 6 ++++++ src/main/java/{ => command}/DeleteCommand.java | 8 ++++++++ src/main/java/{ => command}/EditCommand.java | 8 ++++++++ src/main/java/{ => command}/FalseCommand.java | 7 +++++++ src/main/java/{ => command}/ListCommand.java | 7 +++++++ src/main/java/{ => dateformat}/DateFormat.java | 2 ++ src/main/java/{ => duke}/Duke.java | 12 +++++++++--- src/main/java/{ => exception}/DukeException.java | 2 ++ src/main/java/{ => filedata}/FileData.java | 7 +++++++ src/main/java/{ => parser}/Parser.java | 10 ++++++++++ src/main/java/{ => storage}/Storage.java | 7 +++++++ src/main/java/{ => task}/Deadline.java | 6 +++++- src/main/java/{ => task}/Event.java | 6 +++++- src/main/java/{ => task}/Task.java | 2 ++ src/main/java/{ => task}/TaskList.java | 4 ++++ src/main/java/{ => task}/Todo.java | 3 +++ src/main/java/{ => ui}/Ui.java | 6 +++++- text-ui-test/EXPECTED.TXT | 2 +- 22 files changed, 118 insertions(+), 9 deletions(-) rename src/main/java/{ => command}/AddCommand.java (94%) rename src/main/java/{ => command}/ByeCommand.java (81%) rename src/main/java/{ => command}/Command.java (64%) rename src/main/java/{ => command}/DeleteCommand.java (88%) rename src/main/java/{ => command}/EditCommand.java (92%) rename src/main/java/{ => command}/FalseCommand.java (83%) rename src/main/java/{ => command}/ListCommand.java (86%) rename src/main/java/{ => dateformat}/DateFormat.java (99%) rename src/main/java/{ => duke}/Duke.java (82%) rename src/main/java/{ => exception}/DukeException.java (93%) rename src/main/java/{ => filedata}/FileData.java (97%) rename src/main/java/{ => parser}/Parser.java (81%) rename src/main/java/{ => storage}/Storage.java (94%) rename src/main/java/{ => task}/Deadline.java (87%) rename src/main/java/{ => task}/Event.java (88%) rename src/main/java/{ => task}/Task.java (97%) rename src/main/java/{ => task}/TaskList.java (94%) rename src/main/java/{ => task}/Todo.java (96%) rename src/main/java/{ => ui}/Ui.java (89%) diff --git a/README.md b/README.md index 8715d4d915..a8111be768 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# duke.duke project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/duke.duke.java` file, right-click it, and choose `Run duke.duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: ``` Hello from ____ _ diff --git a/data/tasks.txt b/data/tasks.txt index e69de29bb2..48a6d06889 100644 --- a/data/tasks.txt +++ b/data/tasks.txt @@ -0,0 +1 @@ +[T][ ] read book diff --git a/src/main/java/AddCommand.java b/src/main/java/command/AddCommand.java similarity index 94% rename from src/main/java/AddCommand.java rename to src/main/java/command/AddCommand.java index ab62ae3420..178f1cdf17 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -1,3 +1,14 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; +import task.Task; +import task.Todo; +import task.Deadline; +import task.Event; + public class AddCommand extends Command { protected String commandLine; diff --git a/src/main/java/ByeCommand.java b/src/main/java/command/ByeCommand.java similarity index 81% rename from src/main/java/ByeCommand.java rename to src/main/java/command/ByeCommand.java index c41300f1c2..92fabd5a6c 100644 --- a/src/main/java/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -1,3 +1,9 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; + public class ByeCommand extends Command { protected String commandLine; diff --git a/src/main/java/Command.java b/src/main/java/command/Command.java similarity index 64% rename from src/main/java/Command.java rename to src/main/java/command/Command.java index aceda19ca3..97312ee12c 100644 --- a/src/main/java/Command.java +++ b/src/main/java/command/Command.java @@ -1,3 +1,9 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; + public abstract class Command { public abstract boolean isExit(); public abstract void execute(TaskList task, Ui ui, Storage storage); diff --git a/src/main/java/DeleteCommand.java b/src/main/java/command/DeleteCommand.java similarity index 88% rename from src/main/java/DeleteCommand.java rename to src/main/java/command/DeleteCommand.java index 9ef49ce9ce..599ee56046 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,3 +1,11 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; +import task.Task; + public class DeleteCommand extends Command { protected String commandLine; diff --git a/src/main/java/EditCommand.java b/src/main/java/command/EditCommand.java similarity index 92% rename from src/main/java/EditCommand.java rename to src/main/java/command/EditCommand.java index 531ce58d64..4a32c3001b 100644 --- a/src/main/java/EditCommand.java +++ b/src/main/java/command/EditCommand.java @@ -1,3 +1,11 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; +import task.Task; + public class EditCommand extends Command { protected String commandLine; diff --git a/src/main/java/FalseCommand.java b/src/main/java/command/FalseCommand.java similarity index 83% rename from src/main/java/FalseCommand.java rename to src/main/java/command/FalseCommand.java index f56a8d9acd..cc604b6ec4 100644 --- a/src/main/java/FalseCommand.java +++ b/src/main/java/command/FalseCommand.java @@ -1,3 +1,10 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; + public class FalseCommand extends Command { protected String commandLine; diff --git a/src/main/java/ListCommand.java b/src/main/java/command/ListCommand.java similarity index 86% rename from src/main/java/ListCommand.java rename to src/main/java/command/ListCommand.java index ea89b0467f..f4be35e5ca 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -1,3 +1,10 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; + public class ListCommand extends Command { protected String commandLine; diff --git a/src/main/java/DateFormat.java b/src/main/java/dateformat/DateFormat.java similarity index 99% rename from src/main/java/DateFormat.java rename to src/main/java/dateformat/DateFormat.java index f44b6ca32d..77cf4d0a40 100644 --- a/src/main/java/DateFormat.java +++ b/src/main/java/dateformat/DateFormat.java @@ -1,3 +1,5 @@ +package dateformat; + import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; diff --git a/src/main/java/Duke.java b/src/main/java/duke/Duke.java similarity index 82% rename from src/main/java/Duke.java rename to src/main/java/duke/Duke.java index 182c6d719e..7a37de9df1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,5 +1,11 @@ -import java.util.ArrayList; -import java.util.Scanner; +package duke; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; +import parser.Parser; +import command.Command; public class Duke { @@ -8,7 +14,7 @@ public class Duke { private Ui ui; public Duke(String filePath) { - System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?"); storage = new Storage(filePath); try { tasks = new TaskList(storage.load()); diff --git a/src/main/java/DukeException.java b/src/main/java/exception/DukeException.java similarity index 93% rename from src/main/java/DukeException.java rename to src/main/java/exception/DukeException.java index 1bb2316089..e147a5bb35 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,3 +1,5 @@ +package exception; + public class DukeException extends IllegalArgumentException{ protected String message; diff --git a/src/main/java/FileData.java b/src/main/java/filedata/FileData.java similarity index 97% rename from src/main/java/FileData.java rename to src/main/java/filedata/FileData.java index 45eb80456a..53ad2754d8 100644 --- a/src/main/java/FileData.java +++ b/src/main/java/filedata/FileData.java @@ -1,3 +1,5 @@ +package filedata; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -5,6 +7,11 @@ import java.util.ArrayList; import java.util.Scanner; +import task.Task; +import task.Todo; +import task.Deadline; +import task.Event; + public class FileData { protected String fileName; protected File file; diff --git a/src/main/java/Parser.java b/src/main/java/parser/Parser.java similarity index 81% rename from src/main/java/Parser.java rename to src/main/java/parser/Parser.java index 483198d6d8..fcc731d158 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/parser/Parser.java @@ -1,3 +1,13 @@ +package parser; + +import command.AddCommand; +import command.ByeCommand; +import command.Command; +import command.DeleteCommand; +import command.EditCommand; +import command.FalseCommand; +import command.ListCommand; + public class Parser { protected String fullCommand; diff --git a/src/main/java/Storage.java b/src/main/java/storage/Storage.java similarity index 94% rename from src/main/java/Storage.java rename to src/main/java/storage/Storage.java index 4d3673ec44..4884bddbf9 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/storage/Storage.java @@ -1,7 +1,14 @@ +package storage; + import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import exception.DukeException; +import filedata.FileData; +import task.Task; +import task.TaskList; + public class Storage { protected String filePath; protected FileData f; diff --git a/src/main/java/Deadline.java b/src/main/java/task/Deadline.java similarity index 87% rename from src/main/java/Deadline.java rename to src/main/java/task/Deadline.java index 13c530a072..078d951d9a 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -1,4 +1,8 @@ -public class Deadline extends Task{ +package task; + +import dateformat.DateFormat; + +public class Deadline extends Task { protected String description; protected boolean isDone; protected DateFormat date; diff --git a/src/main/java/Event.java b/src/main/java/task/Event.java similarity index 88% rename from src/main/java/Event.java rename to src/main/java/task/Event.java index a6038117db..48cab7558d 100644 --- a/src/main/java/Event.java +++ b/src/main/java/task/Event.java @@ -1,4 +1,8 @@ -public class Event extends Task{ +package task; + +import dateformat.DateFormat; + +public class Event extends Task { protected String description; protected boolean isDone; protected DateFormat date; diff --git a/src/main/java/Task.java b/src/main/java/task/Task.java similarity index 97% rename from src/main/java/Task.java rename to src/main/java/task/Task.java index 07984cfe63..a68b6c8047 100644 --- a/src/main/java/Task.java +++ b/src/main/java/task/Task.java @@ -1,3 +1,5 @@ +package task; + public class Task { protected String description; protected boolean isDone; diff --git a/src/main/java/TaskList.java b/src/main/java/task/TaskList.java similarity index 94% rename from src/main/java/TaskList.java rename to src/main/java/task/TaskList.java index d345da311a..8af2bdbc28 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,3 +1,7 @@ +package task; + +import exception.DukeException; + import java.util.ArrayList; public class TaskList { diff --git a/src/main/java/Todo.java b/src/main/java/task/Todo.java similarity index 96% rename from src/main/java/Todo.java rename to src/main/java/task/Todo.java index 95d4590495..b78273e256 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/task/Todo.java @@ -1,3 +1,6 @@ +package task; + + public class Todo extends Task { protected String description; protected boolean isDone; diff --git a/src/main/java/Ui.java b/src/main/java/ui/Ui.java similarity index 89% rename from src/main/java/Ui.java rename to src/main/java/ui/Ui.java index 95d47f2f4a..ecba907218 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/ui/Ui.java @@ -1,3 +1,7 @@ +package ui; + +import exception.DukeException; + import java.util.Scanner; public class Ui { @@ -15,7 +19,7 @@ public Ui(Scanner in) { } public void showWelcome() { - System.out.println("Hello! I'm Duke\nWhat can I do for you?\n"); + System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?\n"); } public void showGoodbye() { diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 1121ceaa6e..15ebefbb24 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,4 +1,4 @@ -Hello! I'm Duke +Hello! I'm duke.duke What can I do for you? Got it. I've added this task: From 61d8501032a489905768d85ace28126509e8bc0c Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Mon, 29 Aug 2022 04:11:01 +0800 Subject: [PATCH 14/35] Add JUnit tests to test the behavior of some code --- data/test.txt | 0 src/main/java/command/AddCommand.java | 2 +- src/main/java/dateformat/DateFormat.java | 36 ++++++++++++------------ src/test/java/DeadlineTest.java | 29 +++++++++++++++++++ src/test/java/EventTest.java | 30 ++++++++++++++++++++ src/test/java/TodoTest.java | 30 ++++++++++++++++++++ 6 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 data/test.txt create mode 100644 src/test/java/DeadlineTest.java create mode 100644 src/test/java/EventTest.java create mode 100644 src/test/java/TodoTest.java diff --git a/data/test.txt b/data/test.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/command/AddCommand.java b/src/main/java/command/AddCommand.java index 178f1cdf17..a02027cfd5 100644 --- a/src/main/java/command/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -22,7 +22,7 @@ public boolean isExit() { } @Override - public void execute(TaskList taskList, Ui ui, Storage storage) { + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { if (commandLine.startsWith("todo")) { try { if (commandLine.length() <= 4) { diff --git a/src/main/java/dateformat/DateFormat.java b/src/main/java/dateformat/DateFormat.java index 77cf4d0a40..3946136880 100644 --- a/src/main/java/dateformat/DateFormat.java +++ b/src/main/java/dateformat/DateFormat.java @@ -47,7 +47,7 @@ public DateFormat(String date) { if (this.afterBy.contains("/")) { - if (this.afterBy.indexOf("/") < 2) { + if (this.afterBy.indexOf("/") <= 2) { int afterDaySlashIndex = afterBy.indexOf("/"); String afterDay; if (afterDaySlashIndex == 1) { @@ -55,16 +55,16 @@ public DateFormat(String date) { afterDay = afterBy.substring(afterDaySlashIndex + 1); } else { day = afterBy.substring(0, 2); - afterDay = afterBy.substring(afterDaySlashIndex + 2); + afterDay = afterBy.substring(afterDaySlashIndex + 1); } int afterMonthSlashIndex = afterDay.indexOf("/"); String afterMonth; if (afterMonthSlashIndex == 1) { month = "0" + afterDay.charAt(0); - afterMonth = afterDay.substring(afterMonthSlashIndex + 1); + afterMonth = afterDay.substring(afterDaySlashIndex + 1); } else { month = afterDay.substring(0, 2); - afterMonth = afterDay.substring(afterMonthSlashIndex + 2); + afterMonth = afterDay.substring(afterMonthSlashIndex + 1); } year = afterMonth.substring(0, 4); if (afterMonth.length() > 5) { @@ -85,7 +85,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } year = afterDay.substring(0, 4); if (afterDay.length() > 5) { @@ -106,7 +106,7 @@ public DateFormat(String date) { afterMonth = afterYear.substring(afterMonthSlashIndex + 1); } else { month = afterYear.substring(0, 2); - afterMonth = afterYear.substring(afterMonthSlashIndex + 2); + afterMonth = afterYear.substring(afterMonthSlashIndex + 1); } String afterDay; if (afterMonth.charAt(1) == ' ') { @@ -114,7 +114,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } if (afterDay.length() > 5) { if (afterDay.charAt(7) == ':') { @@ -133,7 +133,7 @@ public DateFormat(String date) { afterDay = afterBy.substring(afterDayDashIndex + 1); } else { day = afterBy.substring(0, 2); - afterDay = afterBy.substring(afterDayDashIndex + 2); + afterDay = afterBy.substring(afterDayDashIndex + 1); } int afterMonthDashIndex = afterDay.indexOf("-"); String afterMonth; @@ -142,7 +142,7 @@ public DateFormat(String date) { afterMonth = afterDay.substring(afterMonthDashIndex + 1); } else { month = afterDay.substring(0, 2); - afterMonth = afterDay.substring(afterMonthDashIndex + 2); + afterMonth = afterDay.substring(afterMonthDashIndex + 1); } year = afterMonth.substring(0, 4); if (afterMonth.length() > 5) { @@ -163,7 +163,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterMonthSlashIndex + 2); + afterDay = afterMonth.substring(afterMonthSlashIndex + 1); } year = afterDay.substring(0, 4); if (afterDay.length() > 5) { @@ -184,7 +184,7 @@ public DateFormat(String date) { afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); } else { month = afterYear.substring(0, 2); - afterMonth = afterYear.substring(afterMonthSpaceIndex + 2); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); } String afterDay; if (afterMonth.charAt(1) == ' ') { @@ -192,7 +192,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterMonthSpaceIndex + 2); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); } if (afterDay.length() > 2) { if (afterDay.charAt(7) == ':') { @@ -212,7 +212,7 @@ public DateFormat(String date) { afterDay = afterBy.substring(afterDaySpaceIndex + 1); } else { day = afterBy.substring(0, 2); - afterDay = afterBy.substring(afterDaySpaceIndex + 2); + afterDay = afterBy.substring(afterDaySpaceIndex + 1); } int afterMonthSpaceIndex = afterDay.indexOf(" "); String afterMonth; @@ -221,7 +221,7 @@ public DateFormat(String date) { afterMonth = afterDay.substring(afterMonthSpaceIndex + 1); } else { month = afterDay.substring(0, 2); - afterMonth = afterDay.substring(afterMonthSpaceIndex + 2); + afterMonth = afterDay.substring(afterMonthSpaceIndex + 1); } year = afterMonth.substring(0, 4); if (afterMonth.length() > 5) { @@ -243,7 +243,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterDaySpaceIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterDaySpaceIndex + 2); + afterDay = afterMonth.substring(afterDaySpaceIndex + 1); } year = afterDay.substring(0, 4); if (afterDay.length() > 5) { @@ -265,7 +265,7 @@ public DateFormat(String date) { afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); } else { month = afterYear.substring(0, 2); - afterMonth = afterYear.substring(afterMonthSpaceIndex + 2); + afterMonth = afterYear.substring(afterMonthSpaceIndex + 1); } String afterDay; if (afterMonth.charAt(1) == ' ') { @@ -273,7 +273,7 @@ public DateFormat(String date) { afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); } else { day = afterMonth.substring(0, 2); - afterDay = afterMonth.substring(afterMonthSpaceIndex + 2); + afterDay = afterMonth.substring(afterMonthSpaceIndex + 1); } if (afterDay.length() > 2) { if (afterDay.charAt(7) == ':') { @@ -327,7 +327,7 @@ public String toString() { } public static void main(String args[]) { - DateFormat d4 = new DateFormat("6/7/2021 1800"); + DateFormat d4 = new DateFormat("16/10/2021 1800"); System.out.println(d4.formatDate("MMM d yyyy")); System.out.println(d4.formatTime()); } diff --git a/src/test/java/DeadlineTest.java b/src/test/java/DeadlineTest.java new file mode 100644 index 0000000000..2e83f75964 --- /dev/null +++ b/src/test/java/DeadlineTest.java @@ -0,0 +1,29 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import task.Task; +import task.Deadline; + +public class DeadlineTest { + + @Test + public void getStatusIcon_unmarked() { + Task deadline = new Deadline("return book", "21/10/2022 1800"); + deadline.isMark(false); + assertEquals(" ", deadline.getStatusIcon()); + } + + @Test + public void getStatusIcon_marked() { + Task deadline = new Deadline("return book", "21/10/2022 1800"); + deadline.isMark(true); + assertEquals("X", deadline.getStatusIcon()); + } + + @Test + public void toString_success() { + Task deadline = new Deadline("return book", "21/10/2022 1800"); + assertEquals("[D][ ] return book (by: Oct 21 2022 18:00:00)", deadline.toString()); + } +} diff --git a/src/test/java/EventTest.java b/src/test/java/EventTest.java new file mode 100644 index 0000000000..9c6012de8f --- /dev/null +++ b/src/test/java/EventTest.java @@ -0,0 +1,30 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import task.Task; +import task.Event; +import task.Deadline; + +public class EventTest { + + @Test + public void getStatusIcon_unmarked() { + Task event = new Event("read book", "20/10/2022 1800"); + event.isMark(false); + assertEquals(" ", event.getStatusIcon()); + } + + @Test + public void getStatusIcon_marked() { + Task event = new Event("read book", "20/10/2022 1800"); + event.isMark(true); + assertEquals("X", event.getStatusIcon()); + } + + @Test + public void toString_success() { + Task event = new Event("read book", "20/10/2022 1800"); + assertEquals("[E][ ] read book (at: Oct 20 2022 18:00:00)", event.toString()); + } +} diff --git a/src/test/java/TodoTest.java b/src/test/java/TodoTest.java new file mode 100644 index 0000000000..a3a254d00b --- /dev/null +++ b/src/test/java/TodoTest.java @@ -0,0 +1,30 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import task.Task; +import task.Todo; + + +public class TodoTest { + + @Test + public void getStatusIcon_unmarked() { + Task todo = new Todo("read book"); + todo.isMark(false); + assertEquals(" ", todo.getStatusIcon()); + } + + @Test + public void getStatusIcon_marked() { + Task todo = new Todo("read book"); + todo.isMark(true); + assertEquals("X", todo.getStatusIcon()); + } + + @Test + public void toString_success() { + Task todo = new Todo("read book"); + assertEquals("[T][ ] read book", todo.toString()); + } +} From dd69271dbb7bbd7d6cf876915585a6961b403344 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Mon, 29 Aug 2022 20:15:45 +0800 Subject: [PATCH 15/35] Package the App as a Jar file --- src/main/java/META-INF/MANIFEST.MF | 3 +++ src/main/java/duke/Duke.java | 4 ++-- src/main/java/filedata/FileData.java | 6 ++++-- data/tasks.txt => tasks.txt | 0 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/main/java/META-INF/MANIFEST.MF rename data/tasks.txt => tasks.txt (100%) diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..2c9a9745c5 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: duke.Duke + diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 7a37de9df1..a3a4bb82ef 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -14,7 +14,7 @@ public class Duke { private Ui ui; public Duke(String filePath) { - System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?"); + System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?\n"); storage = new Storage(filePath); try { tasks = new TaskList(storage.load()); @@ -45,7 +45,7 @@ public void run() { } public static void main(String[] args) { - new Duke("data/tasks.txt").run(); + new Duke("tasks.txt").run(); } } diff --git a/src/main/java/filedata/FileData.java b/src/main/java/filedata/FileData.java index 53ad2754d8..c0a3871540 100644 --- a/src/main/java/filedata/FileData.java +++ b/src/main/java/filedata/FileData.java @@ -19,8 +19,10 @@ public class FileData { public FileData(String fileName) { - this.fileName = fileName; - this.file = new File(fileName); + String home = System.getProperty("user.home"); + java.nio.file.Path path = java.nio.file.Paths.get(home, "Desktop", fileName); + this.fileName = String.valueOf(path); + this.file = new File(String.valueOf(path)); this.tasks = this.storeArray(); } diff --git a/data/tasks.txt b/tasks.txt similarity index 100% rename from data/tasks.txt rename to tasks.txt From 622b3e51a33c341772059b1eebfbfec51acc30a0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Mon, 29 Aug 2022 21:39:04 +0800 Subject: [PATCH 16/35] Add JavaDoc comments to most of the code --- src/main/java/command/AddCommand.java | 31 +++++++++++++- src/main/java/command/ByeCommand.java | 26 +++++++++++- src/main/java/command/Command.java | 23 +++++++++- src/main/java/command/DeleteCommand.java | 25 +++++++++++ src/main/java/command/EditCommand.java | 25 +++++++++++ src/main/java/command/FalseCommand.java | 27 +++++++++++- src/main/java/command/ListCommand.java | 24 +++++++++++ src/main/java/dateformat/DateFormat.java | 54 ++++++++++++++++++++---- src/main/java/parser/Parser.java | 18 ++++++++ src/main/java/task/Deadline.java | 29 +++++++++++++ src/main/java/task/Event.java | 29 +++++++++++++ src/main/java/task/Task.java | 32 ++++++++++++++ src/main/java/task/TaskList.java | 47 ++++++++++++++++++--- src/main/java/task/Todo.java | 29 ++++++++++++- 14 files changed, 399 insertions(+), 20 deletions(-) diff --git a/src/main/java/command/AddCommand.java b/src/main/java/command/AddCommand.java index a02027cfd5..263c8e8106 100644 --- a/src/main/java/command/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -9,18 +9,45 @@ import task.Deadline; import task.Event; +/** + * Represents an Add Command that inherits from + * the abstract class Command. + */ + public class AddCommand extends Command { protected String commandLine; - public AddCommand(String str) { - this.commandLine = str; + /** + * Constructor for this AddCommand that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ + public AddCommand(String commandLine) { + this.commandLine = commandLine; } + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ @Override public boolean isExit() { return false; } + /** + * Executes the command depending on which type of + * task it is and prints a string to tell the user that + * the task has been added. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException If the description of task is empty. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { if (commandLine.startsWith("todo")) { diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index 92fabd5a6c..2ac77d0dd1 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -4,20 +4,44 @@ import task.TaskList; import ui.Ui; +/** + * Represents a Bye Command that inherits from + * the abstract class Command. + */ public class ByeCommand extends Command { protected String commandLine; + /** + * Constructor for this that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ public ByeCommand(String commandLine) { this.commandLine = commandLine; } + /** + * Returns a boolean true to show that this + * is the last command. + * + * @return true. + */ @Override public boolean isExit() { return true; } + /** + * Executes the command and prints a goodbye + * string to the user. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + */ @Override - public void execute(TaskList task, Ui ui, Storage storage) { + public void execute(TaskList taskList, Ui ui, Storage storage) { ui.showGoodbye(); } } diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index 97312ee12c..4dbd15fc18 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -4,7 +4,28 @@ import task.TaskList; import ui.Ui; +/** + * An abstract class Command. + */ public abstract class Command { + + /** + * An abstract method that is implemented in its + * children classes returns a boolean depending on whether + * it is the last command from the user. + * + * @return boolean. + */ public abstract boolean isExit(); - public abstract void execute(TaskList task, Ui ui, Storage storage); + + /** + * An abstract method that is implemented in its + * children classes that executes the command from the user + * differently depending on what command the user gives. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + */ + public abstract void execute(TaskList taskList, Ui ui, Storage storage); } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 599ee56046..7dd7511396 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -6,18 +6,43 @@ import exception.DukeException; import task.Task; +/** + * Represents a Delete Command that inherits from + * the abstract class Command. + */ public class DeleteCommand extends Command { protected String commandLine; + /** + * Constructor for this DeleteCommand that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ public DeleteCommand(String commandLine) { this.commandLine = commandLine; } + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ @Override public boolean isExit() { return false; } + /** + * Executes the command to delete a task that the user + * wants to remove. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException If there are no such task in the taskList. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { int index = Integer.parseInt(commandLine.substring(7)) - 1; diff --git a/src/main/java/command/EditCommand.java b/src/main/java/command/EditCommand.java index 4a32c3001b..ec787a6186 100644 --- a/src/main/java/command/EditCommand.java +++ b/src/main/java/command/EditCommand.java @@ -6,18 +6,43 @@ import exception.DukeException; import task.Task; +/** + * Represents an EditCommand that inherits from + * the abstract class Command. + */ public class EditCommand extends Command { protected String commandLine; + /** + * Constructor for this EditCommand that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ public EditCommand(String commandLine) { this.commandLine = commandLine; } + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ @Override public boolean isExit() { return false; } + /** + * Executes the command depending on which action the user + * wants to do and prints a string if it is executed successfully. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException If there is no such task. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { if (commandLine.startsWith("mark")) { diff --git a/src/main/java/command/FalseCommand.java b/src/main/java/command/FalseCommand.java index cc604b6ec4..c101e11cd4 100644 --- a/src/main/java/command/FalseCommand.java +++ b/src/main/java/command/FalseCommand.java @@ -5,20 +5,45 @@ import ui.Ui; import exception.DukeException; +/** + * Represents a FalseCommand that inherits from + * the abstract class Command. + */ public class FalseCommand extends Command { protected String commandLine; + /** + * Constructor for this FalseCommand that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ public FalseCommand(String commandLine) { this.commandLine = commandLine; } + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ @Override public boolean isExit() { return false; } + /** + * Throws a DukeException to tell the user that the command is + * invalid. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException Always. + */ @Override - public void execute(TaskList task, Ui ui, Storage storage) throws DukeException { + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { try { throw new DukeException("I'm sorry, but I don't know what that means :-(\n"); } catch (DukeException e) { diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index f4be35e5ca..894fc6966c 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -5,18 +5,42 @@ import ui.Ui; import exception.DukeException; +/** + * Represents a ListCommand that inherits from + * the abstract class Command. + */ public class ListCommand extends Command { protected String commandLine; + /** + * Constructor for this ListCommand that takes in a + * commandLine as a String. + * + * @param commandLine Command from the user. + */ public ListCommand(String commandLine) { this.commandLine = commandLine; } + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ @Override public boolean isExit() { return false; } + /** + * Prints out all the tasks from the taskList if successful. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException If the taskList is empty. + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) { try { diff --git a/src/main/java/dateformat/DateFormat.java b/src/main/java/dateformat/DateFormat.java index 3946136880..56fc5d80d9 100644 --- a/src/main/java/dateformat/DateFormat.java +++ b/src/main/java/dateformat/DateFormat.java @@ -8,7 +8,9 @@ import java.util.HashMap; import java.util.Locale; - +/** + * Represents DateFormat to format date and time. + */ public class DateFormat { protected String date; protected LocalDate dateFormatted; @@ -19,18 +21,18 @@ public class DateFormat { protected LocalDateTime dateAndTime; protected HashMap months = new HashMap<>(); + /** + * Constructor for DateFormat that takes in a date + * as a String. + * + * @param date Date in the format of a String. + */ public DateFormat(String date) { this.afterBy = date; this.date = date; this.dateFormatted = null; this.timeFormatted = null; - - String day; - String month; - String year; - String hour; - String minutes; - String time = ""; + dateAndTimeFormatter(); months.put("JAN", "1"); months.put("FEB", "2"); @@ -44,8 +46,19 @@ public DateFormat(String date) { months.put("OCT", "10"); months.put("NOV", "11"); months.put("DEC", "12"); + } - + /** + * A formatter to format the date and time + * into a readable String for the DateTimeFormatterBuilder. + */ + public void dateAndTimeFormatter() { + String day; + String month; + String year; + String hour; + String minutes; + String time = ""; if (this.afterBy.contains("/")) { if (this.afterBy.indexOf("/") <= 2) { int afterDaySlashIndex = afterBy.indexOf("/"); @@ -307,16 +320,39 @@ public DateFormat(String date) { } } + + /** + * Formats the date in the form of a String into + * a date in the form of LocalDate. + * + * @param pattern The pattern in which the date will be formatted to. + * @return Returns the String version of the date after it has been + * formatted. + */ public String formatDate(String pattern) { DateTimeFormatter df = new DateTimeFormatterBuilder().parseCaseInsensitive() .appendPattern(pattern).toFormatter(Locale.ENGLISH); return this.dateFormatted.format(df); } + /** + * Formats the time in the form of a String into + * a time in the form of LocalTime. + * + * @return Returns the String version of the time after it has + * been formatted. + */ public String formatTime() { return this.timeFormatted.format(DateTimeFormatter.ISO_TIME); } + /** + * Returns the string representation of the formatted date + * and time. + * + * @return The string representation of the formatted date + * and time. + */ @Override public String toString() { if (this.timeFormatted == null) { diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java index fcc731d158..868e8aa1ed 100644 --- a/src/main/java/parser/Parser.java +++ b/src/main/java/parser/Parser.java @@ -8,13 +8,31 @@ import command.FalseCommand; import command.ListCommand; +/** + * Represents a parser to parse commands from + * the user. + */ public class Parser { protected String fullCommand; + /** + * Constructor for this Parser that takes in + * a command as a string. + * + * @param fullCommand Command from the user. + */ public Parser(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns different types of commands depending on what + * command the user input. + * + * @param fullCommand Command from the user. + * @return Different types of commands depending on the + * user input. + */ public Command parse(String fullCommand) { if (fullCommand.isEmpty() || fullCommand.equals("bye")) { return new ByeCommand(fullCommand); diff --git a/src/main/java/task/Deadline.java b/src/main/java/task/Deadline.java index 078d951d9a..04b209aa37 100644 --- a/src/main/java/task/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -2,24 +2,53 @@ import dateformat.DateFormat; +/** + * Represents a Deadline task that inherits + * from Task. + */ public class Deadline extends Task { protected String description; protected boolean isDone; protected DateFormat date; + /** + * Constructor for this Deadline task. + * + * @param description The Deadline task. + * @param date The date for the Deadline task. + */ public Deadline(String description, String date) { this.description = description; this.date = new DateFormat(date); } + /** + * Changes the boolean isDone depending on whether the user + * wants to mark or unmark the task. + * + * @param bool The boolean for whether the task is marked + * or unmarked. + */ public void isMark(boolean bool) { this.isDone = bool; } + /** + * Returns a string representation of whether + * the Deadline task is done or undone. + * + * @return Returns a string representation of whether + * the Deadline task is done or undone. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Returns the string representation of the Deadline task. + * + * @return Returns the string representation of the Deadline task. + */ @Override public String toString() { return "[D][" + this.getStatusIcon() + "] " + diff --git a/src/main/java/task/Event.java b/src/main/java/task/Event.java index 48cab7558d..1b08f041af 100644 --- a/src/main/java/task/Event.java +++ b/src/main/java/task/Event.java @@ -2,24 +2,53 @@ import dateformat.DateFormat; +/** + * Represents an Event task that inherits + * from Task. + */ public class Event extends Task { protected String description; protected boolean isDone; protected DateFormat date; + /** + * Constructor for this Event task. + * + * @param description The Event task. + * @param date The date for the Event task. + */ public Event(String description, String date) { this.description = description; this.date = new DateFormat(date); } + /** + * Changes the boolean isDone depending on whether the user + * wants to mark or unmark the Event task. + * + * @param bool The boolean for whether the Event task is marked + * or unmarked. + */ public void isMark(boolean bool) { this.isDone = bool; } + /** + * Returns a string representation of whether + * the Event task is done or undone. + * + * @return Returns a string representation of whether + * the Event task is done or undone. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Returns the string representation of the Event task. + * + * @return Returns the string representation of the Event task. + */ @Override public String toString() { return "[E][" + this.getStatusIcon() + "] " + diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index a68b6c8047..2dc0f0f9c6 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -1,26 +1,58 @@ package task; +/** + * Represents all the tasks. + */ public class Task { protected String description; protected boolean isDone; protected String date; + /** + * Changes the boolean isDone depending on whether the user + * wants to mark or unmark the task. + * + * @param bool The boolean for whether the task is marked + * or unmarked. + */ public void isMark(boolean bool) { this.isDone = bool; } + /** + * Returns the description of the task. + * + * @return Returns the description of the task. + */ public String getDescription() { return this.description; } + /** + * Sets the date for the task. + * + * @param str The date of the task. + */ public void setDate(String str) { this.date = str; } + /** + * Returns a string representation of whether + * the task is done or undone. + * + * @return Returns a string representation of whether + * the task is done or undone. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Returns the string representation of the task. + * + * @return Returns the string representation of the task. + */ public String toString() { return this.description; } diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index 8af2bdbc28..243e60a669 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -4,43 +4,80 @@ import java.util.ArrayList; +/** + * Represents the TaskList. + */ public class TaskList { protected Task task; protected ArrayList taskList; - public TaskList(ArrayList tasks) throws DukeException { + /** + * Constructor for TaskList if there is a ArrayList. + * + * @param tasks ArrayList of the tasks. + */ + public TaskList(ArrayList tasks) { this.taskList = tasks; } + /** + * Constructor for TaskList if there is no ArrayList. + */ public TaskList() { this.taskList = new ArrayList<>(100); } + /** + * Returns the task at the index provided. + * + * @param index The index of the task to be returned. + * @return Returns the task at the index provided. + */ public Task get(int index) { return this.taskList.get(index); } - public void update() { - - } - + /** + * Adds the task to the taskList. + * + * @param task Task to be added to the taskList. + */ public void add(Task task) { taskList.add(task); } + /** + * Prints out all the tasks in the taskList. + */ public void forEach() { taskList.forEach(n -> System.out.println((taskList.indexOf(n) + 1) + "." + n.toString())); } + /** + * Removes the task at the index provided. + * + * @param index The index of the task to be removed. + */ public void remove(int index) { taskList.remove(index); } + /** + * Changes the taskList to an ArrayList. + * + * @return An ArrayList containing all the tasks in the + * taskList. + */ public ArrayList toArray() { return this.taskList; } + /** + * Returns the size of the taskList. + * + * @return Returns the size of the taskList. + */ public int size() { return this.taskList.size(); } diff --git a/src/main/java/task/Todo.java b/src/main/java/task/Todo.java index b78273e256..d80cc3bf5b 100644 --- a/src/main/java/task/Todo.java +++ b/src/main/java/task/Todo.java @@ -1,22 +1,49 @@ package task; - +/** + * Represents a Todo task that inherits + * from Task. + */ public class Todo extends Task { protected String description; protected boolean isDone; + /** + * Constructor for this Todo task. + * + * @param description The Todo task. + */ public Todo(String description) { this.description = description; } + /** + * Changes the boolean isDone depending on whether the user + * wants to mark or unmark the Todo task. + * + * @param bool The boolean for whether the Todo task is marked + * or unmarked. + */ public void isMark(boolean bool) { this.isDone = bool; } + /** + * Returns a string representation of whether + * the Todo task is done or undone. + * + * @return Returns a string representation of whether + * the Todo task is done or undone. + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Returns the string representation of the Todo task. + * + * @return Returns the string representation of the Todo task. + */ @Override public String toString() { return "[T][" + this.getStatusIcon() + "] " + From 42efcef911d81fd56cbf4a0b66fffccda353d6ed Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Mon, 29 Aug 2022 23:01:56 +0800 Subject: [PATCH 17/35] Add Find feature --- src/main/java/command/FindCommand.java | 66 ++++++++++++++++++++++++++ src/main/java/parser/Parser.java | 10 ++-- src/main/java/ui/Ui.java | 5 -- 3 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 src/main/java/command/FindCommand.java diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java new file mode 100644 index 0000000000..0fbb01f5f9 --- /dev/null +++ b/src/main/java/command/FindCommand.java @@ -0,0 +1,66 @@ +package command; + +import storage.Storage; +import task.TaskList; +import ui.Ui; +import exception.DukeException; +import task.Task; + +import java.util.ArrayList; + +public class FindCommand extends Command { + protected String fullCommand; + + public FindCommand(String fullCommand) { + this.fullCommand = fullCommand; + } + + /** + * Returns a boolean false to show that this + * is not the last command. + * + * @return false. + */ + @Override + public boolean isExit() { + return false; + } + + /** + * Executes the command depending on which type of + * task it is and prints a string to tell the user that + * the task has been added. + * + * @param taskList The ArrayList that contains all the tasks. + * @param ui The Ui that interacts with the next command from the user. + * @param storage The Storage used to store the tasks. + * @throws DukeException If the description of task is empty. + */ + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + try { + if (taskList.size() == 0) { + throw new DukeException("There are no tasks in your list. :)"); + } else { + String taskToFind = this.fullCommand.substring(5); + ArrayList tasksFound = new ArrayList<>(taskList.size()); + for (int i = 0; i < taskList.size(); i++) { + Task currTask = taskList.get(i); + String currTaskString = currTask.toString(); + if (currTaskString.contains(taskToFind)) { + tasksFound.add(currTask); + } + } + if (tasksFound.isEmpty()) { + throw new DukeException("There is nothing that matches the task."); + } else { + System.out.println("Here are the matching tasks in your list:"); + tasksFound.forEach(n -> System.out.println((tasksFound.indexOf(n) + 1) + "." + + n.toString())); + } + } + } catch (DukeException e) { + System.out.println(e.toString()); + } + } +} diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java index 868e8aa1ed..29f05b7b92 100644 --- a/src/main/java/parser/Parser.java +++ b/src/main/java/parser/Parser.java @@ -1,12 +1,6 @@ package parser; -import command.AddCommand; -import command.ByeCommand; -import command.Command; -import command.DeleteCommand; -import command.EditCommand; -import command.FalseCommand; -import command.ListCommand; +import command.*; /** * Represents a parser to parse commands from @@ -45,6 +39,8 @@ public Command parse(String fullCommand) { } else if (fullCommand.startsWith("todo") || fullCommand.startsWith("deadline") || fullCommand.startsWith("event")) { return new AddCommand(fullCommand); + } else if (fullCommand.startsWith("find")) { + return new FindCommand(fullCommand); } else { return new FalseCommand(fullCommand); } diff --git a/src/main/java/ui/Ui.java b/src/main/java/ui/Ui.java index ecba907218..4f535dcf2b 100644 --- a/src/main/java/ui/Ui.java +++ b/src/main/java/ui/Ui.java @@ -13,11 +13,6 @@ public Ui() { this.nextCommand = in.nextLine(); } - public Ui(Scanner in) { - this.in = in; - this.nextCommand = in.nextLine(); - } - public void showWelcome() { System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?\n"); } From a94bf3bf5cc360d8fd7b0158996c6ce10c27c4f8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Thu, 1 Sep 2022 09:23:58 +0800 Subject: [PATCH 18/35] Fix some minor bugs in DateFormat --- src/main/java/dateformat/DateFormat.java | 9 +++++---- src/main/java/duke/Duke.java | 2 +- src/main/java/filedata/FileData.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/dateformat/DateFormat.java b/src/main/java/dateformat/DateFormat.java index 56fc5d80d9..a9c68addf3 100644 --- a/src/main/java/dateformat/DateFormat.java +++ b/src/main/java/dateformat/DateFormat.java @@ -19,7 +19,7 @@ public class DateFormat { protected String stringDate; protected String stringTime; protected LocalDateTime dateAndTime; - protected HashMap months = new HashMap<>(); + protected static HashMap months = new HashMap<>(); /** * Constructor for DateFormat that takes in a date @@ -32,7 +32,6 @@ public DateFormat(String date) { this.date = date; this.dateFormatted = null; this.timeFormatted = null; - dateAndTimeFormatter(); months.put("JAN", "1"); months.put("FEB", "2"); @@ -46,6 +45,8 @@ public DateFormat(String date) { months.put("OCT", "10"); months.put("NOV", "11"); months.put("DEC", "12"); + + dateAndTimeFormatter(); } /** @@ -216,7 +217,7 @@ public void dateAndTimeFormatter() { } } } else { - this.afterBy = this.afterBy.substring(1); + afterBy = afterBy.substring(1); // When read from text file, it has an extra ":". if (this.afterBy.indexOf(" ") < 2) { int afterDaySpaceIndex = afterBy.indexOf(" "); String afterDay; @@ -363,7 +364,7 @@ public String toString() { } public static void main(String args[]) { - DateFormat d4 = new DateFormat("16/10/2021 1800"); + DateFormat d4 = new DateFormat("Feb 10 2022 1800"); System.out.println(d4.formatDate("MMM d yyyy")); System.out.println(d4.formatTime()); } diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index a3a4bb82ef..f963922a91 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -14,7 +14,7 @@ public class Duke { private Ui ui; public Duke(String filePath) { - System.out.println("Hello! I'm Duke.Duke\nWhat can I do for you?\n"); + System.out.println("Hello! I'm Duke.\nWhat can I do for you?\n"); storage = new Storage(filePath); try { tasks = new TaskList(storage.load()); diff --git a/src/main/java/filedata/FileData.java b/src/main/java/filedata/FileData.java index c0a3871540..2d35a74bef 100644 --- a/src/main/java/filedata/FileData.java +++ b/src/main/java/filedata/FileData.java @@ -62,7 +62,7 @@ public ArrayList allTasks() { public ArrayList storeArray() { ArrayList tasks = new ArrayList<>(100); - try { + try { if (!this.file.exists()) { throw new FileNotFoundException(); } else { From 639a81757ba7fe2064f2ffb27ce09c563e4a02e6 Mon Sep 17 00:00:00 2001 From: Hoodineee <97339748+Hoodineee@users.noreply.github.com> Date: Sat, 3 Sep 2022 00:24:45 +0800 Subject: [PATCH 19/35] Update README.md --- README.md | 57 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index a8111be768..633b0e4f76 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,33 @@ -# duke.duke project template - -This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. - -## Setting up in Intellij - -Prerequisites: JDK 11, update Intellij to the most recent version. - -1. Open Intellij (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project first) -1. Open the project into Intellij as follows: - 1. Click `Open`. - 1. Select the project directory, and click `OK`. - 1. If there are any further prompts, accept the defaults. -1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
- In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/duke.duke.java` file, right-click it, and choose `Run duke.duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: - ``` - Hello from - ____ _ - | _ \ _ _| | _____ - | | | | | | | |/ / _ \ - | |_| | |_| | < __/ - |____/ \__,_|_|\_\___| - ``` +# DukePro +> “Your mind is for having ideas, not holding them.” – David Allen ([source](https://dansilvestre.com/productivity-quotes)) + +DukePro frees your mind of having to remember things you need to do. It's, + +- text-based +- easy to learn +- ~~FAST~~ *SUPER* FAST to use + +All you need to do is, + +1. download it from [here](https://github.com/Hoodineee/ip). +2. double-click it. +3. add your tasks. +4. let it manage your tasks for you :wink: + +And it is **FREE**! + +Features: + +- [x] Managing tasks +- [ ] Managing deadlines (coming soon) +- [ ] Reminders (coming soon) + +If you Java programmer, you can use it to practice Java too. Here's the main method: +``` + +public class Main { + public static void main(String[] args) { + Application.launch(MainApp.class, args); + } +} +``` From ffb6cf7eefe705b869090f71d46d7b94105c3788 Mon Sep 17 00:00:00 2001 From: Hoodineee <97339748+Hoodineee@users.noreply.github.com> Date: Sat, 3 Sep 2022 00:27:32 +0800 Subject: [PATCH 20/35] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 633b0e4f76..ad4939fe8d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Features: - [ ] Managing deadlines (coming soon) - [ ] Reminders (coming soon) -If you Java programmer, you can use it to practice Java too. Here's the main method: +If you Java programmer, you can use it to practice Java too. Here's the `main` method: ``` public class Main { From eab27763b296483ab8dd86d25fcc6b83f389bd06 Mon Sep 17 00:00:00 2001 From: Hoodineee <97339748+Hoodineee@users.noreply.github.com> Date: Sat, 3 Sep 2022 00:28:49 +0800 Subject: [PATCH 21/35] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ad4939fe8d..7fe7178ece 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,7 @@ Features: - [ ] Reminders (coming soon) If you Java programmer, you can use it to practice Java too. Here's the `main` method: -``` - +```java public class Main { public static void main(String[] args) { Application.launch(MainApp.class, args); From baa72388a7edd302ca14cb903a4821e1af2434d0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LBC8HLP\\User" Date: Sat, 3 Sep 2022 22:56:55 +0800 Subject: [PATCH 22/35] Add a GUI to Duke --- build.gradle | 15 +++++ data/{test.txt => duke.txt} | 0 src/main/java/GUI/DialogBox.java | 61 +++++++++++++++++++++ src/main/java/GUI/MainWindow.java | 53 ++++++++++++++++++ src/main/java/command/AddCommand.java | 34 ++++++++---- src/main/java/command/ByeCommand.java | 3 +- src/main/java/command/Command.java | 2 +- src/main/java/command/DeleteCommand.java | 12 ++-- src/main/java/command/EditCommand.java | 17 ++++-- src/main/java/command/FalseCommand.java | 4 +- src/main/java/command/FindCommand.java | 16 +++++- src/main/java/command/ListCommand.java | 12 +++- src/main/java/dateformat/DateFormat.java | 26 ++++++--- src/main/java/duke/Duke.java | 9 ++- src/main/java/duke/Launcher.java | 12 ++++ src/main/java/duke/Main.java | 37 +++++++++++++ src/main/java/exception/DukeException.java | 2 +- src/main/java/parser/Parser.java | 14 ++++- src/main/java/ui/Ui.java | 4 +- src/main/resources/images/DaDuke.png | Bin 0 -> 16526 bytes src/main/resources/images/DaUser.png | Bin 0 -> 5218 bytes src/main/resources/view/DialogBox.fxml | 16 ++++++ src/main/resources/view/MainWindow.fxml | 19 +++++++ 23 files changed, 323 insertions(+), 45 deletions(-) rename data/{test.txt => duke.txt} (100%) create mode 100644 src/main/java/GUI/DialogBox.java create mode 100644 src/main/java/GUI/MainWindow.java create mode 100644 src/main/java/duke/Launcher.java create mode 100644 src/main/java/duke/Main.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 885198fcfa..fad401f369 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,21 @@ repositories { } dependencies { + 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' + 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' } diff --git a/data/test.txt b/data/duke.txt similarity index 100% rename from data/test.txt rename to data/duke.txt diff --git a/src/main/java/GUI/DialogBox.java b/src/main/java/GUI/DialogBox.java new file mode 100644 index 0000000000..1ce498edc4 --- /dev/null +++ b/src/main/java/GUI/DialogBox.java @@ -0,0 +1,61 @@ +package GUI; + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/GUI/MainWindow.java b/src/main/java/GUI/MainWindow.java new file mode 100644 index 0000000000..358645368f --- /dev/null +++ b/src/main/java/GUI/MainWindow.java @@ -0,0 +1,53 @@ +package GUI; + +import duke.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.VBox; +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends VBox { + @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()); + dialogContainer.getChildren().add(DialogBox.getDukeDialog + ("Hello! I'm Duck\n" + "What can I do for you?", this.dukeImage)); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.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/command/AddCommand.java b/src/main/java/command/AddCommand.java index 263c8e8106..3e4df9db33 100644 --- a/src/main/java/command/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -49,7 +49,8 @@ public boolean isExit() { * @throws DukeException If the description of task is empty. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + String response = ""; if (commandLine.startsWith("todo")) { try { if (commandLine.length() <= 4) { @@ -59,12 +60,15 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeExcept Task currTask = new Todo(actTask); taskList.add(currTask); storage.updateData(taskList); - System.out.println("Got it. I've added this task:\n" + - " " + currTask + "\n" + - "Now you have " + taskList.size() + " tasks in the list.\n"); + response = "Got it. I've added this task:\n" + + " " + currTask + "\n" + "Now you have " + + taskList.size() + " tasks in the list.\n"; + System.out.println(response); + return response; } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } else if (commandLine.startsWith("deadline")) { try { @@ -72,7 +76,7 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeExcept throw new DukeException("The description of a deadline cannot be empty."); } else { if (!commandLine.contains("/")) { - System.out.println("There is no date! >:(\n"); + throw new DukeException("There is no date! >:(\n"); } else { int slashIndex = commandLine.indexOf("/"); String actTask = commandLine.substring(9, slashIndex - 1); @@ -80,15 +84,18 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeExcept Task currTask = new Deadline(actTask, taskDate); taskList.add(currTask); storage.updateData(taskList); - System.out.println("Got it. I've added this task:\n" + - " " + currTask + "\n" + - "Now you have " + taskList.size() + " tasks in the list.\n"); + response = "Got it. I've added this task:\n" + + " " + currTask + "\n" + "Now you have " + + taskList.size() + " tasks in the list.\n"; + System.out.println(response); + return response; } } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } - } else if (commandLine.startsWith("event")) { + } else { try { if (commandLine.length() <= 5) { throw new DukeException("The description of a event cannot be empty."); @@ -102,13 +109,16 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeExcept Task currTask = new Event(actTask, taskDate); taskList.add(currTask); storage.updateData(taskList); - System.out.println("Got it. I've added this task:\n" + - " " + currTask.toString() + "\n" + - "Now you have " + taskList.size() + " tasks in the list.\n"); + response = "Got it. I've added this task:\n" + + " " + currTask + "\n" + "Now you have " + + taskList.size() + " tasks in the list.\n"; + System.out.println(response); + return response; } } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } } diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index 2ac77d0dd1..4802f1278b 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -41,7 +41,8 @@ public boolean isExit() { * @param storage The Storage used to store the tasks. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) { + public String execute(TaskList taskList, Ui ui, Storage storage) { ui.showGoodbye(); + return "Bye. Hope to see you again soon!"; } } diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index 4dbd15fc18..79cd7b5705 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -27,5 +27,5 @@ public abstract class Command { * @param ui The Ui that interacts with the next command from the user. * @param storage The Storage used to store the tasks. */ - public abstract void execute(TaskList taskList, Ui ui, Storage storage); + public abstract String execute(TaskList taskList, Ui ui, Storage storage); } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 7dd7511396..5911e2093d 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -44,7 +44,8 @@ public boolean isExit() { * @throws DukeException If there are no such task in the taskList. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) { + public String execute(TaskList taskList, Ui ui, Storage storage) { + String response = ""; int index = Integer.parseInt(commandLine.substring(7)) - 1; try { if (index > taskList.size() - 1) { @@ -53,12 +54,15 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(index); taskList.remove(index); storage.updateData(taskList); - System.out.println("Noted. I've removed this task:\n" + - " " + task.toString() + "\n" + "Now you have " + - taskList.size() + " tasks in the list.\n"); + response = "Noted. I've removed this task:\n" + + " " + task.toString() + "\n" + "Now you have " + + taskList.size() + " tasks in the list.\n"; + System.out.println(response); + return response; } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } } diff --git a/src/main/java/command/EditCommand.java b/src/main/java/command/EditCommand.java index ec787a6186..40df2c95d8 100644 --- a/src/main/java/command/EditCommand.java +++ b/src/main/java/command/EditCommand.java @@ -44,7 +44,8 @@ public boolean isExit() { * @throws DukeException If there is no such task. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) { + public String execute(TaskList taskList, Ui ui, Storage storage) { + String response = ""; if (commandLine.startsWith("mark")) { int index = Integer.parseInt(commandLine.substring(5)) - 1; try { @@ -54,11 +55,14 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(index); task.isMark(true); storage.updateData(taskList); - System.out.println("Nice! I've marked this task as done:\n" + - " " + task + "\n"); + response = "Nice! I've marked this task as done:\n" + + " " + task + "\n"; + System.out.println(response); + return response; } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } else { int index = Integer.parseInt(commandLine.substring(7)) - 1; @@ -69,11 +73,14 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { Task task = taskList.get(index); task.isMark(false); storage.updateData(taskList); - System.out.println("OK, I've marked this task as not done yet:\n" + - " " + task + "\n"); + response = "OK, I've marked this task as not done yet:\n" + + " " + task + "\n"; + System.out.println(response); + return response; } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } } diff --git a/src/main/java/command/FalseCommand.java b/src/main/java/command/FalseCommand.java index c101e11cd4..6d4794db8d 100644 --- a/src/main/java/command/FalseCommand.java +++ b/src/main/java/command/FalseCommand.java @@ -43,12 +43,12 @@ public boolean isExit() { * @throws DukeException Always. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { try { throw new DukeException("I'm sorry, but I don't know what that means :-(\n"); } catch (DukeException e) { System.out.println(e.toString()); - ui.nextCommand(); + return e.toString(); } } } diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java index 0fbb01f5f9..ed2cd90760 100644 --- a/src/main/java/command/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -37,7 +37,8 @@ public boolean isExit() { * @throws DukeException If the description of task is empty. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws DukeException { + String response = ""; try { if (taskList.size() == 0) { throw new DukeException("There are no tasks in your list. :)"); @@ -55,12 +56,21 @@ public void execute(TaskList taskList, Ui ui, Storage storage) throws DukeExcept throw new DukeException("There is nothing that matches the task."); } else { System.out.println("Here are the matching tasks in your list:"); - tasksFound.forEach(n -> System.out.println((tasksFound.indexOf(n) + 1) + "." - + n.toString())); + tasksFound.forEach(n -> System.out.println((tasksFound.indexOf(n) + 1) + + "." + n.toString())); + response = "Here are the matching tasks in your list:\n"; + for (int j = 0; j < tasksFound.size(); j++) { + Task currTaskFound = tasksFound.get(j); + String currTaskFoundString = currTaskFound.toString(); + response += currTaskFoundString; + } + return response; + } } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } } diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index 894fc6966c..9e545442d4 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -1,6 +1,7 @@ package command; import storage.Storage; +import task.Task; import task.TaskList; import ui.Ui; import exception.DukeException; @@ -42,7 +43,8 @@ public boolean isExit() { * @throws DukeException If the taskList is empty. */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) { + public String execute(TaskList taskList, Ui ui, Storage storage) { + String response = ""; try { if (taskList.size() == 0) { throw new DukeException("There are no tasks in your list. :)"); @@ -50,9 +52,17 @@ public void execute(TaskList taskList, Ui ui, Storage storage) { System.out.println("Here are the tasks in your list:"); taskList.forEach(); System.out.println(); + response = "Here are the tasks in your list:\n"; + for (int i = 0; i < taskList.size(); i++) { + Task currTask = taskList.get(i); + String currTaskString = currTask.toString(); + response += currTaskString; + } + return response; } } catch (DukeException e) { System.out.println(e.toString()); + return e.toString(); } } } diff --git a/src/main/java/dateformat/DateFormat.java b/src/main/java/dateformat/DateFormat.java index a9c68addf3..d451aedc74 100644 --- a/src/main/java/dateformat/DateFormat.java +++ b/src/main/java/dateformat/DateFormat.java @@ -75,7 +75,7 @@ public void dateAndTimeFormatter() { String afterMonth; if (afterMonthSlashIndex == 1) { month = "0" + afterDay.charAt(0); - afterMonth = afterDay.substring(afterDaySlashIndex + 1); + afterMonth = afterDay.substring(afterMonthSlashIndex + 1); } else { month = afterDay.substring(0, 2); afterMonth = afterDay.substring(afterMonthSlashIndex + 1); @@ -88,6 +88,7 @@ public void dateAndTimeFormatter() { time = afterMonth.substring(5); } } + } else if (afterBy.indexOf("/") == 3) { month = afterBy.substring(0, 3); int afterMonthSlashIndex = afterBy.indexOf("/"); @@ -139,7 +140,7 @@ public void dateAndTimeFormatter() { } } } else if (this.afterBy.contains("-")) { - if (this.afterBy.indexOf("-") < 2) { + if (this.afterBy.indexOf("-") <= 2) { int afterDayDashIndex = afterBy.indexOf("-"); String afterDay; if (afterDayDashIndex == 1) { @@ -217,8 +218,10 @@ public void dateAndTimeFormatter() { } } } else { - afterBy = afterBy.substring(1); // When read from text file, it has an extra ":". - if (this.afterBy.indexOf(" ") < 2) { + if (afterBy.contains(":")) { + afterBy = afterBy.substring(1); // When read from text file, it has an extra ":". + } + if (this.afterBy.indexOf(" ") <= 2) { int afterDaySpaceIndex = afterBy.indexOf(" "); String afterDay; if (afterDaySpaceIndex == 1) { @@ -245,7 +248,9 @@ public void dateAndTimeFormatter() { time = afterMonth.substring(5); } } - month = months.get(month.toUpperCase()); + if (!month.contains("1") && !month.contains("0")) { + month = months.get(month.toUpperCase()); + } } else if (afterBy.indexOf(" ") == 3) { month = afterBy.substring(0, 3); int afterMonthSpaceIndex = afterBy.indexOf(" "); @@ -267,7 +272,10 @@ public void dateAndTimeFormatter() { time = afterDay.substring(5); } } - month = months.get(month.toUpperCase()); + if (!month.contains("1") && !month.contains("0")) { + month = months.get(month.toUpperCase()); + } + } else { year = afterBy.substring(0, 4); int afterYearSpaceIndex = afterBy.indexOf(" "); @@ -296,7 +304,9 @@ public void dateAndTimeFormatter() { time = afterDay.substring(5); } } - month = months.get(month.toUpperCase()); + if (!month.contains("1") && !month.contains("0")) { + month = months.get(month.toUpperCase()); + } } } if (month.length() == 1) { @@ -364,7 +374,7 @@ public String toString() { } public static void main(String args[]) { - DateFormat d4 = new DateFormat("Feb 10 2022 1800"); + DateFormat d4 = new DateFormat("30 08 2022 1800"); System.out.println(d4.formatDate("MMM d yyyy")); System.out.println(d4.formatTime()); } diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index f963922a91..5db9a1ed4d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -14,11 +14,9 @@ public class Duke { private Ui ui; public Duke(String filePath) { - System.out.println("Hello! I'm Duke.\nWhat can I do for you?\n"); storage = new Storage(filePath); try { tasks = new TaskList(storage.load()); - ui = new Ui(); } catch (DukeException e) { ui.showLoadingError(); tasks = new TaskList(); @@ -44,6 +42,13 @@ public void run() { } } + public String getResponse(String input) { + Parser parser = new Parser(input); + Command c = parser.parse(input); + String response = c.execute(tasks, ui, storage); + return response; + } + public static void main(String[] args) { new Duke("tasks.txt").run(); } diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java new file mode 100644 index 0000000000..5483e63637 --- /dev/null +++ b/src/main/java/duke/Launcher.java @@ -0,0 +1,12 @@ +package duke; + +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/duke/Main.java b/src/main/java/duke/Main.java new file mode 100644 index 0000000000..94446c08d5 --- /dev/null +++ b/src/main/java/duke/Main.java @@ -0,0 +1,37 @@ +package duke; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; + +import GUI.MainWindow; +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("tasks.txt"); + + @Override + public void start(Stage stage) { + try { + Path path = Paths.get("MainWindow.fxml"); + System.out.println(path.toAbsolutePath()); + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setTitle("DontTouchMeDuck"); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/exception/DukeException.java b/src/main/java/exception/DukeException.java index e147a5bb35..1bc1cb36e5 100644 --- a/src/main/java/exception/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,6 +1,6 @@ package exception; -public class DukeException extends IllegalArgumentException{ +public class DukeException extends IllegalArgumentException { protected String message; public DukeException(String message) { diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java index 29f05b7b92..5f7b6a1c30 100644 --- a/src/main/java/parser/Parser.java +++ b/src/main/java/parser/Parser.java @@ -1,6 +1,13 @@ package parser; -import command.*; +import command.Command; +import command.AddCommand; +import command.ByeCommand; +import command.DeleteCommand; +import command.EditCommand; +import command.FalseCommand; +import command.FindCommand; +import command.ListCommand; /** * Represents a parser to parse commands from @@ -36,8 +43,9 @@ public Command parse(String fullCommand) { return new DeleteCommand(fullCommand); } else if (fullCommand.startsWith("mark") || fullCommand.startsWith("unmark")) { return new EditCommand(fullCommand); - } else if (fullCommand.startsWith("todo") || fullCommand.startsWith("deadline") || - fullCommand.startsWith("event")) { + } else if (fullCommand.startsWith("todo") + || fullCommand.startsWith("deadline") + || fullCommand.startsWith("event")) { return new AddCommand(fullCommand); } else if (fullCommand.startsWith("find")) { return new FindCommand(fullCommand); diff --git a/src/main/java/ui/Ui.java b/src/main/java/ui/Ui.java index 4f535dcf2b..4efe4ef403 100644 --- a/src/main/java/ui/Ui.java +++ b/src/main/java/ui/Ui.java @@ -9,8 +9,8 @@ public class Ui { protected String nextCommand; public Ui() { + System.out.println("Hello! I'm Duke.\nWhat can I do for you?\n"); this.in = new Scanner(System.in); - this.nextCommand = in.nextLine(); } public void showWelcome() { @@ -22,7 +22,7 @@ public void showGoodbye() { } public String readCommand() { - return this.nextCommand; + return this.in.nextLine(); } public void changeCommand() { diff --git a/src/main/resources/images/DaDuke.png b/src/main/resources/images/DaDuke.png new file mode 100644 index 0000000000000000000000000000000000000000..91883d1f3dcfe0f2342ad8aebd3a6ff679117a71 GIT binary patch literal 16526 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 + + + + + + + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..6c4613298f --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +