From 556af3f47a96b32898ab4cdbd65b16486a4871e8 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/32] 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 e9a7c041f0ecf53d49e9f8679e93d7acae72906d Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Thu, 19 Jan 2023 13:12:07 +0800 Subject: [PATCH 02/32] Level-1: Implemented echo --- src/main/java/Duke.java | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..101f31d65c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,5 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -6,5 +8,28 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + System.out.println("Welcome welcome!"); + echo(); } + + public static void echo() { + System.out.println("Start by typing something and Dukey will echo!! Type bye to exit!! "); + Scanner scanner = new Scanner(System.in); + while (true) { + String input = scanner.nextLine(); + if (input.equals("bye")) { + break; + } + System.out.println("Dukey: " + input); + if (input.equals("Bye")) { + System.out.println("Dukey: Did you mean 'bye'? Type 'bye' to exit!!"); + } + } + System.out.println("\nDukey: Goodbye!! Please return to Dukey again soon!! :) "); + scanner.close(); + + } + + + } From fe9f60725794ee50543d43c99005e438b7b637fc Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Thu, 19 Jan 2023 16:29:02 +0800 Subject: [PATCH 03/32] Level-2 add list --- src/main/java/Duke.java | 35 +++++++++++++++++++++++++++++++++-- src/main/java/Item.java | 25 +++++++++++++++++++++++++ src/main/java/ItemList.java | 20 ++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/main/java/Item.java create mode 100644 src/main/java/ItemList.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 101f31d65c..f0a8955896 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,9 @@ import java.util.Scanner; +import java.util.ArrayList; public class Duke { + public static final String BYE_MESSAGE = "Goodbye!! Please return to Dukey again soon!! :)"; + public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -9,7 +12,8 @@ public static void main(String[] args) { + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); System.out.println("Welcome welcome!"); - echo(); + initiateToDo(); + //echo(); } public static void echo() { @@ -25,11 +29,38 @@ public static void echo() { System.out.println("Dukey: Did you mean 'bye'? Type 'bye' to exit!!"); } } - System.out.println("\nDukey: Goodbye!! Please return to Dukey again soon!! :) "); + System.out.println("\nDukey: " + BYE_MESSAGE); scanner.close(); } + public static void initiateToDo() { + System.out.println("DukeyList: Type something and Dukey will add it to the list!! Type 'list' to view the list! Type 'bye' to exit!! "); + ItemList itemList = new ItemList(); + Scanner scanner = new Scanner(System.in); + while (true) { + String input = scanner.nextLine(); + if (input.equals("bye")) { + System.out.println("DukeyList: " + BYE_MESSAGE); + break; + } + if (input.equals("list")) { + System.out.println("DukeyList:"); + itemList.readList(); + continue; + } + + itemList.addItem(new Item(input)); + System.out.println("DukeyList just added: " + input); + + } + + } + + + + + } diff --git a/src/main/java/Item.java b/src/main/java/Item.java new file mode 100644 index 0000000000..b15aba8c36 --- /dev/null +++ b/src/main/java/Item.java @@ -0,0 +1,25 @@ +public class Item { + private String name; + private Boolean done; + + public Item(String name) { + this.name = name; + this.done = false; + } + + public String getName() { + return this.name; + } + + public Boolean isDone() { + return this.done; + } + + @Override + public String toString() { + return this.name; + } + + + +} diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java new file mode 100644 index 0000000000..0ff50d294a --- /dev/null +++ b/src/main/java/ItemList.java @@ -0,0 +1,20 @@ +import java.util.ArrayList; +import java.util.Iterator; + +public class ItemList { + private ArrayList list; + + public ItemList() { + this.list = new ArrayList(); + } + + public void addItem(Item item) { + this.list.add(item); + } + + public void readList() { + //this.list.forEach(x -> System.out.println(list.indexOf(x) + x.toString())); + Iterator it = this.list.iterator(); + it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); + } +} From 8e93d2ff6d6b8a8449b2f35db0d38a68595487d8 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Thu, 19 Jan 2023 17:43:21 +0800 Subject: [PATCH 04/32] Level-3 Implemented mark as done --- src/main/java/Duke.java | 16 ++++++++++++++-- src/main/java/Item.java | 13 ++++++++++++- src/main/java/ItemList.java | 17 ++++++++++++++++- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f0a8955896..7daee6729c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -40,7 +40,18 @@ public static void initiateToDo() { ItemList itemList = new ItemList(); Scanner scanner = new Scanner(System.in); while (true) { - String input = scanner.nextLine(); + String input = scanner.next(); + if (input.equals("mark")) { + int itemNumber = scanner.nextInt() - 1; + itemList.mark(itemNumber); + continue; + } + if (input.equals("unmark")) { + int itemNumber = scanner.nextInt() - 1; + itemList.unmark(itemNumber); + continue; + } + input = input + scanner.nextLine(); if (input.equals("bye")) { System.out.println("DukeyList: " + BYE_MESSAGE); break; @@ -51,8 +62,9 @@ public static void initiateToDo() { continue; } + itemList.addItem(new Item(input)); - System.out.println("DukeyList just added: " + input); + } diff --git a/src/main/java/Item.java b/src/main/java/Item.java index b15aba8c36..522a4a0344 100644 --- a/src/main/java/Item.java +++ b/src/main/java/Item.java @@ -15,9 +15,20 @@ public Boolean isDone() { return this.done; } + public void markAsDone() { + this.done = true; + } + + public void unmark() { + this.done = false; + } + @Override public String toString() { - return this.name; + if (this.isDone()) { + return "[X] " + this.getName(); + } + return "[ ] " + this.name; } diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index 0ff50d294a..d874b96893 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -5,11 +5,12 @@ public class ItemList { private ArrayList list; public ItemList() { - this.list = new ArrayList(); + this.list = new ArrayList<>(); } public void addItem(Item item) { this.list.add(item); + System.out.println("DukeyList just added: " + item.toString()); } public void readList() { @@ -17,4 +18,18 @@ public void readList() { Iterator it = this.list.iterator(); it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); } + + public void mark(int itemNumber) { + Item itemToMark = this.list.get(itemNumber); + itemToMark.markAsDone(); + System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been mark as done!"); + System.out.println((itemNumber + 1) + ". " + itemToMark); + } + + public void unmark(int itemNumber) { + Item itemToUnmark = this.list.get(itemNumber); + itemToUnmark.unmark(); + System.out.println("DukeyList: Item number " + (1 + itemNumber) + " has been unmarked!"); + System.out.println((itemNumber + 1) + ". " + itemToUnmark); + } } From a4cbe725b56c9fbd7a61d3141d7b154cc34d4aef Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Fri, 20 Jan 2023 17:06:26 +0800 Subject: [PATCH 05/32] Level-4 implemented todo, deadlines, events --- src/main/java/Deadlines.java | 22 +++++++++++++++++++++ src/main/java/Duke.java | 38 ++++++++++++++++++++++++++++-------- src/main/java/Event.java | 27 +++++++++++++++++++++++++ src/main/java/Item.java | 4 ++++ src/main/java/ItemList.java | 2 +- src/main/java/ToDo.java | 22 +++++++++++++++++++++ 6 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 src/main/java/Deadlines.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/ToDo.java diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java new file mode 100644 index 0000000000..3c95c9a584 --- /dev/null +++ b/src/main/java/Deadlines.java @@ -0,0 +1,22 @@ +public class Deadlines extends Item { + private static final String TYPE = "[D]"; + private String deadline; + + public Deadlines(String name, String deadline) { + super(name); + this.deadline = deadline; + } + + @Override + public String messageWhenAdded() { + return "DukeyList just added a new deadline:"; + } + + @Override + public String toString() { + if (this.isDone()) { + return TYPE + "[X] " + this.getName() + " (" + this.deadline + ")"; + } + return TYPE + "[ ] " + this.getName() + " (" + this.deadline + ")"; + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7daee6729c..2f7435318d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,4 @@ import java.util.Scanner; -import java.util.ArrayList; public class Duke { public static final String BYE_MESSAGE = "Goodbye!! Please return to Dukey again soon!! :)"; @@ -12,7 +11,7 @@ public static void main(String[] args) { + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); System.out.println("Welcome welcome!"); - initiateToDo(); + initiateDukeyList(); //echo(); } @@ -35,37 +34,60 @@ public static void echo() { } - public static void initiateToDo() { + public static void initiateDukeyList() { System.out.println("DukeyList: Type something and Dukey will add it to the list!! Type 'list' to view the list! Type 'bye' to exit!! "); ItemList itemList = new ItemList(); Scanner scanner = new Scanner(System.in); while (true) { String input = scanner.next(); + + //add a new todo + if (input.equals("todo")) { + itemList.addItem(new ToDo(scanner.nextLine())); + continue; + } + + //add a new deadline + if (input.equals("deadline")) { + String[] details = scanner.nextLine().split("/"); + itemList.addItem(new Deadlines(details[0], details[1])); + continue; + } + + //add a new event + if (input.equals("event")) { + String[] details = scanner.nextLine().split("/"); + itemList.addItem(new Event(details[0], details[1], details[2])); + continue; + } + + //mark if (input.equals("mark")) { int itemNumber = scanner.nextInt() - 1; itemList.mark(itemNumber); continue; } + + //unmark if (input.equals("unmark")) { int itemNumber = scanner.nextInt() - 1; itemList.unmark(itemNumber); continue; } - input = input + scanner.nextLine(); + + //exit if (input.equals("bye")) { System.out.println("DukeyList: " + BYE_MESSAGE); break; } + + //list if (input.equals("list")) { System.out.println("DukeyList:"); itemList.readList(); continue; } - - itemList.addItem(new Item(input)); - - } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..a724bf9ebb --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,27 @@ +public class Event extends Item { + private static final String TYPE = "[E]"; + private String start; + private String end; + + public Event(String name, String start, String end) { + super(name); + this.start = start; + this.end = end; + } + + @Override + public String messageWhenAdded() { + return "DukeyList just added a new event:"; + } + + @Override + public String toString() { + if (this.isDone()) { + return TYPE + "[X] " + this.getName() + " (" + this.start + " to " + this.end + ")"; + } + return TYPE + "[ ] " + this.getName() + " (" + this.start + " to " + this.end + ")"; + } + + + +} diff --git a/src/main/java/Item.java b/src/main/java/Item.java index 522a4a0344..da21e57511 100644 --- a/src/main/java/Item.java +++ b/src/main/java/Item.java @@ -23,6 +23,10 @@ public void unmark() { this.done = false; } + public String messageWhenAdded() { + return "DukeyList just added a new item: "; + } + @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index d874b96893..310ff21cae 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -10,7 +10,7 @@ public ItemList() { public void addItem(Item item) { this.list.add(item); - System.out.println("DukeyList just added: " + item.toString()); + System.out.println(item.messageWhenAdded() + " " + item.toString()); } public void readList() { diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java new file mode 100644 index 0000000000..41f5a55a6b --- /dev/null +++ b/src/main/java/ToDo.java @@ -0,0 +1,22 @@ +public class ToDo extends Item { + private static final String TYPE = "[T]"; + public ToDo(String name) { + super(name); + } + + + @Override + public String messageWhenAdded() { + return "DukeyList just added a new todo:"; + } + + @Override + public String toString() { + if (this.isDone()) { + return TYPE + "[X]" + " " + this.getName(); + } + + return TYPE + "[ ]" + " " + this.getName(); + } +} + From ea90da7fd088b1bc6282a56e505b2abe1fb9033f Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Mon, 30 Jan 2023 17:31:30 +0800 Subject: [PATCH 06/32] implement Level-5: handle errors --- src/main/java/Duke.java | 72 ++++++++++++++++++++++++++++++++++--- src/main/java/Error.java | 34 ++++++++++++++++++ src/main/java/ItemList.java | 27 +++++++++++++- 3 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 src/main/java/Error.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2f7435318d..e193d663c1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,7 @@ import java.util.Scanner; +import static java.lang.Integer.parseInt; + public class Duke { public static final String BYE_MESSAGE = "Goodbye!! Please return to Dukey again soon!! :)"; @@ -35,7 +37,8 @@ public static void echo() { public static void initiateDukeyList() { - System.out.println("DukeyList: Type something and Dukey will add it to the list!! Type 'list' to view the list! Type 'bye' to exit!! "); + //System.out.println("DukeyList: Type something and Dukey will add it to the list!! Type 'list' to view the list! Type 'bye' to exit!! "); + ItemList.printInstruction(); ItemList itemList = new ItemList(); Scanner scanner = new Scanner(System.in); while (true) { @@ -43,13 +46,34 @@ public static void initiateDukeyList() { //add a new todo if (input.equals("todo")) { - itemList.addItem(new ToDo(scanner.nextLine())); + String restOfInput = scanner.nextLine(); + restOfInput = restOfInput.strip(); + if (restOfInput.equals("")) { + Error.raiseEmptyDescriptionError("todo"); + continue; + } + itemList.addItem(new ToDo(restOfInput)); continue; } //add a new deadline if (input.equals("deadline")) { String[] details = scanner.nextLine().split("/"); + if (details.length != 2) { + Error.raiseIncorrectFormatError(); + continue; + } + for (int i = 0; i < 2; i += 1) { + details[i] = details[i].strip(); + } + if (details[1].equals("")) { + Error.raiseMissingDeadlineError(); + continue; + } + if (details[0].equals("")) { + Error.raiseEmptyDescriptionError("deadline"); + continue; + } itemList.addItem(new Deadlines(details[0], details[1])); continue; } @@ -57,20 +81,58 @@ public static void initiateDukeyList() { //add a new event if (input.equals("event")) { String[] details = scanner.nextLine().split("/"); + if (details.length != 3) { + Error.raiseIncorrectFormatError(); + } + for (int i = 0; i < 3; i += 1) { + details[i] = details[i].strip(); + } + if (details[0].equals("")) { + Error.raiseEmptyDescriptionError("event"); + } + if (details[1].equals("") || details[2].equals("")) { + Error.raiseMissingEventTimeError(); + } itemList.addItem(new Event(details[0], details[1], details[2])); continue; } //mark if (input.equals("mark")) { - int itemNumber = scanner.nextInt() - 1; + String restOfInput = scanner.nextLine(); + if (restOfInput.isEmpty()) { + Error.raiseMissingIndexError(); + continue; + } + int itemNumber = parseInt(restOfInput.strip()) - 1; + if (itemNumber >= itemList.getSize()) { + Error.raiseInvalidTaskNumberError(itemList.getSize()); + continue; + } + if (itemNumber < 0) { + Error.raiseIndexError(); + continue; + } itemList.mark(itemNumber); continue; } //unmark if (input.equals("unmark")) { - int itemNumber = scanner.nextInt() - 1; + String restOfInput = scanner.nextLine(); + if (restOfInput.isEmpty()) { + Error.raiseMissingIndexError(); + continue; + } + int itemNumber = parseInt(restOfInput.strip()) - 1; + if (itemNumber >= itemList.getSize()) { + Error.raiseInvalidTaskNumberError(itemList.getSize()); + continue; + } + if (itemNumber < 0) { + Error.raiseIndexError(); + continue; + } itemList.unmark(itemNumber); continue; } @@ -88,6 +150,8 @@ public static void initiateDukeyList() { continue; } + Error.raiseWrongCommandError(); + } } diff --git a/src/main/java/Error.java b/src/main/java/Error.java new file mode 100644 index 0000000000..c4f2313857 --- /dev/null +++ b/src/main/java/Error.java @@ -0,0 +1,34 @@ +public class Error { + public static void raiseEmptyDescriptionError(String type) { + System.out.println("Error! The description of a " + type + " cannot be empty."); + } + + public static void raiseWrongCommandError() { + System.out.println("Error! Invalid Command!"); + } + + public static void raiseMissingDeadlineError() { + System.out.println("Error! Missing Deadline!"); + } + + public static void raiseIncorrectFormatError() { + System.out.println("Error! The format of the command is incorrect!"); + } + + public static void raiseMissingEventTimeError() { + System.out.println("Error! Missing event timings!"); + } + + public static void raiseInvalidTaskNumberError(int size) { + System.out.println("Error! Invalid task number! DukeyList only has " + size + " number of tasks."); + } + + public static void raiseIndexError() { + System.out.println("Error! Task index invalid."); + } + + public static void raiseMissingIndexError() { + System.out.println("Error! Task index missing."); + } + +} diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index 310ff21cae..266a74add5 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -11,6 +11,7 @@ public ItemList() { public void addItem(Item item) { this.list.add(item); System.out.println(item.messageWhenAdded() + " " + item.toString()); + printSize(); } public void readList() { @@ -22,7 +23,7 @@ public void readList() { public void mark(int itemNumber) { Item itemToMark = this.list.get(itemNumber); itemToMark.markAsDone(); - System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been mark as done!"); + System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been marked as done!"); System.out.println((itemNumber + 1) + ". " + itemToMark); } @@ -32,4 +33,28 @@ public void unmark(int itemNumber) { System.out.println("DukeyList: Item number " + (1 + itemNumber) + " has been unmarked!"); System.out.println((itemNumber + 1) + ". " + itemToUnmark); } + + public int getSize() { + return list.size(); + } + + public void printSize() { + if (getSize() == 1){ + System.out.println("DukeyList now has 1 task."); + } else { + System.out.println("DukeyList now has " + getSize() + " tasks."); + } + + } + + public static void printInstruction() { + System.out.println("DukeyList: Welcome to DukeyList!! The instructions are as follows:"); + System.out.println("To list: 'list'"); + System.out.println("To exit: 'bye'"); + System.out.println("To add a todo: 'todo '"); + System.out.println("To add a deadline: 'deadline / '"); + System.out.println("To add an event: 'event / / '"); + System.out.println("To mark a task as done: 'mark '"); + System.out.println("To unmark a task: 'unmark '"); + } } From 5e5301172b4ced8ed453536e6912b0e15d127b55 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Mon, 30 Jan 2023 20:22:10 +0800 Subject: [PATCH 07/32] implement Level-6: delete tasks --- src/main/java/Duke.java | 24 ++++++++++++++++++++++++ src/main/java/ItemList.java | 8 ++++++++ text-ui-test/EXPECTED.TXT | 8 +------- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e193d663c1..caf1d30ba5 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -83,15 +83,19 @@ public static void initiateDukeyList() { String[] details = scanner.nextLine().split("/"); if (details.length != 3) { Error.raiseIncorrectFormatError(); + continue; } for (int i = 0; i < 3; i += 1) { details[i] = details[i].strip(); } if (details[0].equals("")) { Error.raiseEmptyDescriptionError("event"); + continue; } if (details[1].equals("") || details[2].equals("")) { Error.raiseMissingEventTimeError(); + continue; + } itemList.addItem(new Event(details[0], details[1], details[2])); continue; @@ -137,6 +141,26 @@ public static void initiateDukeyList() { continue; } + //delete + if (input.equals("delete")) { + String restOfInput = scanner.nextLine(); + if (restOfInput.isEmpty()) { + Error.raiseMissingIndexError(); + continue; + } + int itemNumber = parseInt(restOfInput.strip()) - 1; + if (itemNumber >= itemList.getSize()) { + Error.raiseInvalidTaskNumberError(itemList.getSize()); + continue; + } + if (itemNumber < 0) { + Error.raiseIndexError(); + continue; + } + itemList.delete(itemNumber); + continue; + } + //exit if (input.equals("bye")) { System.out.println("DukeyList: " + BYE_MESSAGE); diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index 266a74add5..cce6401bd0 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -34,6 +34,14 @@ public void unmark(int itemNumber) { System.out.println((itemNumber + 1) + ". " + itemToUnmark); } + public void delete(int itemNumber) { + Item itemToRemove = list.get(itemNumber); + System.out.println("DukeyList: The following item has been removed!"); + System.out.println(itemToRemove.toString()); + list.remove(itemNumber); + this.printSize(); + } + public int getSize() { return list.size(); } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..b14df6442e 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - +Hi From 03f005fc41b01e4ffe0c6822b3f936bdfe47d59c Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Wed, 15 Feb 2023 17:27:41 +0800 Subject: [PATCH 08/32] add improvements to error catching --- src/main/java/Deadlines.java | 22 +++++- src/main/java/Duke.java | 126 +++++++++--------------------- src/main/java/DukeyException.java | 14 ++++ src/main/java/Error.java | 34 -------- src/main/java/Event.java | 22 ++++++ src/main/java/Item.java | 2 + src/main/java/ItemList.java | 76 +++++++++++++++--- src/main/java/ToDo.java | 11 +++ 8 files changed, 169 insertions(+), 138 deletions(-) create mode 100644 src/main/java/DukeyException.java delete mode 100644 src/main/java/Error.java diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index 3c95c9a584..a35bcdce2e 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -1,3 +1,5 @@ +import java.util.Scanner; + public class Deadlines extends Item { private static final String TYPE = "[D]"; private String deadline; @@ -7,6 +9,22 @@ public Deadlines(String name, String deadline) { this.deadline = deadline; } + public static Deadlines createDeadline(Scanner scanner) throws DukeyException { + System.out.print("Deadline task name: "); + String deadlineName = scanner.nextLine(); + if (deadlineName.equals("")) { + throw new DukeyException("Error!! Deadline task name cannot be empty!!"); + } + System.out.print("Deadline: "); + String deadlineTime = scanner.nextLine(); + if (deadlineTime.equals("")) { + throw new DukeyException("Error!! Deadline time cannot be empty!!"); + } + + return new Deadlines(deadlineName.strip(), deadlineTime.strip()); + + } + @Override public String messageWhenAdded() { return "DukeyList just added a new deadline:"; @@ -15,8 +33,8 @@ public String messageWhenAdded() { @Override public String toString() { if (this.isDone()) { - return TYPE + "[X] " + this.getName() + " (" + this.deadline + ")"; + return TYPE + "[X] " + this.getName() + " (by " + this.deadline + ")"; } - return TYPE + "[ ] " + this.getName() + " (" + this.deadline + ")"; + return TYPE + "[ ] " + this.getName() + " (by " + this.deadline + ")"; } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index caf1d30ba5..231ba0a266 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,6 +17,7 @@ public static void main(String[] args) { //echo(); } + public static void echo() { System.out.println("Start by typing something and Dukey will echo!! Type bye to exit!! "); Scanner scanner = new Scanner(System.in); @@ -41,123 +42,68 @@ public static void initiateDukeyList() { ItemList.printInstruction(); ItemList itemList = new ItemList(); Scanner scanner = new Scanner(System.in); - while (true) { - String input = scanner.next(); + while (true) { + System.out.println("_________________________________________________________"); + System.out.print("Dukey command: "); + String input = scanner.nextLine(); //add a new todo - if (input.equals("todo")) { - String restOfInput = scanner.nextLine(); - restOfInput = restOfInput.strip(); - if (restOfInput.equals("")) { - Error.raiseEmptyDescriptionError("todo"); - continue; + if (input.strip().equals("todo")) { + try { + itemList.addItem(ToDo.createToDo(scanner)); + } catch(DukeyException e) { + e.printMessage(); } - itemList.addItem(new ToDo(restOfInput)); continue; } //add a new deadline - if (input.equals("deadline")) { - String[] details = scanner.nextLine().split("/"); - if (details.length != 2) { - Error.raiseIncorrectFormatError(); - continue; - } - for (int i = 0; i < 2; i += 1) { - details[i] = details[i].strip(); + if (input.strip().equals("deadline")) { + try { + itemList.addItem(Deadlines.createDeadline(scanner)); + } catch (DukeyException e) { + e.printMessage(); } - if (details[1].equals("")) { - Error.raiseMissingDeadlineError(); - continue; - } - if (details[0].equals("")) { - Error.raiseEmptyDescriptionError("deadline"); - continue; - } - itemList.addItem(new Deadlines(details[0], details[1])); continue; } //add a new event - if (input.equals("event")) { - String[] details = scanner.nextLine().split("/"); - if (details.length != 3) { - Error.raiseIncorrectFormatError(); - continue; - } - for (int i = 0; i < 3; i += 1) { - details[i] = details[i].strip(); - } - if (details[0].equals("")) { - Error.raiseEmptyDescriptionError("event"); - continue; + if (input.strip().equals("event")) { + try { + itemList.addItem(Event.createEvent(scanner)); + } catch (DukeyException e) { + e.printMessage(); } - if (details[1].equals("") || details[2].equals("")) { - Error.raiseMissingEventTimeError(); - continue; - - } - itemList.addItem(new Event(details[0], details[1], details[2])); continue; } //mark - if (input.equals("mark")) { - String restOfInput = scanner.nextLine(); - if (restOfInput.isEmpty()) { - Error.raiseMissingIndexError(); - continue; - } - int itemNumber = parseInt(restOfInput.strip()) - 1; - if (itemNumber >= itemList.getSize()) { - Error.raiseInvalidTaskNumberError(itemList.getSize()); - continue; + if (input.strip().equals("mark")) { + try { + itemList.mark(scanner); + } catch (DukeyException e) { + e.printMessage(); } - if (itemNumber < 0) { - Error.raiseIndexError(); - continue; - } - itemList.mark(itemNumber); continue; } //unmark - if (input.equals("unmark")) { - String restOfInput = scanner.nextLine(); - if (restOfInput.isEmpty()) { - Error.raiseMissingIndexError(); - continue; - } - int itemNumber = parseInt(restOfInput.strip()) - 1; - if (itemNumber >= itemList.getSize()) { - Error.raiseInvalidTaskNumberError(itemList.getSize()); - continue; + if (input.strip().equals("unmark")) { + try { + itemList.unmark(scanner); + } catch (DukeyException e) { + e.printMessage(); } - if (itemNumber < 0) { - Error.raiseIndexError(); - continue; - } - itemList.unmark(itemNumber); continue; } //delete if (input.equals("delete")) { - String restOfInput = scanner.nextLine(); - if (restOfInput.isEmpty()) { - Error.raiseMissingIndexError(); - continue; - } - int itemNumber = parseInt(restOfInput.strip()) - 1; - if (itemNumber >= itemList.getSize()) { - Error.raiseInvalidTaskNumberError(itemList.getSize()); - continue; + try { + itemList.delete(scanner); + } catch (DukeyException e) { + e.printMessage(); } - if (itemNumber < 0) { - Error.raiseIndexError(); - continue; - } - itemList.delete(itemNumber); continue; } @@ -169,14 +115,14 @@ public static void initiateDukeyList() { //list if (input.equals("list")) { - System.out.println("DukeyList:"); itemList.readList(); continue; } - Error.raiseWrongCommandError(); + System.out.println("Error! Unknown command. Try again!"); } + scanner.close(); } diff --git a/src/main/java/DukeyException.java b/src/main/java/DukeyException.java new file mode 100644 index 0000000000..dd8fb6fbe7 --- /dev/null +++ b/src/main/java/DukeyException.java @@ -0,0 +1,14 @@ +public class DukeyException extends Exception { + + public DukeyException(String message) { + super(message); + } + + public void printMessage() { + System.out.println(this.getMessage()); + System.out.println("__________________________(-o-)__________________________"); + } + + + +} diff --git a/src/main/java/Error.java b/src/main/java/Error.java deleted file mode 100644 index c4f2313857..0000000000 --- a/src/main/java/Error.java +++ /dev/null @@ -1,34 +0,0 @@ -public class Error { - public static void raiseEmptyDescriptionError(String type) { - System.out.println("Error! The description of a " + type + " cannot be empty."); - } - - public static void raiseWrongCommandError() { - System.out.println("Error! Invalid Command!"); - } - - public static void raiseMissingDeadlineError() { - System.out.println("Error! Missing Deadline!"); - } - - public static void raiseIncorrectFormatError() { - System.out.println("Error! The format of the command is incorrect!"); - } - - public static void raiseMissingEventTimeError() { - System.out.println("Error! Missing event timings!"); - } - - public static void raiseInvalidTaskNumberError(int size) { - System.out.println("Error! Invalid task number! DukeyList only has " + size + " number of tasks."); - } - - public static void raiseIndexError() { - System.out.println("Error! Task index invalid."); - } - - public static void raiseMissingIndexError() { - System.out.println("Error! Task index missing."); - } - -} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index a724bf9ebb..a35c02868c 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,3 +1,5 @@ +import java.util.Scanner; + public class Event extends Item { private static final String TYPE = "[E]"; private String start; @@ -9,6 +11,26 @@ public Event(String name, String start, String end) { this.end = end; } + public static Event createEvent(Scanner scanner) throws DukeyException{ + System.out.print("Event name: "); + String eventName = scanner.nextLine(); + if (eventName.equals("")) { + throw new DukeyException("Error! Event name cannot be empty!"); + } + System.out.print("Event start time: "); + String eventStart = scanner.nextLine(); + if (eventStart.equals("")) { + throw new DukeyException("Error! Please provide a start time!"); + } + System.out.print("Event end time: "); + String eventEnd = scanner.nextLine(); + if (eventEnd.equals("")) { + throw new DukeyException("Error! Please provide an end time!"); + } + + return new Event(eventName, eventStart, eventEnd); + } + @Override public String messageWhenAdded() { return "DukeyList just added a new event:"; diff --git a/src/main/java/Item.java b/src/main/java/Item.java index da21e57511..420b28a009 100644 --- a/src/main/java/Item.java +++ b/src/main/java/Item.java @@ -1,3 +1,5 @@ +import java.util.Scanner; + public class Item { private String name; private Boolean done; diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index cce6401bd0..9aa787bc37 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -1,5 +1,7 @@ +import static java.lang.Integer.parseInt; import java.util.ArrayList; import java.util.Iterator; +import java.util.Scanner; public class ItemList { private ArrayList list; @@ -10,31 +12,80 @@ public ItemList() { public void addItem(Item item) { this.list.add(item); + System.out.println(""); System.out.println(item.messageWhenAdded() + " " + item.toString()); printSize(); } public void readList() { - //this.list.forEach(x -> System.out.println(list.indexOf(x) + x.toString())); - Iterator it = this.list.iterator(); - it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); + if (this.list.isEmpty()) { + System.out.println("DukeyList: DukeyList is empty!"); + } else { + System.out.println("DukeyList:"); + Iterator it = this.list.iterator(); + it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); + } } - public void mark(int itemNumber) { + public void mark(Scanner scanner) throws DukeyException { + System.out.print("Task number: "); + String itemNumberString = scanner.nextLine(); + int itemNumber; + try { + itemNumber = parseInt(itemNumberString.strip()) - 1; + } catch (NumberFormatException e) { + throw new DukeyException("Error! Invalid task number format!"); + } + + if (itemNumber < 0) { + throw new DukeyException("Error! Invalid task number"); + } else if (itemNumber >= this.list.size()) { + throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); + } + Item itemToMark = this.list.get(itemNumber); itemToMark.markAsDone(); System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been marked as done!"); System.out.println((itemNumber + 1) + ". " + itemToMark); } - public void unmark(int itemNumber) { + public void unmark(Scanner scanner) throws DukeyException { + System.out.print("Task number: "); + String itemNumberString = scanner.nextLine(); + int itemNumber; + try { + itemNumber = parseInt(itemNumberString.strip()) - 1; + } catch (NumberFormatException e) { + throw new DukeyException("Error! Invalid task number format!"); + } + + if (itemNumber < 0) { + throw new DukeyException("Error! Invalid task number"); + } else if (itemNumber >= this.list.size()) { + throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); + } Item itemToUnmark = this.list.get(itemNumber); itemToUnmark.unmark(); System.out.println("DukeyList: Item number " + (1 + itemNumber) + " has been unmarked!"); System.out.println((itemNumber + 1) + ". " + itemToUnmark); } - public void delete(int itemNumber) { + public void delete(Scanner scanner) throws DukeyException { + System.out.print("Task number: "); + String itemNumberString = scanner.nextLine(); + int itemNumber; + try { + itemNumber = parseInt(itemNumberString.strip()) - 1; + } catch (NumberFormatException e) { + throw new DukeyException("Error! Invalid task number format!"); + } + + if (itemNumber < 0) { + throw new DukeyException("Error! Invalid task number"); + } else if (itemNumber >= this.list.size()) { + throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); + } + Item itemToRemove = list.get(itemNumber); System.out.println("DukeyList: The following item has been removed!"); System.out.println(itemToRemove.toString()); @@ -56,13 +107,14 @@ public void printSize() { } public static void printInstruction() { - System.out.println("DukeyList: Welcome to DukeyList!! The instructions are as follows:"); + System.out.println("DukeyList: Welcome to DukeyList!! The commands are as follows:"); System.out.println("To list: 'list'"); System.out.println("To exit: 'bye'"); - System.out.println("To add a todo: 'todo '"); - System.out.println("To add a deadline: 'deadline / '"); - System.out.println("To add an event: 'event / / '"); - System.out.println("To mark a task as done: 'mark '"); - System.out.println("To unmark a task: 'unmark '"); + System.out.println("To add a todo: 'todo'"); + System.out.println("To add a deadline: 'deadline'"); + System.out.println("To add an event: 'event'"); + System.out.println("To mark a task as done: 'mark'"); + System.out.println("To unmark a task: 'unmark'"); + System.out.println("To delete a task: 'delete'"); } } diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index 41f5a55a6b..df1ce3305a 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -1,3 +1,5 @@ +import java.util.Scanner; + public class ToDo extends Item { private static final String TYPE = "[T]"; public ToDo(String name) { @@ -5,6 +7,15 @@ public ToDo(String name) { } + public static ToDo createToDo(Scanner scanner) throws DukeyException { + System.out.print("Todo task name: "); + String toDoName = scanner.nextLine(); + if (toDoName.equals("")) { + throw new DukeyException("Error!! ToDo name cannot be empty!"); + } + return new ToDo(toDoName); + } + @Override public String messageWhenAdded() { return "DukeyList just added a new todo:"; From 8c3f19d538716b796069d46f78bac234871377bf Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Fri, 17 Feb 2023 15:26:22 +0800 Subject: [PATCH 09/32] implement level-7 --- DukeySave.txt | 0 src/main/java/Deadlines.java | 21 +++++++++++++ src/main/java/Duke.java | 36 ++++++++++++++++++++-- src/main/java/DukeyFile.java | 33 ++++++++++++++++++++ src/main/java/Event.java | 19 ++++++++++++ src/main/java/Item.java | 14 ++++++++- src/main/java/ItemList.java | 58 ++++++++++++++++++++++++++++++++++-- src/main/java/ToDo.java | 17 +++++++++++ 8 files changed, 192 insertions(+), 6 deletions(-) create mode 100644 DukeySave.txt create mode 100644 src/main/java/DukeyFile.java diff --git a/DukeySave.txt b/DukeySave.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index a35bcdce2e..6ce21ad784 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -9,6 +9,11 @@ public Deadlines(String name, String deadline) { this.deadline = deadline; } + public Deadlines(String name, String deadline, boolean isMarked) { + super(name, isMarked); + this.deadline = deadline; + } + public static Deadlines createDeadline(Scanner scanner) throws DukeyException { System.out.print("Deadline task name: "); String deadlineName = scanner.nextLine(); @@ -25,11 +30,27 @@ public static Deadlines createDeadline(Scanner scanner) throws DukeyException { } + public String getDeadline() { + return this.deadline; + } + + public static Deadlines createDeadlineFromLog(String[] logStringArray) { + String name = logStringArray[2]; + String deadline = logStringArray[3]; + boolean isMarked = !logStringArray[1].equals("0"); + return new Deadlines(name, deadline, isMarked); + } + @Override public String messageWhenAdded() { return "DukeyList just added a new deadline:"; } + @Override + public String getLogString() { + return "D" + "/" + this.isDoneStatus() + "/" + this.getName() + "/" + this.getDeadline(); + } + @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 231ba0a266..adc3c4cc80 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,8 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.Scanner; -import static java.lang.Integer.parseInt; public class Duke { public static final String BYE_MESSAGE = "Goodbye!! Please return to Dukey again soon!! :)"; @@ -38,9 +40,15 @@ public static void echo() { public static void initiateDukeyList() { - //System.out.println("DukeyList: Type something and Dukey will add it to the list!! Type 'list' to view the list! Type 'bye' to exit!! "); + File f = DukeyFile.openFile(); ItemList.printInstruction(); ItemList itemList = new ItemList(); + try { + itemList.initiate(f); + } catch (FileNotFoundException e) { + System.out.println("No saved list found, starting new list."); + } + Scanner scanner = new Scanner(System.in); while (true) { @@ -109,6 +117,7 @@ public static void initiateDukeyList() { //exit if (input.equals("bye")) { + itemList.save(f); System.out.println("DukeyList: " + BYE_MESSAGE); break; } @@ -119,6 +128,29 @@ public static void initiateDukeyList() { continue; } + //save + if (input.equals("save")) { + itemList.save(f); + continue; + } + + //clearlist + if (input.equals("clearList")) { + itemList.clearList(); + continue; + } + + //clearSave + if (input.equals("clearSave")) { + DukeyFile.clearFile(f); + continue; + } + + //forceStop + if (input.equals("forceStop")) { + break; + } + System.out.println("Error! Unknown command. Try again!"); } diff --git a/src/main/java/DukeyFile.java b/src/main/java/DukeyFile.java new file mode 100644 index 0000000000..66c854f9d2 --- /dev/null +++ b/src/main/java/DukeyFile.java @@ -0,0 +1,33 @@ +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +public class DukeyFile { + + public static File openFile() { + File f = new File("DukeySave.txt"); + if (!f.exists()) { + try { + f.createNewFile(); + } catch (IOException e) { + System.out.println("Error! Unable to create file"); + } + } + return f; + } + + public static void writeToFile(File file, String textToAdd) throws IOException { + FileWriter fw = new FileWriter(file, true); + fw.write(textToAdd + "\n"); + fw.close(); + } + + public static void deleteFile(File file) { + file.delete(); + } + + public static void clearFile(File file) { + deleteFile(file); + openFile(); + } +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index a35c02868c..e6a4818155 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -11,6 +11,12 @@ public Event(String name, String start, String end) { this.end = end; } + public Event(String name, String start, String end, boolean isMarked) { + super(name, isMarked); + this.start = start; + this.end = end; + } + public static Event createEvent(Scanner scanner) throws DukeyException{ System.out.print("Event name: "); String eventName = scanner.nextLine(); @@ -31,11 +37,24 @@ public static Event createEvent(Scanner scanner) throws DukeyException{ return new Event(eventName, eventStart, eventEnd); } + public static Event createEventFromLog(String[] logStringArray) { + String name = logStringArray[2]; + String start = logStringArray[3]; + String end = logStringArray[4]; + boolean isMarked = !logStringArray[1].equals("0"); + return new Event(name, start, end, isMarked); + } + @Override public String messageWhenAdded() { return "DukeyList just added a new event:"; } + @Override + public String getLogString() { + return "E" + "/" + isDoneStatus() + "/" + this.getName() + "/" + this.start + "/" + this.end; + } + @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/Item.java b/src/main/java/Item.java index 420b28a009..16bb2e4a3a 100644 --- a/src/main/java/Item.java +++ b/src/main/java/Item.java @@ -1,6 +1,6 @@ import java.util.Scanner; -public class Item { +public abstract class Item { private String name; private Boolean done; @@ -9,6 +9,11 @@ public Item(String name) { this.done = false; } + public Item(String name, boolean isDone) { + this.name = name; + this.done = isDone; + } + public String getName() { return this.name; } @@ -17,6 +22,10 @@ public Boolean isDone() { return this.done; } + public int isDoneStatus() { + return this.isDone() ? 1 : 0; + } + public void markAsDone() { this.done = true; } @@ -29,6 +38,9 @@ public String messageWhenAdded() { return "DukeyList just added a new item: "; } + public abstract String getLogString(); + + @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/ItemList.java b/src/main/java/ItemList.java index 9aa787bc37..34b568e025 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/ItemList.java @@ -1,4 +1,7 @@ +import java.io.File; import static java.lang.Integer.parseInt; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.Scanner; @@ -12,8 +15,8 @@ public ItemList() { public void addItem(Item item) { this.list.add(item); - System.out.println(""); - System.out.println(item.messageWhenAdded() + " " + item.toString()); + System.out.println(); + System.out.println(item.messageWhenAdded() + " " + item); printSize(); } @@ -103,11 +106,57 @@ public void printSize() { } else { System.out.println("DukeyList now has " + getSize() + " tasks."); } + } + + public void clearList() { + this.list.clear(); + System.out.println("DukeyList cleared! DukeyList is now empty."); + } + + public void save(File file) { + DukeyFile.clearFile(file); + Iterator it = this.list.iterator(); + it.forEachRemaining(x -> { + String logString = x.getLogString(); + try { + DukeyFile.writeToFile(file, logString); + } catch (IOException e) { + System.out.println("Error! Unable to save!"); + } + }); + System.out.println("DukeList saved!"); + } + + public void initiate(File file) throws FileNotFoundException { + Scanner fileScanner = new Scanner(file); + while (fileScanner.hasNextLine()) { + String taskLogString = fileScanner.nextLine(); + String[] logStringArray = taskLogString.split("/"); + if (logStringArray[0].equals("T")) { + this.list.add(ToDo.createToDoFromLog(logStringArray)); + } else if (logStringArray[0].equals("D")) { + this.list.add(Deadlines.createDeadlineFromLog(logStringArray)); + } else if (logStringArray[0].equals("E")) { + this.list.add(Event.createEventFromLog(logStringArray)); + } + } + + if (this.list.isEmpty()) { + System.out.println("No tasks saved, starting a new list."); + } else { + System.out.println("Saved list loaded:"); + this.readList(); + } + + } + public void clearSave(File file) { + DukeyFile.deleteFile(file); + System.out.println("DukeyList save has been cleared."); } public static void printInstruction() { - System.out.println("DukeyList: Welcome to DukeyList!! The commands are as follows:"); + System.out.println("DukeyList: Welcome to DukeyList!! To use DukeyList, type the appropriate command and follow the prompts:"); System.out.println("To list: 'list'"); System.out.println("To exit: 'bye'"); System.out.println("To add a todo: 'todo'"); @@ -116,5 +165,8 @@ public static void printInstruction() { System.out.println("To mark a task as done: 'mark'"); System.out.println("To unmark a task: 'unmark'"); System.out.println("To delete a task: 'delete'"); + System.out.println("To clear the list: 'clearList"); + System.out.println("To save the list: 'save'"); + System.out.println("_________________________________________________________"); } } diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index df1ce3305a..b3d5fe4c26 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -1,11 +1,17 @@ +import java.util.Arrays; import java.util.Scanner; public class ToDo extends Item { private static final String TYPE = "[T]"; + public ToDo(String name) { super(name); } + public ToDo(String name, boolean isMarked) { + super(name, isMarked); + } + public static ToDo createToDo(Scanner scanner) throws DukeyException { System.out.print("Todo task name: "); @@ -16,11 +22,22 @@ public static ToDo createToDo(Scanner scanner) throws DukeyException { return new ToDo(toDoName); } + public static ToDo createToDoFromLog(String[] logStringArray) { + String name = logStringArray[2]; + boolean isMarked = !logStringArray[1].equals("0"); + return new ToDo(name, isMarked); + } + @Override public String messageWhenAdded() { return "DukeyList just added a new todo:"; } + @Override + public String getLogString() { + return "T" + "/" + isDoneStatus() + "/" + this.getName(); + } + @Override public String toString() { if (this.isDone()) { From c0bcf033275e4d54b4454398f249bf8bca473cf0 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Fri, 17 Feb 2023 15:31:02 +0800 Subject: [PATCH 10/32] improve level-7 --- DukeySave.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 DukeySave.txt diff --git a/DukeySave.txt b/DukeySave.txt deleted file mode 100644 index e69de29bb2..0000000000 From 2a4b3d604f5bda7ab38facdf0faef07c7813c5c9 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Sat, 18 Feb 2023 14:09:04 +0800 Subject: [PATCH 11/32] implement Level-8 --- src/main/java/Deadline.java | 71 +++++++++++++++++++ src/main/java/Deadlines.java | 61 ---------------- src/main/java/Duke.java | 7 +- src/main/java/DukeyTime.java | 22 ++++++ src/main/java/Event.java | 47 +++++++----- src/main/java/{Item.java => Task.java} | 8 +-- .../java/{ItemList.java => TaskList.java} | 22 +++--- src/main/java/ToDo.java | 5 +- 8 files changed, 142 insertions(+), 101 deletions(-) create mode 100644 src/main/java/Deadline.java delete mode 100644 src/main/java/Deadlines.java create mode 100644 src/main/java/DukeyTime.java rename src/main/java/{Item.java => Task.java} (85%) rename src/main/java/{ItemList.java => TaskList.java} (91%) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..c34779b1fb --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,71 @@ +import java.time.LocalDate; +import java.util.Scanner; + +public class Deadline extends Task { + private static final String TYPE = "[D]"; + private LocalDate deadline; + + public Deadline(String name, LocalDate deadline) { + super(name); + this.deadline = deadline; + } + + public Deadline(String name, LocalDate deadline, boolean isMarked) { + super(name, isMarked); + this.deadline = deadline; + } + + public static Deadline createDeadline(Scanner scanner) throws DukeyException { + System.out.print("Deadline task name: "); + String deadlineName = scanner.nextLine(); + if (deadlineName.equals("")) { + throw new DukeyException("Error!! Deadline task name cannot be empty!!"); + } + System.out.print("Deadline: "); + String deadlineTime = scanner.nextLine(); + if (deadlineTime.equals("")) { + throw new DukeyException("Error!! Deadline time cannot be empty!!"); + } + + LocalDate deadline = DukeyTime.getDateFromString(deadlineTime); + + return new Deadline(deadlineName.strip(), deadline); + + } + + public LocalDate getDeadline() { + return this.deadline; + } + + public static Deadline createDeadlineFromLog(String[] logStringArray) { + String name = logStringArray[2]; + String deadlineString = logStringArray[3]; + boolean isMarked = !logStringArray[1].equals("0"); + LocalDate deadline = LocalDate.now(); + try { + deadline = DukeyTime.getDateFromString(deadlineString); + } catch (DukeyException e) { + e.printMessage(); + } + + return new Deadline(name, deadline, isMarked); + } + + @Override + public String messageWhenAdded() { + return "DukeyList just added a new deadline:"; + } + + @Override + public String getLogString() { + return "D" + "," + this.isDoneStatus() + "," + this.getName() + "," + this.getDeadline(); + } + + @Override + public String toString() { + if (this.isDone()) { + return TYPE + "[X] " + this.getName() + " (by " + DukeyTime.dateToString(this.deadline) + ")"; + } + return TYPE + "[ ] " + this.getName() + " (by " + DukeyTime.dateToString(this.deadline) + ")"; + } +} diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java deleted file mode 100644 index 6ce21ad784..0000000000 --- a/src/main/java/Deadlines.java +++ /dev/null @@ -1,61 +0,0 @@ -import java.util.Scanner; - -public class Deadlines extends Item { - private static final String TYPE = "[D]"; - private String deadline; - - public Deadlines(String name, String deadline) { - super(name); - this.deadline = deadline; - } - - public Deadlines(String name, String deadline, boolean isMarked) { - super(name, isMarked); - this.deadline = deadline; - } - - public static Deadlines createDeadline(Scanner scanner) throws DukeyException { - System.out.print("Deadline task name: "); - String deadlineName = scanner.nextLine(); - if (deadlineName.equals("")) { - throw new DukeyException("Error!! Deadline task name cannot be empty!!"); - } - System.out.print("Deadline: "); - String deadlineTime = scanner.nextLine(); - if (deadlineTime.equals("")) { - throw new DukeyException("Error!! Deadline time cannot be empty!!"); - } - - return new Deadlines(deadlineName.strip(), deadlineTime.strip()); - - } - - public String getDeadline() { - return this.deadline; - } - - public static Deadlines createDeadlineFromLog(String[] logStringArray) { - String name = logStringArray[2]; - String deadline = logStringArray[3]; - boolean isMarked = !logStringArray[1].equals("0"); - return new Deadlines(name, deadline, isMarked); - } - - @Override - public String messageWhenAdded() { - return "DukeyList just added a new deadline:"; - } - - @Override - public String getLogString() { - return "D" + "/" + this.isDoneStatus() + "/" + this.getName() + "/" + this.getDeadline(); - } - - @Override - public String toString() { - if (this.isDone()) { - return TYPE + "[X] " + this.getName() + " (by " + this.deadline + ")"; - } - return TYPE + "[ ] " + this.getName() + " (by " + this.deadline + ")"; - } -} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index adc3c4cc80..e1340481fc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,5 @@ import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; import java.util.Scanner; @@ -41,8 +40,8 @@ public static void echo() { public static void initiateDukeyList() { File f = DukeyFile.openFile(); - ItemList.printInstruction(); - ItemList itemList = new ItemList(); + TaskList.printInstruction(); + TaskList itemList = new TaskList(); try { itemList.initiate(f); } catch (FileNotFoundException e) { @@ -68,7 +67,7 @@ public static void initiateDukeyList() { //add a new deadline if (input.strip().equals("deadline")) { try { - itemList.addItem(Deadlines.createDeadline(scanner)); + itemList.addItem(Deadline.createDeadline(scanner)); } catch (DukeyException e) { e.printMessage(); } diff --git a/src/main/java/DukeyTime.java b/src/main/java/DukeyTime.java new file mode 100644 index 0000000000..42616f12a9 --- /dev/null +++ b/src/main/java/DukeyTime.java @@ -0,0 +1,22 @@ +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; + +public class DukeyTime { + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + public static LocalDate getDateFromString(String s) throws DukeyException { + LocalDate date = LocalDate.now(); + try { + date = LocalDate.parse(s, formatter); + } catch (DateTimeException e) { + throw new DukeyException("Error! Invalid date!"); + } + return date; + } + + public static String dateToString(LocalDate date) { + return date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)); + } +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index e6a4818155..596e54d9f6 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,17 +1,18 @@ +import java.time.LocalDate; import java.util.Scanner; -public class Event extends Item { +public class Event extends Task { private static final String TYPE = "[E]"; - private String start; - private String end; + private final LocalDate start; + private final LocalDate end; - public Event(String name, String start, String end) { + public Event(String name, LocalDate start, LocalDate end) { super(name); this.start = start; this.end = end; } - public Event(String name, String start, String end, boolean isMarked) { + public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { super(name, isMarked); this.start = start; this.end = end; @@ -23,25 +24,35 @@ public static Event createEvent(Scanner scanner) throws DukeyException{ if (eventName.equals("")) { throw new DukeyException("Error! Event name cannot be empty!"); } - System.out.print("Event start time: "); - String eventStart = scanner.nextLine(); - if (eventStart.equals("")) { + System.out.print("Event start: "); + String eventStartString = scanner.nextLine(); + if (eventStartString.equals("")) { throw new DukeyException("Error! Please provide a start time!"); } - System.out.print("Event end time: "); - String eventEnd = scanner.nextLine(); - if (eventEnd.equals("")) { + System.out.print("Event end: "); + String eventEndString = scanner.nextLine(); + if (eventEndString.equals("")) { throw new DukeyException("Error! Please provide an end time!"); } - return new Event(eventName, eventStart, eventEnd); + return new Event(eventName, DukeyTime.getDateFromString(eventStartString), + DukeyTime.getDateFromString(eventEndString)); } public static Event createEventFromLog(String[] logStringArray) { String name = logStringArray[2]; - String start = logStringArray[3]; - String end = logStringArray[4]; + String startString = logStringArray[3]; + String endString = logStringArray[4]; boolean isMarked = !logStringArray[1].equals("0"); + + LocalDate start = LocalDate.now(); + LocalDate end = LocalDate.now(); + try { + start = DukeyTime.getDateFromString(startString); + end = DukeyTime.getDateFromString(endString); + } catch (DukeyException e) { + e.printMessage(); + } return new Event(name, start, end, isMarked); } @@ -52,15 +63,17 @@ public String messageWhenAdded() { @Override public String getLogString() { - return "E" + "/" + isDoneStatus() + "/" + this.getName() + "/" + this.start + "/" + this.end; + return "E" + "," + isDoneStatus() + "," + this.getName() + "," + this.start + "," + this.end; } @Override public String toString() { if (this.isDone()) { - return TYPE + "[X] " + this.getName() + " (" + this.start + " to " + this.end + ")"; + return TYPE + "[X] " + this.getName() + " (" + DukeyTime.dateToString(this.start) + + " to " + DukeyTime.dateToString(this.end) + ")"; } - return TYPE + "[ ] " + this.getName() + " (" + this.start + " to " + this.end + ")"; + return TYPE + "[ ] " + this.getName() + " (" + DukeyTime.dateToString(this.start) + + " to " + DukeyTime.dateToString(this.end) + ")"; } diff --git a/src/main/java/Item.java b/src/main/java/Task.java similarity index 85% rename from src/main/java/Item.java rename to src/main/java/Task.java index 16bb2e4a3a..b53c1a0a6a 100644 --- a/src/main/java/Item.java +++ b/src/main/java/Task.java @@ -1,15 +1,13 @@ -import java.util.Scanner; - -public abstract class Item { +public abstract class Task { private String name; private Boolean done; - public Item(String name) { + public Task(String name) { this.name = name; this.done = false; } - public Item(String name, boolean isDone) { + public Task(String name, boolean isDone) { this.name = name; this.done = isDone; } diff --git a/src/main/java/ItemList.java b/src/main/java/TaskList.java similarity index 91% rename from src/main/java/ItemList.java rename to src/main/java/TaskList.java index 34b568e025..0b43f94d21 100644 --- a/src/main/java/ItemList.java +++ b/src/main/java/TaskList.java @@ -6,14 +6,14 @@ import java.util.Iterator; import java.util.Scanner; -public class ItemList { - private ArrayList list; +public class TaskList { + private ArrayList list; - public ItemList() { + public TaskList() { this.list = new ArrayList<>(); } - public void addItem(Item item) { + public void addItem(Task item) { this.list.add(item); System.out.println(); System.out.println(item.messageWhenAdded() + " " + item); @@ -25,7 +25,7 @@ public void readList() { System.out.println("DukeyList: DukeyList is empty!"); } else { System.out.println("DukeyList:"); - Iterator it = this.list.iterator(); + Iterator it = this.list.iterator(); it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); } } @@ -46,7 +46,7 @@ public void mark(Scanner scanner) throws DukeyException { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Item itemToMark = this.list.get(itemNumber); + Task itemToMark = this.list.get(itemNumber); itemToMark.markAsDone(); System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been marked as done!"); System.out.println((itemNumber + 1) + ". " + itemToMark); @@ -67,7 +67,7 @@ public void unmark(Scanner scanner) throws DukeyException { } else if (itemNumber >= this.list.size()) { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Item itemToUnmark = this.list.get(itemNumber); + Task itemToUnmark = this.list.get(itemNumber); itemToUnmark.unmark(); System.out.println("DukeyList: Item number " + (1 + itemNumber) + " has been unmarked!"); System.out.println((itemNumber + 1) + ". " + itemToUnmark); @@ -89,7 +89,7 @@ public void delete(Scanner scanner) throws DukeyException { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Item itemToRemove = list.get(itemNumber); + Task itemToRemove = list.get(itemNumber); System.out.println("DukeyList: The following item has been removed!"); System.out.println(itemToRemove.toString()); list.remove(itemNumber); @@ -115,7 +115,7 @@ public void clearList() { public void save(File file) { DukeyFile.clearFile(file); - Iterator it = this.list.iterator(); + Iterator it = this.list.iterator(); it.forEachRemaining(x -> { String logString = x.getLogString(); try { @@ -131,11 +131,11 @@ public void initiate(File file) throws FileNotFoundException { Scanner fileScanner = new Scanner(file); while (fileScanner.hasNextLine()) { String taskLogString = fileScanner.nextLine(); - String[] logStringArray = taskLogString.split("/"); + String[] logStringArray = taskLogString.split(","); if (logStringArray[0].equals("T")) { this.list.add(ToDo.createToDoFromLog(logStringArray)); } else if (logStringArray[0].equals("D")) { - this.list.add(Deadlines.createDeadlineFromLog(logStringArray)); + this.list.add(Deadline.createDeadlineFromLog(logStringArray)); } else if (logStringArray[0].equals("E")) { this.list.add(Event.createEventFromLog(logStringArray)); } diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index b3d5fe4c26..53dc4a70da 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -1,7 +1,6 @@ -import java.util.Arrays; import java.util.Scanner; -public class ToDo extends Item { +public class ToDo extends Task { private static final String TYPE = "[T]"; public ToDo(String name) { @@ -35,7 +34,7 @@ public String messageWhenAdded() { @Override public String getLogString() { - return "T" + "/" + isDoneStatus() + "/" + this.getName(); + return "T" + "," + isDoneStatus() + "," + this.getName(); } @Override From 96622f7d983668fc8307a63843da1d56b88bcd7b Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Mon, 20 Feb 2023 17:33:49 +0800 Subject: [PATCH 12/32] implement A-MoreOOP by adding Ui, Parser, Storage and TaskList classes --- src/main/java/ActionEnum.java | 15 +++ src/main/java/Deadline.java | 21 +--- src/main/java/Duke.java | 198 +++++++++++------------------- src/main/java/DukeyException.java | 4 - src/main/java/DukeyFile.java | 33 ----- src/main/java/Event.java | 26 +--- src/main/java/Parser.java | 68 ++++++++++ src/main/java/Storage.java | 56 +++++++++ src/main/java/TaskList.java | 164 ++++++++++--------------- src/main/java/ToDo.java | 8 +- src/main/java/Ui.java | 171 ++++++++++++++++++++++++++ 11 files changed, 462 insertions(+), 302 deletions(-) create mode 100644 src/main/java/ActionEnum.java delete mode 100644 src/main/java/DukeyFile.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/Ui.java diff --git a/src/main/java/ActionEnum.java b/src/main/java/ActionEnum.java new file mode 100644 index 0000000000..7560f366b4 --- /dev/null +++ b/src/main/java/ActionEnum.java @@ -0,0 +1,15 @@ +public enum ActionEnum { + LIST, + TODO, + DEADLINE, + EVENT, + MARK, + UNMARK, + DELETE, + SAVE, + CLEARLIST, + BYE, + FORCESTOP, + CLEARSAVE + +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index c34779b1fb..b718ceb481 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,5 +1,4 @@ import java.time.LocalDate; -import java.util.Scanner; public class Deadline extends Task { private static final String TYPE = "[D]"; @@ -15,21 +14,11 @@ public Deadline(String name, LocalDate deadline, boolean isMarked) { this.deadline = deadline; } - public static Deadline createDeadline(Scanner scanner) throws DukeyException { - System.out.print("Deadline task name: "); - String deadlineName = scanner.nextLine(); - if (deadlineName.equals("")) { - throw new DukeyException("Error!! Deadline task name cannot be empty!!"); - } - System.out.print("Deadline: "); - String deadlineTime = scanner.nextLine(); - if (deadlineTime.equals("")) { - throw new DukeyException("Error!! Deadline time cannot be empty!!"); - } - - LocalDate deadline = DukeyTime.getDateFromString(deadlineTime); + public static Deadline createDeadline(Ui ui) throws DukeyException { + String deadlineName = ui.readTaskName("Deadline"); + LocalDate deadlineTime = ui.readTime("Deadline"); - return new Deadline(deadlineName.strip(), deadline); + return new Deadline(deadlineName, deadlineTime); } @@ -45,7 +34,7 @@ public static Deadline createDeadlineFromLog(String[] logStringArray) { try { deadline = DukeyTime.getDateFromString(deadlineString); } catch (DukeyException e) { - e.printMessage(); + e.getMessage(); } return new Deadline(name, deadline, isMarked); diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e1340481fc..62d1c08f3f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,159 +1,107 @@ +import javax.swing.*; import java.io.File; import java.io.FileNotFoundException; -import java.util.Scanner; public class Duke { - public static final String BYE_MESSAGE = "Goodbye!! Please return to Dukey again soon!! :)"; + private Ui ui; + private Storage storage; + private TaskList taskList; + + public Duke(String filePath) { + this.ui = new Ui(); + this.storage = new Storage(filePath); + this.taskList = new TaskList(ui); + } public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - System.out.println("Welcome welcome!"); - initiateDukeyList(); - //echo(); + Duke duke = new Duke("DukeySave.txt"); + duke.initiateDukeyList(); + } - public static void echo() { - System.out.println("Start by typing something and Dukey will echo!! Type bye to exit!! "); - Scanner scanner = new Scanner(System.in); + public void echo() { while (true) { - String input = scanner.nextLine(); + String input = ui.readEchoInput(); if (input.equals("bye")) { break; } - System.out.println("Dukey: " + input); - if (input.equals("Bye")) { - System.out.println("Dukey: Did you mean 'bye'? Type 'bye' to exit!!"); - } + ui.echo(input); } - System.out.println("\nDukey: " + BYE_MESSAGE); - scanner.close(); + ui.printGoodbyeMessage(); } - public static void initiateDukeyList() { - File f = DukeyFile.openFile(); - TaskList.printInstruction(); - TaskList itemList = new TaskList(); + public void initiateDukeyList() { + ui.printWelcomeMessage(); + ui.printInstruction(); try { - itemList.initiate(f); + taskList.initiate(storage); } catch (FileNotFoundException e) { - System.out.println("No saved list found, starting new list."); + ui.printExceptionMessage(new DukeyException("No saved list found, starting new list.")); } - Scanner scanner = new Scanner(System.in); - - while (true) { - System.out.println("_________________________________________________________"); - System.out.print("Dukey command: "); - String input = scanner.nextLine(); - //add a new todo - if (input.strip().equals("todo")) { - try { - itemList.addItem(ToDo.createToDo(scanner)); - } catch(DukeyException e) { - e.printMessage(); + boolean stillRunning = true; + boolean forceStop = false; + + while (stillRunning && !forceStop) { + ui.printLnBreak(); + ActionEnum actionEnum = ActionEnum.BYE; + try { + actionEnum = ui.readCommand(); + switch (actionEnum) { + case TODO: + taskList.addItem(ToDo.createToDo(ui)); + break; + case DEADLINE: + taskList.addItem(Deadline.createDeadline(ui)); + break; + case EVENT: + taskList.addItem(Event.createEvent(ui)); + break; + case MARK: + taskList.mark(); + break; + case UNMARK: + taskList.unmark(); + break; + case DELETE: + taskList.delete(); + break; + case LIST: + taskList.readList(); + break; + case CLEARLIST: + taskList.clearList(); + break; + case SAVE: + taskList.save(storage); + break; + case CLEARSAVE: + taskList.clearSave(storage); + break; + case BYE: + stillRunning = false; + break; + case FORCESTOP: + forceStop = true; + break; } - continue; + } catch (DukeyException e) { + ui.printExceptionMessage(e); } - //add a new deadline - if (input.strip().equals("deadline")) { - try { - itemList.addItem(Deadline.createDeadline(scanner)); - } catch (DukeyException e) { - e.printMessage(); - } - continue; - } - - //add a new event - if (input.strip().equals("event")) { - try { - itemList.addItem(Event.createEvent(scanner)); - } catch (DukeyException e) { - e.printMessage(); - } - continue; + if (!stillRunning) { + taskList.save(storage); + ui.printGoodbyeMessage(); } - //mark - if (input.strip().equals("mark")) { - try { - itemList.mark(scanner); - } catch (DukeyException e) { - e.printMessage(); - } - continue; - } - - //unmark - if (input.strip().equals("unmark")) { - try { - itemList.unmark(scanner); - } catch (DukeyException e) { - e.printMessage(); - } - continue; - } - - //delete - if (input.equals("delete")) { - try { - itemList.delete(scanner); - } catch (DukeyException e) { - e.printMessage(); - } - continue; - } - - //exit - if (input.equals("bye")) { - itemList.save(f); - System.out.println("DukeyList: " + BYE_MESSAGE); - break; - } - - //list - if (input.equals("list")) { - itemList.readList(); - continue; - } - - //save - if (input.equals("save")) { - itemList.save(f); - continue; - } - - //clearlist - if (input.equals("clearList")) { - itemList.clearList(); - continue; - } - - //clearSave - if (input.equals("clearSave")) { - DukeyFile.clearFile(f); - continue; - } + } - //forceStop - if (input.equals("forceStop")) { - break; - } - System.out.println("Error! Unknown command. Try again!"); - } - scanner.close(); } diff --git a/src/main/java/DukeyException.java b/src/main/java/DukeyException.java index dd8fb6fbe7..c53465f6e2 100644 --- a/src/main/java/DukeyException.java +++ b/src/main/java/DukeyException.java @@ -4,10 +4,6 @@ public DukeyException(String message) { super(message); } - public void printMessage() { - System.out.println(this.getMessage()); - System.out.println("__________________________(-o-)__________________________"); - } diff --git a/src/main/java/DukeyFile.java b/src/main/java/DukeyFile.java deleted file mode 100644 index 66c854f9d2..0000000000 --- a/src/main/java/DukeyFile.java +++ /dev/null @@ -1,33 +0,0 @@ -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -public class DukeyFile { - - public static File openFile() { - File f = new File("DukeySave.txt"); - if (!f.exists()) { - try { - f.createNewFile(); - } catch (IOException e) { - System.out.println("Error! Unable to create file"); - } - } - return f; - } - - public static void writeToFile(File file, String textToAdd) throws IOException { - FileWriter fw = new FileWriter(file, true); - fw.write(textToAdd + "\n"); - fw.close(); - } - - public static void deleteFile(File file) { - file.delete(); - } - - public static void clearFile(File file) { - deleteFile(file); - openFile(); - } -} diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 596e54d9f6..f44a4d14ef 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -18,25 +18,11 @@ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { this.end = end; } - public static Event createEvent(Scanner scanner) throws DukeyException{ - System.out.print("Event name: "); - String eventName = scanner.nextLine(); - if (eventName.equals("")) { - throw new DukeyException("Error! Event name cannot be empty!"); - } - System.out.print("Event start: "); - String eventStartString = scanner.nextLine(); - if (eventStartString.equals("")) { - throw new DukeyException("Error! Please provide a start time!"); - } - System.out.print("Event end: "); - String eventEndString = scanner.nextLine(); - if (eventEndString.equals("")) { - throw new DukeyException("Error! Please provide an end time!"); - } - - return new Event(eventName, DukeyTime.getDateFromString(eventStartString), - DukeyTime.getDateFromString(eventEndString)); + public static Event createEvent(Ui ui) throws DukeyException{ + String eventName = ui.readTaskName("Event"); + LocalDate eventStart = ui.readTime("Event start time"); + LocalDate eventEnd = ui.readTime("Event end time"); + return new Event(eventName, eventStart, eventEnd); } public static Event createEventFromLog(String[] logStringArray) { @@ -51,7 +37,7 @@ public static Event createEventFromLog(String[] logStringArray) { start = DukeyTime.getDateFromString(startString); end = DukeyTime.getDateFromString(endString); } catch (DukeyException e) { - e.printMessage(); + e.getMessage(); } return new Event(name, start, end, isMarked); } diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..0ffa682c97 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,68 @@ +import java.time.LocalDate; + +public class Parser { + + public boolean checkIfEmpty(String input) { + return input.strip().equals(""); + } + + public ActionEnum parseCommand(String input) throws DukeyException { + input = input.strip().toLowerCase(); + if (checkIfEmpty(input)) { + throw new DukeyException("Error! Input cannot be empty."); + } + if (input.equals("todo")) { + return ActionEnum.TODO; + } + if (input.equals("deadline")) { + return ActionEnum.DEADLINE; + } + if (input.equals("event")) { + return ActionEnum.EVENT; + } + if (input.equals("list")) { + return ActionEnum.LIST; + } + if (input.equals("mark")) { + return ActionEnum.MARK; + } + if (input.equals("unmark")) { + return ActionEnum.UNMARK; + } + if (input.equals("delete")) { + return ActionEnum.DELETE; + } + if (input.equals("save")) { + return ActionEnum.SAVE; + } + if (input.equals("clearlist")) { + return ActionEnum.CLEARLIST; + } + if (input.equals("clearsave")) { + return ActionEnum.CLEARSAVE; + } + if (input.equals("bye")) { + return ActionEnum.BYE; + } + if (input.equals("forcestop")) { + return ActionEnum.FORCESTOP; + } + + throw new DukeyException("Error! Invalid command!"); + } + + public String parseTaskName(String input) throws DukeyException{ + input = input.strip(); + if (checkIfEmpty(input)) { + throw new DukeyException("Error! Task name cannot be empty!"); + } + return input; + } + + public LocalDate parseDate(String input) throws DukeyException { + if (checkIfEmpty(input)) { + throw new DukeyException("Input cannot be empty!"); + } + return DukeyTime.getDateFromString(input); + } +} diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..ef9a9635f3 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,56 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Iterator; +import java.util.Scanner; + +public class Storage { + File file; + String filePath; + + public Storage(String filePath) { + this.file = new File(filePath); + this.filePath = filePath; + } + + public void writeToFile(String textToAdd) throws IOException { + FileWriter fw = new FileWriter(this.file, true); + fw.write(textToAdd + "\n"); + fw.close(); + } + + public void clearFile() { + this.file.delete(); + this.file = new File(this.filePath); + } + + public void save(TaskList taskList) throws DukeyException { + this.clearFile(); + Iterator it = taskList.getIterator(); + it.forEachRemaining(x -> { + String logString = x.getLogString(); + try { + this.writeToFile(logString); + } catch (IOException e) { + e.getMessage(); + } + }); + + } + + public void load(TaskList taskList) throws FileNotFoundException { + Scanner fileScanner = new Scanner(file); + while (fileScanner.hasNextLine()) { + String taskLogString = fileScanner.nextLine(); + String[] logStringArray = taskLogString.split(","); + if (logStringArray[0].equals("T")) { + taskList.addTaskFromSave(ToDo.createToDoFromLog(logStringArray)); + } else if (logStringArray[0].equals("D")) { + taskList.addTaskFromSave(Deadline.createDeadlineFromLog(logStringArray)); + } else if (logStringArray[0].equals("E")) { + taskList.addTaskFromSave(Event.createEventFromLog(logStringArray)); + } + } + } +} diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 0b43f94d21..843ba703ad 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,98 +1,97 @@ -import java.io.File; import static java.lang.Integer.parseInt; import java.io.FileNotFoundException; -import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import java.util.Scanner; + public class TaskList { private ArrayList list; + private Ui ui; - public TaskList() { + public TaskList(Ui ui) { this.list = new ArrayList<>(); + this.ui = ui; + } + + public boolean isEmpty() { + return this.list.isEmpty(); + } + + public Iterator getIterator() { + return this.list.iterator(); } - public void addItem(Task item) { - this.list.add(item); - System.out.println(); - System.out.println(item.messageWhenAdded() + " " + item); + public void addItem(Task task) { + this.list.add(task); + ui.printAddedMessage(task); printSize(); } + public void addTaskFromSave(Task task) { + this.list.add(task); + } + public void readList() { - if (this.list.isEmpty()) { - System.out.println("DukeyList: DukeyList is empty!"); - } else { - System.out.println("DukeyList:"); - Iterator it = this.list.iterator(); - it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); - } + ui.readList(this.list); } - public void mark(Scanner scanner) throws DukeyException { - System.out.print("Task number: "); - String itemNumberString = scanner.nextLine(); - int itemNumber; + public void mark() throws DukeyException { + String taskNumberString = ui.getTaskNumber(); + int taskNumber; try { - itemNumber = parseInt(itemNumberString.strip()) - 1; + taskNumber = parseInt(taskNumberString.strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } - if (itemNumber < 0) { + if (taskNumber < 0) { throw new DukeyException("Error! Invalid task number"); - } else if (itemNumber >= this.list.size()) { + } else if (taskNumber >= this.list.size()) { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Task itemToMark = this.list.get(itemNumber); - itemToMark.markAsDone(); - System.out.println("DukeyList: Item number " + (itemNumber + 1) + " has been marked as done!"); - System.out.println((itemNumber + 1) + ". " + itemToMark); + Task taskToMark = this.list.get(taskNumber); + taskToMark.markAsDone(); + ui.printMarkedMessage(taskNumber, taskToMark); } - public void unmark(Scanner scanner) throws DukeyException { - System.out.print("Task number: "); - String itemNumberString = scanner.nextLine(); - int itemNumber; + public void unmark() throws DukeyException { + String taskNumberString = ui.getTaskNumber(); + int taskNumber; try { - itemNumber = parseInt(itemNumberString.strip()) - 1; + taskNumber = parseInt(taskNumberString.strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } - if (itemNumber < 0) { + if (taskNumber < 0) { throw new DukeyException("Error! Invalid task number"); - } else if (itemNumber >= this.list.size()) { + } else if (taskNumber >= this.list.size()) { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Task itemToUnmark = this.list.get(itemNumber); - itemToUnmark.unmark(); - System.out.println("DukeyList: Item number " + (1 + itemNumber) + " has been unmarked!"); - System.out.println((itemNumber + 1) + ". " + itemToUnmark); + Task taskToUnmark = this.list.get(taskNumber); + taskToUnmark.unmark(); + ui.printUnmarkedMessage(taskNumber, taskToUnmark); } - public void delete(Scanner scanner) throws DukeyException { - System.out.print("Task number: "); - String itemNumberString = scanner.nextLine(); - int itemNumber; + public void delete() throws DukeyException { + String taskNumberString = ui.getTaskNumber(); + int taskNumber; try { - itemNumber = parseInt(itemNumberString.strip()) - 1; + taskNumber = parseInt(taskNumberString.strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } - if (itemNumber < 0) { + if (taskNumber < 0) { throw new DukeyException("Error! Invalid task number"); - } else if (itemNumber >= this.list.size()) { + } else if (taskNumber >= this.list.size()) { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } - Task itemToRemove = list.get(itemNumber); - System.out.println("DukeyList: The following item has been removed!"); - System.out.println(itemToRemove.toString()); - list.remove(itemNumber); + Task taskToRemove = list.get(taskNumber); + ui.printDeletedMessage(taskToRemove); + list.remove(taskNumber); this.printSize(); } @@ -101,11 +100,7 @@ public int getSize() { } public void printSize() { - if (getSize() == 1){ - System.out.println("DukeyList now has 1 task."); - } else { - System.out.println("DukeyList now has " + getSize() + " tasks."); - } + ui.printSize(getSize()); } public void clearList() { @@ -113,60 +108,33 @@ public void clearList() { System.out.println("DukeyList cleared! DukeyList is now empty."); } - public void save(File file) { - DukeyFile.clearFile(file); - Iterator it = this.list.iterator(); - it.forEachRemaining(x -> { - String logString = x.getLogString(); - try { - DukeyFile.writeToFile(file, logString); - } catch (IOException e) { - System.out.println("Error! Unable to save!"); - } - }); - System.out.println("DukeList saved!"); + public void save(Storage storage) { + try { + storage.save(this); + } catch (DukeyException e) { + ui.printExceptionMessage(e); + } + + ui.printSavedMessage(); } - public void initiate(File file) throws FileNotFoundException { - Scanner fileScanner = new Scanner(file); - while (fileScanner.hasNextLine()) { - String taskLogString = fileScanner.nextLine(); - String[] logStringArray = taskLogString.split(","); - if (logStringArray[0].equals("T")) { - this.list.add(ToDo.createToDoFromLog(logStringArray)); - } else if (logStringArray[0].equals("D")) { - this.list.add(Deadline.createDeadlineFromLog(logStringArray)); - } else if (logStringArray[0].equals("E")) { - this.list.add(Event.createEventFromLog(logStringArray)); - } - } + public void initiate(Storage storage) throws FileNotFoundException { + storage.load(this); if (this.list.isEmpty()) { - System.out.println("No tasks saved, starting a new list."); + ui.printLoadMessage(0); } else { - System.out.println("Saved list loaded:"); - this.readList(); + ui.printLoadMessage(1); + ui.readList(list); } } - public void clearSave(File file) { - DukeyFile.deleteFile(file); - System.out.println("DukeyList save has been cleared."); + public void clearSave(Storage storage) { + storage.clearFile(); + ui.printClearedMessage(); } - public static void printInstruction() { - System.out.println("DukeyList: Welcome to DukeyList!! To use DukeyList, type the appropriate command and follow the prompts:"); - System.out.println("To list: 'list'"); - System.out.println("To exit: 'bye'"); - System.out.println("To add a todo: 'todo'"); - System.out.println("To add a deadline: 'deadline'"); - System.out.println("To add an event: 'event'"); - System.out.println("To mark a task as done: 'mark'"); - System.out.println("To unmark a task: 'unmark'"); - System.out.println("To delete a task: 'delete'"); - System.out.println("To clear the list: 'clearList"); - System.out.println("To save the list: 'save'"); - System.out.println("_________________________________________________________"); - } + + } diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index 53dc4a70da..2360950eba 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -12,12 +12,8 @@ public ToDo(String name, boolean isMarked) { } - public static ToDo createToDo(Scanner scanner) throws DukeyException { - System.out.print("Todo task name: "); - String toDoName = scanner.nextLine(); - if (toDoName.equals("")) { - throw new DukeyException("Error!! ToDo name cannot be empty!"); - } + public static ToDo createToDo(Ui ui) throws DukeyException { + String toDoName = ui.readTaskName("ToDo"); return new ToDo(toDoName); } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..3a9ae775b4 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,171 @@ +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Scanner; + +public class Ui { + Scanner scanner = new Scanner(System.in); + Parser parser = new Parser(); + + private String readLine() { + return scanner.nextLine(); + } + + public ActionEnum readCommand() throws DukeyException { + this.print("Dukey command: "); + String input = this.readLine(); + return parser.parseCommand(input); + } + + public String readEchoInput() { + return this.readLine(); + } + + public String readTaskName(String type) throws DukeyException{ + this.print(type + " task name: "); + String input = this.readLine(); + return parser.parseTaskName(input); + } + + public LocalDate readTime(String type) throws DukeyException{ + this.print(type + ": "); + String timeString = this.readLine(); + return parser.parseDate(timeString); + } + + private void printLine(String string) { + System.out.println(string); + } + + private void print(String string) { + System.out.print(string); + } + + + public String getTaskNumber() { + this.print("Task number: "); + return this.readLine(); + } + + public void printWelcomeMessage() { + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + this.printLine("Hello from\n" + logo); + this.printLine("Welcome welcome!"); + } + + public void printGoodbyeMessage() { + this.printLine("DukeyList: Goodbye!! Please return to Dukey again soon!! :)"); + } + + public void printLnBreak() { + this.printLine("_________________________________________________________"); + } + + public void printErrorBreak() { + this.printLine("__________________________error__________________________"); + } + + public void echo(String string) { + this.printLine("Dukey: " + string); + } + + public void printWrongCommandMessage() { + this.printLine("Error! Unknown command. Try again!"); + } + + public void printTask(int taskNumber, Task task) { + this.printLine((taskNumber + 1) + ". " + task); + } + + public void printTask (Task task) { + this.printLine(task.toString()); + } + + public void printEmptyListMessage() { + this.printLine("DukeyList: DukeyList is empty!"); + } + + public void readList(ArrayList list) { + if (list.isEmpty()) { + this.printEmptyListMessage(); + } else { + this.printLine("DukeyList:"); + Iterator it = list.iterator(); + it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); + } + } + + public void printAddedMessage(Task task) { + this.printLine(""); + this.printLine(task.messageWhenAdded() + " " + task); + } + + public void printMarkedMessage(int taskNumber, Task taskToMark) { + this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been marked as done!"); + this.printTask(taskNumber, taskToMark); + } + + public void printUnmarkedMessage(int taskNumber, Task taskToUnmark) { + this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been unmarked."); + this.printTask(taskNumber, taskToUnmark); + } + + public void printDeletedMessage(Task taskToDelete) { + this.printLine("DukeyList: The following item has been removed!"); + this.printTask(taskToDelete); + } + + public void printSavedMessage() { + System.out.println("DukeList saved!"); + } + + public void printLoadMessage(int status) { + if (status == 0) { + this.printLine("DukeList saved!"); + } else { + System.out.println("Saved list loaded:"); + } + } + + public void printClearedMessage() { + this.printLine("DukeyList save has been cleared."); + } + + + public void printSize(int size) { + if (size == 1){ + printLine("DukeyList now has 1 task."); + } else { + printLine("DukeyList now has " + size + " tasks."); + } + } + + public void printExceptionMessage(DukeyException e) { + printLine(e.getMessage()); + printErrorBreak(); + } + + public void printInstruction() { + printLine("DukeyList: Welcome to DukeyList!! To use DukeyList, type the appropriate command and follow the prompts:"); + printLine("To list: 'list'"); + printLine("To exit: 'bye'"); + printLine("To add a todo: 'todo'"); + printLine("To add a deadline: 'deadline'"); + printLine("To add an event: 'event'"); + printLine("To mark a task as done: 'mark'"); + printLine("To unmark a task: 'unmark'"); + printLine("To delete a task: 'delete'"); + printLine("To clear the list: 'clearList"); + printLine("To save the list: 'save'"); + printLnBreak(); + } + + public void printEchoInstruction() { + printLine("Start by typing something and Dukey will echo!! Type bye to exit!! "); + } + +} From 054c520ccea099110ca4816cbcd284c3b0738802 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Mon, 20 Feb 2023 18:38:07 +0800 Subject: [PATCH 13/32] implement A-Packages by creating a duke package and duke.exceptions package --- README.md | 4 ++-- src/main/java/{ => duke}/ActionEnum.java | 2 ++ src/main/java/{ => duke}/Deadline.java | 8 ++++++-- src/main/java/{ => duke}/Duke.java | 6 ++++-- src/main/java/{ => duke}/DukeyTime.java | 4 ++++ src/main/java/{ => duke}/Event.java | 14 +++++++++----- src/main/java/{ => duke}/Parser.java | 6 +++++- src/main/java/{ => duke}/Storage.java | 4 ++++ src/main/java/{ => duke}/Task.java | 2 ++ src/main/java/{ => duke}/TaskList.java | 4 ++++ src/main/java/{ => duke}/ToDo.java | 6 ++++-- src/main/java/{ => duke}/Ui.java | 10 +++++++--- .../java/{ => duke/exceptions}/DukeyException.java | 2 ++ text-ui-test/runtest.bat | 2 +- 14 files changed, 56 insertions(+), 18 deletions(-) rename src/main/java/{ => duke}/ActionEnum.java (91%) rename src/main/java/{ => duke}/Deadline.java (90%) rename src/main/java/{ => duke}/Duke.java (98%) rename src/main/java/{ => duke}/DukeyTime.java (93%) rename src/main/java/{ => duke}/Event.java (88%) rename src/main/java/{ => duke}/Parser.java (93%) rename src/main/java/{ => duke}/Storage.java (96%) rename src/main/java/{ => duke}/Task.java (98%) rename src/main/java/{ => duke}/TaskList.java (98%) rename src/main/java/{ => duke}/ToDo.java (89%) rename src/main/java/{ => duke}/Ui.java (94%) rename src/main/java/{ => duke/exceptions}/DukeyException.java (83%) diff --git a/README.md b/README.md index 8715d4d915..0f2208ab64 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/src/main/java/ActionEnum.java b/src/main/java/duke/ActionEnum.java similarity index 91% rename from src/main/java/ActionEnum.java rename to src/main/java/duke/ActionEnum.java index 7560f366b4..cd7f361f35 100644 --- a/src/main/java/ActionEnum.java +++ b/src/main/java/duke/ActionEnum.java @@ -1,3 +1,5 @@ +package duke; + public enum ActionEnum { LIST, TODO, diff --git a/src/main/java/Deadline.java b/src/main/java/duke/Deadline.java similarity index 90% rename from src/main/java/Deadline.java rename to src/main/java/duke/Deadline.java index b718ceb481..0ff1818546 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.time.LocalDate; public class Deadline extends Task { @@ -15,8 +19,8 @@ public Deadline(String name, LocalDate deadline, boolean isMarked) { } public static Deadline createDeadline(Ui ui) throws DukeyException { - String deadlineName = ui.readTaskName("Deadline"); - LocalDate deadlineTime = ui.readTime("Deadline"); + String deadlineName = ui.readTaskName("duke.Deadline"); + LocalDate deadlineTime = ui.readTime("duke.Deadline"); return new Deadline(deadlineName, deadlineTime); diff --git a/src/main/java/Duke.java b/src/main/java/duke/Duke.java similarity index 98% rename from src/main/java/Duke.java rename to src/main/java/duke/Duke.java index 62d1c08f3f..835e78de1f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,5 +1,7 @@ -import javax.swing.*; -import java.io.File; +package duke; + +import duke.exceptions.DukeyException; + import java.io.FileNotFoundException; diff --git a/src/main/java/DukeyTime.java b/src/main/java/duke/DukeyTime.java similarity index 93% rename from src/main/java/DukeyTime.java rename to src/main/java/duke/DukeyTime.java index 42616f12a9..1401b06536 100644 --- a/src/main/java/DukeyTime.java +++ b/src/main/java/duke/DukeyTime.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.time.DateTimeException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/Event.java b/src/main/java/duke/Event.java similarity index 88% rename from src/main/java/Event.java rename to src/main/java/duke/Event.java index f44a4d14ef..3d6b8120fa 100644 --- a/src/main/java/Event.java +++ b/src/main/java/duke/Event.java @@ -1,5 +1,9 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.time.LocalDate; -import java.util.Scanner; + public class Event extends Task { private static final String TYPE = "[E]"; @@ -18,10 +22,10 @@ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { this.end = end; } - public static Event createEvent(Ui ui) throws DukeyException{ - String eventName = ui.readTaskName("Event"); - LocalDate eventStart = ui.readTime("Event start time"); - LocalDate eventEnd = ui.readTime("Event end time"); + public static Event createEvent(Ui ui) throws DukeyException { + String eventName = ui.readTaskName("duke.Event"); + LocalDate eventStart = ui.readTime("duke.Event start time"); + LocalDate eventEnd = ui.readTime("duke.Event end time"); return new Event(eventName, eventStart, eventEnd); } diff --git a/src/main/java/Parser.java b/src/main/java/duke/Parser.java similarity index 93% rename from src/main/java/Parser.java rename to src/main/java/duke/Parser.java index 0ffa682c97..6ac2aa073f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.time.LocalDate; public class Parser { @@ -54,7 +58,7 @@ public ActionEnum parseCommand(String input) throws DukeyException { public String parseTaskName(String input) throws DukeyException{ input = input.strip(); if (checkIfEmpty(input)) { - throw new DukeyException("Error! Task name cannot be empty!"); + throw new DukeyException("Error! duke.Task name cannot be empty!"); } return input; } diff --git a/src/main/java/Storage.java b/src/main/java/duke/Storage.java similarity index 96% rename from src/main/java/Storage.java rename to src/main/java/duke/Storage.java index ef9a9635f3..dbe7f0eb9a 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/duke/Storage.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; diff --git a/src/main/java/Task.java b/src/main/java/duke/Task.java similarity index 98% rename from src/main/java/Task.java rename to src/main/java/duke/Task.java index b53c1a0a6a..5b58023db2 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/Task.java @@ -1,3 +1,5 @@ +package duke; + public abstract class Task { private String name; private Boolean done; diff --git a/src/main/java/TaskList.java b/src/main/java/duke/TaskList.java similarity index 98% rename from src/main/java/TaskList.java rename to src/main/java/duke/TaskList.java index 843ba703ad..2652120641 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import static java.lang.Integer.parseInt; import java.io.FileNotFoundException; import java.util.ArrayList; diff --git a/src/main/java/ToDo.java b/src/main/java/duke/ToDo.java similarity index 89% rename from src/main/java/ToDo.java rename to src/main/java/duke/ToDo.java index 2360950eba..8d42bb758b 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -1,4 +1,6 @@ -import java.util.Scanner; +package duke; + +import duke.exceptions.DukeyException; public class ToDo extends Task { private static final String TYPE = "[T]"; @@ -13,7 +15,7 @@ public ToDo(String name, boolean isMarked) { public static ToDo createToDo(Ui ui) throws DukeyException { - String toDoName = ui.readTaskName("ToDo"); + String toDoName = ui.readTaskName("duke.ToDo"); return new ToDo(toDoName); } diff --git a/src/main/java/Ui.java b/src/main/java/duke/Ui.java similarity index 94% rename from src/main/java/Ui.java rename to src/main/java/duke/Ui.java index 3a9ae775b4..355e8830ac 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/duke/Ui.java @@ -1,3 +1,7 @@ +package duke; + +import duke.exceptions.DukeyException; + import java.time.LocalDate; import java.util.ArrayList; import java.util.Iterator; @@ -43,7 +47,7 @@ private void print(String string) { public String getTaskNumber() { - this.print("Task number: "); + this.print("duke.Task number: "); return this.readLine(); } @@ -105,12 +109,12 @@ public void printAddedMessage(Task task) { } public void printMarkedMessage(int taskNumber, Task taskToMark) { - this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been marked as done!"); + this.printLine("DukeyList: duke.Task number " + (taskNumber + 1) + " has been marked as done!"); this.printTask(taskNumber, taskToMark); } public void printUnmarkedMessage(int taskNumber, Task taskToUnmark) { - this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been unmarked."); + this.printLine("DukeyList: duke.Task number " + (taskNumber + 1) + " has been unmarked."); this.printTask(taskNumber, taskToUnmark); } diff --git a/src/main/java/DukeyException.java b/src/main/java/duke/exceptions/DukeyException.java similarity index 83% rename from src/main/java/DukeyException.java rename to src/main/java/duke/exceptions/DukeyException.java index c53465f6e2..277601c95d 100644 --- a/src/main/java/DukeyException.java +++ b/src/main/java/duke/exceptions/DukeyException.java @@ -1,3 +1,5 @@ +package duke.exceptions; + public class DukeyException extends Exception { public DukeyException(String message) { diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..62752b8814 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From 4e2ca625a522a0f46b0b08d1e86ae3c0534821ef Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Mon, 20 Feb 2023 23:25:58 +0800 Subject: [PATCH 14/32] implement A-Gradle --- build.gradle | 2 +- config/checkstyle/checkstyle.xml | 434 +++++++++++++++++++++++++++++ config/checkstyle/suppressions.xml | 10 + src/main/java/duke/Deadline.java | 4 +- src/main/java/duke/Event.java | 6 +- src/main/java/duke/ToDo.java | 2 +- src/main/java/duke/Ui.java | 2 +- 7 files changed, 452 insertions(+), 8 deletions(-) create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 config/checkstyle/suppressions.xml diff --git a/build.gradle b/build.gradle index 885198fcfa..0bdc254568 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.Duke" } shadowJar { diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..fb88cedfc2 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 0000000000..135ea49ee0 --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index 0ff1818546..0db40e37b3 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -19,8 +19,8 @@ public Deadline(String name, LocalDate deadline, boolean isMarked) { } public static Deadline createDeadline(Ui ui) throws DukeyException { - String deadlineName = ui.readTaskName("duke.Deadline"); - LocalDate deadlineTime = ui.readTime("duke.Deadline"); + String deadlineName = ui.readTaskName("Deadline"); + LocalDate deadlineTime = ui.readTime("Deadline"); return new Deadline(deadlineName, deadlineTime); diff --git a/src/main/java/duke/Event.java b/src/main/java/duke/Event.java index 3d6b8120fa..0dc91ad3b0 100644 --- a/src/main/java/duke/Event.java +++ b/src/main/java/duke/Event.java @@ -23,9 +23,9 @@ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { } public static Event createEvent(Ui ui) throws DukeyException { - String eventName = ui.readTaskName("duke.Event"); - LocalDate eventStart = ui.readTime("duke.Event start time"); - LocalDate eventEnd = ui.readTime("duke.Event end time"); + String eventName = ui.readTaskName("Event"); + LocalDate eventStart = ui.readTime("Event start time"); + LocalDate eventEnd = ui.readTime("Event end time"); return new Event(eventName, eventStart, eventEnd); } diff --git a/src/main/java/duke/ToDo.java b/src/main/java/duke/ToDo.java index 8d42bb758b..435304389c 100644 --- a/src/main/java/duke/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -15,7 +15,7 @@ public ToDo(String name, boolean isMarked) { public static ToDo createToDo(Ui ui) throws DukeyException { - String toDoName = ui.readTaskName("duke.ToDo"); + String toDoName = ui.readTaskName("ToDo"); return new ToDo(toDoName); } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 355e8830ac..7e226a8892 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -163,7 +163,7 @@ public void printInstruction() { printLine("To mark a task as done: 'mark'"); printLine("To unmark a task: 'unmark'"); printLine("To delete a task: 'delete'"); - printLine("To clear the list: 'clearList"); + printLine("To clear the list: 'clearList'"); printLine("To save the list: 'save'"); printLnBreak(); } From d645ec66f51d6816838293afe47a6b22036ee013 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Tue, 21 Feb 2023 00:23:22 +0800 Subject: [PATCH 15/32] implement A-JUnit --- build.gradle | 5 +++++ src/main/java/duke/Duke.java | 6 +++--- src/main/java/duke/TaskList.java | 7 ++++++- src/test/java/duke/TaskListTest.java | 17 +++++++++++++++++ src/test/java/duke/ToDoTest.java | 25 +++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 src/test/java/duke/TaskListTest.java create mode 100644 src/test/java/duke/ToDoTest.java diff --git a/build.gradle b/build.gradle index 0bdc254568..644b364b6c 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,11 @@ test { } } +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' +} + application { mainClassName = "duke.Duke" } diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 835e78de1f..02dcf1e3d2 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -55,13 +55,13 @@ public void initiateDukeyList() { actionEnum = ui.readCommand(); switch (actionEnum) { case TODO: - taskList.addItem(ToDo.createToDo(ui)); + taskList.addTask(ToDo.createToDo(ui)); break; case DEADLINE: - taskList.addItem(Deadline.createDeadline(ui)); + taskList.addTask(Deadline.createDeadline(ui)); break; case EVENT: - taskList.addItem(Event.createEvent(ui)); + taskList.addTask(Event.createEvent(ui)); break; case MARK: taskList.mark(); diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 2652120641..d82b28a622 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -17,6 +17,11 @@ public TaskList(Ui ui) { this.ui = ui; } + public TaskList() { + this.list = new ArrayList<>(); + this.ui = new Ui(); + } + public boolean isEmpty() { return this.list.isEmpty(); } @@ -25,7 +30,7 @@ public Iterator getIterator() { return this.list.iterator(); } - public void addItem(Task task) { + public void addTask(Task task) { this.list.add(task); ui.printAddedMessage(task); printSize(); diff --git a/src/test/java/duke/TaskListTest.java b/src/test/java/duke/TaskListTest.java new file mode 100644 index 0000000000..9b727ade58 --- /dev/null +++ b/src/test/java/duke/TaskListTest.java @@ -0,0 +1,17 @@ +package duke; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +public class TaskListTest { + + @Test + public void AddingTask() { + TaskList taskList = new TaskList(); + ToDo toDo = new ToDo("test"); + taskList.addTask(toDo); + assertEquals(taskList.isEmpty(), false); + assertEquals(taskList.getSize(), 1); + } +} diff --git a/src/test/java/duke/ToDoTest.java b/src/test/java/duke/ToDoTest.java new file mode 100644 index 0000000000..ae2bb8ade7 --- /dev/null +++ b/src/test/java/duke/ToDoTest.java @@ -0,0 +1,25 @@ +package duke; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +public class ToDoTest { + + @Test + public void addToDo() { + ToDo toDo = new ToDo("testing ToDo"); + assertNotNull(toDo); + assertEquals(toDo.getName(), "testing ToDo"); + } + + @Test + public void checkMarkAndUnmark() { + ToDo toDo = new ToDo("testing ToDo"); + assertEquals(toDo.isDone(), false); + toDo.markAsDone(); + assertEquals(toDo.isDone(), true); + toDo.unmark(); + assertEquals(toDo.isDone(), false); + } +} From bb3e5502ca6713e828398417e7f42501622684ef Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Tue, 21 Feb 2023 11:19:46 +0800 Subject: [PATCH 16/32] implement A-CodingStandard --- DukeySave.txt | 2 ++ src/main/java/duke/Deadline.java | 4 ++-- src/main/java/duke/Duke.java | 12 ++++++------ src/main/java/duke/Event.java | 4 ++-- src/main/java/duke/Task.java | 8 ++++---- src/main/java/duke/TaskList.java | 4 ++-- src/main/java/duke/ToDo.java | 4 ++-- src/main/java/duke/Ui.java | 8 ++++---- src/test/java/duke/ToDoTest.java | 4 ++-- 9 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 DukeySave.txt diff --git a/DukeySave.txt b/DukeySave.txt new file mode 100644 index 0000000000..10dd14a788 --- /dev/null +++ b/DukeySave.txt @@ -0,0 +1,2 @@ +T,1,eat +D,0,eat,2022-12-12 diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index 0db40e37b3..818b1c1aea 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -45,13 +45,13 @@ public static Deadline createDeadlineFromLog(String[] logStringArray) { } @Override - public String messageWhenAdded() { + public String getMessageWhenAdded() { return "DukeyList just added a new deadline:"; } @Override public String getLogString() { - return "D" + "," + this.isDoneStatus() + "," + this.getName() + "," + this.getDeadline(); + return "D" + "," + this.getMarkedStatus() + "," + this.getName() + "," + this.getDeadline(); } @Override diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 02dcf1e3d2..bb73cb536d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -45,10 +45,10 @@ public void initiateDukeyList() { ui.printExceptionMessage(new DukeyException("No saved list found, starting new list.")); } - boolean stillRunning = true; - boolean forceStop = false; + boolean isStillRunning = true; + boolean isForceStopped = false; - while (stillRunning && !forceStop) { + while (isStillRunning && !isForceStopped) { ui.printLnBreak(); ActionEnum actionEnum = ActionEnum.BYE; try { @@ -85,17 +85,17 @@ public void initiateDukeyList() { taskList.clearSave(storage); break; case BYE: - stillRunning = false; + isStillRunning = false; break; case FORCESTOP: - forceStop = true; + isForceStopped = true; break; } } catch (DukeyException e) { ui.printExceptionMessage(e); } - if (!stillRunning) { + if (!isStillRunning) { taskList.save(storage); ui.printGoodbyeMessage(); } diff --git a/src/main/java/duke/Event.java b/src/main/java/duke/Event.java index 0dc91ad3b0..7755ba455c 100644 --- a/src/main/java/duke/Event.java +++ b/src/main/java/duke/Event.java @@ -47,13 +47,13 @@ public static Event createEventFromLog(String[] logStringArray) { } @Override - public String messageWhenAdded() { + public String getMessageWhenAdded() { return "DukeyList just added a new event:"; } @Override public String getLogString() { - return "E" + "," + isDoneStatus() + "," + this.getName() + "," + this.start + "," + this.end; + return "E" + "," + getMarkedStatus() + "," + this.getName() + "," + this.start + "," + this.end; } @Override diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index 5b58023db2..9b32ef68c2 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -22,19 +22,19 @@ public Boolean isDone() { return this.done; } - public int isDoneStatus() { + public int getMarkedStatus() { return this.isDone() ? 1 : 0; } - public void markAsDone() { + public void setMarked() { this.done = true; } - public void unmark() { + public void setUnmarked() { this.done = false; } - public String messageWhenAdded() { + public String getMessageWhenAdded() { return "DukeyList just added a new item: "; } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index d82b28a622..d28bc0b547 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -60,7 +60,7 @@ public void mark() throws DukeyException { } Task taskToMark = this.list.get(taskNumber); - taskToMark.markAsDone(); + taskToMark.setMarked(); ui.printMarkedMessage(taskNumber, taskToMark); } @@ -79,7 +79,7 @@ public void unmark() throws DukeyException { throw new DukeyException("Error! DukeyList only contains " + this.list.size() + " tasks"); } Task taskToUnmark = this.list.get(taskNumber); - taskToUnmark.unmark(); + taskToUnmark.setUnmarked(); ui.printUnmarkedMessage(taskNumber, taskToUnmark); } diff --git a/src/main/java/duke/ToDo.java b/src/main/java/duke/ToDo.java index 435304389c..a084c42eee 100644 --- a/src/main/java/duke/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -26,13 +26,13 @@ public static ToDo createToDoFromLog(String[] logStringArray) { } @Override - public String messageWhenAdded() { + public String getMessageWhenAdded() { return "DukeyList just added a new todo:"; } @Override public String getLogString() { - return "T" + "," + isDoneStatus() + "," + this.getName(); + return "T" + "," + getMarkedStatus() + "," + this.getName(); } @Override diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 7e226a8892..8b1763cf1a 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -47,7 +47,7 @@ private void print(String string) { public String getTaskNumber() { - this.print("duke.Task number: "); + this.print("Task number: "); return this.readLine(); } @@ -105,16 +105,16 @@ public void readList(ArrayList list) { public void printAddedMessage(Task task) { this.printLine(""); - this.printLine(task.messageWhenAdded() + " " + task); + this.printLine(task.getMessageWhenAdded() + " " + task); } public void printMarkedMessage(int taskNumber, Task taskToMark) { - this.printLine("DukeyList: duke.Task number " + (taskNumber + 1) + " has been marked as done!"); + this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been marked as done!"); this.printTask(taskNumber, taskToMark); } public void printUnmarkedMessage(int taskNumber, Task taskToUnmark) { - this.printLine("DukeyList: duke.Task number " + (taskNumber + 1) + " has been unmarked."); + this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been unmarked."); this.printTask(taskNumber, taskToUnmark); } diff --git a/src/test/java/duke/ToDoTest.java b/src/test/java/duke/ToDoTest.java index ae2bb8ade7..518537fc16 100644 --- a/src/test/java/duke/ToDoTest.java +++ b/src/test/java/duke/ToDoTest.java @@ -17,9 +17,9 @@ public void addToDo() { public void checkMarkAndUnmark() { ToDo toDo = new ToDo("testing ToDo"); assertEquals(toDo.isDone(), false); - toDo.markAsDone(); + toDo.setMarked(); assertEquals(toDo.isDone(), true); - toDo.unmark(); + toDo.setUnmarked(); assertEquals(toDo.isDone(), false); } } From 00b192eb180a6bc5c478f9583fc69ec91b2c67fd Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Tue, 21 Feb 2023 12:14:13 +0800 Subject: [PATCH 17/32] implement Level-9 --- src/main/java/duke/ActionEnum.java | 4 +++- src/main/java/duke/Duke.java | 5 ++++- src/main/java/duke/Parser.java | 14 +++++++++++++- src/main/java/duke/TaskList.java | 22 ++++++++++++++++++++++ src/main/java/duke/TaskNumberPair.java | 19 +++++++++++++++++++ src/main/java/duke/Ui.java | 24 +++++++++++++++++++++--- 6 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 src/main/java/duke/TaskNumberPair.java diff --git a/src/main/java/duke/ActionEnum.java b/src/main/java/duke/ActionEnum.java index cd7f361f35..62f7c455da 100644 --- a/src/main/java/duke/ActionEnum.java +++ b/src/main/java/duke/ActionEnum.java @@ -12,6 +12,8 @@ public enum ActionEnum { CLEARLIST, BYE, FORCESTOP, - CLEARSAVE + CLEARSAVE, + FIND + } diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 02dcf1e3d2..1927b2f892 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -42,7 +42,7 @@ public void initiateDukeyList() { try { taskList.initiate(storage); } catch (FileNotFoundException e) { - ui.printExceptionMessage(new DukeyException("No saved list found, starting new list.")); + ui.printLoadMessage(0); } boolean stillRunning = true; @@ -78,6 +78,9 @@ public void initiateDukeyList() { case CLEARLIST: taskList.clearList(); break; + case FIND: + taskList.find(); + break; case SAVE: taskList.save(storage); break; diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 6ac2aa073f..2ba7ae33b2 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -51,6 +51,9 @@ public ActionEnum parseCommand(String input) throws DukeyException { if (input.equals("forcestop")) { return ActionEnum.FORCESTOP; } + if (input.equals("find")) { + return ActionEnum.FIND; + } throw new DukeyException("Error! Invalid command!"); } @@ -58,15 +61,24 @@ public ActionEnum parseCommand(String input) throws DukeyException { public String parseTaskName(String input) throws DukeyException{ input = input.strip(); if (checkIfEmpty(input)) { - throw new DukeyException("Error! duke.Task name cannot be empty!"); + throw new DukeyException("Error! Task name cannot be empty!"); } return input; } public LocalDate parseDate(String input) throws DukeyException { + input = input.strip(); if (checkIfEmpty(input)) { throw new DukeyException("Input cannot be empty!"); } return DukeyTime.getDateFromString(input); } + + public String parseKeyword(String input) throws DukeyException { + input = input.strip(); + if (checkIfEmpty(input)) { + throw new DukeyException("Input cannot be empty!"); + } + return input; + } } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index d82b28a622..b965377319 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -104,6 +104,28 @@ public void delete() throws DukeyException { this.printSize(); } + public void find() { + String keyword = ""; + try { + keyword = ui.readKeyword(); + } catch (DukeyException e) { + ui.printExceptionMessage(e); + } + + String confirmedKeyword = keyword; + ArrayList foundTaskList = new ArrayList<>(); + Iterator it = getIterator(); + + it.forEachRemaining(x -> { + if (x.getName().contains(confirmedKeyword)) { + foundTaskList.add(new TaskNumberPair(x, list.indexOf(x))); + } + }); + + ui.printFoundTaskList(foundTaskList); + + } + public int getSize() { return list.size(); } diff --git a/src/main/java/duke/TaskNumberPair.java b/src/main/java/duke/TaskNumberPair.java new file mode 100644 index 0000000000..6aacac8d34 --- /dev/null +++ b/src/main/java/duke/TaskNumberPair.java @@ -0,0 +1,19 @@ +package duke; + +public class TaskNumberPair { + private Task task; + private int number; + + public TaskNumberPair(Task task, int number) { + this.task = task; + this.number = number; + } + + public Task getTask() { + return this.task; + } + + public int getNumber() { + return this.number; + } +} diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 7e226a8892..44113ee620 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -25,18 +25,24 @@ public String readEchoInput() { return this.readLine(); } - public String readTaskName(String type) throws DukeyException{ + public String readTaskName(String type) throws DukeyException { this.print(type + " task name: "); String input = this.readLine(); return parser.parseTaskName(input); } - public LocalDate readTime(String type) throws DukeyException{ + public LocalDate readTime(String type) throws DukeyException { this.print(type + ": "); String timeString = this.readLine(); return parser.parseDate(timeString); } + public String readKeyword() throws DukeyException { + this.print("Search keyword: "); + String keyword = this.readLine(); + return parser.parseKeyword(keyword); + } + private void printLine(String string) { System.out.println(string); } @@ -103,6 +109,16 @@ public void readList(ArrayList list) { } } + public void printFoundTaskList(ArrayList foundTaskList) { + if (foundTaskList.isEmpty()) { + this.printLine("No tasks found matching this keyword!"); + } else { + this.printLine("DukeyList found these tasks matching the keyword:"); + Iterator it = foundTaskList.iterator(); + it.forEachRemaining(x -> this.printLine((x.getNumber() + 1) + ". " + x.getTask())); + } + } + public void printAddedMessage(Task task) { this.printLine(""); this.printLine(task.messageWhenAdded() + " " + task); @@ -127,9 +143,10 @@ public void printSavedMessage() { System.out.println("DukeList saved!"); } + public void printLoadMessage(int status) { if (status == 0) { - this.printLine("DukeList saved!"); + this.printLine("DukeyList is empty, starting a new list."); } else { System.out.println("Saved list loaded:"); } @@ -165,6 +182,7 @@ public void printInstruction() { printLine("To delete a task: 'delete'"); printLine("To clear the list: 'clearList'"); printLine("To save the list: 'save'"); + printLine("To find tasks using keywords: 'find'"); printLnBreak(); } From 4959603b150a058ad5cf780fffc2efae92fa47fc Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Tue, 21 Feb 2023 15:27:52 +0800 Subject: [PATCH 18/32] implement A-JavaDoc --- src/main/java/duke/ActionEnum.java | 5 +++ src/main/java/duke/Deadline.java | 45 ++++++++++++++++++++ src/main/java/duke/Duke.java | 14 +++++- src/main/java/duke/DukeyTime.java | 11 +++++ src/main/java/duke/Event.java | 43 ++++++++++++++++++- src/main/java/duke/Parser.java | 27 +++++++++++- src/main/java/duke/Storage.java | 25 +++++++++++ src/main/java/duke/Task.java | 56 +++++++++++++++++++++--- src/main/java/duke/TaskList.java | 68 +++++++++++++++++++++++++++++- src/main/java/duke/ToDo.java | 36 ++++++++++++++++ src/main/java/duke/Ui.java | 3 ++ 11 files changed, 323 insertions(+), 10 deletions(-) diff --git a/src/main/java/duke/ActionEnum.java b/src/main/java/duke/ActionEnum.java index cd7f361f35..fbf05dedde 100644 --- a/src/main/java/duke/ActionEnum.java +++ b/src/main/java/duke/ActionEnum.java @@ -1,5 +1,10 @@ package duke; +import java.io.FileNotFoundException; + +/** + * Available actions that can be performed with Duke + */ public enum ActionEnum { LIST, TODO, diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index 0db40e37b3..32295cbaf5 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -4,20 +4,41 @@ import java.time.LocalDate; +/** + * Deadline is a type of Task which contains a name and a date (in the form of + * a LocalDate) by which the task has to be + * completed. + */ public class Deadline extends Task { private static final String TYPE = "[D]"; private LocalDate deadline; + /** + * Returns a Deadline with a name, deadline, and sets its status to undone. + * @param name the name of the Deadline + * @param deadline the time which the Deadline must be completed + */ public Deadline(String name, LocalDate deadline) { super(name); this.deadline = deadline; } + /** + * Returns a Deadline with a name and sets its status accordingly. + * @param name the name of the Deadline + * @param deadline the time by which the Deadline must be completed + * @param isMarked the status of the Deadline + */ public Deadline(String name, LocalDate deadline, boolean isMarked) { super(name, isMarked); this.deadline = deadline; } + /** + * Returns a Deadline created with details taken from user input. + * @param ui object to handle user interactions + * @return Deadline created based on the user's input + */ public static Deadline createDeadline(Ui ui) throws DukeyException { String deadlineName = ui.readTaskName("Deadline"); LocalDate deadlineTime = ui.readTime("Deadline"); @@ -26,10 +47,21 @@ public static Deadline createDeadline(Ui ui) throws DukeyException { } + /** + * Returns the deadline + * @return deadline of the task + */ public LocalDate getDeadline() { return this.deadline; } + /** + * Returns a Deadline created from its log string. This method "loads" + * a Deadline from a save. + * @param logStringArray an array of strings where each string is a component of the log string that + * has been split up + * @return Deadline created from its log string. + */ public static Deadline createDeadlineFromLog(String[] logStringArray) { String name = logStringArray[2]; String deadlineString = logStringArray[3]; @@ -44,16 +76,29 @@ public static Deadline createDeadlineFromLog(String[] logStringArray) { return new Deadline(name, deadline, isMarked); } + /** + * Returns a message to be printed whenever a Deadline is added. + * @return the message to be printed + */ @Override public String messageWhenAdded() { return "DukeyList just added a new deadline:"; } + /** + * Returns the log string of a Deadline, which is a string containing details about the task. The log + * string will be used to save the task locally when the task list is saved. + * @return the log string of the Deadline + */ @Override public String getLogString() { return "D" + "," + this.isDoneStatus() + "," + this.getName() + "," + this.getDeadline(); } + + /** + * Returns the string representation of a Deadline + */ @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 02dcf1e3d2..5e73bf612d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -4,12 +4,18 @@ import java.io.FileNotFoundException; - +/** + * Interactive list which allows users to add Tasks and perform various operations to these Tasks. + */ public class Duke { private Ui ui; private Storage storage; private TaskList taskList; + /** + * Returns a new instance of Duke with a Storage, Ui and TaskList. + * @param filePath the file path of the save file used to save data from the Duke + */ public Duke(String filePath) { this.ui = new Ui(); this.storage = new Storage(filePath); @@ -23,6 +29,9 @@ public static void main(String[] args) { } + /** + * Takes in user input and prints it back to the user. + */ public void echo() { while (true) { String input = ui.readEchoInput(); @@ -36,6 +45,9 @@ public void echo() { } + /** + * Initiates the DukeyList by loading a save, then scans for and performs commands from the user. + */ public void initiateDukeyList() { ui.printWelcomeMessage(); ui.printInstruction(); diff --git a/src/main/java/duke/DukeyTime.java b/src/main/java/duke/DukeyTime.java index 1401b06536..48219153ef 100644 --- a/src/main/java/duke/DukeyTime.java +++ b/src/main/java/duke/DukeyTime.java @@ -7,9 +7,16 @@ import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; +/** + * Handles operations relating to dates + */ public class DukeyTime { private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + /** + * Returns a LocalDate from a String + * @param s the String containing the date + */ public static LocalDate getDateFromString(String s) throws DukeyException { LocalDate date = LocalDate.now(); try { @@ -20,6 +27,10 @@ public static LocalDate getDateFromString(String s) throws DukeyException { return date; } + /** + * Returns a string representation of a date + * @param date the date to be represented + */ public static String dateToString(LocalDate date) { return date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)); } diff --git a/src/main/java/duke/Event.java b/src/main/java/duke/Event.java index 0dc91ad3b0..372def0045 100644 --- a/src/main/java/duke/Event.java +++ b/src/main/java/duke/Event.java @@ -4,24 +4,46 @@ import java.time.LocalDate; - +/** + * Event is a type of Task which contains a name and two dates (in the form of + * a LocalDate) indicating the starting date and the ending date. + * completed. + */ public class Event extends Task { private static final String TYPE = "[E]"; private final LocalDate start; private final LocalDate end; + /** + * Returns an Event with a name, start date and end date, and sets its status to undone. + * @param name the name of the Event + * @param start the starting date of the event + * @param end the ending date of the event + */ public Event(String name, LocalDate start, LocalDate end) { super(name); this.start = start; this.end = end; } + /** + * Returns an Event with a name, start date and end date, and sets its status accordingly. + * @param name the name of the Event + * @param start the starting date of the event + * @param end the ending date of the event + * @param isMarked the status of the event + */ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { super(name, isMarked); this.start = start; this.end = end; } + /** + * Returns an Event created with details taken from user input. + * @param ui object to handle user interactions + * @return Event created based on the user's input + */ public static Event createEvent(Ui ui) throws DukeyException { String eventName = ui.readTaskName("Event"); LocalDate eventStart = ui.readTime("Event start time"); @@ -29,6 +51,13 @@ public static Event createEvent(Ui ui) throws DukeyException { return new Event(eventName, eventStart, eventEnd); } + /** + * Returns an Event created from its log string. This method "loads" + * an Event from a save. + * @param logStringArray an array of strings where each string is a component of the log string that + * has been split up + * @return Event created from its log string. + */ public static Event createEventFromLog(String[] logStringArray) { String name = logStringArray[2]; String startString = logStringArray[3]; @@ -46,16 +75,28 @@ public static Event createEventFromLog(String[] logStringArray) { return new Event(name, start, end, isMarked); } + /** + * Returns a message to be printed whenever an Event is added. + * @return the message to be printed + */ @Override public String messageWhenAdded() { return "DukeyList just added a new event:"; } + /** + * Returns the log string of an Event, which is a string containing details about the task. The log + * string will be used to save the task locally when the task list is saved. + * @return the log string of the Event + */ @Override public String getLogString() { return "E" + "," + isDoneStatus() + "," + this.getName() + "," + this.start + "," + this.end; } + /** + * Returns the string representation of an Event + */ @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 6ac2aa073f..0f06525b19 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -4,12 +4,26 @@ import java.time.LocalDate; +/** + * Analyzes user input. + */ public class Parser { + /** + * Returns true if a given user input is empty. + * @param input the user input + */ public boolean checkIfEmpty(String input) { return input.strip().equals(""); } + /** + * Detects the user's command based on the user's input String, throws an exception if the user's input + * does not match any of the existing commands. + * @param input the user input + * @return the detected action + * @exception DukeyException on invalid user command + */ public ActionEnum parseCommand(String input) throws DukeyException { input = input.strip().toLowerCase(); if (checkIfEmpty(input)) { @@ -55,14 +69,25 @@ public ActionEnum parseCommand(String input) throws DukeyException { throw new DukeyException("Error! Invalid command!"); } + + /** + * Scans the user's input for a Task name and returns the Task name, throws an exception if the + * user input is empty. + * @param input the user input + */ public String parseTaskName(String input) throws DukeyException{ input = input.strip(); if (checkIfEmpty(input)) { - throw new DukeyException("Error! duke.Task name cannot be empty!"); + throw new DukeyException("Error! Task name cannot be empty!"); } return input; } + /** + * Scans the user's input for a date and returns the date in the form of a LocalDate. Throws an exception if the + * user input is empty or if the date is in the incorrect format. + * @param input the user input + */ public LocalDate parseDate(String input) throws DukeyException { if (checkIfEmpty(input)) { throw new DukeyException("Input cannot be empty!"); diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index dbe7f0eb9a..d3a54a0594 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -9,26 +9,46 @@ import java.util.Iterator; import java.util.Scanner; + +/** + * Deals with the saving and loading of Tasks onto a hard drive. + */ public class Storage { File file; String filePath; + /** + * Returns a new storage containing a File where data is to be stored. + */ public Storage(String filePath) { this.file = new File(filePath); this.filePath = filePath; } + /** + * Appends text to the save File. + * @param textToAdd the text to be added + * @exception IOException on problems with the input text + */ public void writeToFile(String textToAdd) throws IOException { FileWriter fw = new FileWriter(this.file, true); fw.write(textToAdd + "\n"); fw.close(); } + /** + * Clears the save File of any data. + */ public void clearFile() { this.file.delete(); this.file = new File(this.filePath); } + /** + * Saves all the Tasks on a TaskList to the hard drive by writing the log strings of each Task + * onto the save File. + * @param taskList the TaskList to be saved + */ public void save(TaskList taskList) throws DukeyException { this.clearFile(); Iterator it = taskList.getIterator(); @@ -43,6 +63,11 @@ public void save(TaskList taskList) throws DukeyException { } + /** + * Loads all the Tasks on the hard drive to a TaskList by creating new Tasks based on the details from + * their log string. + * @param taskList the TaskList on which the Tasks are to be laoded. + */ public void load(TaskList taskList) throws FileNotFoundException { Scanner fileScanner = new Scanner(file); while (fileScanner.hasNextLine()) { diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index 5b58023db2..3e2d045c7f 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -1,46 +1,90 @@ package duke; +/** + * Task is an abstract class representing something that a user can do + */ public abstract class Task { private String name; - private Boolean done; + private Boolean IsDone; + + /** + * Returns a task with a name and sets the status to undone + * @param name the name of the task + */ public Task(String name) { this.name = name; - this.done = false; + this.IsDone = false; } + /** + * Returns a task with a name and sets the status to done or undone accordingly + * @param name the name of the task + * @param isDone the status of the task + */ public Task(String name, boolean isDone) { this.name = name; - this.done = isDone; + this.IsDone = isDone; } + /** + * Returns the name of a task + * @return the name of the task + */ public String getName() { return this.name; } + /** + * Returns the status of the task, whether done or undone + * @return the status of the task + */ public Boolean isDone() { - return this.done; + return this.IsDone; } + /** + * Returns the status of a task in the form of an int, with 0 and 1 representing done + * and undone respectively. + * @return the status of the task + */ public int isDoneStatus() { return this.isDone() ? 1 : 0; } + /** + * Changes the status of the task to done. + */ public void markAsDone() { - this.done = true; + this.IsDone = true; } + /** + * Changes the status of the task to undone. + */ public void unmark() { - this.done = false; + this.IsDone = false; } + /** + * Returns a message to be printed whenever a task is added. + * @return the message to be printed + */ public String messageWhenAdded() { return "DukeyList just added a new item: "; } + /** + * Returns the log string of a task, which is a string containing details about the task. The log + * string will be used to save the task locally when the task list is saved. + * @return the log string + */ public abstract String getLogString(); + /** + * Returns the string representation of a task. + */ @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index d82b28a622..446c1eee3a 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -7,43 +7,75 @@ import java.util.ArrayList; import java.util.Iterator; - +/** + * Stores and performs various operations to a list of Tasks. + */ public class TaskList { private ArrayList list; private Ui ui; + /** + * Returns a new empty TaskList + * @param ui object that deals with user interactions. + */ public TaskList(Ui ui) { this.list = new ArrayList<>(); this.ui = ui; } + /** + * Returns a new empty TaskList + */ public TaskList() { this.list = new ArrayList<>(); this.ui = new Ui(); } + /** + * Returns true if the TaskList does not contain any Tasks. + */ public boolean isEmpty() { return this.list.isEmpty(); } + /** + * Returns an iterator of the list of Tasks. + */ public Iterator getIterator() { return this.list.iterator(); } + /** + * Adds a new Task to the TaskList, printing out a confirmation message for the user. + * @param task the Task to be added + */ public void addTask(Task task) { this.list.add(task); ui.printAddedMessage(task); printSize(); } + /** + * Adds a new Task to the TaskList. + * @param task the Task to be added + */ public void addTaskFromSave(Task task) { this.list.add(task); } + /** + * Prints out the TaskList. + */ public void readList() { ui.readList(this.list); } + /** + * Changes the status of a Task to done and prints out a confirmation message for the + * user. This method makes use of ui to read input from the user for details regarding the task to + * be marked. + * @exception DukeyException on invalid task numbers + */ public void mark() throws DukeyException { String taskNumberString = ui.getTaskNumber(); int taskNumber; @@ -64,6 +96,13 @@ public void mark() throws DukeyException { ui.printMarkedMessage(taskNumber, taskToMark); } + + /** + * Changes the status of a Task to undone and prints out a confirmation message for the + * user. This method makes use of ui to read input from the user for details regarding the task to + * be marked. + * @exception DukeyException on invalid task numbers + */ public void unmark() throws DukeyException { String taskNumberString = ui.getTaskNumber(); int taskNumber; @@ -83,6 +122,11 @@ public void unmark() throws DukeyException { ui.printUnmarkedMessage(taskNumber, taskToUnmark); } + /** + * Deletes a Task from the TaskList. This method makes use of ui to read input from the user for details + * regarding the task to be deleted. + * @exception DukeyException on invalid task numbers + */ public void delete() throws DukeyException { String taskNumberString = ui.getTaskNumber(); int taskNumber; @@ -104,19 +148,32 @@ public void delete() throws DukeyException { this.printSize(); } + /** + * Returns the number of Tasks in the TaskList. + */ public int getSize() { return list.size(); } + /** + * Prints out the number of Tasks in the TaskList. + */ public void printSize() { ui.printSize(getSize()); } + /** + * Clears the TaskList. + */ public void clearList() { this.list.clear(); System.out.println("DukeyList cleared! DukeyList is now empty."); } + /** + * Saves the TaskList locally. + * @param storage the class that deals with loading and saving Tasks + */ public void save(Storage storage) { try { storage.save(this); @@ -127,6 +184,11 @@ public void save(Storage storage) { ui.printSavedMessage(); } + /** + * Loads Tasks into the TaskList from a save, if there are any. + * @param storage the class that deals with loading and saving Tasks + * @exception FileNotFoundException on missing saved file + */ public void initiate(Storage storage) throws FileNotFoundException { storage.load(this); @@ -139,6 +201,10 @@ public void initiate(Storage storage) throws FileNotFoundException { } + /** + * Clears any Tasks that are saved on the hard drive. + * @param storage the class that deals with loading and saving Tasks + */ public void clearSave(Storage storage) { storage.clearFile(); ui.printClearedMessage(); diff --git a/src/main/java/duke/ToDo.java b/src/main/java/duke/ToDo.java index 435304389c..dce746ea12 100644 --- a/src/main/java/duke/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -2,39 +2,75 @@ import duke.exceptions.DukeyException; +/** + * ToDo is a type of Task which only contains a task name. + */ public class ToDo extends Task { private static final String TYPE = "[T]"; + /** + * Returns a ToDo with a name and status set to undone. + * @param name the name of the ToDo + */ public ToDo(String name) { super(name); } + /** + * Returns a ToDo with a name and sets the status accordingly. + * @param name the name of the ToDo + * @param isMarked the status of the ToDo + */ public ToDo(String name, boolean isMarked) { super(name, isMarked); } + /** + * Returns a ToDo created with details taken from user input. + * @param ui object to handle user interactions + * @return ToDo created based on user's input + */ public static ToDo createToDo(Ui ui) throws DukeyException { String toDoName = ui.readTaskName("ToDo"); return new ToDo(toDoName); } + /** + * Returns a ToDo created from its log string. This method "loads" + * a ToDo from a save. + * @param logStringArray an array of strings where each string is a component of the log string that + * has been split up + * @return ToDo created from its log string. + */ public static ToDo createToDoFromLog(String[] logStringArray) { String name = logStringArray[2]; boolean isMarked = !logStringArray[1].equals("0"); return new ToDo(name, isMarked); } + /** + * Returns a message to be printed whenever a ToDo is added. + * @return the message to be printed + */ @Override public String messageWhenAdded() { return "DukeyList just added a new todo:"; } + /** + * Returns the log string of a ToDo, which is a string containing details about the task. The log + * string will be used to save the task locally when the task list is saved. + * @return the log string of the ToDo + */ @Override public String getLogString() { return "T" + "," + isDoneStatus() + "," + this.getName(); } + /** + * Returns a string representation of the ToDo + */ @Override public String toString() { if (this.isDone()) { diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 7e226a8892..0e9e652740 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -7,6 +7,9 @@ import java.util.Iterator; import java.util.Scanner; +/** + * Deals with user interactions, namely reading input from the user and printing messages to the user. + */ public class Ui { Scanner scanner = new Scanner(System.in); Parser parser = new Parser(); From 89a24eb1214f30aa5e88f00616bbe995261e1dd3 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Tue, 21 Feb 2023 17:16:25 +0800 Subject: [PATCH 19/32] Implement A-Checkstyle --- build.gradle | 1 + config/checkstyle/checkstyle.xml | 7 +- src/main/java/duke/ActionEnum.java | 2 - src/main/java/duke/Deadline.java | 4 +- src/main/java/duke/Duke.java | 85 ++++++++++--------- src/main/java/duke/DukeyTime.java | 5 +- src/main/java/duke/Event.java | 4 +- src/main/java/duke/Parser.java | 14 ++- src/main/java/duke/Storage.java | 14 +-- src/main/java/duke/TaskList.java | 8 +- src/main/java/duke/TaskNumberPair.java | 12 +++ src/main/java/duke/ToDo.java | 1 + src/main/java/duke/Ui.java | 17 ++-- .../java/duke/exceptions/DukeyException.java | 7 ++ 14 files changed, 109 insertions(+), 72 deletions(-) diff --git a/build.gradle b/build.gradle index 644b364b6c..a212ff63dd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' id 'application' + id 'checkstyle' id 'com.github.johnrengelman.shadow' version '5.1.0' } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index fb88cedfc2..65b7ca123e 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -352,7 +352,7 @@ - + @@ -394,11 +394,7 @@ - - - - @@ -411,7 +407,6 @@ - diff --git a/src/main/java/duke/ActionEnum.java b/src/main/java/duke/ActionEnum.java index 2390387ec1..c8518a21fa 100644 --- a/src/main/java/duke/ActionEnum.java +++ b/src/main/java/duke/ActionEnum.java @@ -1,7 +1,5 @@ package duke; -import java.io.FileNotFoundException; - /** * Available actions that can be performed with Duke */ diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index 269e1dadbd..fe668db15a 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -1,8 +1,9 @@ package duke; +import java.time.LocalDate; + import duke.exceptions.DukeyException; -import java.time.LocalDate; /** * Deadline is a type of Task which contains a name and a date (in the form of @@ -38,6 +39,7 @@ public Deadline(String name, LocalDate deadline, boolean isMarked) { * Returns a Deadline created with details taken from user input. * @param ui object to handle user interactions * @return Deadline created based on the user's input + * @exception DukeyException on invalid user input */ public static Deadline createDeadline(Ui ui) throws DukeyException { String deadlineName = ui.readTaskName("Deadline"); diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 38f3824892..41d379e686 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,9 +1,9 @@ package duke; -import duke.exceptions.DukeyException; - import java.io.FileNotFoundException; +import duke.exceptions.DukeyException; + /** * Interactive list which allows users to add Tasks and perform various operations to these Tasks. */ @@ -22,6 +22,9 @@ public Duke(String filePath) { this.taskList = new TaskList(ui); } + /** + * Starts Duke + */ public static void main(String[] args) { Duke duke = new Duke("DukeySave.txt"); duke.initiateDukeyList(); @@ -66,45 +69,45 @@ public void initiateDukeyList() { try { actionEnum = ui.readCommand(); switch (actionEnum) { - case TODO: - taskList.addTask(ToDo.createToDo(ui)); - break; - case DEADLINE: - taskList.addTask(Deadline.createDeadline(ui)); - break; - case EVENT: - taskList.addTask(Event.createEvent(ui)); - break; - case MARK: - taskList.mark(); - break; - case UNMARK: - taskList.unmark(); - break; - case DELETE: - taskList.delete(); - break; - case LIST: - taskList.readList(); - break; - case CLEARLIST: - taskList.clearList(); - break; - case FIND: - taskList.find(); - break; - case SAVE: - taskList.save(storage); - break; - case CLEARSAVE: - taskList.clearSave(storage); - break; - case BYE: - isStillRunning = false; - break; - case FORCESTOP: - isForceStopped = true; - break; + case TODO: + taskList.addTask(ToDo.createToDo(ui)); + break; + case DEADLINE: + taskList.addTask(Deadline.createDeadline(ui)); + break; + case EVENT: + taskList.addTask(Event.createEvent(ui)); + break; + case MARK: + taskList.mark(); + break; + case UNMARK: + taskList.unmark(); + break; + case DELETE: + taskList.delete(); + break; + case LIST: + taskList.readList(); + break; + case CLEARLIST: + taskList.clearList(); + break; + case FIND: + taskList.find(); + break; + case SAVE: + taskList.save(storage); + break; + case CLEARSAVE: + taskList.clearSave(storage); + break; + case BYE: + isStillRunning = false; + break; + case FORCESTOP: + isForceStopped = true; + break; } } catch (DukeyException e) { ui.printExceptionMessage(e); diff --git a/src/main/java/duke/DukeyTime.java b/src/main/java/duke/DukeyTime.java index 48219153ef..4989dd301b 100644 --- a/src/main/java/duke/DukeyTime.java +++ b/src/main/java/duke/DukeyTime.java @@ -1,12 +1,12 @@ package duke; -import duke.exceptions.DukeyException; - import java.time.DateTimeException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; +import duke.exceptions.DukeyException; + /** * Handles operations relating to dates */ @@ -16,6 +16,7 @@ public class DukeyTime { /** * Returns a LocalDate from a String * @param s the String containing the date + * @throws DukeyException on invalid string input for date */ public static LocalDate getDateFromString(String s) throws DukeyException { LocalDate date = LocalDate.now(); diff --git a/src/main/java/duke/Event.java b/src/main/java/duke/Event.java index 0c808619a4..e4c5b52268 100644 --- a/src/main/java/duke/Event.java +++ b/src/main/java/duke/Event.java @@ -1,8 +1,9 @@ package duke; +import java.time.LocalDate; + import duke.exceptions.DukeyException; -import java.time.LocalDate; /** * Event is a type of Task which contains a name and two dates (in the form of @@ -43,6 +44,7 @@ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { * Returns an Event created with details taken from user input. * @param ui object to handle user interactions * @return Event created based on the user's input + * @throws DukeyException on invalid String provided for date */ public static Event createEvent(Ui ui) throws DukeyException { String eventName = ui.readTaskName("Event"); diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 434b7eec0f..5efe260a01 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,9 +1,9 @@ package duke; -import duke.exceptions.DukeyException; - import java.time.LocalDate; +import duke.exceptions.DukeyException; + /** * Analyzes user input. */ @@ -77,8 +77,9 @@ public ActionEnum parseCommand(String input) throws DukeyException { * Scans the user's input for a Task name and returns the Task name, throws an exception if the * user input is empty. * @param input the user input + * @throws DukeyException on empty input for Task name */ - public String parseTaskName(String input) throws DukeyException{ + public String parseTaskName(String input) throws DukeyException { input = input.strip(); if (checkIfEmpty(input)) { throw new DukeyException("Error! Task name cannot be empty!"); @@ -90,6 +91,7 @@ public String parseTaskName(String input) throws DukeyException{ * Scans the user's input for a date and returns the date in the form of a LocalDate. Throws an exception if the * user input is empty or if the date is in the incorrect format. * @param input the user input + * @throws DukeyException on invalid string input for date */ public LocalDate parseDate(String input) throws DukeyException { input = input.strip(); @@ -99,6 +101,12 @@ public LocalDate parseDate(String input) throws DukeyException { return DukeyTime.getDateFromString(input); } + /** + * Scans the user's input for a keywrod and returns the keyword. Throws an exception if the + * user input is empty. + * @param input the user input + * @throws DukeyException on empty user input + */ public String parseKeyword(String input) throws DukeyException { input = input.strip(); if (checkIfEmpty(input)) { diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index d3a54a0594..7811d60bee 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -1,7 +1,5 @@ package duke; -import duke.exceptions.DukeyException; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -9,13 +7,15 @@ import java.util.Iterator; import java.util.Scanner; +import duke.exceptions.DukeyException; + /** * Deals with the saving and loading of Tasks onto a hard drive. */ public class Storage { - File file; - String filePath; + private File file; + private String filePath; /** * Returns a new storage containing a File where data is to be stored. @@ -28,7 +28,7 @@ public Storage(String filePath) { /** * Appends text to the save File. * @param textToAdd the text to be added - * @exception IOException on problems with the input text + * @throws IOException on problems with the input text */ public void writeToFile(String textToAdd) throws IOException { FileWriter fw = new FileWriter(this.file, true); @@ -48,6 +48,7 @@ public void clearFile() { * Saves all the Tasks on a TaskList to the hard drive by writing the log strings of each Task * onto the save File. * @param taskList the TaskList to be saved + * @throws DukeyException on invalid filepath provided */ public void save(TaskList taskList) throws DukeyException { this.clearFile(); @@ -66,7 +67,8 @@ public void save(TaskList taskList) throws DukeyException { /** * Loads all the Tasks on the hard drive to a TaskList by creating new Tasks based on the details from * their log string. - * @param taskList the TaskList on which the Tasks are to be laoded. + * @param taskList the TaskList on which the Tasks are to be laoded + * @throws FileNotFoundException on missing file */ public void load(TaskList taskList) throws FileNotFoundException { Scanner fileScanner = new Scanner(file); diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index c6df7be1e5..2133469177 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -1,12 +1,12 @@ package duke; -import duke.exceptions.DukeyException; - import static java.lang.Integer.parseInt; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Iterator; +import duke.exceptions.DukeyException; + /** * Stores and manages Tasks. */ @@ -71,6 +71,7 @@ public void readList() { /** * Marks a particular Task as done. This method uses the Ui class to read input from the user to get * details about which Task is to be marked. + * @throws DukeyException on invalid Task number from user input */ public void mark() throws DukeyException { String taskNumberString = ui.getTaskNumber(); @@ -95,6 +96,7 @@ public void mark() throws DukeyException { /** * Marks a particular Task as undone. This method uses the Ui class to read input from the user to get * details about which Task is to be unmarked. + * @throws DukeyException on invalid task number from user input */ public void unmark() throws DukeyException { String taskNumberString = ui.getTaskNumber(); @@ -118,6 +120,7 @@ public void unmark() throws DukeyException { /** * Deletes a Task from the TaskList. This method uses the Ui class to read input from the user to get * details about which Task is to be deleted. + * @throws DukeyException on invalid Task number from user input */ public void delete() throws DukeyException { String taskNumberString = ui.getTaskNumber(); @@ -205,6 +208,7 @@ public void save(Storage storage) { /** * Loads all the Tasks in the save File to the TaskList. * @param storage deals with the saving and loading of data to the save File. + * @throws FileNotFoundException on missing save file */ public void initiate(Storage storage) throws FileNotFoundException { storage.load(this); diff --git a/src/main/java/duke/TaskNumberPair.java b/src/main/java/duke/TaskNumberPair.java index 6aacac8d34..265f7e4b46 100644 --- a/src/main/java/duke/TaskNumberPair.java +++ b/src/main/java/duke/TaskNumberPair.java @@ -1,18 +1,30 @@ package duke; +/** + * Pairs a Task with its index number in the TaskList. + */ public class TaskNumberPair { private Task task; private int number; + /** + * Returns a TaskNumberPair given a Task and its index + */ public TaskNumberPair(Task task, int number) { this.task = task; this.number = number; } + /** + * Returns the Task. + */ public Task getTask() { return this.task; } + /** + * Returns the index of the Task. + */ public int getNumber() { return this.number; } diff --git a/src/main/java/duke/ToDo.java b/src/main/java/duke/ToDo.java index 0aa30b87c4..f0991b16f5 100644 --- a/src/main/java/duke/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -30,6 +30,7 @@ public ToDo(String name, boolean isMarked) { * Returns a ToDo created with details taken from user input. * @param ui object to handle user interactions * @return ToDo created based on user's input + * @throws DukeyException on invalid user input for ToDo name */ public static ToDo createToDo(Ui ui) throws DukeyException { String toDoName = ui.readTaskName("ToDo"); diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index a3ab2baaba..012779844c 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -1,18 +1,18 @@ package duke; -import duke.exceptions.DukeyException; - import java.time.LocalDate; import java.util.ArrayList; import java.util.Iterator; import java.util.Scanner; +import duke.exceptions.DukeyException; + /** * Deals with user interactions, namely reading input from the user and printing messages to the user. */ public class Ui { - Scanner scanner = new Scanner(System.in); - Parser parser = new Parser(); + private Scanner scanner = new Scanner(System.in); + private Parser parser = new Parser(); private String readLine() { return scanner.nextLine(); @@ -36,7 +36,7 @@ public String readTaskName(String type) throws DukeyException { public LocalDate readTime(String type) throws DukeyException { this.print(type + ": "); - String timeString = this.readLine(); + String timeString = this.readLine(); return parser.parseDate(timeString); } @@ -94,7 +94,7 @@ public void printTask(int taskNumber, Task task) { this.printLine((taskNumber + 1) + ". " + task); } - public void printTask (Task task) { + public void printTask(Task task) { this.printLine(task.toString()); } @@ -161,7 +161,7 @@ public void printClearedMessage() { public void printSize(int size) { - if (size == 1){ + if (size == 1) { printLine("DukeyList now has 1 task."); } else { printLine("DukeyList now has " + size + " tasks."); @@ -174,7 +174,8 @@ public void printExceptionMessage(DukeyException e) { } public void printInstruction() { - printLine("DukeyList: Welcome to DukeyList!! To use DukeyList, type the appropriate command and follow the prompts:"); + printLine("DukeyList: Welcome to DukeyList!! To use DukeyList, " + + "type the appropriate command and follow the prompts:"); printLine("To list: 'list'"); printLine("To exit: 'bye'"); printLine("To add a todo: 'todo'"); diff --git a/src/main/java/duke/exceptions/DukeyException.java b/src/main/java/duke/exceptions/DukeyException.java index 277601c95d..d6c5284af9 100644 --- a/src/main/java/duke/exceptions/DukeyException.java +++ b/src/main/java/duke/exceptions/DukeyException.java @@ -1,7 +1,14 @@ package duke.exceptions; +/** + * Exceptions that can be thrown by Duke + */ public class DukeyException extends Exception { + /** + * Returns a DukeyExecption with a given message. + * @param message the exception message + */ public DukeyException(String message) { super(message); } From 926c8baeeb2e941d1b8189fbb6454073e14c6dc0 Mon Sep 17 00:00:00 2001 From: Nicholas Tan Date: Thu, 23 Feb 2023 13:17:52 +0800 Subject: [PATCH 20/32] implement Level-10 GUI --- src/main/java/duke/Deadline.java | 10 +- src/main/java/duke/DialogBox.java | 68 ++++++ src/main/java/duke/Duke.java | 262 ++++++++++++++++++------ src/main/java/duke/Event.java | 12 +- src/main/java/duke/Launcher.java | 9 + src/main/java/duke/Main.java | 31 +++ src/main/java/duke/MainWindow.java | 76 +++++++ src/main/java/duke/Parser.java | 30 +-- src/main/java/duke/TaskList.java | 93 +++++---- src/main/java/duke/ToDo.java | 8 +- src/main/java/duke/Ui.java | 145 ++++++------- src/main/resources/view/DialogBox.fxml | 16 ++ src/main/resources/view/MainWindow.fxml | 19 ++ 13 files changed, 576 insertions(+), 203 deletions(-) create mode 100644 src/main/java/duke/DialogBox.java create mode 100644 src/main/java/duke/Launcher.java create mode 100644 src/main/java/duke/Main.java create mode 100644 src/main/java/duke/MainWindow.java create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/src/main/java/duke/Deadline.java b/src/main/java/duke/Deadline.java index fe668db15a..8569b12bd5 100644 --- a/src/main/java/duke/Deadline.java +++ b/src/main/java/duke/Deadline.java @@ -41,9 +41,13 @@ public Deadline(String name, LocalDate deadline, boolean isMarked) { * @return Deadline created based on the user's input * @exception DukeyException on invalid user input */ - public static Deadline createDeadline(Ui ui) throws DukeyException { - String deadlineName = ui.readTaskName("Deadline"); - LocalDate deadlineTime = ui.readTime("Deadline"); + public static Deadline createDeadline(Ui ui, String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 3) { + throw new DukeyException("Error! invalid format!"); + } + String deadlineName = ui.readTaskName(inputArray[1]); + LocalDate deadlineTime = ui.readTime(inputArray[2]); return new Deadline(deadlineName, deadlineTime); diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java new file mode 100644 index 0000000000..e580ffca54 --- /dev/null +++ b/src/main/java/duke/DialogBox.java @@ -0,0 +1,68 @@ +package duke; + +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.Insets; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import javafx.scene.shape.Circle; + +/** + * 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); + dialog.setWrapText(true); + dialog.setMinHeight(Double.NEGATIVE_INFINITY); + dialog.setPadding(new Insets(10, 25, 10, 25)); + displayPicture.setImage(img); + Circle clip = new Circle(60, 60, 60); + displayPicture.setClip(clip); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 41d379e686..10246c0388 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,33 +1,56 @@ package duke; import java.io.FileNotFoundException; +import javafx.application.Application; +import javafx.application.Platform; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; import duke.exceptions.DukeyException; /** * Interactive list which allows users to add Tasks and perform various operations to these Tasks. */ -public class Duke { +public class Duke extends Application { + private static final String FILEPATH = "DukeySave.txt"; private Ui ui; private Storage storage; private TaskList taskList; + private int inputStatus; + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + private Image user = new Image(this.getClass().getResourceAsStream("/images/Cap.jpeg")); + private Image duke = new Image(this.getClass().getResourceAsStream("/images/IronMan.jpg")); /** * Returns a new instance of Duke with a Storage, Ui and TaskList. - * @param filePath the file path of the save file used to save data from the Duke */ - public Duke(String filePath) { + public Duke() { this.ui = new Ui(); - this.storage = new Storage(filePath); + this.storage = new Storage(FILEPATH); this.taskList = new TaskList(ui); + this.inputStatus = 0; } + /** * Starts Duke */ public static void main(String[] args) { - Duke duke = new Duke("DukeySave.txt"); - duke.initiateDukeyList(); + Duke duke = new Duke(); + //duke.initiateDukeyList(); } @@ -44,90 +67,193 @@ public void echo() { ui.echo(input); } ui.printGoodbyeMessage(); + } + public int getInputStatus() { + return this.inputStatus; } /** * Initiates the DukeyList by loading a save, then scans for and performs commands from the user. */ - public void initiateDukeyList() { - ui.printWelcomeMessage(); - ui.printInstruction(); + public String runDuke(String input) { + StringBuilder sb = new StringBuilder(); + ActionEnum actionEnum = ActionEnum.BYE; try { - taskList.initiate(storage); - } catch (FileNotFoundException e) { - ui.printLoadMessage(0); + actionEnum = ui.readCommand(input); + switch (actionEnum) { + case TODO: + sb.append(taskList.addTask(ToDo.createToDo(ui, input))); + break; + case DEADLINE: + sb.append(taskList.addTask(Deadline.createDeadline(ui, input))); + break; + case EVENT: + sb.append(taskList.addTask(Event.createEvent(ui, input))); + break; + case MARK: + sb.append(taskList.mark(input)); + break; + case UNMARK: + sb.append(taskList.unmark(input)); + break; + case DELETE: + sb.append(taskList.delete(input)); + break; + case LIST: + sb.append(taskList.readList()); + break; + case CLEARLIST: + sb.append(taskList.clearList()); + break; + case FIND: + sb.append(taskList.find(input)); + break; + case SAVE: + sb.append(taskList.save(storage)); + break; + case CLEARSAVE: + taskList.clearSave(storage); + break; + case BYE: + return "DukeyList saved! Exiting now..."; + case FORCESTOP: + //isForceStopped = true; + break; + } + } catch (DukeyException e) { + sb.append(ui.printExceptionMessage(e)); } - boolean isStillRunning = true; - boolean isForceStopped = false; - - while (isStillRunning && !isForceStopped) { - ui.printLnBreak(); - ActionEnum actionEnum = ActionEnum.BYE; - try { - actionEnum = ui.readCommand(); - switch (actionEnum) { - case TODO: - taskList.addTask(ToDo.createToDo(ui)); - break; - case DEADLINE: - taskList.addTask(Deadline.createDeadline(ui)); - break; - case EVENT: - taskList.addTask(Event.createEvent(ui)); - break; - case MARK: - taskList.mark(); - break; - case UNMARK: - taskList.unmark(); - break; - case DELETE: - taskList.delete(); - break; - case LIST: - taskList.readList(); - break; - case CLEARLIST: - taskList.clearList(); - break; - case FIND: - taskList.find(); - break; - case SAVE: - taskList.save(storage); - break; - case CLEARSAVE: - taskList.clearSave(storage); - break; - case BYE: - isStillRunning = false; - break; - case FORCESTOP: - isForceStopped = true; - break; - } - } catch (DukeyException e) { - ui.printExceptionMessage(e); - } + return sb.toString(); - if (!isStillRunning) { - taskList.save(storage); - ui.printGoodbyeMessage(); - } + } + + public String printInstruction() { + return ui.printInstruction(); + } + + public String loadDuke() { + StringBuilder sb = new StringBuilder(); + try { + int status = taskList.initiate(storage); + sb.append(ui.printLoadMessage(status)); + } catch (FileNotFoundException e) { + sb.append(ui.printLoadMessage(0)); + } + sb.append(taskList.readList()); + return sb.toString(); + } + + public String exitDuke() { + String response = ""; + try { + response = taskList.save(storage); + } catch (DukeyException e) { + response = ui.printExceptionMessage(e); } + return response + ui.printGoodbyeMessage(); + } + + @Override + public void start(Stage stage) { + //Setting up the required components + scrollPane = new ScrollPane(); + dialogContainer = new VBox(); + scrollPane.setContent(dialogContainer); + + userInput = new TextField(); + sendButton = new Button("Send"); + + AnchorPane mainLayout = new AnchorPane(); + mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); + + scene = new Scene(mainLayout); + + stage.setScene(scene); + stage.show(); + + //Formatting to look as expected. + stage.setTitle("Duke"); + stage.setResizable(false); + stage.setMinHeight(600.0); + stage.setMinWidth(400.0); + + mainLayout.setPrefSize(400.0, 600.0); + + scrollPane.setPrefSize(385, 535); + scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); + scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); + scrollPane.setVvalue(1.0); + scrollPane.setFitToWidth(true); + + dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); + userInput.setPrefWidth(325.0); + sendButton.setPrefWidth(55.0); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + AnchorPane.setLeftAnchor(userInput , 1.0); + AnchorPane.setBottomAnchor(userInput, 1.0); + //Handle user input + sendButton.setOnMouseClicked((event) -> { + handleUserInput(5); + }); + + userInput.setOnAction((event) -> { + handleUserInput(5); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); } + /** + * Iteration 1: + * Creates a label with the specified text and adds it to the dialog container. + * @param text String containing text to add + * @return a label with the specified text that has word wrap enabled. + */ + private Label getDialogLabel(String text) { + Label textToAdd = new Label(text); + textToAdd.setWrapText(true); + return textToAdd; + } + /** + * Iteration 2: + * 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. + */ + private void handleUserInput(int a) { + String userText = userInput.getText(); + String response = ""; + String dukeText = getResponse(userText); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(userText, user), + DialogBox.getDukeDialog(dukeText, duke) + ); + userInput.clear(); + } + + /** + * Generates a response to user input. + */ + public String getResponse(String input) { + return "DukeyList: " + input; + } + public String trySomething(String input) { + return input + " good"; + } } diff --git a/src/main/java/duke/Event.java b/src/main/java/duke/Event.java index e4c5b52268..4a5b4d6f35 100644 --- a/src/main/java/duke/Event.java +++ b/src/main/java/duke/Event.java @@ -46,10 +46,14 @@ public Event(String name, LocalDate start, LocalDate end, boolean isMarked) { * @return Event created based on the user's input * @throws DukeyException on invalid String provided for date */ - public static Event createEvent(Ui ui) throws DukeyException { - String eventName = ui.readTaskName("Event"); - LocalDate eventStart = ui.readTime("Event start time"); - LocalDate eventEnd = ui.readTime("Event end time"); + public static Event createEvent(Ui ui, String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 4) { + throw new DukeyException("Error! Invalid Format!"); + } + String eventName = ui.readTaskName(inputArray[1]); + LocalDate eventStart = ui.readTime(inputArray[2]); + LocalDate eventEnd = ui.readTime(inputArray[3]); return new Event(eventName, eventStart, eventEnd); } diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java new file mode 100644 index 0000000000..b8c0f9c373 --- /dev/null +++ b/src/main/java/duke/Launcher.java @@ -0,0 +1,9 @@ +package duke; + +import javafx.application.Application; + +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} diff --git a/src/main/java/duke/Main.java b/src/main/java/duke/Main.java new file mode 100644 index 0000000000..59ae50a45c --- /dev/null +++ b/src/main/java/duke/Main.java @@ -0,0 +1,31 @@ +package duke; + +import java.io.IOException; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/duke/MainWindow.java b/src/main/java/duke/MainWindow.java new file mode 100644 index 0000000000..4142f73447 --- /dev/null +++ b/src/main/java/duke/MainWindow.java @@ -0,0 +1,76 @@ +package duke; + +import javafx.animation.PauseTransition; +import javafx.application.Platform; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +import javafx.util.Duration; + +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/Cap.jpeg")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/IronMan.jpg")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + dialogContainer.getChildren().addAll( + DialogBox.getDukeDialog(duke.printInstruction(), dukeImage)); + dialogContainer.getChildren().addAll( + DialogBox.getDukeDialog(duke.loadDuke(), dukeImage)); + + } + + /** + * 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(); + if (input.strip().equals("bye")) { + String byeMessage = duke.exitDuke(); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(byeMessage, dukeImage) + ); + PauseTransition pt = new PauseTransition(Duration.seconds(3)); + pt.setOnFinished(e -> { + Platform.exit(); + }); + pt.play(); + + } + String response = duke.runDuke(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage) + ); + dialogContainer.getChildren().addAll( + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } + +} \ No newline at end of file diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 5efe260a01..9e0e859b8c 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -29,43 +29,43 @@ public ActionEnum parseCommand(String input) throws DukeyException { if (checkIfEmpty(input)) { throw new DukeyException("Error! Input cannot be empty."); } - if (input.equals("todo")) { + if (input.length() < 3) { + throw new DukeyException("Invalid Command!"); + } + if (input.substring(0,3).strip().equals("tod")) { return ActionEnum.TODO; } - if (input.equals("deadline")) { + if (input.substring(0,3).strip().equals("dea")) { return ActionEnum.DEADLINE; } - if (input.equals("event")) { + if (input.substring(0,3).strip().equals("eve")) { return ActionEnum.EVENT; } - if (input.equals("list")) { + if (input.substring(0,3).strip().equals("lis")) { return ActionEnum.LIST; } - if (input.equals("mark")) { + if (input.substring(0,3).strip().equals("mar")) { return ActionEnum.MARK; } - if (input.equals("unmark")) { + if (input.substring(0,3).strip().equals("unm")) { return ActionEnum.UNMARK; } - if (input.equals("delete")) { + if (input.substring(0,3).strip().equals("del")) { return ActionEnum.DELETE; } - if (input.equals("save")) { + if (input.substring(0,3).strip().equals("sav")) { return ActionEnum.SAVE; } - if (input.equals("clearlist")) { + if (input.substring(0,3).strip().equals("cle")) { return ActionEnum.CLEARLIST; } - if (input.equals("clearsave")) { - return ActionEnum.CLEARSAVE; - } - if (input.equals("bye")) { + if (input.substring(0,3).strip().equals("bye")) { return ActionEnum.BYE; } - if (input.equals("forcestop")) { + if (input.substring(0,3).strip().equals("for")) { return ActionEnum.FORCESTOP; } - if (input.equals("find")) { + if (input.substring(0,3).strip().equals("fin")) { return ActionEnum.FIND; } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 2133469177..8b01e67918 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -46,11 +46,11 @@ public Iterator getIterator() { /** * Adds a new Task to the TaskList and prints out a confirmation message for the user. + * @return the confirmation message for the user */ - public void addTask(Task task) { + public String addTask(Task task) { this.list.add(task); - ui.printAddedMessage(task); - printSize(); + return ui.printAddedMessage(task) + '\n' + printSize(); } /** @@ -63,21 +63,26 @@ public void addTaskFromSave(Task task) { /** * Prints out all the Tasks in the TaskList. + * @return the string containing the list of tasks */ - public void readList() { - ui.readList(this.list); + public String readList() { + return ui.readList(this.list); } /** * Marks a particular Task as done. This method uses the Ui class to read input from the user to get * details about which Task is to be marked. + * @return the confirmation message for the user * @throws DukeyException on invalid Task number from user input */ - public void mark() throws DukeyException { - String taskNumberString = ui.getTaskNumber(); + public String mark(String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 2) { + throw new DukeyException("Error, Invalid Format!"); + } int taskNumber; try { - taskNumber = parseInt(taskNumberString.strip()) - 1; + taskNumber = parseInt(inputArray[1].strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } @@ -90,19 +95,23 @@ public void mark() throws DukeyException { Task taskToMark = this.list.get(taskNumber); taskToMark.setMarked(); - ui.printMarkedMessage(taskNumber, taskToMark); + return ui.printMarkedMessage(taskNumber, taskToMark); } /** * Marks a particular Task as undone. This method uses the Ui class to read input from the user to get * details about which Task is to be unmarked. + * @return the confirmation message for the user * @throws DukeyException on invalid task number from user input */ - public void unmark() throws DukeyException { - String taskNumberString = ui.getTaskNumber(); + public String unmark(String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 2) { + throw new DukeyException("Error, Invalid Format!"); + } int taskNumber; try { - taskNumber = parseInt(taskNumberString.strip()) - 1; + taskNumber = parseInt(inputArray[1].strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } @@ -114,19 +123,23 @@ public void unmark() throws DukeyException { } Task taskToUnmark = this.list.get(taskNumber); taskToUnmark.setUnmarked(); - ui.printUnmarkedMessage(taskNumber, taskToUnmark); + return ui.printUnmarkedMessage(taskNumber, taskToUnmark); } /** * Deletes a Task from the TaskList. This method uses the Ui class to read input from the user to get * details about which Task is to be deleted. + * @return the confirmation message for the user * @throws DukeyException on invalid Task number from user input */ - public void delete() throws DukeyException { - String taskNumberString = ui.getTaskNumber(); + public String delete(String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 2) { + throw new DukeyException("Error, Invalid Format!"); + } int taskNumber; try { - taskNumber = parseInt(taskNumberString.strip()) - 1; + taskNumber = parseInt(inputArray[1].strip()) - 1; } catch (NumberFormatException e) { throw new DukeyException("Error! Invalid task number format!"); } @@ -138,23 +151,23 @@ public void delete() throws DukeyException { } Task taskToRemove = list.get(taskNumber); - ui.printDeletedMessage(taskToRemove); + String response = ui.printDeletedMessage(taskToRemove); list.remove(taskNumber); - this.printSize(); + response += '\n' + this.printSize(); + return response; } /** * Finds Tasks in the TaskList that contains a particular keyword. This method * uses the Ui class to read input from the user to get the keyword. The found Tasks are then printed out. + * @return the confirmation message for the user */ - public void find() { - String keyword = ""; - try { - keyword = ui.readKeyword(); - } catch (DukeyException e) { - ui.printExceptionMessage(e); + public String find(String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 2) { + throw new DukeyException("Error! Invalid format!"); } - + String keyword = ui.readKeyword(inputArray[1]); String confirmedKeyword = keyword; ArrayList foundTaskList = new ArrayList<>(); Iterator it = getIterator(); @@ -165,7 +178,7 @@ public void find() { } }); - ui.printFoundTaskList(foundTaskList); + return ui.printFoundTaskList(foundTaskList); } @@ -178,31 +191,28 @@ public int getSize() { /** * Uses the Ui class to print out the number of Tasks in the TaskList. + * @return the string containing the size */ - public void printSize() { - ui.printSize(getSize()); + public String printSize() { + return ui.printSize(getSize()); } /** * Clears the TaskList. */ - public void clearList() { + public String clearList() { this.list.clear(); - System.out.println("DukeyList cleared! DukeyList is now empty."); + return ui.printClearedMessage(); } /** * Saves the current TaskList to the save File. + * @return the confirmation message for the user * @param storage deals with the saving and loading of data to the save File. */ - public void save(Storage storage) { - try { - storage.save(this); - } catch (DukeyException e) { - ui.printExceptionMessage(e); - } - - ui.printSavedMessage(); + public String save(Storage storage) throws DukeyException { + storage.save(this); + return ui.printSavedMessage(); } /** @@ -210,14 +220,13 @@ public void save(Storage storage) { * @param storage deals with the saving and loading of data to the save File. * @throws FileNotFoundException on missing save file */ - public void initiate(Storage storage) throws FileNotFoundException { + public int initiate(Storage storage) throws FileNotFoundException { storage.load(this); if (this.list.isEmpty()) { - ui.printLoadMessage(0); + return 0; } else { - ui.printLoadMessage(1); - ui.readList(list); + return 1; } } diff --git a/src/main/java/duke/ToDo.java b/src/main/java/duke/ToDo.java index f0991b16f5..0872c15560 100644 --- a/src/main/java/duke/ToDo.java +++ b/src/main/java/duke/ToDo.java @@ -32,8 +32,12 @@ public ToDo(String name, boolean isMarked) { * @return ToDo created based on user's input * @throws DukeyException on invalid user input for ToDo name */ - public static ToDo createToDo(Ui ui) throws DukeyException { - String toDoName = ui.readTaskName("ToDo"); + public static ToDo createToDo(Ui ui, String input) throws DukeyException { + String[] inputArray = input.split("/"); + if (inputArray.length != 2) { + throw new DukeyException("Error! Invalid Format!"); + } + String toDoName = ui.readTaskName(inputArray[1]); return new ToDo(toDoName); } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 012779844c..62f9e70b98 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -18,31 +18,23 @@ private String readLine() { return scanner.nextLine(); } - public ActionEnum readCommand() throws DukeyException { - this.print("Dukey command: "); - String input = this.readLine(); - return parser.parseCommand(input); + public ActionEnum readCommand(String command) throws DukeyException { + return parser.parseCommand(command); } public String readEchoInput() { return this.readLine(); } - public String readTaskName(String type) throws DukeyException { - this.print(type + " task name: "); - String input = this.readLine(); + public String readTaskName(String input) throws DukeyException { return parser.parseTaskName(input); } - public LocalDate readTime(String type) throws DukeyException { - this.print(type + ": "); - String timeString = this.readLine(); + public LocalDate readTime(String timeString) throws DukeyException { return parser.parseDate(timeString); } - public String readKeyword() throws DukeyException { - this.print("Search keyword: "); - String keyword = this.readLine(); + public String readKeyword(String keyword) throws DukeyException { return parser.parseKeyword(keyword); } @@ -70,8 +62,8 @@ public void printWelcomeMessage() { this.printLine("Welcome welcome!"); } - public void printGoodbyeMessage() { - this.printLine("DukeyList: Goodbye!! Please return to Dukey again soon!! :)"); + public String printGoodbyeMessage() { + return "DukeyList: Goodbye!! Please return to Dukey again soon!! :)"; } public void printLnBreak() { @@ -90,108 +82,123 @@ public void printWrongCommandMessage() { this.printLine("Error! Unknown command. Try again!"); } - public void printTask(int taskNumber, Task task) { - this.printLine((taskNumber + 1) + ". " + task); + public String printTask(int taskNumber, Task task) { + return (taskNumber + 1) + ". " + task; } - public void printTask(Task task) { - this.printLine(task.toString()); + public String printTask(Task task) { + return task.toString(); } - public void printEmptyListMessage() { - this.printLine("DukeyList: DukeyList is empty!"); + public String printEmptyListMessage() { + return "DukeyList: DukeyList is empty!"; } - public void readList(ArrayList list) { + public String readList(ArrayList list) { + StringBuilder sb = new StringBuilder(); if (list.isEmpty()) { - this.printEmptyListMessage(); + sb.append(printEmptyListMessage()); } else { - this.printLine("DukeyList:"); + sb.append("DukeyList:\n"); Iterator it = list.iterator(); - it.forEachRemaining(x -> System.out.println((list.indexOf(x) + 1) + ". " + x.toString())); + it.forEachRemaining(x -> sb.append((list.indexOf(x) + 1) + ". " + x.toString() + '\n')); } + return sb.toString(); } - public void printFoundTaskList(ArrayList foundTaskList) { + public String printFoundTaskList(ArrayList foundTaskList) { + StringBuilder sb = new StringBuilder(); if (foundTaskList.isEmpty()) { - this.printLine("No tasks found matching this keyword!"); + sb.append("No tasks found matching this keyword!"); } else { - this.printLine("DukeyList found these tasks matching the keyword:"); + sb.append("DukeyList found these tasks matching the keyword:\n"); Iterator it = foundTaskList.iterator(); - it.forEachRemaining(x -> this.printLine((x.getNumber() + 1) + ". " + x.getTask())); + it.forEachRemaining(x -> sb.append((x.getNumber() + 1) + ". " + x.getTask() + "\n")); } + + return sb.toString(); } - public void printAddedMessage(Task task) { - this.printLine(""); - this.printLine(task.getMessageWhenAdded() + " " + task); + public String printAddedMessage(Task task) { + return '\n' + task.getMessageWhenAdded() + "\n" + task; } - public void printMarkedMessage(int taskNumber, Task taskToMark) { - this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been marked as done!"); - this.printTask(taskNumber, taskToMark); + public String printMarkedMessage(int taskNumber, Task taskToMark) { + String response = ""; + response += "DukeyList: Task number " + (taskNumber + 1) + " has been marked as done!\n"; + response += printTask(taskNumber, taskToMark); + return response; } - public void printUnmarkedMessage(int taskNumber, Task taskToUnmark) { - this.printLine("DukeyList: Task number " + (taskNumber + 1) + " has been unmarked."); - this.printTask(taskNumber, taskToUnmark); + public String printUnmarkedMessage(int taskNumber, Task taskToUnmark) { + String response = ""; + response += "DukeyList: Task number " + (taskNumber + 1) + " has been unmarked.\n"; + response += printTask(taskNumber, taskToUnmark); + return response; } - public void printDeletedMessage(Task taskToDelete) { - this.printLine("DukeyList: The following item has been removed!"); - this.printTask(taskToDelete); + public String printDeletedMessage(Task taskToDelete) { + String response = ""; + response += "DukeyList: The following item has been removed!\n"; + response += this.printTask(taskToDelete); + return response; } - public void printSavedMessage() { - System.out.println("DukeList saved!"); + public String printSavedMessage() { + return "DukeList saved!"; } - public void printLoadMessage(int status) { + public String printLoadMessage(int status) { if (status == 0) { - this.printLine("DukeyList is empty, starting a new list."); + return "DukeyList is empty, starting a new list.\n"; } else { - System.out.println("Saved list loaded:"); + return "Saved list loaded:\n"; } } - public void printClearedMessage() { - this.printLine("DukeyList save has been cleared."); + public String printClearedMessage() { + return "DukeyList save has been cleared."; } - public void printSize(int size) { + public String printSize(int size) { if (size == 1) { - printLine("DukeyList now has 1 task."); + return "DukeyList now has 1 task.\n"; } else { - printLine("DukeyList now has " + size + " tasks."); + return "DukeyList now has " + size + " tasks.\n"; } } - public void printExceptionMessage(DukeyException e) { - printLine(e.getMessage()); - printErrorBreak(); + public String printExceptionMessage(DukeyException e) { + return ":(\n" + e.getMessage(); } - public void printInstruction() { - printLine("DukeyList: Welcome to DukeyList!! To use DukeyList, " + - "type the appropriate command and follow the prompts:"); - printLine("To list: 'list'"); - printLine("To exit: 'bye'"); - printLine("To add a todo: 'todo'"); - printLine("To add a deadline: 'deadline'"); - printLine("To add an event: 'event'"); - printLine("To mark a task as done: 'mark'"); - printLine("To unmark a task: 'unmark'"); - printLine("To delete a task: 'delete'"); - printLine("To clear the list: 'clearList'"); - printLine("To save the list: 'save'"); - printLine("To find tasks using keywords: 'find'"); - printLnBreak(); + public String printInstruction() { + StringBuilder sb = new StringBuilder(); + sb.append("DukeyList: Welcome to DukeyList!! To use DukeyList, " + + "type the appropriate command and follow the prompts:\n"); + sb.append("To list: 'list'\n"); + sb.append("To exit: 'bye'\n"); + sb.append("To add a todo: 'todo / '\n"); + sb.append("To add a deadline: 'deadline / / deadline '\n"); + sb.append("To add an event: 'event'\n"); + sb.append("To mark a task as done: 'mark'\n"); + sb.append("To unmark a task: 'unmark'\n"); + sb.append("To delete a task: 'delete'\n"); + sb.append("To clear the list: 'clearList'\n"); + sb.append("To save the list: 'save'\n"); + sb.append("To find tasks using keywords: 'find'\n"); + + return sb.toString(); } public void printEchoInstruction() { printLine("Start by typing something and Dukey will echo!! Type bye to exit!! "); } + public void close() { + scanner.close(); + } + } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e433809947 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..832f84382e --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +