From 556af3f47a96b32898ab4cdbd65b16486a4871e8 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/31] 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 dc082c34bd887b6359fcf28ca262e9390b9c9599 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 25 Aug 2022 17:48:12 +0800 Subject: [PATCH 02/31] Added level 1- 6, A-Collections --- src/main/java/AddFunction.java | 70 ++++++++++++++++++++++++ src/main/java/ByeFunction.java | 11 ++++ src/main/java/CleverNotBot.java | 21 +++++++ src/main/java/CleverNotBotException.java | 14 +++++ src/main/java/Deadline.java | 18 ++++++ src/main/java/DefaultFunction.java | 11 ++++ src/main/java/DeleteFunction.java | 25 +++++++++ src/main/java/Duke.java | 10 ---- src/main/java/Event.java | 18 ++++++ src/main/java/Function.java | 19 +++++++ src/main/java/GreetFunction.java | 11 ++++ src/main/java/Handler.java | 28 ++++++++++ src/main/java/ListFunction.java | 22 ++++++++ src/main/java/MarkFunction.java | 22 ++++++++ src/main/java/Task.java | 31 +++++++++++ src/main/java/TaskList.java | 44 +++++++++++++++ src/main/java/ToDo.java | 16 ++++++ src/main/java/UITextBox.java | 49 +++++++++++++++++ src/main/java/UnmarkFunction.java | 22 ++++++++ 19 files changed, 452 insertions(+), 10 deletions(-) create mode 100644 src/main/java/AddFunction.java create mode 100644 src/main/java/ByeFunction.java create mode 100644 src/main/java/CleverNotBot.java create mode 100644 src/main/java/CleverNotBotException.java create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/DefaultFunction.java create mode 100644 src/main/java/DeleteFunction.java delete mode 100644 src/main/java/Duke.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Function.java create mode 100644 src/main/java/GreetFunction.java create mode 100644 src/main/java/Handler.java create mode 100644 src/main/java/ListFunction.java create mode 100644 src/main/java/MarkFunction.java create mode 100644 src/main/java/Task.java create mode 100644 src/main/java/TaskList.java create mode 100644 src/main/java/ToDo.java create mode 100644 src/main/java/UITextBox.java create mode 100644 src/main/java/UnmarkFunction.java diff --git a/src/main/java/AddFunction.java b/src/main/java/AddFunction.java new file mode 100644 index 0000000000..9194b72a81 --- /dev/null +++ b/src/main/java/AddFunction.java @@ -0,0 +1,70 @@ +import java.util.Arrays; + +public class AddFunction extends Function { + + public AddFunction(String function,boolean exit){ + super(function,exit); + } + + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { + String[] desc = getFunction().split(" "); + if(desc[0].equals("todo")){ + if(desc.length != 1){ + String[] descOnly = Arrays.copyOfRange(desc,1,desc.length); + String joinDesc = String.join(" ", descOnly); + Task newTask = new ToDo(joinDesc,false); + tasks.addTask(newTask); + textBox.chat(String.format(""" + Got it. I've added this task: + %s\s + Now you have %d tasks in the list.\s""".indent(1) + ,newTask.toString(),tasks.getSize())); + } else{ + throw new CleverNotBotException("Please fill in the description of ToDo!",textBox); + } + } else if(desc[0].equals("deadline")){ + if(desc.length == 1){ + throw new CleverNotBotException("Please fill in the description of Deadline!",textBox); + } else if (!getFunction().contains("/by")){ + throw new CleverNotBotException("Please include a /by in your description of Deadline! ",textBox); + } else{ + String searchWord = " /by"; + int start = "deadline ".length(); + int mid = getFunction().indexOf(searchWord); + String functionName = getFunction().substring(start,mid); + String by = getFunction().substring(mid + searchWord.length() + 1); // to remove the space + Task newTask = new Deadline(functionName,false,by); + tasks.addTask(newTask); + textBox.chat(String.format(""" + Got it. I've added this task: + %s\s + Now you have %d tasks in the list.\s""".indent(1) + ,newTask.toString(),tasks.getSize())); + } + } + else if(desc[0].equals("event")){ + if(desc.length == 1){ + throw new CleverNotBotException("Please fill in the description of Event!",textBox); + } else if (!getFunction().contains("/at")){ + throw new CleverNotBotException("Please include a /at in your description of Deadline! ",textBox); + } else{ + String searchWord = " /at"; + int start = "event ".length(); + int mid = getFunction().indexOf(searchWord); + String functionName = getFunction().substring(start,mid); + String at = getFunction().substring(mid + searchWord.length() + 1); // to remove the space; + Task newTask = new Event(functionName,false,at); + tasks.addTask(newTask); + textBox.chat(String.format(""" + Got it. I've added this task: + %s\s + Now you have %d tasks in the list.\s""".indent(1) + ,newTask.toString(),tasks.getSize())); + } + }else { + throw new CleverNotBotException("An unexpected error has occurred (addf no results found)",textBox); + } + + } + +} diff --git a/src/main/java/ByeFunction.java b/src/main/java/ByeFunction.java new file mode 100644 index 0000000000..72bcd810d5 --- /dev/null +++ b/src/main/java/ByeFunction.java @@ -0,0 +1,11 @@ +public class ByeFunction extends Function { + + public ByeFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + textBox.chat("Bye. Hope to see you again soon!"); + } +} diff --git a/src/main/java/CleverNotBot.java b/src/main/java/CleverNotBot.java new file mode 100644 index 0000000000..febab73d1d --- /dev/null +++ b/src/main/java/CleverNotBot.java @@ -0,0 +1,21 @@ +import java.util.Scanner; + +public class CleverNotBot { + public static void main(String[] args) throws CleverNotBotException { + + UITextBox textBox = new UITextBox(); + TaskList tasks = new TaskList(); + Scanner sc = new Scanner(System.in); + Handler hl = new Handler(); + + hl.parseText("greet").run(tasks,textBox); + while(sc.hasNext()){ + String ip = sc.nextLine(); + Function nxtStep = hl.parseText(ip); + nxtStep.run(tasks,textBox); + if(nxtStep.isExitingProgram()) { break; } + } + + } + +} diff --git a/src/main/java/CleverNotBotException.java b/src/main/java/CleverNotBotException.java new file mode 100644 index 0000000000..c1b41c8b41 --- /dev/null +++ b/src/main/java/CleverNotBotException.java @@ -0,0 +1,14 @@ +public class CleverNotBotException extends Exception{ + private String errorMessage; + private UITextBox textBox; + + public CleverNotBotException(String errorMessage, UITextBox textBox){ + this.errorMessage = errorMessage; + this.textBox = textBox; + } + + @Override + public String toString(){ + return textBox.coverText(errorMessage); + } +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..b2a11abbc0 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,18 @@ +public class Deadline extends Task{ + private String by; + + public Deadline(String name, boolean completed, String by){ + super(name,completed); + this.by = by; + } + + @Override + public Task toggleCompleted(){ + return new Deadline(getName(),!isCompleted(),by); + } + + @Override + public String toString(){ + return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),by); + } +} diff --git a/src/main/java/DefaultFunction.java b/src/main/java/DefaultFunction.java new file mode 100644 index 0000000000..803b80caff --- /dev/null +++ b/src/main/java/DefaultFunction.java @@ -0,0 +1,11 @@ +public class DefaultFunction extends Function{ + + public DefaultFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + textBox.chat("This command doesn't exist!"); + } +} diff --git a/src/main/java/DeleteFunction.java b/src/main/java/DeleteFunction.java new file mode 100644 index 0000000000..c15b54ae30 --- /dev/null +++ b/src/main/java/DeleteFunction.java @@ -0,0 +1,25 @@ +public class DeleteFunction extends Function{ + + public DeleteFunction(String function,boolean exit){ + super(function,exit); + } + + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { + try{ + String[] desc = getFunction().split(" "); + if(desc.length <= 1){ + throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); + } + Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task 3 is in idx 2 + tasks.removeTask(deletedTask); + textBox.chat(String.format(""" + Noted. I've removed this task: + %s\s + Now you have %d tasks in the list.\s""".indent(1) + ,deletedTask.toString(),tasks.getSize())); + } catch (IndexOutOfBoundsException e){ + throw new CleverNotBotException("The task does not exist!",textBox); + } + + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index 5d313334cc..0000000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,10 +0,0 @@ -public class Duke { - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - } -} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..4c497ffc9f --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,18 @@ +public class Event extends Task{ + private String at; + + public Event(String name, boolean completed, String at){ + super(name,completed); + this.at = at; + } + + @Override + public Task toggleCompleted(){ + return new Event(getName(),!isCompleted(),at); + } + + @Override + public String toString(){ + return String.format("[E][%s] %s (at: %s)",checkMarked(),getName(),at); + } +} diff --git a/src/main/java/Function.java b/src/main/java/Function.java new file mode 100644 index 0000000000..11522cc7ed --- /dev/null +++ b/src/main/java/Function.java @@ -0,0 +1,19 @@ +public abstract class Function { + private String function; + private boolean exit; + + public Function(String function,boolean exit){ + this.function = function; + this.exit = exit; + } + + public String getFunction(){ + return function; + } + + public boolean isExitingProgram(){ + return exit; + } + + public abstract void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException; +} diff --git a/src/main/java/GreetFunction.java b/src/main/java/GreetFunction.java new file mode 100644 index 0000000000..3a228e20c1 --- /dev/null +++ b/src/main/java/GreetFunction.java @@ -0,0 +1,11 @@ +public class GreetFunction extends Function { + + public GreetFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); + } +} diff --git a/src/main/java/Handler.java b/src/main/java/Handler.java new file mode 100644 index 0000000000..d022f0e27e --- /dev/null +++ b/src/main/java/Handler.java @@ -0,0 +1,28 @@ +public class Handler { + + public Function parseText(String text){ + String[] txtArr = text.split(" "); + switch(txtArr[0]){ + case "mark": + return new MarkFunction(text,false); + case "unmark": + return new UnmarkFunction(text,false); + case "list": + return new ListFunction(text,false); + case "todo": + case "deadline": + case "event": + return new AddFunction(text,false); + case "delete": + return new DeleteFunction(text,false); + case "greet": + return new GreetFunction(text,false); + case "bye": + return new ByeFunction(text,true); + default: + return new DefaultFunction(text,false); + } + } + +} + diff --git a/src/main/java/ListFunction.java b/src/main/java/ListFunction.java new file mode 100644 index 0000000000..f62403ddbe --- /dev/null +++ b/src/main/java/ListFunction.java @@ -0,0 +1,22 @@ +public class ListFunction extends Function { + + public ListFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); + }else { + int counter = 1; + StringBuilder op = new StringBuilder(); + for (Task task : tasks.getTaskList()) { + op.append(counter++); + op.append("."); + op.append(task.toString()); + op.append("\n"); + } + textBox.chat(op.toString()); + } + } +} diff --git a/src/main/java/MarkFunction.java b/src/main/java/MarkFunction.java new file mode 100644 index 0000000000..2c401becd2 --- /dev/null +++ b/src/main/java/MarkFunction.java @@ -0,0 +1,22 @@ +public class MarkFunction extends Function{ + + public MarkFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + Task taskToMark = tasks.getTask(number); + if(taskToMark.checkMarked().equals(" ")) { + Task markedTask = taskToMark.toggleCompleted(); + tasks.removeTask(taskToMark); + tasks.addTaskByIdx(number, markedTask); + textBox.chat(String.format("Nice! I've marked this task as done:\n [%s] %s", + markedTask.checkMarked(),markedTask.getName())); + } else{ + textBox.chat("Hey! This task is already marked!"); + } + + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..ff3cb7bd24 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,31 @@ +public abstract class Task { + private final String name; + private final boolean completed; + + + public Task(String name, boolean completed){ + this.name = name; + this.completed = completed; + } + + public String getName(){ + return name; + } + + public boolean isCompleted(){ + return completed; + } + + public String checkMarked(){ + return isCompleted()? "X":" "; + } + + public abstract Task toggleCompleted(); + //return new Task(name,!completed); + + + @Override + public String toString() { + return name; + } +} diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..b736e4a0a9 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,44 @@ +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class TaskList { + private List tasks = new ArrayList();; + private int size; + + public TaskList(){ + size = 0; + } + + public void addTask(Task element){ + tasks.add(element); + size++; + } + + public void addTaskByIdx(int idx, Task element){ + tasks.add(idx, element); + size++; + } + + public void removeTask(Task task){ + tasks.remove((Task)task); + size--; + } + + public Task getTask(int idx){ + return tasks.get(idx); + } + + public List getTaskList(){ + return tasks; + } + public int getSize(){ + return size; + } + + @Override + public String toString(){ + return Arrays.toString(tasks.toArray()); + } + +} diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java new file mode 100644 index 0000000000..0cad4d7475 --- /dev/null +++ b/src/main/java/ToDo.java @@ -0,0 +1,16 @@ +public class ToDo extends Task{ + + public ToDo(String name, boolean completed){ + super(name,completed); + } + + @Override + public Task toggleCompleted(){ + return new ToDo(getName(),!isCompleted()); + } + + @Override + public String toString(){ + return String.format("[T][%s] %s",checkMarked(),getName()); + } +} diff --git a/src/main/java/UITextBox.java b/src/main/java/UITextBox.java new file mode 100644 index 0000000000..687c2d435d --- /dev/null +++ b/src/main/java/UITextBox.java @@ -0,0 +1,49 @@ +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +public class UITextBox { + + public UITextBox(){} + + public void chat(String text){ + List textLines; + int max; + if (text == null){ + textLines = Collections.singletonList("null"); + max = 4; + } else { + textLines = Arrays.asList(text.split("\n")); + max = textLines.stream().map(String::length).max(Integer::compareTo).get(); + } + System.out.println(" " + "_".repeat(max + 10)); + System.out.println("|" + " ".repeat(max + 10) + "|"); + for (int i = 0; i < textLines.size(); i++) { + int curr = textLines.get(i).length(); + System.out.println("|" + " ".repeat(5) + textLines.get(i) + " ".repeat(5 + max-curr) + "|"); + } + System.out.println("|" + "_".repeat(max + 10) + "|"); + + } + + public String coverText(String text){ + List textLines; + int max; + if (text == null){ + textLines = Collections.singletonList("null"); + max = 4; + } else { + textLines = Arrays.asList(text.split("\n")); + max = textLines.stream().map(String::length).max(Integer::compareTo).get(); + } + StringBuilder op = new StringBuilder(); + op.append(" ").append("_".repeat(max + 10)); + op.append("|").append(" ".repeat(max + 10)).append("|"); + for (int i = 0; i < textLines.size(); i++) { + int curr = textLines.get(i).length(); + op.append("|").append(" ".repeat(5)).append(textLines.get(i)).append(" ".repeat(5 + max-curr)).append("|"); + } + op.append("|").append("_".repeat(max + 10)).append("|"); + return op.toString(); + } +} diff --git a/src/main/java/UnmarkFunction.java b/src/main/java/UnmarkFunction.java new file mode 100644 index 0000000000..1151e3738e --- /dev/null +++ b/src/main/java/UnmarkFunction.java @@ -0,0 +1,22 @@ +public class UnmarkFunction extends Function { + + public UnmarkFunction(String function,boolean exit){ + super(function,exit); + } + + @Override + public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + Task taskToUnmark = tasks.getTask(number); + if(taskToUnmark.checkMarked().equals("X")) { + Task unmarkedTask = taskToUnmark.toggleCompleted(); + tasks.removeTask(taskToUnmark); + tasks.addTaskByIdx(number, unmarkedTask); + textBox.chat(String.format("OK, I've marked this task as not done yet:\n [%s] %s", + unmarkedTask.checkMarked(),unmarkedTask.getName())); + } else{ + textBox.chat("Hey! This task is already unmarked!"); + } + + } +} From cd6befb9a15a0a4d9ac4b2e707103b8490acb0af Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 25 Aug 2022 18:40:45 +0800 Subject: [PATCH 03/31] Remove Text block literal (Not supported in JDK11) --- src/main/java/AddFunction.java | 24 ++++++++++++------------ src/main/java/DeleteFunction.java | 8 ++++---- text-ui-test/input.txt | 0 text-ui-test/lvl6.txt | 11 +++++++++++ text-ui-test/runtest.bat | 4 ++-- text-ui-test/runtest.sh | 2 +- 6 files changed, 30 insertions(+), 19 deletions(-) delete mode 100644 text-ui-test/input.txt create mode 100644 text-ui-test/lvl6.txt diff --git a/src/main/java/AddFunction.java b/src/main/java/AddFunction.java index 9194b72a81..7d3a553ec8 100644 --- a/src/main/java/AddFunction.java +++ b/src/main/java/AddFunction.java @@ -14,10 +14,10 @@ public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { String joinDesc = String.join(" ", descOnly); Task newTask = new ToDo(joinDesc,false); tasks.addTask(newTask); - textBox.chat(String.format(""" - Got it. I've added this task: - %s\s - Now you have %d tasks in the list.\s""".indent(1) + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." ,newTask.toString(),tasks.getSize())); } else{ throw new CleverNotBotException("Please fill in the description of ToDo!",textBox); @@ -35,10 +35,10 @@ public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { String by = getFunction().substring(mid + searchWord.length() + 1); // to remove the space Task newTask = new Deadline(functionName,false,by); tasks.addTask(newTask); - textBox.chat(String.format(""" - Got it. I've added this task: - %s\s - Now you have %d tasks in the list.\s""".indent(1) + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." ,newTask.toString(),tasks.getSize())); } } @@ -55,10 +55,10 @@ else if(desc[0].equals("event")){ String at = getFunction().substring(mid + searchWord.length() + 1); // to remove the space; Task newTask = new Event(functionName,false,at); tasks.addTask(newTask); - textBox.chat(String.format(""" - Got it. I've added this task: - %s\s - Now you have %d tasks in the list.\s""".indent(1) + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." ,newTask.toString(),tasks.getSize())); } }else { diff --git a/src/main/java/DeleteFunction.java b/src/main/java/DeleteFunction.java index c15b54ae30..1044fc2867 100644 --- a/src/main/java/DeleteFunction.java +++ b/src/main/java/DeleteFunction.java @@ -12,10 +12,10 @@ public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task 3 is in idx 2 tasks.removeTask(deletedTask); - textBox.chat(String.format(""" - Noted. I've removed this task: - %s\s - Now you have %d tasks in the list.\s""".indent(1) + textBox.chat(String.format( + "Noted. I've removed this task:"+ + "\n %s"+ + "\nNow you have %d tasks in the list." ,deletedTask.toString(),tasks.getSize())); } catch (IndexOutOfBoundsException e){ throw new CleverNotBotException("The task does not exist!",textBox); diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/text-ui-test/lvl6.txt b/text-ui-test/lvl6.txt new file mode 100644 index 0000000000..f163922cb3 --- /dev/null +++ b/text-ui-test/lvl6.txt @@ -0,0 +1,11 @@ +todo read book +mark 1 +deadline return book /by June 6th +mark 2 +event project meeting /at Aug 6th 2-4pm +todo join sports club +mark 4 +todo borrow book +list +delete 3 + diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..d9dcf1ed46 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java +javac -D:\Sem 7 Repo\Cs2030\src\main\java\CleverNotBot.java -Xlint:none -d ..\bin ..\src\main\java\*.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java D:\Sem 7 Repo\Cs2030\src\main\java\CleverNotBot.java\bin CleverNotBot < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index c9ec870033..5aac90348b 100644 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -19,7 +19,7 @@ then exit 1 fi -# run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT +# run the program, feed commands from lvl6.txt file and redirect the output to the ACTUAL.TXT java -classpath ../bin Duke < input.txt > ACTUAL.TXT # convert to UNIX format From ae43f2ce2b268963b19baa3651ac3da49f204150 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 16:31:30 +0800 Subject: [PATCH 04/31] Add Level 7 --- src/main/java/AddFunction.java | 70 -------------------- src/main/java/AddFunctionDeadLine.java | 37 +++++++++++ src/main/java/AddFunctionEvent.java | 37 +++++++++++ src/main/java/AddFunctionToDo.java | 33 ++++++++++ src/main/java/ByeFunction.java | 2 +- src/main/java/CleverNotBot.java | 13 ++-- src/main/java/Deadline.java | 32 ++++++++-- src/main/java/DefaultFunction.java | 2 +- src/main/java/DeleteFunction.java | 3 +- src/main/java/Event.java | 10 +++ src/main/java/Function.java | 2 +- src/main/java/GreetFunction.java | 2 +- src/main/java/Handler.java | 42 ++++++------ src/main/java/ListFunction.java | 2 +- src/main/java/MarkFunction.java | 2 +- src/main/java/Storage.java | 88 ++++++++++++++++++++++++++ src/main/java/Task.java | 4 ++ src/main/java/TaskList.java | 9 +-- src/main/java/ToDo.java | 10 +++ src/main/java/UnmarkFunction.java | 2 +- 20 files changed, 290 insertions(+), 112 deletions(-) delete mode 100644 src/main/java/AddFunction.java create mode 100644 src/main/java/AddFunctionDeadLine.java create mode 100644 src/main/java/AddFunctionEvent.java create mode 100644 src/main/java/AddFunctionToDo.java create mode 100644 src/main/java/Storage.java diff --git a/src/main/java/AddFunction.java b/src/main/java/AddFunction.java deleted file mode 100644 index 7d3a553ec8..0000000000 --- a/src/main/java/AddFunction.java +++ /dev/null @@ -1,70 +0,0 @@ -import java.util.Arrays; - -public class AddFunction extends Function { - - public AddFunction(String function,boolean exit){ - super(function,exit); - } - - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { - String[] desc = getFunction().split(" "); - if(desc[0].equals("todo")){ - if(desc.length != 1){ - String[] descOnly = Arrays.copyOfRange(desc,1,desc.length); - String joinDesc = String.join(" ", descOnly); - Task newTask = new ToDo(joinDesc,false); - tasks.addTask(newTask); - textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." - ,newTask.toString(),tasks.getSize())); - } else{ - throw new CleverNotBotException("Please fill in the description of ToDo!",textBox); - } - } else if(desc[0].equals("deadline")){ - if(desc.length == 1){ - throw new CleverNotBotException("Please fill in the description of Deadline!",textBox); - } else if (!getFunction().contains("/by")){ - throw new CleverNotBotException("Please include a /by in your description of Deadline! ",textBox); - } else{ - String searchWord = " /by"; - int start = "deadline ".length(); - int mid = getFunction().indexOf(searchWord); - String functionName = getFunction().substring(start,mid); - String by = getFunction().substring(mid + searchWord.length() + 1); // to remove the space - Task newTask = new Deadline(functionName,false,by); - tasks.addTask(newTask); - textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." - ,newTask.toString(),tasks.getSize())); - } - } - else if(desc[0].equals("event")){ - if(desc.length == 1){ - throw new CleverNotBotException("Please fill in the description of Event!",textBox); - } else if (!getFunction().contains("/at")){ - throw new CleverNotBotException("Please include a /at in your description of Deadline! ",textBox); - } else{ - String searchWord = " /at"; - int start = "event ".length(); - int mid = getFunction().indexOf(searchWord); - String functionName = getFunction().substring(start,mid); - String at = getFunction().substring(mid + searchWord.length() + 1); // to remove the space; - Task newTask = new Event(functionName,false,at); - tasks.addTask(newTask); - textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." - ,newTask.toString(),tasks.getSize())); - } - }else { - throw new CleverNotBotException("An unexpected error has occurred (addf no results found)",textBox); - } - - } - -} diff --git a/src/main/java/AddFunctionDeadLine.java b/src/main/java/AddFunctionDeadLine.java new file mode 100644 index 0000000000..0d6aeb7a09 --- /dev/null +++ b/src/main/java/AddFunctionDeadLine.java @@ -0,0 +1,37 @@ +import java.util.Arrays; + +public class AddFunctionDeadLine extends Function { + + public AddFunctionDeadLine(String function, boolean exit) { + super(function, exit); + } + + public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { + String[] desc = getFunction().split(" "); + try { + if (desc.length == 1) { + throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); + } else if (!getFunction().contains("/by")) { + throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); + } else { + String searchWord = " /by"; + int start = "deadline ".length(); + int mid = getFunction().indexOf(searchWord); + String functionName = getFunction().substring(start, mid); + String dateTime = getFunction().substring(mid + searchWord.length() + 1); // to remove the space + Task newTask = new Deadline(functionName, false, dateTime); + tasks.addTask(newTask); + storage.writeToFile(tasks.getTaskList()); + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , newTask.toString(), tasks.getSize())); + } + } catch (CleverNotBotException e){ + throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); + } + } + + +} diff --git a/src/main/java/AddFunctionEvent.java b/src/main/java/AddFunctionEvent.java new file mode 100644 index 0000000000..60eee3a2af --- /dev/null +++ b/src/main/java/AddFunctionEvent.java @@ -0,0 +1,37 @@ +import java.util.Arrays; + +public class AddFunctionEvent extends Function { + + public AddFunctionEvent(String function, boolean exit) { + super(function, exit); + } + + public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { + String[] desc = getFunction().split(" "); + try{ + if (desc.length == 1) { + throw new CleverNotBotException("Please fill in the description of Event!", textBox); + } else if (!getFunction().contains("/at")) { + throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); + } else { + String searchWord = " /at"; + int start = "event ".length(); + int mid = getFunction().indexOf(searchWord); + String functionName = getFunction().substring(start, mid); + String at = getFunction().substring(mid + searchWord.length() + 1); // to remove the space; + Task newTask = new Event(functionName, false, at); + tasks.addTask(newTask); + storage.writeToFile(tasks.getTaskList()); + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , newTask.toString(), tasks.getSize())); + } + } catch(CleverNotBotException e){ + throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); + } + + } + +} diff --git a/src/main/java/AddFunctionToDo.java b/src/main/java/AddFunctionToDo.java new file mode 100644 index 0000000000..29b3e2e2a8 --- /dev/null +++ b/src/main/java/AddFunctionToDo.java @@ -0,0 +1,33 @@ +import java.util.Arrays; + +public class AddFunctionToDo extends Function { + + public AddFunctionToDo(String function, boolean exit) { + super(function, exit); + } + + public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { + String[] desc = getFunction().split(" "); + try { + if (desc.length != 1) { + //removes the function name "todo" eg. [todo,borrow,book] -> [borrow,book] + String[] descOnly = Arrays.copyOfRange(desc, 1, desc.length); + String joinDesc = String.join(" ", descOnly); + Task newTask = new ToDo(joinDesc, false); + tasks.addTask(newTask); + storage.writeToFile(tasks.getTaskList()); + textBox.chat(String.format( + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , newTask.toString(), tasks.getSize())); + } else { + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + } + } catch(CleverNotBotException e){ + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + } + + } + +} diff --git a/src/main/java/ByeFunction.java b/src/main/java/ByeFunction.java index 72bcd810d5..7336d92ea5 100644 --- a/src/main/java/ByeFunction.java +++ b/src/main/java/ByeFunction.java @@ -5,7 +5,7 @@ public ByeFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ textBox.chat("Bye. Hope to see you again soon!"); } } diff --git a/src/main/java/CleverNotBot.java b/src/main/java/CleverNotBot.java index febab73d1d..576256e55f 100644 --- a/src/main/java/CleverNotBot.java +++ b/src/main/java/CleverNotBot.java @@ -4,16 +4,19 @@ public class CleverNotBot { public static void main(String[] args) throws CleverNotBotException { UITextBox textBox = new UITextBox(); - TaskList tasks = new TaskList(); + Storage storage = new Storage(); + TaskList tasks = new TaskList(storage.getTasksFromFile()); Scanner sc = new Scanner(System.in); Handler hl = new Handler(); - hl.parseText("greet").run(tasks,textBox); - while(sc.hasNext()){ + hl.parseText("greet").run(tasks, textBox, storage); + while (sc.hasNext()) { String ip = sc.nextLine(); Function nxtStep = hl.parseText(ip); - nxtStep.run(tasks,textBox); - if(nxtStep.isExitingProgram()) { break; } + nxtStep.run(tasks, textBox, storage); + if (nxtStep.isExitingProgram()) { + break; + } } } diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index b2a11abbc0..3070ffc40e 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,18 +1,40 @@ +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + public class Deadline extends Task{ - private String by; + private String dateTime; + //private LocalDateTime date; - public Deadline(String name, boolean completed, String by){ + public Deadline(String name, boolean completed, String dateTime){ super(name,completed); - this.by = by; + this.dateTime = dateTime; + //stringToDate(dateTime); + } + /* + public void stringToDate(String dateTime){ + String[] dateTimeArr = dateTime.split(" "); + LocalDate.parse( + .format(DateTimeFormatter.ofPattern("MMM d yyyy")) + } + */ + @Override + public String getTime() { + return dateTime; + } + + @Override + public String getTaskType() { + return "D"; } @Override public Task toggleCompleted(){ - return new Deadline(getName(),!isCompleted(),by); + return new Deadline(getName(),!isCompleted(), dateTime); } @Override public String toString(){ - return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),by); + return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(), dateTime); } } diff --git a/src/main/java/DefaultFunction.java b/src/main/java/DefaultFunction.java index 803b80caff..72d26ad54d 100644 --- a/src/main/java/DefaultFunction.java +++ b/src/main/java/DefaultFunction.java @@ -5,7 +5,7 @@ public DefaultFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ textBox.chat("This command doesn't exist!"); } } diff --git a/src/main/java/DeleteFunction.java b/src/main/java/DeleteFunction.java index 1044fc2867..4b87d7becb 100644 --- a/src/main/java/DeleteFunction.java +++ b/src/main/java/DeleteFunction.java @@ -4,7 +4,7 @@ public DeleteFunction(String function,boolean exit){ super(function,exit); } - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException { try{ String[] desc = getFunction().split(" "); if(desc.length <= 1){ @@ -12,6 +12,7 @@ public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException { } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task 3 is in idx 2 tasks.removeTask(deletedTask); + storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( "Noted. I've removed this task:"+ "\n %s"+ diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 4c497ffc9f..73b8eb314c 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -6,6 +6,16 @@ public Event(String name, boolean completed, String at){ this.at = at; } + @Override + public String getTime() { + return at; + } + + @Override + public String getTaskType() { + return "E"; + } + @Override public Task toggleCompleted(){ return new Event(getName(),!isCompleted(),at); diff --git a/src/main/java/Function.java b/src/main/java/Function.java index 11522cc7ed..8a96a75fc4 100644 --- a/src/main/java/Function.java +++ b/src/main/java/Function.java @@ -15,5 +15,5 @@ public boolean isExitingProgram(){ return exit; } - public abstract void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException; + public abstract void run(TaskList tasks,UITextBox textBox,Storage storage) throws CleverNotBotException; } diff --git a/src/main/java/GreetFunction.java b/src/main/java/GreetFunction.java index 3a228e20c1..b06e40e11f 100644 --- a/src/main/java/GreetFunction.java +++ b/src/main/java/GreetFunction.java @@ -5,7 +5,7 @@ public GreetFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); } } diff --git a/src/main/java/Handler.java b/src/main/java/Handler.java index d022f0e27e..3da09fc5bf 100644 --- a/src/main/java/Handler.java +++ b/src/main/java/Handler.java @@ -1,26 +1,28 @@ public class Handler { - public Function parseText(String text){ + public Function parseText(String text) { String[] txtArr = text.split(" "); - switch(txtArr[0]){ - case "mark": - return new MarkFunction(text,false); - case "unmark": - return new UnmarkFunction(text,false); - case "list": - return new ListFunction(text,false); - case "todo": - case "deadline": - case "event": - return new AddFunction(text,false); - case "delete": - return new DeleteFunction(text,false); - case "greet": - return new GreetFunction(text,false); - case "bye": - return new ByeFunction(text,true); - default: - return new DefaultFunction(text,false); + switch (txtArr[0]) { + case "mark": + return new MarkFunction(text, false); + case "unmark": + return new UnmarkFunction(text, false); + case "list": + return new ListFunction(text, false); + case "todo": + return new AddFunctionToDo(text, false); + case "deadline": + return new AddFunctionDeadLine(text, false); + case "event": + return new AddFunctionEvent(text, false); + case "delete": + return new DeleteFunction(text, false); + case "greet": + return new GreetFunction(text, false); + case "bye": + return new ByeFunction(text, true); + default: + return new DefaultFunction(text, false); } } diff --git a/src/main/java/ListFunction.java b/src/main/java/ListFunction.java index f62403ddbe..396dbbb54e 100644 --- a/src/main/java/ListFunction.java +++ b/src/main/java/ListFunction.java @@ -5,7 +5,7 @@ public ListFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); }else { int counter = 1; diff --git a/src/main/java/MarkFunction.java b/src/main/java/MarkFunction.java index 2c401becd2..53d8753245 100644 --- a/src/main/java/MarkFunction.java +++ b/src/main/java/MarkFunction.java @@ -5,7 +5,7 @@ public MarkFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..57302b1c88 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,88 @@ +import java.io.*; +import java.util.ArrayList; + +public class Storage { + private String fileLocation = "/data/cleverNotBot.txt"; + private File file; + + public Storage(){ + this.file = new File(this.fileLocation); + } + + public ArrayList getTasksFromFile() { + ArrayList tasks = new ArrayList<>(); + String line; + try{ + BufferedReader reader = new BufferedReader(new FileReader(fileLocation)); + while((line = reader.readLine()) != null){ + Task task = convertLineToTask(line); + tasks.add(task); + } + } catch (FileNotFoundException e){ + System.out.println("Error! File does not exist! Creating a new file at location!"); + try{ + file.getParentFile().mkdirs(); + file.createNewFile(); + } catch (IOException errorCreate){ + System.out.println("An error has occurred when trying to create new file"); + } + } catch (IOException errorObtain){ + System.out.println("An error has occurred when trying to obtain data from the save file."); + } + return tasks; + } + + public void writeToFile(ArrayList tasks) { + try { + // if the file above doesn't exist, create it. + if(!file.getParentFile().exists()){ + file.getParentFile().mkdir(); + } + FileWriter fw = new FileWriter(file); + StringBuilder op = new StringBuilder(); + int counter = 0; + for (Task task: tasks){ + String taskToStorage = ""; + if (task.getTaskType().equals("T")){ + taskToStorage = String.format("%s | %d | %s", + task.getTaskType(),task.isCompleted()? 1:0,task.getName()); + } else if(task.getTaskType().equals("D") || task.getTaskType().equals("E")){ + taskToStorage = String.format("%s | %d | %s | %s", + task.getTaskType(),task.isCompleted()? 1:0,task.getName(),task.getTime()); + } else { + System.out.println("Warning! Illegal entries has been detected!"); + } + + op.append(taskToStorage); + counter++; + if(counter < tasks.size()){ + op.append("\n"); + } + } + String result = op.toString(); + fw.write(result); + fw.close(); + } catch(IOException e){ + System.out.println("An error has occurred during saving of file!"); + } + } + + private Task convertLineToTask(String line) { + String[] content = line.split(" \\| "); + /* debug line + System.out.println(file.getAbsolutePath()); + System.out.println(String.join(",",content)); + */ + //"1".equals(content[1]) is to convert it to boolean + switch (content[0]) { + case "T": + return new ToDo(content[2], "1".equals(content[1])); + case "D": + return new Deadline(content[2], "1".equals(content[1]), content[3]); + default: + // new event + return new Event(content[2], "1".equals(content[1]), content[3]); + } + } + +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index ff3cb7bd24..7016226947 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -20,6 +20,10 @@ public String checkMarked(){ return isCompleted()? "X":" "; } + public abstract String getTime(); + + public abstract String getTaskType(); + public abstract Task toggleCompleted(); //return new Task(name,!completed); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index b736e4a0a9..953c0c5ca3 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -3,11 +3,12 @@ import java.util.List; public class TaskList { - private List tasks = new ArrayList();; + private ArrayList tasks; private int size; - public TaskList(){ - size = 0; + public TaskList(ArrayList tasks){ + this.tasks = tasks; + size = tasks.size(); } public void addTask(Task element){ @@ -29,7 +30,7 @@ public Task getTask(int idx){ return tasks.get(idx); } - public List getTaskList(){ + public ArrayList getTaskList(){ return tasks; } public int getSize(){ diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index 0cad4d7475..8bf380ff6a 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -4,6 +4,16 @@ public ToDo(String name, boolean completed){ super(name,completed); } + @Override + public String getTime() { + return "inf"; + } + + @Override + public String getTaskType() { + return "T"; + } + @Override public Task toggleCompleted(){ return new ToDo(getName(),!isCompleted()); diff --git a/src/main/java/UnmarkFunction.java b/src/main/java/UnmarkFunction.java index 1151e3738e..32de7bcf3a 100644 --- a/src/main/java/UnmarkFunction.java +++ b/src/main/java/UnmarkFunction.java @@ -5,7 +5,7 @@ public UnmarkFunction(String function,boolean exit){ } @Override - public void run(TaskList tasks,UITextBox textBox) throws CleverNotBotException{ + public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToUnmark = tasks.getTask(number); if(taskToUnmark.checkMarked().equals("X")) { From 62afe570ffecfac6c38528b9eac2a5afda110405 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 16:56:54 +0800 Subject: [PATCH 05/31] Add Level-8 --- src/main/java/Deadline.java | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index b2a11abbc0..39e81510cd 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,18 +1,39 @@ +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + public class Deadline extends Task{ - private String by; + private String dateTime; + private LocalDateTime date; - public Deadline(String name, boolean completed, String by){ + public Deadline(String name, boolean completed, String dateTime){ super(name,completed); - this.by = by; + this.dateTime = dateTime; + applyDate(dateTime); + + } + + private void applyDate(String dateTime) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + this.date = LocalDateTime.parse(dateTime, formatter); + } + + public String getDateTime(){ + return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); + } + + public String getDate(){ + return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } @Override public Task toggleCompleted(){ - return new Deadline(getName(),!isCompleted(),by); + return new Deadline(getName(),!isCompleted(),dateTime); + } @Override public String toString(){ - return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),by); + return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),dateTime); } + } From 3c675940868752a2ec76192ee6b5ed740ef0cb42 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 17:12:17 +0800 Subject: [PATCH 06/31] Update AddFunctionDeadLine.java Update Deadline.java --- src/main/java/AddFunctionDeadLine.java | 4 +++ src/main/java/Deadline.java | 43 ++++++++------------------ 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/main/java/AddFunctionDeadLine.java b/src/main/java/AddFunctionDeadLine.java index 0d6aeb7a09..aa314b91b8 100644 --- a/src/main/java/AddFunctionDeadLine.java +++ b/src/main/java/AddFunctionDeadLine.java @@ -19,6 +19,7 @@ public void run(TaskList tasks, UITextBox textBox, Storage storage) throws Cleve int mid = getFunction().indexOf(searchWord); String functionName = getFunction().substring(start, mid); String dateTime = getFunction().substring(mid + searchWord.length() + 1); // to remove the space + Deadline.validDateTime(dateTime); Task newTask = new Deadline(functionName, false, dateTime); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); @@ -30,6 +31,9 @@ public void run(TaskList tasks, UITextBox textBox, Storage storage) throws Cleve } } catch (CleverNotBotException e){ throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); + } catch (Exception ex){ + throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + + "\nFor example, 22-09-2022 19:40", textBox); } } diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 95b00bc2b6..78250d991d 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,31 +1,16 @@ -<<<<<<< HEAD -import java.time.LocalDate; -======= ->>>>>>> branch-Level-8 import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; public class Deadline extends Task{ private String dateTime; -<<<<<<< HEAD - //private LocalDateTime date; -======= private LocalDateTime date; ->>>>>>> branch-Level-8 - public Deadline(String name, boolean completed, String dateTime){ - super(name,completed); + public Deadline(String name, boolean completed, String dateTime) { + super(name, completed); this.dateTime = dateTime; -<<<<<<< HEAD - //stringToDate(dateTime); - } - /* - public void stringToDate(String dateTime){ - String[] dateTimeArr = dateTime.split(" "); - LocalDate.parse( - .format(DateTimeFormatter.ofPattern("MMM d yyyy")) + applyDate(dateTime); } - */ + @Override public String getTime() { return dateTime; @@ -34,8 +19,6 @@ public String getTime() { @Override public String getTaskType() { return "D"; -======= - applyDate(dateTime); } @@ -48,28 +31,28 @@ public String getDateTime(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); } + public String getDateTime(String format){ + return date.format(DateTimeFormatter.ofPattern(format)); + } + public String getDate(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); ->>>>>>> branch-Level-8 } @Override public Task toggleCompleted(){ -<<<<<<< HEAD return new Deadline(getName(),!isCompleted(), dateTime); -======= - return new Deadline(getName(),!isCompleted(),dateTime); ->>>>>>> branch-Level-8 } @Override public String toString(){ -<<<<<<< HEAD - return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(), dateTime); -======= return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),dateTime); ->>>>>>> branch-Level-8 + } + + public static void validDateTime(String date) throws Exception { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); + LocalDateTime d = LocalDateTime.parse(date, formatter); } } From 69f112c23903b4b66d740efafa5ff0c2793183f2 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 19:35:05 +0800 Subject: [PATCH 07/31] Add A-MoreOOP Update all functions to command. Update Handler to Parser Update UITextbox to UI --- .gitignore | 1 + build.gradle | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- gradlew.bat | 22 +- ...nDeadLine.java => AddCommandDeadLine.java} | 24 +- ...unctionEvent.java => AddCommandEvent.java} | 22 +- ...dFunctionToDo.java => AddCommandToDo.java} | 12 +- src/main/java/ByeCommand.java | 11 + src/main/java/ByeFunction.java | 11 - src/main/java/CleverNotBot.java | 6 +- src/main/java/CleverNotBotException.java | 10 +- src/main/java/Command.java | 19 ++ src/main/java/Deadline.java | 12 +- src/main/java/DefaultCommand.java | 11 + src/main/java/DefaultFunction.java | 11 - ...DeleteFunction.java => DeleteCommand.java} | 10 +- src/main/java/Function.java | 19 -- src/main/java/GreetCommand.java | 11 + src/main/java/GreetFunction.java | 11 - src/main/java/Handler.java | 30 -- .../{ListFunction.java => ListCommand.java} | 8 +- .../{MarkFunction.java => MarkCommand.java} | 10 +- src/main/java/Parser.java | 30 ++ src/main/java/{UITextBox.java => UI.java} | 4 +- ...UnmarkFunction.java => UnmarkCommand.java} | 10 +- text-ui-test/lvl8.txt | 11 + 28 files changed, 320 insertions(+), 269 deletions(-) rename src/main/java/{AddFunctionDeadLine.java => AddCommandDeadLine.java} (61%) rename src/main/java/{AddFunctionEvent.java => AddCommandEvent.java} (58%) rename src/main/java/{AddFunctionToDo.java => AddCommandToDo.java} (71%) create mode 100644 src/main/java/ByeCommand.java delete mode 100644 src/main/java/ByeFunction.java create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DefaultCommand.java delete mode 100644 src/main/java/DefaultFunction.java rename src/main/java/{DeleteFunction.java => DeleteCommand.java} (72%) delete mode 100644 src/main/java/Function.java create mode 100644 src/main/java/GreetCommand.java delete mode 100644 src/main/java/GreetFunction.java delete mode 100644 src/main/java/Handler.java rename src/main/java/{ListFunction.java => ListCommand.java} (67%) rename src/main/java/{MarkFunction.java => MarkCommand.java} (60%) create mode 100644 src/main/java/Parser.java rename src/main/java/{UITextBox.java => UI.java} (97%) rename src/main/java/{UnmarkFunction.java => UnmarkCommand.java} (60%) create mode 100644 text-ui-test/lvl8.txt diff --git a/.gitignore b/.gitignore index f69985ef1f..9928ebf611 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ bin/ /text-ui-test/ACTUAL.txt text-ui-test/EXPECTED-UNIX.TXT +src/main/java/MyFrame.java diff --git a/build.gradle b/build.gradle index 885198fcfa..13d2e75658 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,11 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "CleverNotBot" } shadowJar { - archiveBaseName = "duke" + archiveBaseName = "cleverNotBot" archiveClassifier = null } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2faf2fc91d853cd5d4242b5547257070..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18411 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 Hzh{2~$&vlj delta 17345 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 QW2~J&pQ{+#&jH5%0<2&hD*ylh diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7c8c5dbf5..ffed3a254e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d95..76ccb9c36c 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright ? 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions á$varâ, á${var}â, á${var:-default}â, á${var+SET}â, +# á${var#prefix}â, á${var%suffix}â, and á$( cmd )â; +# * compound commands having a testable exit status, especially ácaseâ; +# * various built-in commands including ácommandâ, ásetâ, and áulimitâ. +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -105,79 +140,95 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# 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" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9cce..107acd32c4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/AddFunctionDeadLine.java b/src/main/java/AddCommandDeadLine.java similarity index 61% rename from src/main/java/AddFunctionDeadLine.java rename to src/main/java/AddCommandDeadLine.java index aa314b91b8..73ae3ea3f5 100644 --- a/src/main/java/AddFunctionDeadLine.java +++ b/src/main/java/AddCommandDeadLine.java @@ -1,26 +1,25 @@ -import java.util.Arrays; +public class AddCommandDeadLine extends Command { -public class AddFunctionDeadLine extends Function { - - public AddFunctionDeadLine(String function, boolean exit) { - super(function, exit); + public AddCommandDeadLine(String commandName, boolean exit) { + super(commandName, exit); } - public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { - String[] desc = getFunction().split(" "); + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); - } else if (!getFunction().contains("/by")) { + } else if (!getCommandName().contains("/by")) { throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); } else { String searchWord = " /by"; int start = "deadline ".length(); - int mid = getFunction().indexOf(searchWord); - String functionName = getFunction().substring(start, mid); - String dateTime = getFunction().substring(mid + searchWord.length() + 1); // to remove the space + int mid = getCommandName().indexOf(searchWord); + //deadline desc /by datetime -> "desc" + String commandName = getCommandName().substring(start, mid); + String dateTime = getCommandName().substring(mid + searchWord.length() + 1); // to remove the space Deadline.validDateTime(dateTime); - Task newTask = new Deadline(functionName, false, dateTime); + Task newTask = new Deadline(commandName, false, dateTime); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( @@ -35,6 +34,7 @@ public void run(TaskList tasks, UITextBox textBox, Storage storage) throws Cleve throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); } + } diff --git a/src/main/java/AddFunctionEvent.java b/src/main/java/AddCommandEvent.java similarity index 58% rename from src/main/java/AddFunctionEvent.java rename to src/main/java/AddCommandEvent.java index 60eee3a2af..c63740d264 100644 --- a/src/main/java/AddFunctionEvent.java +++ b/src/main/java/AddCommandEvent.java @@ -1,25 +1,23 @@ -import java.util.Arrays; +public class AddCommandEvent extends Command { -public class AddFunctionEvent extends Function { - - public AddFunctionEvent(String function, boolean exit) { - super(function, exit); + public AddCommandEvent(String commandName, boolean exit) { + super(commandName, exit); } - public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { - String[] desc = getFunction().split(" "); + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + String[] desc = getCommandName().split(" "); try{ if (desc.length == 1) { throw new CleverNotBotException("Please fill in the description of Event!", textBox); - } else if (!getFunction().contains("/at")) { + } else if (!getCommandName().contains("/at")) { throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); } else { String searchWord = " /at"; int start = "event ".length(); - int mid = getFunction().indexOf(searchWord); - String functionName = getFunction().substring(start, mid); - String at = getFunction().substring(mid + searchWord.length() + 1); // to remove the space; - Task newTask = new Event(functionName, false, at); + int mid = getCommandName().indexOf(searchWord); + String commandName = getCommandName().substring(start, mid); + String at = getCommandName().substring(mid + searchWord.length() + 1); // to remove the space; + Task newTask = new Event(commandName, false, at); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( diff --git a/src/main/java/AddFunctionToDo.java b/src/main/java/AddCommandToDo.java similarity index 71% rename from src/main/java/AddFunctionToDo.java rename to src/main/java/AddCommandToDo.java index 29b3e2e2a8..094b847c51 100644 --- a/src/main/java/AddFunctionToDo.java +++ b/src/main/java/AddCommandToDo.java @@ -1,16 +1,16 @@ import java.util.Arrays; -public class AddFunctionToDo extends Function { +public class AddCommandToDo extends Command { - public AddFunctionToDo(String function, boolean exit) { - super(function, exit); + public AddCommandToDo(String commandName, boolean exit) { + super(commandName, exit); } - public void run(TaskList tasks, UITextBox textBox, Storage storage) throws CleverNotBotException { - String[] desc = getFunction().split(" "); + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + String[] desc = getCommandName().split(" "); try { if (desc.length != 1) { - //removes the function name "todo" eg. [todo,borrow,book] -> [borrow,book] + //removes the command name "todo" eg. [todo,borrow,book] -> [borrow,book] String[] descOnly = Arrays.copyOfRange(desc, 1, desc.length); String joinDesc = String.join(" ", descOnly); Task newTask = new ToDo(joinDesc, false); diff --git a/src/main/java/ByeCommand.java b/src/main/java/ByeCommand.java new file mode 100644 index 0000000000..ca34d76e19 --- /dev/null +++ b/src/main/java/ByeCommand.java @@ -0,0 +1,11 @@ +public class ByeCommand extends Command { + + public ByeCommand(String commandName, boolean exit){ + super(commandName,exit); + } + + @Override + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + textBox.chat("Bye. Hope to see you again soon!"); + } +} diff --git a/src/main/java/ByeFunction.java b/src/main/java/ByeFunction.java deleted file mode 100644 index 7336d92ea5..0000000000 --- a/src/main/java/ByeFunction.java +++ /dev/null @@ -1,11 +0,0 @@ -public class ByeFunction extends Function { - - public ByeFunction(String function,boolean exit){ - super(function,exit); - } - - @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ - textBox.chat("Bye. Hope to see you again soon!"); - } -} diff --git a/src/main/java/CleverNotBot.java b/src/main/java/CleverNotBot.java index 576256e55f..f0915e12d9 100644 --- a/src/main/java/CleverNotBot.java +++ b/src/main/java/CleverNotBot.java @@ -3,16 +3,16 @@ public class CleverNotBot { public static void main(String[] args) throws CleverNotBotException { - UITextBox textBox = new UITextBox(); + UI textBox = new UI(); Storage storage = new Storage(); TaskList tasks = new TaskList(storage.getTasksFromFile()); Scanner sc = new Scanner(System.in); - Handler hl = new Handler(); + Parser hl = new Parser(); hl.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { String ip = sc.nextLine(); - Function nxtStep = hl.parseText(ip); + Command nxtStep = hl.parseText(ip); nxtStep.run(tasks, textBox, storage); if (nxtStep.isExitingProgram()) { break; diff --git a/src/main/java/CleverNotBotException.java b/src/main/java/CleverNotBotException.java index c1b41c8b41..4952627758 100644 --- a/src/main/java/CleverNotBotException.java +++ b/src/main/java/CleverNotBotException.java @@ -1,14 +1,18 @@ public class CleverNotBotException extends Exception{ private String errorMessage; - private UITextBox textBox; + private UI textBox; - public CleverNotBotException(String errorMessage, UITextBox textBox){ + public CleverNotBotException(String errorMessage, UI textBox){ this.errorMessage = errorMessage; this.textBox = textBox; } @Override - public String toString(){ + /*public String toString(){ return textBox.coverText(errorMessage); } + */ + public String toString(){ + return errorMessage; + } } diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..937e7919ed --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,19 @@ +public abstract class Command { + private String commandName; + private boolean exit; + + public Command(String commandName, boolean exit){ + this.commandName = commandName; + this.exit = exit; + } + + public String getCommandName(){ + return commandName; + } + + public boolean isExitingProgram(){ + return exit; + } + + public abstract void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 78250d991d..5fb33e804a 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -23,7 +23,7 @@ public String getTaskType() { } private void applyDate(String dateTime) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); this.date = LocalDateTime.parse(dateTime, formatter); } @@ -45,14 +45,14 @@ public Task toggleCompleted(){ } - @Override - public String toString(){ - return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),dateTime); - } - public static void validDateTime(String date) throws Exception { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); LocalDateTime d = LocalDateTime.parse(date, formatter); } + @Override + public String toString(){ + return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),getDateTime()); + } + } diff --git a/src/main/java/DefaultCommand.java b/src/main/java/DefaultCommand.java new file mode 100644 index 0000000000..246daf4f60 --- /dev/null +++ b/src/main/java/DefaultCommand.java @@ -0,0 +1,11 @@ +public class DefaultCommand extends Command { + + public DefaultCommand(String commandName, boolean exit){ + super(commandName,exit); + } + + @Override + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + textBox.chat("This command doesn't exist!"); + } +} diff --git a/src/main/java/DefaultFunction.java b/src/main/java/DefaultFunction.java deleted file mode 100644 index 72d26ad54d..0000000000 --- a/src/main/java/DefaultFunction.java +++ /dev/null @@ -1,11 +0,0 @@ -public class DefaultFunction extends Function{ - - public DefaultFunction(String function,boolean exit){ - super(function,exit); - } - - @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ - textBox.chat("This command doesn't exist!"); - } -} diff --git a/src/main/java/DeleteFunction.java b/src/main/java/DeleteCommand.java similarity index 72% rename from src/main/java/DeleteFunction.java rename to src/main/java/DeleteCommand.java index 4b87d7becb..9f9f161042 100644 --- a/src/main/java/DeleteFunction.java +++ b/src/main/java/DeleteCommand.java @@ -1,12 +1,12 @@ -public class DeleteFunction extends Function{ +public class DeleteCommand extends Command { - public DeleteFunction(String function,boolean exit){ - super(function,exit); + public DeleteCommand(String commandName, boolean exit){ + super(commandName,exit); } - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException { + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { try{ - String[] desc = getFunction().split(" "); + String[] desc = getCommandName().split(" "); if(desc.length <= 1){ throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); } diff --git a/src/main/java/Function.java b/src/main/java/Function.java deleted file mode 100644 index 8a96a75fc4..0000000000 --- a/src/main/java/Function.java +++ /dev/null @@ -1,19 +0,0 @@ -public abstract class Function { - private String function; - private boolean exit; - - public Function(String function,boolean exit){ - this.function = function; - this.exit = exit; - } - - public String getFunction(){ - return function; - } - - public boolean isExitingProgram(){ - return exit; - } - - public abstract void run(TaskList tasks,UITextBox textBox,Storage storage) throws CleverNotBotException; -} diff --git a/src/main/java/GreetCommand.java b/src/main/java/GreetCommand.java new file mode 100644 index 0000000000..a1d5a1867e --- /dev/null +++ b/src/main/java/GreetCommand.java @@ -0,0 +1,11 @@ +public class GreetCommand extends Command { + + public GreetCommand(String commandName, boolean exit){ + super(commandName,exit); + } + + @Override + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); + } +} diff --git a/src/main/java/GreetFunction.java b/src/main/java/GreetFunction.java deleted file mode 100644 index b06e40e11f..0000000000 --- a/src/main/java/GreetFunction.java +++ /dev/null @@ -1,11 +0,0 @@ -public class GreetFunction extends Function { - - public GreetFunction(String function,boolean exit){ - super(function,exit); - } - - @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ - textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); - } -} diff --git a/src/main/java/Handler.java b/src/main/java/Handler.java deleted file mode 100644 index 3da09fc5bf..0000000000 --- a/src/main/java/Handler.java +++ /dev/null @@ -1,30 +0,0 @@ -public class Handler { - - public Function parseText(String text) { - String[] txtArr = text.split(" "); - switch (txtArr[0]) { - case "mark": - return new MarkFunction(text, false); - case "unmark": - return new UnmarkFunction(text, false); - case "list": - return new ListFunction(text, false); - case "todo": - return new AddFunctionToDo(text, false); - case "deadline": - return new AddFunctionDeadLine(text, false); - case "event": - return new AddFunctionEvent(text, false); - case "delete": - return new DeleteFunction(text, false); - case "greet": - return new GreetFunction(text, false); - case "bye": - return new ByeFunction(text, true); - default: - return new DefaultFunction(text, false); - } - } - -} - diff --git a/src/main/java/ListFunction.java b/src/main/java/ListCommand.java similarity index 67% rename from src/main/java/ListFunction.java rename to src/main/java/ListCommand.java index 396dbbb54e..ff4556bc06 100644 --- a/src/main/java/ListFunction.java +++ b/src/main/java/ListCommand.java @@ -1,11 +1,11 @@ -public class ListFunction extends Function { +public class ListCommand extends Command { - public ListFunction(String function,boolean exit){ - super(function,exit); + public ListCommand(String commandName, boolean exit){ + super(commandName,exit); } @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); }else { int counter = 1; diff --git a/src/main/java/MarkFunction.java b/src/main/java/MarkCommand.java similarity index 60% rename from src/main/java/MarkFunction.java rename to src/main/java/MarkCommand.java index 53d8753245..e16e0356ec 100644 --- a/src/main/java/MarkFunction.java +++ b/src/main/java/MarkCommand.java @@ -1,12 +1,12 @@ -public class MarkFunction extends Function{ +public class MarkCommand extends Command { - public MarkFunction(String function,boolean exit){ - super(function,exit); + public MarkCommand(String commandName, boolean exit){ + super(commandName,exit); } @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ - int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { Task markedTask = taskToMark.toggleCompleted(); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..1df126d61f --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,30 @@ +public class Parser { + + public Command parseText(String text) { + String[] txtArr = text.split(" "); + switch (txtArr[0]) { + case "mark": + return new MarkCommand(text, false); + case "unmark": + return new UnmarkCommand(text, false); + case "list": + return new ListCommand(text, false); + case "todo": + return new AddCommandToDo(text, false); + case "deadline": + return new AddCommandDeadLine(text, false); + case "event": + return new AddCommandEvent(text, false); + case "delete": + return new DeleteCommand(text, false); + case "greet": + return new GreetCommand(text, false); + case "bye": + return new ByeCommand(text, true); + default: + return new DefaultCommand(text, false); + } + } + +} + diff --git a/src/main/java/UITextBox.java b/src/main/java/UI.java similarity index 97% rename from src/main/java/UITextBox.java rename to src/main/java/UI.java index 687c2d435d..64ea54710d 100644 --- a/src/main/java/UITextBox.java +++ b/src/main/java/UI.java @@ -2,9 +2,9 @@ import java.util.Collections; import java.util.List; -public class UITextBox { +public class UI { - public UITextBox(){} + public UI(){} public void chat(String text){ List textLines; diff --git a/src/main/java/UnmarkFunction.java b/src/main/java/UnmarkCommand.java similarity index 60% rename from src/main/java/UnmarkFunction.java rename to src/main/java/UnmarkCommand.java index 32de7bcf3a..7534955acc 100644 --- a/src/main/java/UnmarkFunction.java +++ b/src/main/java/UnmarkCommand.java @@ -1,12 +1,12 @@ -public class UnmarkFunction extends Function { +public class UnmarkCommand extends Command { - public UnmarkFunction(String function,boolean exit){ - super(function,exit); + public UnmarkCommand(String commandName, boolean exit){ + super(commandName,exit); } @Override - public void run(TaskList tasks,UITextBox textBox, Storage storage) throws CleverNotBotException{ - int number = Integer. parseInt(getFunction().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToUnmark = tasks.getTask(number); if(taskToUnmark.checkMarked().equals("X")) { Task unmarkedTask = taskToUnmark.toggleCompleted(); diff --git a/text-ui-test/lvl8.txt b/text-ui-test/lvl8.txt new file mode 100644 index 0000000000..3c67dda177 --- /dev/null +++ b/text-ui-test/lvl8.txt @@ -0,0 +1,11 @@ +todo read book +mark 1 +deadline return book /by 02-12-2022 18:00 +mark 2 +event project meeting /at Aug 6th 2-4pm +todo join sports club +mark 4 +todo borrow book +list +delete 3 + From 0677f0936afe97c4768ee2ad1594cdf0d2f1ccad Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 21:41:36 +0800 Subject: [PATCH 08/31] Add packages to all the relevant classes --- build.gradle | 2 +- src/main/java/{ => cleverNotBot}/AddCommandDeadLine.java | 8 +++++--- src/main/java/{ => cleverNotBot}/AddCommandEvent.java | 8 +++++--- src/main/java/{ => cleverNotBot}/AddCommandToDo.java | 6 ++++-- src/main/java/{ => cleverNotBot}/ByeCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/CleverNotBot.java | 2 ++ .../java/{ => cleverNotBot}/CleverNotBotException.java | 2 ++ src/main/java/{ => cleverNotBot}/Command.java | 2 ++ src/main/java/{ => cleverNotBot}/Deadline.java | 2 ++ src/main/java/{ => cleverNotBot}/DefaultCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/DeleteCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/Event.java | 2 ++ src/main/java/{ => cleverNotBot}/GreetCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/ListCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/MarkCommand.java | 4 +++- src/main/java/{ => cleverNotBot}/Parser.java | 2 ++ src/main/java/{ => cleverNotBot}/Storage.java | 2 ++ src/main/java/{ => cleverNotBot}/Task.java | 4 +++- src/main/java/{ => cleverNotBot}/TaskList.java | 3 ++- src/main/java/{ => cleverNotBot}/ToDo.java | 2 ++ src/main/java/{ => cleverNotBot}/UI.java | 2 ++ src/main/java/{ => cleverNotBot}/UnmarkCommand.java | 4 +++- 22 files changed, 59 insertions(+), 18 deletions(-) rename src/main/java/{ => cleverNotBot}/AddCommandDeadLine.java (87%) rename src/main/java/{ => cleverNotBot}/AddCommandEvent.java (85%) rename src/main/java/{ => cleverNotBot}/AddCommandToDo.java (92%) rename src/main/java/{ => cleverNotBot}/ByeCommand.java (83%) rename src/main/java/{ => cleverNotBot}/CleverNotBot.java (96%) rename src/main/java/{ => cleverNotBot}/CleverNotBotException.java (94%) rename src/main/java/{ => cleverNotBot}/Command.java (95%) rename src/main/java/{ => cleverNotBot}/Deadline.java (98%) rename src/main/java/{ => cleverNotBot}/DefaultCommand.java (83%) rename src/main/java/{ => cleverNotBot}/DeleteCommand.java (94%) rename src/main/java/{ => cleverNotBot}/Event.java (96%) rename src/main/java/{ => cleverNotBot}/GreetCommand.java (84%) rename src/main/java/{ => cleverNotBot}/ListCommand.java (92%) rename src/main/java/{ => cleverNotBot}/MarkCommand.java (93%) rename src/main/java/{ => cleverNotBot}/Parser.java (97%) rename src/main/java/{ => cleverNotBot}/Storage.java (99%) rename src/main/java/{ => cleverNotBot}/Task.java (90%) rename src/main/java/{ => cleverNotBot}/TaskList.java (97%) rename src/main/java/{ => cleverNotBot}/ToDo.java (95%) rename src/main/java/{ => cleverNotBot}/UI.java (98%) rename src/main/java/{ => cleverNotBot}/UnmarkCommand.java (94%) diff --git a/build.gradle b/build.gradle index 13d2e75658..0eac494f96 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { } application { - mainClassName = "CleverNotBot" + mainClassName = "cleverNotBot.CleverNotBot" } shadowJar { diff --git a/src/main/java/AddCommandDeadLine.java b/src/main/java/cleverNotBot/AddCommandDeadLine.java similarity index 87% rename from src/main/java/AddCommandDeadLine.java rename to src/main/java/cleverNotBot/AddCommandDeadLine.java index 73ae3ea3f5..0919048017 100644 --- a/src/main/java/AddCommandDeadLine.java +++ b/src/main/java/cleverNotBot/AddCommandDeadLine.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class AddCommandDeadLine extends Command { public AddCommandDeadLine(String commandName, boolean exit) { @@ -8,9 +10,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.Deadline!", textBox); } else if (!getCommandName().contains("/by")) { - throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); + throw new CleverNotBotException("Please include a /by in your description of Task.Deadline! ", textBox); } else { String searchWord = " /by"; int start = "deadline ".length(); @@ -29,7 +31,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e){ - throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); + throw new CleverNotBotException("Task.Deadline description must not be empty or must contain /by!", textBox); } catch (Exception ex){ throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); diff --git a/src/main/java/AddCommandEvent.java b/src/main/java/cleverNotBot/AddCommandEvent.java similarity index 85% rename from src/main/java/AddCommandEvent.java rename to src/main/java/cleverNotBot/AddCommandEvent.java index c63740d264..0fa10cb04e 100644 --- a/src/main/java/AddCommandEvent.java +++ b/src/main/java/cleverNotBot/AddCommandEvent.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class AddCommandEvent extends Command { public AddCommandEvent(String commandName, boolean exit) { @@ -8,9 +10,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot String[] desc = getCommandName().split(" "); try{ if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Event!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.Event!", textBox); } else if (!getCommandName().contains("/at")) { - throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); + throw new CleverNotBotException("Please include a /at in your description of Task.Deadline! ", textBox); } else { String searchWord = " /at"; int start = "event ".length(); @@ -27,7 +29,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); + throw new CleverNotBotException("Task.Event description must not be empty or must contain /at!", textBox); } } diff --git a/src/main/java/AddCommandToDo.java b/src/main/java/cleverNotBot/AddCommandToDo.java similarity index 92% rename from src/main/java/AddCommandToDo.java rename to src/main/java/cleverNotBot/AddCommandToDo.java index 094b847c51..9d6bcaf950 100644 --- a/src/main/java/AddCommandToDo.java +++ b/src/main/java/cleverNotBot/AddCommandToDo.java @@ -1,3 +1,5 @@ +package cleverNotBot; + import java.util.Arrays; public class AddCommandToDo extends Command { @@ -22,10 +24,10 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } else { - throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } } diff --git a/src/main/java/ByeCommand.java b/src/main/java/cleverNotBot/ByeCommand.java similarity index 83% rename from src/main/java/ByeCommand.java rename to src/main/java/cleverNotBot/ByeCommand.java index ca34d76e19..fb8ec9456c 100644 --- a/src/main/java/ByeCommand.java +++ b/src/main/java/cleverNotBot/ByeCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class ByeCommand extends Command { public ByeCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public ByeCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Bye. Hope to see you again soon!"); } } diff --git a/src/main/java/CleverNotBot.java b/src/main/java/cleverNotBot/CleverNotBot.java similarity index 96% rename from src/main/java/CleverNotBot.java rename to src/main/java/cleverNotBot/CleverNotBot.java index f0915e12d9..d646f37319 100644 --- a/src/main/java/CleverNotBot.java +++ b/src/main/java/cleverNotBot/CleverNotBot.java @@ -1,3 +1,5 @@ +package cleverNotBot; + import java.util.Scanner; public class CleverNotBot { diff --git a/src/main/java/CleverNotBotException.java b/src/main/java/cleverNotBot/CleverNotBotException.java similarity index 94% rename from src/main/java/CleverNotBotException.java rename to src/main/java/cleverNotBot/CleverNotBotException.java index 4952627758..2bd0d53063 100644 --- a/src/main/java/CleverNotBotException.java +++ b/src/main/java/cleverNotBot/CleverNotBotException.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class CleverNotBotException extends Exception{ private String errorMessage; private UI textBox; diff --git a/src/main/java/Command.java b/src/main/java/cleverNotBot/Command.java similarity index 95% rename from src/main/java/Command.java rename to src/main/java/cleverNotBot/Command.java index 937e7919ed..a73d3329c3 100644 --- a/src/main/java/Command.java +++ b/src/main/java/cleverNotBot/Command.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public abstract class Command { private String commandName; private boolean exit; diff --git a/src/main/java/Deadline.java b/src/main/java/cleverNotBot/Deadline.java similarity index 98% rename from src/main/java/Deadline.java rename to src/main/java/cleverNotBot/Deadline.java index 5fb33e804a..38589be1dd 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/cleverNotBot/Deadline.java @@ -1,3 +1,5 @@ +package cleverNotBot; + import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/DefaultCommand.java b/src/main/java/cleverNotBot/DefaultCommand.java similarity index 83% rename from src/main/java/DefaultCommand.java rename to src/main/java/cleverNotBot/DefaultCommand.java index 246daf4f60..7b82df70de 100644 --- a/src/main/java/DefaultCommand.java +++ b/src/main/java/cleverNotBot/DefaultCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class DefaultCommand extends Command { public DefaultCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public DefaultCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("This command doesn't exist!"); } } diff --git a/src/main/java/DeleteCommand.java b/src/main/java/cleverNotBot/DeleteCommand.java similarity index 94% rename from src/main/java/DeleteCommand.java rename to src/main/java/cleverNotBot/DeleteCommand.java index 9f9f161042..4d15824c9c 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/cleverNotBot/DeleteCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class DeleteCommand extends Command { public DeleteCommand(String commandName, boolean exit){ @@ -10,7 +12,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot if(desc.length <= 1){ throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); } - Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task 3 is in idx 2 + Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( diff --git a/src/main/java/Event.java b/src/main/java/cleverNotBot/Event.java similarity index 96% rename from src/main/java/Event.java rename to src/main/java/cleverNotBot/Event.java index 73b8eb314c..f47c5d7f7a 100644 --- a/src/main/java/Event.java +++ b/src/main/java/cleverNotBot/Event.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class Event extends Task{ private String at; diff --git a/src/main/java/GreetCommand.java b/src/main/java/cleverNotBot/GreetCommand.java similarity index 84% rename from src/main/java/GreetCommand.java rename to src/main/java/cleverNotBot/GreetCommand.java index a1d5a1867e..2053a679ff 100644 --- a/src/main/java/GreetCommand.java +++ b/src/main/java/cleverNotBot/GreetCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class GreetCommand extends Command { public GreetCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public GreetCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); } } diff --git a/src/main/java/ListCommand.java b/src/main/java/cleverNotBot/ListCommand.java similarity index 92% rename from src/main/java/ListCommand.java rename to src/main/java/cleverNotBot/ListCommand.java index ff4556bc06..584a66a4dd 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/cleverNotBot/ListCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class ListCommand extends Command { public ListCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public ListCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); }else { int counter = 1; diff --git a/src/main/java/MarkCommand.java b/src/main/java/cleverNotBot/MarkCommand.java similarity index 93% rename from src/main/java/MarkCommand.java rename to src/main/java/cleverNotBot/MarkCommand.java index e16e0356ec..dad72e83ad 100644 --- a/src/main/java/MarkCommand.java +++ b/src/main/java/cleverNotBot/MarkCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class MarkCommand extends Command { public MarkCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public MarkCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { diff --git a/src/main/java/Parser.java b/src/main/java/cleverNotBot/Parser.java similarity index 97% rename from src/main/java/Parser.java rename to src/main/java/cleverNotBot/Parser.java index 1df126d61f..9bf6abd10e 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/cleverNotBot/Parser.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class Parser { public Command parseText(String text) { diff --git a/src/main/java/Storage.java b/src/main/java/cleverNotBot/Storage.java similarity index 99% rename from src/main/java/Storage.java rename to src/main/java/cleverNotBot/Storage.java index 57302b1c88..aedaf83c74 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/cleverNotBot/Storage.java @@ -1,3 +1,5 @@ +package cleverNotBot; + import java.io.*; import java.util.ArrayList; diff --git a/src/main/java/Task.java b/src/main/java/cleverNotBot/Task.java similarity index 90% rename from src/main/java/Task.java rename to src/main/java/cleverNotBot/Task.java index 7016226947..e9d733f358 100644 --- a/src/main/java/Task.java +++ b/src/main/java/cleverNotBot/Task.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public abstract class Task { private final String name; private final boolean completed; @@ -25,7 +27,7 @@ public String checkMarked(){ public abstract String getTaskType(); public abstract Task toggleCompleted(); - //return new Task(name,!completed); + //return new Task.Task(name,!completed); @Override diff --git a/src/main/java/TaskList.java b/src/main/java/cleverNotBot/TaskList.java similarity index 97% rename from src/main/java/TaskList.java rename to src/main/java/cleverNotBot/TaskList.java index 953c0c5ca3..bcf63ae765 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/cleverNotBot/TaskList.java @@ -1,6 +1,7 @@ +package cleverNotBot; + import java.util.ArrayList; import java.util.Arrays; -import java.util.List; public class TaskList { private ArrayList tasks; diff --git a/src/main/java/ToDo.java b/src/main/java/cleverNotBot/ToDo.java similarity index 95% rename from src/main/java/ToDo.java rename to src/main/java/cleverNotBot/ToDo.java index 8bf380ff6a..43ecc2223a 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/cleverNotBot/ToDo.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class ToDo extends Task{ public ToDo(String name, boolean completed){ diff --git a/src/main/java/UI.java b/src/main/java/cleverNotBot/UI.java similarity index 98% rename from src/main/java/UI.java rename to src/main/java/cleverNotBot/UI.java index 64ea54710d..f615ded1cf 100644 --- a/src/main/java/UI.java +++ b/src/main/java/cleverNotBot/UI.java @@ -1,3 +1,5 @@ +package cleverNotBot; + import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/UnmarkCommand.java b/src/main/java/cleverNotBot/UnmarkCommand.java similarity index 94% rename from src/main/java/UnmarkCommand.java rename to src/main/java/cleverNotBot/UnmarkCommand.java index 7534955acc..61f9d3c8b1 100644 --- a/src/main/java/UnmarkCommand.java +++ b/src/main/java/cleverNotBot/UnmarkCommand.java @@ -1,3 +1,5 @@ +package cleverNotBot; + public class UnmarkCommand extends Command { public UnmarkCommand(String commandName, boolean exit){ @@ -5,7 +7,7 @@ public UnmarkCommand(String commandName, boolean exit){ } @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException{ + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToUnmark = tasks.getTask(number); if(taskToUnmark.checkMarked().equals("X")) { From 3b3702ffbfb07e1fc15ac789a5a9ff3f08a81442 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 22:55:34 +0800 Subject: [PATCH 09/31] Add A-JUnit: ParserTest, TaskListTest, ToDoTest --- .gitignore | 1 + .../AddCommandDeadLine.java | 2 +- .../AddCommandEvent.java | 2 +- .../AddCommandToDo.java | 2 +- .../ByeCommand.java | 2 +- .../CleverNotBot.java | 2 +- .../CleverNotBotException.java | 2 +- .../Command.java | 2 +- .../Deadline.java | 2 +- .../DefaultCommand.java | 2 +- .../DeleteCommand.java | 2 +- .../{cleverNotBot => clevernotbot}/Event.java | 2 +- .../GreetCommand.java | 2 +- .../ListCommand.java | 2 +- .../MarkCommand.java | 2 +- .../Parser.java | 2 +- .../Storage.java | 2 +- .../{cleverNotBot => clevernotbot}/Task.java | 2 +- .../TaskList.java | 2 +- .../{cleverNotBot => clevernotbot}/ToDo.java | 2 +- .../{cleverNotBot => clevernotbot}/UI.java | 2 +- .../UnmarkCommand.java | 2 +- src/test/java/clevernotbot/ParserTest.java | 41 +++++++++++ src/test/java/clevernotbot/TaskListTest.java | 68 +++++++++++++++++++ src/test/java/clevernotbot/ToDoTest.java | 26 +++++++ 25 files changed, 157 insertions(+), 21 deletions(-) rename src/main/java/{cleverNotBot => clevernotbot}/AddCommandDeadLine.java (98%) rename src/main/java/{cleverNotBot => clevernotbot}/AddCommandEvent.java (98%) rename src/main/java/{cleverNotBot => clevernotbot}/AddCommandToDo.java (98%) rename src/main/java/{cleverNotBot => clevernotbot}/ByeCommand.java (93%) rename src/main/java/{cleverNotBot => clevernotbot}/CleverNotBot.java (96%) rename src/main/java/{cleverNotBot => clevernotbot}/CleverNotBotException.java (95%) rename src/main/java/{cleverNotBot => clevernotbot}/Command.java (95%) rename src/main/java/{cleverNotBot => clevernotbot}/Deadline.java (98%) rename src/main/java/{cleverNotBot => clevernotbot}/DefaultCommand.java (93%) rename src/main/java/{cleverNotBot => clevernotbot}/DeleteCommand.java (97%) rename src/main/java/{cleverNotBot => clevernotbot}/Event.java (96%) rename src/main/java/{cleverNotBot => clevernotbot}/GreetCommand.java (93%) rename src/main/java/{cleverNotBot => clevernotbot}/ListCommand.java (96%) rename src/main/java/{cleverNotBot => clevernotbot}/MarkCommand.java (97%) rename src/main/java/{cleverNotBot => clevernotbot}/Parser.java (97%) rename src/main/java/{cleverNotBot => clevernotbot}/Storage.java (99%) rename src/main/java/{cleverNotBot => clevernotbot}/Task.java (96%) rename src/main/java/{cleverNotBot => clevernotbot}/TaskList.java (97%) rename src/main/java/{cleverNotBot => clevernotbot}/ToDo.java (95%) rename src/main/java/{cleverNotBot => clevernotbot}/UI.java (98%) rename src/main/java/{cleverNotBot => clevernotbot}/UnmarkCommand.java (97%) create mode 100644 src/test/java/clevernotbot/ParserTest.java create mode 100644 src/test/java/clevernotbot/TaskListTest.java create mode 100644 src/test/java/clevernotbot/ToDoTest.java diff --git a/.gitignore b/.gitignore index 9928ebf611..a4fa06e127 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ bin/ /text-ui-test/ACTUAL.txt text-ui-test/EXPECTED-UNIX.TXT src/main/java/MyFrame.java +src/main/java/clevernotbot/MyFrame.java diff --git a/src/main/java/cleverNotBot/AddCommandDeadLine.java b/src/main/java/clevernotbot/AddCommandDeadLine.java similarity index 98% rename from src/main/java/cleverNotBot/AddCommandDeadLine.java rename to src/main/java/clevernotbot/AddCommandDeadLine.java index 0919048017..6ad726dacf 100644 --- a/src/main/java/cleverNotBot/AddCommandDeadLine.java +++ b/src/main/java/clevernotbot/AddCommandDeadLine.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class AddCommandDeadLine extends Command { diff --git a/src/main/java/cleverNotBot/AddCommandEvent.java b/src/main/java/clevernotbot/AddCommandEvent.java similarity index 98% rename from src/main/java/cleverNotBot/AddCommandEvent.java rename to src/main/java/clevernotbot/AddCommandEvent.java index 0fa10cb04e..17022bffbe 100644 --- a/src/main/java/cleverNotBot/AddCommandEvent.java +++ b/src/main/java/clevernotbot/AddCommandEvent.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class AddCommandEvent extends Command { diff --git a/src/main/java/cleverNotBot/AddCommandToDo.java b/src/main/java/clevernotbot/AddCommandToDo.java similarity index 98% rename from src/main/java/cleverNotBot/AddCommandToDo.java rename to src/main/java/clevernotbot/AddCommandToDo.java index 9d6bcaf950..6ae038cb32 100644 --- a/src/main/java/cleverNotBot/AddCommandToDo.java +++ b/src/main/java/clevernotbot/AddCommandToDo.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.util.Arrays; diff --git a/src/main/java/cleverNotBot/ByeCommand.java b/src/main/java/clevernotbot/ByeCommand.java similarity index 93% rename from src/main/java/cleverNotBot/ByeCommand.java rename to src/main/java/clevernotbot/ByeCommand.java index fb8ec9456c..62a5ecaec2 100644 --- a/src/main/java/cleverNotBot/ByeCommand.java +++ b/src/main/java/clevernotbot/ByeCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class ByeCommand extends Command { diff --git a/src/main/java/cleverNotBot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java similarity index 96% rename from src/main/java/cleverNotBot/CleverNotBot.java rename to src/main/java/clevernotbot/CleverNotBot.java index d646f37319..7a79223368 100644 --- a/src/main/java/cleverNotBot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.util.Scanner; diff --git a/src/main/java/cleverNotBot/CleverNotBotException.java b/src/main/java/clevernotbot/CleverNotBotException.java similarity index 95% rename from src/main/java/cleverNotBot/CleverNotBotException.java rename to src/main/java/clevernotbot/CleverNotBotException.java index 2bd0d53063..501cb8c0be 100644 --- a/src/main/java/cleverNotBot/CleverNotBotException.java +++ b/src/main/java/clevernotbot/CleverNotBotException.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class CleverNotBotException extends Exception{ private String errorMessage; diff --git a/src/main/java/cleverNotBot/Command.java b/src/main/java/clevernotbot/Command.java similarity index 95% rename from src/main/java/cleverNotBot/Command.java rename to src/main/java/clevernotbot/Command.java index a73d3329c3..0aa99938f3 100644 --- a/src/main/java/cleverNotBot/Command.java +++ b/src/main/java/clevernotbot/Command.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public abstract class Command { private String commandName; diff --git a/src/main/java/cleverNotBot/Deadline.java b/src/main/java/clevernotbot/Deadline.java similarity index 98% rename from src/main/java/cleverNotBot/Deadline.java rename to src/main/java/clevernotbot/Deadline.java index 38589be1dd..7bfee42d8a 100644 --- a/src/main/java/cleverNotBot/Deadline.java +++ b/src/main/java/clevernotbot/Deadline.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/cleverNotBot/DefaultCommand.java b/src/main/java/clevernotbot/DefaultCommand.java similarity index 93% rename from src/main/java/cleverNotBot/DefaultCommand.java rename to src/main/java/clevernotbot/DefaultCommand.java index 7b82df70de..4ae3a01f66 100644 --- a/src/main/java/cleverNotBot/DefaultCommand.java +++ b/src/main/java/clevernotbot/DefaultCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class DefaultCommand extends Command { diff --git a/src/main/java/cleverNotBot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java similarity index 97% rename from src/main/java/cleverNotBot/DeleteCommand.java rename to src/main/java/clevernotbot/DeleteCommand.java index 4d15824c9c..4ba13268ee 100644 --- a/src/main/java/cleverNotBot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class DeleteCommand extends Command { diff --git a/src/main/java/cleverNotBot/Event.java b/src/main/java/clevernotbot/Event.java similarity index 96% rename from src/main/java/cleverNotBot/Event.java rename to src/main/java/clevernotbot/Event.java index f47c5d7f7a..b938686162 100644 --- a/src/main/java/cleverNotBot/Event.java +++ b/src/main/java/clevernotbot/Event.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class Event extends Task{ private String at; diff --git a/src/main/java/cleverNotBot/GreetCommand.java b/src/main/java/clevernotbot/GreetCommand.java similarity index 93% rename from src/main/java/cleverNotBot/GreetCommand.java rename to src/main/java/clevernotbot/GreetCommand.java index 2053a679ff..ef39ae3950 100644 --- a/src/main/java/cleverNotBot/GreetCommand.java +++ b/src/main/java/clevernotbot/GreetCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class GreetCommand extends Command { diff --git a/src/main/java/cleverNotBot/ListCommand.java b/src/main/java/clevernotbot/ListCommand.java similarity index 96% rename from src/main/java/cleverNotBot/ListCommand.java rename to src/main/java/clevernotbot/ListCommand.java index 584a66a4dd..bc94b96ec9 100644 --- a/src/main/java/cleverNotBot/ListCommand.java +++ b/src/main/java/clevernotbot/ListCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class ListCommand extends Command { diff --git a/src/main/java/cleverNotBot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java similarity index 97% rename from src/main/java/cleverNotBot/MarkCommand.java rename to src/main/java/clevernotbot/MarkCommand.java index dad72e83ad..3f279abdb0 100644 --- a/src/main/java/cleverNotBot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class MarkCommand extends Command { diff --git a/src/main/java/cleverNotBot/Parser.java b/src/main/java/clevernotbot/Parser.java similarity index 97% rename from src/main/java/cleverNotBot/Parser.java rename to src/main/java/clevernotbot/Parser.java index 9bf6abd10e..0cb37889f9 100644 --- a/src/main/java/cleverNotBot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class Parser { diff --git a/src/main/java/cleverNotBot/Storage.java b/src/main/java/clevernotbot/Storage.java similarity index 99% rename from src/main/java/cleverNotBot/Storage.java rename to src/main/java/clevernotbot/Storage.java index aedaf83c74..a731d94a8e 100644 --- a/src/main/java/cleverNotBot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.io.*; import java.util.ArrayList; diff --git a/src/main/java/cleverNotBot/Task.java b/src/main/java/clevernotbot/Task.java similarity index 96% rename from src/main/java/cleverNotBot/Task.java rename to src/main/java/clevernotbot/Task.java index e9d733f358..37c8271133 100644 --- a/src/main/java/cleverNotBot/Task.java +++ b/src/main/java/clevernotbot/Task.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public abstract class Task { private final String name; diff --git a/src/main/java/cleverNotBot/TaskList.java b/src/main/java/clevernotbot/TaskList.java similarity index 97% rename from src/main/java/cleverNotBot/TaskList.java rename to src/main/java/clevernotbot/TaskList.java index bcf63ae765..0560fc367e 100644 --- a/src/main/java/cleverNotBot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/cleverNotBot/ToDo.java b/src/main/java/clevernotbot/ToDo.java similarity index 95% rename from src/main/java/cleverNotBot/ToDo.java rename to src/main/java/clevernotbot/ToDo.java index 43ecc2223a..c7986df2c9 100644 --- a/src/main/java/cleverNotBot/ToDo.java +++ b/src/main/java/clevernotbot/ToDo.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class ToDo extends Task{ diff --git a/src/main/java/cleverNotBot/UI.java b/src/main/java/clevernotbot/UI.java similarity index 98% rename from src/main/java/cleverNotBot/UI.java rename to src/main/java/clevernotbot/UI.java index f615ded1cf..fdfcbe5186 100644 --- a/src/main/java/cleverNotBot/UI.java +++ b/src/main/java/clevernotbot/UI.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/cleverNotBot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java similarity index 97% rename from src/main/java/cleverNotBot/UnmarkCommand.java rename to src/main/java/clevernotbot/UnmarkCommand.java index 61f9d3c8b1..17eb84bf6c 100644 --- a/src/main/java/cleverNotBot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -1,4 +1,4 @@ -package cleverNotBot; +package clevernotbot; public class UnmarkCommand extends Command { diff --git a/src/test/java/clevernotbot/ParserTest.java b/src/test/java/clevernotbot/ParserTest.java new file mode 100644 index 0000000000..b518e1079e --- /dev/null +++ b/src/test/java/clevernotbot/ParserTest.java @@ -0,0 +1,41 @@ +package clevernotbot; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class ParserTest { + + @Test + public void parseTextTest(){ + Parser testParser = new Parser(); + String txtTest1 = "todo read book"; + String txtTest2 = "deadline return book /by 02-12-2022 18:00"; + String txtTest3 = "mark 1"; + String txtTest4 = "event project meeting /at Aug 6th 2-4pm"; + String txtTest5 = "unmark 1"; + String txtTest6 = "list"; + String txtTest7 = "delete"; + String txtTest8 = "greet"; + String txtTest9 = "Random command 32123"; + + Command testCommand1 = testParser.parseText(txtTest1); + Command testCommand2 = testParser.parseText(txtTest2); + Command testCommand3 = testParser.parseText(txtTest3); + Command testCommand4 = testParser.parseText(txtTest4); + Command testCommand5 = testParser.parseText(txtTest5); + Command testCommand6 = testParser.parseText(txtTest6); + Command testCommand7 = testParser.parseText(txtTest7); + Command testCommand8 = testParser.parseText(txtTest8); + Command testCommand9 = testParser.parseText(txtTest9); + + assertTrue(testCommand1 instanceof AddCommandToDo); + assertTrue(testCommand2 instanceof AddCommandDeadLine); + assertTrue(testCommand3 instanceof MarkCommand); + assertTrue(testCommand4 instanceof AddCommandEvent); + assertTrue(testCommand5 instanceof UnmarkCommand); + assertTrue(testCommand6 instanceof ListCommand); + assertTrue(testCommand7 instanceof DeleteCommand); + assertTrue(testCommand8 instanceof GreetCommand); + assertTrue(testCommand9 instanceof DefaultCommand); + } +} diff --git a/src/test/java/clevernotbot/TaskListTest.java b/src/test/java/clevernotbot/TaskListTest.java new file mode 100644 index 0000000000..a2c032821a --- /dev/null +++ b/src/test/java/clevernotbot/TaskListTest.java @@ -0,0 +1,68 @@ +package clevernotbot; + +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskListTest { + + @Test + public void getTaskListTest(){ + TaskList list = new TaskList(new ArrayList()); + Task task1 = new ToDo("Test1",false); + list.addTask(task1); + ArrayList testArray = new ArrayList<>(); + testArray.add(task1); + assertEquals(list.getTaskList(),testArray); + } + + @Test + public void addTaskTest(){ + TaskList list = new TaskList(new ArrayList()); + Task task1 = new ToDo("Test1",false); + Task task2 = new Event("Test2",false,"Aug 6th 2-4pm"); + Task task3 = new Deadline("Test3",false,"02-12-2022 18:00"); + list.addTask(task1); + list.addTask(task2); + list.addTask(task3); + ArrayList testTasks = new ArrayList<>(); + testTasks.add(task1); + testTasks.add(task2); + testTasks.add(task3); + assertEquals(list.getTaskList(),testTasks); + } + + @Test + public void removeTaskTest(){ + TaskList listActual = new TaskList(new ArrayList()); + Task task1 = new ToDo("Test1",false); + Task task2 = new Event("Test2",false,"Aug 6th 2-4pm"); + Task task3 = new Deadline("Test3",false,"02-12-2022 18:00"); + listActual.addTask(task1); + listActual.addTask(task2); + listActual.addTask(task3); + listActual.removeTask(task2); + ArrayList arrayExpected = new ArrayList<>(); + arrayExpected.add(task1); + arrayExpected.add(task3); + assertEquals(arrayExpected,listActual.getTaskList()); + } + + @Test + public void getTaskTest(){ + TaskList listActual = new TaskList(new ArrayList()); + Task task1 = new ToDo("Test1",false); + Task task2 = new Event("Test2",false,"Aug 6th 2-4pm"); + Task task3 = new Deadline("Test3",false,"02-12-2022 18:00"); + listActual.addTask(task1); + listActual.addTask(task2); + listActual.addTask(task3); + listActual.removeTask(task1); + assertEquals(task2,listActual.getTask(0)); + } + + + +} diff --git a/src/test/java/clevernotbot/ToDoTest.java b/src/test/java/clevernotbot/ToDoTest.java new file mode 100644 index 0000000000..0e927e7fee --- /dev/null +++ b/src/test/java/clevernotbot/ToDoTest.java @@ -0,0 +1,26 @@ +package clevernotbot; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ToDoTest { + + @Test + public void getTaskTypeTest() { + Task toDoTest = new ToDo("Test 1",false); + assertEquals(toDoTest.getTaskType(),"T"); + } + + @Test + public void toggleCompletedTest(){ + Task toDoTest = new ToDo("Test 2",false); + assertEquals(!toDoTest.isCompleted(),toDoTest.toggleCompleted().isCompleted()); + } + + @Test + public void toStringTest(){ + Task toDoTest = new ToDo("Test 3",false); + assertEquals(toDoTest.toString(),"[T][ ] Test 3"); + } + +} From de8b34e11ccf5d547ede55624ea2eb486adb3641 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Thu, 1 Sep 2022 23:25:51 +0800 Subject: [PATCH 10/31] Add A-Jar --- build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0eac494f96..1a6c38ecfe 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,21 @@ test { } application { - mainClassName = "cleverNotBot.CleverNotBot" + mainClassName = "clevernotbot.CleverNotBot" +} + +jar { + manifest { + attributes "Main-Class": "clevernotbot.CleverNotBot" + } + + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } } shadowJar { - archiveBaseName = "cleverNotBot" + archiveBaseName = "clevernotbot" archiveClassifier = null } From 189448e3c8033f5f58581fa481a14982c8b068a6 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 02:54:43 +0800 Subject: [PATCH 11/31] Add JavaDocs for all classes except CleverNotBot.java . --- ...dDeadLine.java => AddDeadLineCommand.java} | 27 +++++++-- ...CommandEvent.java => AddEventCommand.java} | 27 +++++++-- ...ddCommandToDo.java => AddToDoCommand.java} | 25 ++++++-- src/main/java/clevernotbot/ByeCommand.java | 17 ++++++ src/main/java/clevernotbot/CleverNotBot.java | 8 +-- .../clevernotbot/CleverNotBotException.java | 14 +++++ src/main/java/clevernotbot/Command.java | 27 +++++++++ src/main/java/clevernotbot/Deadline.java | 58 +++++++++++++++++++ .../java/clevernotbot/DefaultCommand.java | 17 ++++++ src/main/java/clevernotbot/DeleteCommand.java | 39 +++++++++---- src/main/java/clevernotbot/Event.java | 31 ++++++++++ src/main/java/clevernotbot/GreetCommand.java | 17 ++++++ src/main/java/clevernotbot/ListCommand.java | 17 ++++++ src/main/java/clevernotbot/MarkCommand.java | 20 ++++++- src/main/java/clevernotbot/Parser.java | 15 ++++- src/main/java/clevernotbot/Storage.java | 25 +++++++- src/main/java/clevernotbot/Task.java | 47 ++++++++++++++- src/main/java/clevernotbot/TaskList.java | 47 +++++++++++++++ src/main/java/clevernotbot/ToDo.java | 29 ++++++++++ src/main/java/clevernotbot/UI.java | 16 ++++- src/main/java/clevernotbot/UnmarkCommand.java | 17 ++++++ src/test/java/clevernotbot/ParserTest.java | 6 +- 22 files changed, 505 insertions(+), 41 deletions(-) rename src/main/java/clevernotbot/{AddCommandDeadLine.java => AddDeadLineCommand.java} (65%) rename src/main/java/clevernotbot/{AddCommandEvent.java => AddEventCommand.java} (60%) rename src/main/java/clevernotbot/{AddCommandToDo.java => AddToDoCommand.java} (62%) diff --git a/src/main/java/clevernotbot/AddCommandDeadLine.java b/src/main/java/clevernotbot/AddDeadLineCommand.java similarity index 65% rename from src/main/java/clevernotbot/AddCommandDeadLine.java rename to src/main/java/clevernotbot/AddDeadLineCommand.java index 6ad726dacf..c03b6b0b20 100644 --- a/src/main/java/clevernotbot/AddCommandDeadLine.java +++ b/src/main/java/clevernotbot/AddDeadLineCommand.java @@ -1,18 +1,35 @@ package clevernotbot; -public class AddCommandDeadLine extends Command { +/** + * Represents a command used to add an Event Task. + */ +public class AddDeadLineCommand extends Command { - public AddCommandDeadLine(String commandName, boolean exit) { + /** + * Constructor for the AddDeadLineCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddDeadLineCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add deadline command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when deadline description is empty or not contain /by. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Task.Deadline!", textBox); + throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); } else if (!getCommandName().contains("/by")) { - throw new CleverNotBotException("Please include a /by in your description of Task.Deadline! ", textBox); + throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); } else { String searchWord = " /by"; int start = "deadline ".length(); @@ -31,7 +48,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e){ - throw new CleverNotBotException("Task.Deadline description must not be empty or must contain /by!", textBox); + throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); } catch (Exception ex){ throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); diff --git a/src/main/java/clevernotbot/AddCommandEvent.java b/src/main/java/clevernotbot/AddEventCommand.java similarity index 60% rename from src/main/java/clevernotbot/AddCommandEvent.java rename to src/main/java/clevernotbot/AddEventCommand.java index 17022bffbe..1677b75b6f 100644 --- a/src/main/java/clevernotbot/AddCommandEvent.java +++ b/src/main/java/clevernotbot/AddEventCommand.java @@ -1,18 +1,35 @@ package clevernotbot; -public class AddCommandEvent extends Command { +/** + * Represents a command used to add an Event Task. + */ +public class AddEventCommand extends Command { - public AddCommandEvent(String commandName, boolean exit) { + /** + * Constructor for the AddEventCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddEventCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add event command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try{ if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Task.Event!", textBox); + throw new CleverNotBotException("Please fill in the description of Event!", textBox); } else if (!getCommandName().contains("/at")) { - throw new CleverNotBotException("Please include a /at in your description of Task.Deadline! ", textBox); + throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); } else { String searchWord = " /at"; int start = "event ".length(); @@ -29,7 +46,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Task.Event description must not be empty or must contain /at!", textBox); + throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); } } diff --git a/src/main/java/clevernotbot/AddCommandToDo.java b/src/main/java/clevernotbot/AddToDoCommand.java similarity index 62% rename from src/main/java/clevernotbot/AddCommandToDo.java rename to src/main/java/clevernotbot/AddToDoCommand.java index 6ae038cb32..88ef814365 100644 --- a/src/main/java/clevernotbot/AddCommandToDo.java +++ b/src/main/java/clevernotbot/AddToDoCommand.java @@ -2,12 +2,29 @@ import java.util.Arrays; -public class AddCommandToDo extends Command { +/** + * Represents a command used to add a ToDo Task. + */ +public class AddToDoCommand extends Command { - public AddCommandToDo(String commandName, boolean exit) { + /** + * Constructor for the AddToDoCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddToDoCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add ToDo command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when todo's description is empty. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { @@ -24,10 +41,10 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } else { - throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); } } diff --git a/src/main/java/clevernotbot/ByeCommand.java b/src/main/java/clevernotbot/ByeCommand.java index 62a5ecaec2..2bb2a54a98 100644 --- a/src/main/java/clevernotbot/ByeCommand.java +++ b/src/main/java/clevernotbot/ByeCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used for saying bye. + */ public class ByeCommand extends Command { + /** + * Constructor for the ByeCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public ByeCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the bye command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Bye. Hope to see you again soon!"); diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index 7a79223368..ba82ee39b0 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -13,10 +13,10 @@ public static void main(String[] args) throws CleverNotBotException { hl.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { - String ip = sc.nextLine(); - Command nxtStep = hl.parseText(ip); - nxtStep.run(tasks, textBox, storage); - if (nxtStep.isExitingProgram()) { + String inp = sc.nextLine(); + Command commandToRun = hl.parseText(inp); + commandToRun.run(tasks, textBox, storage); + if (commandToRun.isExitingProgram()) { break; } } diff --git a/src/main/java/clevernotbot/CleverNotBotException.java b/src/main/java/clevernotbot/CleverNotBotException.java index 501cb8c0be..1a5425eef9 100644 --- a/src/main/java/clevernotbot/CleverNotBotException.java +++ b/src/main/java/clevernotbot/CleverNotBotException.java @@ -1,14 +1,28 @@ package clevernotbot; +/** + * Deals with exception + */ public class CleverNotBotException extends Exception{ private String errorMessage; private UI textBox; + /** + * Constructor for CleverNotBotException. + * + * @param errorMessage Error message logged in the system. + * @param textBox For textbox wrapping.(Removed for now) + */ public CleverNotBotException(String errorMessage, UI textBox){ this.errorMessage = errorMessage; this.textBox = textBox; } + /** + * Converts CleverNotBotException to a string. + * + * @return Exception text. + */ @Override /*public String toString(){ return textBox.coverText(errorMessage); diff --git a/src/main/java/clevernotbot/Command.java b/src/main/java/clevernotbot/Command.java index 0aa99938f3..b7294ccef8 100644 --- a/src/main/java/clevernotbot/Command.java +++ b/src/main/java/clevernotbot/Command.java @@ -1,21 +1,48 @@ package clevernotbot; +/** + * Represents a command. + */ public abstract class Command { private String commandName; private boolean exit; + /** + * Constructor for the Command. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public Command(String commandName, boolean exit){ this.commandName = commandName; this.exit = exit; } + /** + * Returns name of Command. + * + * @return Name of Command. + */ public String getCommandName(){ return commandName; } + /** + * Returns true if the program is intending to exit. + * + * @return Exit status. + */ public boolean isExitingProgram(){ return exit; } + /** + * An abstract method of run + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ public abstract void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; } diff --git a/src/main/java/clevernotbot/Deadline.java b/src/main/java/clevernotbot/Deadline.java index 7bfee42d8a..4394372999 100644 --- a/src/main/java/clevernotbot/Deadline.java +++ b/src/main/java/clevernotbot/Deadline.java @@ -3,55 +3,113 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +/** + * Represents a more specific task with time limit attached to it. A Deadline object corresponds to + * a task by a specific time e.g., 02-12-2018 18:00 + */ public class Deadline extends Task{ private String dateTime; private LocalDateTime date; + /** + * Constructor for Deadline. + * + * @param name Name of the Task. + * @param completed The status of the Task. (Completed or not) + * @param dateTime The deadline. + */ public Deadline(String name, boolean completed, String dateTime) { super(name, completed); this.dateTime = dateTime; applyDate(dateTime); } + /** + * Returns the deadline. + * + * @return Time of deadline. + */ @Override public String getTime() { return dateTime; } + /** + * Returns The type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "D"; } + /** + * Applies date for the constructor. + * + * @param dateTime String type time of deadline. ("20-04-1990 19:30") + */ private void applyDate(String dateTime) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); this.date = LocalDateTime.parse(dateTime, formatter); } + /** + * Returns date and time. + * + * @return Date and time in MMM d yyyy HH:mm e.g. "Jan 9 1998 19:30". + */ public String getDateTime(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); } + /** + * Return date and time with a specific format. + * + * @param format String of a format e.g. "yyyy-dd-MM HH:mm". + * @return The date and time in a specific format. + */ public String getDateTime(String format){ return date.format(DateTimeFormatter.ofPattern(format)); } + /** + * Return the date only in MMM d yyyy format. + * + * @return Date in MMM d yyyy format. + */ public String getDate(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } + /** + * Toggles the completion of deadline. + * + * @return A toggled version of deadline. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new Deadline(getName(),!isCompleted(), dateTime); } + /** + * Checks the validity of the date and time provided in a string. + * + * @param date Date and time in String. + * @throws Exception If improper date is entered. + */ public static void validDateTime(String date) throws Exception { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); LocalDateTime d = LocalDateTime.parse(date, formatter); } + /** + * Converts deadline to a string. + * + * @return A string that represent a deadline. E.g. [D][X] get a book /by 20-04-1990 19:30. + */ @Override public String toString(){ return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),getDateTime()); diff --git a/src/main/java/clevernotbot/DefaultCommand.java b/src/main/java/clevernotbot/DefaultCommand.java index 4ae3a01f66..54165c2e68 100644 --- a/src/main/java/clevernotbot/DefaultCommand.java +++ b/src/main/java/clevernotbot/DefaultCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used at default. + */ public class DefaultCommand extends Command { + /** + * Constructor for the DefaultCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public DefaultCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the default command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("This command doesn't exist!"); diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java index 4ba13268ee..371407a171 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -1,27 +1,44 @@ package clevernotbot; +/** + * Represents a command to delete a task. + */ public class DeleteCommand extends Command { - public DeleteCommand(String commandName, boolean exit){ - super(commandName,exit); + /** + * Constructor for the DeleteCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public DeleteCommand(String commandName, boolean exit) { + super(commandName, exit); } + /** + * Runs the command to delete a specific task in task list (tasks). + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception if there is not a valid number or if task does not exist. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - try{ + try { String[] desc = getCommandName().split(" "); - if(desc.length <= 1){ - throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); + if (desc.length <= 1) { + throw new CleverNotBotException("Invalid arguments. Please enter a number!", textBox); } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Noted. I've removed this task:"+ - "\n %s"+ - "\nNow you have %d tasks in the list." - ,deletedTask.toString(),tasks.getSize())); - } catch (IndexOutOfBoundsException e){ - throw new CleverNotBotException("The task does not exist!",textBox); + "Noted. I've removed this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , deletedTask.toString(), tasks.getSize())); + } catch (IndexOutOfBoundsException e) { + throw new CleverNotBotException("The task does not exist!", textBox); } } diff --git a/src/main/java/clevernotbot/Event.java b/src/main/java/clevernotbot/Event.java index b938686162..1bc7e78287 100644 --- a/src/main/java/clevernotbot/Event.java +++ b/src/main/java/clevernotbot/Event.java @@ -1,28 +1,59 @@ package clevernotbot; +/** + * Represents a more specific task with time limit attached to it. A Event object corresponds to + * a task with a time range e.g., Aug 6th 2-4pm + */ public class Event extends Task{ private String at; + /** + * Constructor for Event. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + * @param at The deadline. + */ public Event(String name, boolean completed, String at){ super(name,completed); this.at = at; } + /** + * Returns the Event's time. + * + * @return Time of event. + */ @Override public String getTime() { return at; } + /** + * Returns the type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "E"; } + /** + * Toggles the completion of event task. + * + * @return A toggled version of event. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new Event(getName(),!isCompleted(),at); } + /** + * Converts event to a string. + * + * @return A string that represent a event. E.g. [E][X] get a book /at Aug 6th 2-4pm. + */ @Override public String toString(){ return String.format("[E][%s] %s (at: %s)",checkMarked(),getName(),at); diff --git a/src/main/java/clevernotbot/GreetCommand.java b/src/main/java/clevernotbot/GreetCommand.java index ef39ae3950..2c21325fca 100644 --- a/src/main/java/clevernotbot/GreetCommand.java +++ b/src/main/java/clevernotbot/GreetCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used for greeting + */ public class GreetCommand extends Command { + /** + * Constructor for the GreetCommand. + * + * @param commandName Description of command. + * @param exit Checking if program intends to exit. + */ public GreetCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the greet command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); diff --git a/src/main/java/clevernotbot/ListCommand.java b/src/main/java/clevernotbot/ListCommand.java index bc94b96ec9..ed609d3d2b 100644 --- a/src/main/java/clevernotbot/ListCommand.java +++ b/src/main/java/clevernotbot/ListCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command to show what is in the list. + */ public class ListCommand extends Command { + /** + * Constructor for the ListCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public ListCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the list command to list out every task in list. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 3f279abdb0..9bdd7c9b81 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -1,14 +1,32 @@ package clevernotbot; +/** + * Represents a command to mark a task. + */ public class MarkCommand extends Command { + /** + * Constructor for the MarkCommand. + * + * @param commandName Description of command. + * @param exit Checking if program intends to exit. + */ public MarkCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the mark command to mark the task as completed. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + //mark 3 -> 2, because number 3 is actually idx 2 + int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { Task markedTask = taskToMark.toggleCompleted(); diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 0cb37889f9..01a918fc30 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -1,7 +1,16 @@ package clevernotbot; +/** + * Deals with making sense of the user command + */ public class Parser { + /** + * Makes sense out of user command. + * + * @param text User command. + * @return A runnable command. + */ public Command parseText(String text) { String[] txtArr = text.split(" "); switch (txtArr[0]) { @@ -12,11 +21,11 @@ public Command parseText(String text) { case "list": return new ListCommand(text, false); case "todo": - return new AddCommandToDo(text, false); + return new AddToDoCommand(text, false); case "deadline": - return new AddCommandDeadLine(text, false); + return new AddDeadLineCommand(text, false); case "event": - return new AddCommandEvent(text, false); + return new AddEventCommand(text, false); case "delete": return new DeleteCommand(text, false); case "greet": diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index a731d94a8e..b64482e56e 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -3,14 +3,25 @@ import java.io.*; import java.util.ArrayList; +/** + * Deals with loading tasks from the file and saving tasks in the file + */ public class Storage { private String fileLocation = "/data/cleverNotBot.txt"; private File file; + /** + * Constructor for Storage. + */ public Storage(){ this.file = new File(this.fileLocation); } + /** + * Gets Task from the saved file. + * + * @return An ArrayList full of tasks. + */ public ArrayList getTasksFromFile() { ArrayList tasks = new ArrayList<>(); String line; @@ -34,6 +45,11 @@ public ArrayList getTasksFromFile() { return tasks; } + /** + * Writes tasks to file. + * + * @param tasks The tasks that needs to put in. + */ public void writeToFile(ArrayList tasks) { try { // if the file above doesn't exist, create it. @@ -69,9 +85,16 @@ public void writeToFile(ArrayList tasks) { } } + /** + * Converts line to Tasks. + * E.g. "D | 0 | return book | 02-12-2022 18:00" -> new Dateline("return book",false,02-12-2022 18:00") + * + * @param line Line that stored in the file. + * @return Task. + */ private Task convertLineToTask(String line) { String[] content = line.split(" \\| "); - /* debug line + /* Debug line System.out.println(file.getAbsolutePath()); System.out.println(String.join(",",content)); */ diff --git a/src/main/java/clevernotbot/Task.java b/src/main/java/clevernotbot/Task.java index 37c8271133..bc11b06a80 100644 --- a/src/main/java/clevernotbot/Task.java +++ b/src/main/java/clevernotbot/Task.java @@ -1,35 +1,78 @@ package clevernotbot; +/** + * Represents a string as a Task. A Task object corresponding to + * name of task given and whether if it is completed. + */ public abstract class Task { private final String name; private final boolean completed; - + /** + * Constructor for Task. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + */ public Task(String name, boolean completed){ this.name = name; this.completed = completed; } + /** + * Returns task's name. + * + * @return Name. + */ public String getName(){ return name; } + /** + * Returns task's completion. + * + * @return Task's completion. + */ public boolean isCompleted(){ return completed; } + /** + * Returns the mark "X" if it is completed and " " if it is not. + * + * @return Mark. + */ public String checkMarked(){ return isCompleted()? "X":" "; } + /** + * An abstract method to get time. + * + * @return Time. + */ public abstract String getTime(); + /** + * An abstract method to get task type. + * + * @return Task type. + */ public abstract String getTaskType(); + /** + * Toggles the completion of Task. + * + * @return A toggled version. (Completed = true -> Completed = false) + */ public abstract Task toggleCompleted(); //return new Task.Task(name,!completed); - + /** + * Converts Task to a string. + * + * @return Task's name. + */ @Override public String toString() { return name; diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index 0560fc367e..3dc3e03f34 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -3,41 +3,88 @@ import java.util.ArrayList; import java.util.Arrays; +/** + * Represents a list for Task. A TaskList object corresponds to + * an ArrayList of task. + */ public class TaskList { private ArrayList tasks; private int size; + /** + * Constructor for the TaskList. + * + * @param tasks A list of task. + */ public TaskList(ArrayList tasks){ this.tasks = tasks; size = tasks.size(); } + /** + * Adds task to TaskList + * + * @param element Task to be inputted. + */ public void addTask(Task element){ tasks.add(element); size++; } + /** + * Adds task by index to TaskList. + * + * @param idx Index to be slotted in. + * @param element Task to be inputted. + */ public void addTaskByIdx(int idx, Task element){ tasks.add(idx, element); size++; } + /** + * Removes task from TaskList. + * + * @param task Task to be removed. + */ public void removeTask(Task task){ tasks.remove((Task)task); size--; } + /** + * Gets Task from TaskList. + * + * @param idx Index that the Task is at. + * @return Task at that index. + */ public Task getTask(int idx){ return tasks.get(idx); } + /** + * Gets an ArrayList from TaskList. + * + * @return An ArrayList. + */ public ArrayList getTaskList(){ return tasks; } + + /** + * Gets size from TaskList. + * + * @return How many Task is in a TaskList. + */ public int getSize(){ return size; } + /** + * Converts TaskList to a string. + * + * @return A string that represent a TaskList. + */ @Override public String toString(){ return Arrays.toString(tasks.toArray()); diff --git a/src/main/java/clevernotbot/ToDo.java b/src/main/java/clevernotbot/ToDo.java index c7986df2c9..42b5478f28 100644 --- a/src/main/java/clevernotbot/ToDo.java +++ b/src/main/java/clevernotbot/ToDo.java @@ -1,26 +1,55 @@ package clevernotbot; +/** + * Represents a more specific task with no time limit attached to it. + */ public class ToDo extends Task{ + /** + * Constructor for ToDo. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + */ public ToDo(String name, boolean completed){ super(name,completed); } + /** + * Returns the deadline for Todo which is just infinite. + * + * @return Deadline for Todo. + */ @Override public String getTime() { return "inf"; } + /** + * Returns The type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "T"; } + /** + * Toggles the completion of todo task. + * + * @return A toggled version of todo. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new ToDo(getName(),!isCompleted()); } + /** + * Converts ToDo to a string. + * + * @return A string that represent a todo. E.g. [E][X] get a book /at Aug 6th 2-4pm. + */ @Override public String toString(){ return String.format("[T][%s] %s",checkMarked(),getName()); diff --git a/src/main/java/clevernotbot/UI.java b/src/main/java/clevernotbot/UI.java index fdfcbe5186..985802e266 100644 --- a/src/main/java/clevernotbot/UI.java +++ b/src/main/java/clevernotbot/UI.java @@ -4,10 +4,16 @@ import java.util.Collections; import java.util.List; +/** + * Deals with interactions with the user + */ public class UI { - public UI(){} - + /** + * Prints a text surrounded by a chat box. + * + * @param text Text to be printed out. + */ public void chat(String text){ List textLines; int max; @@ -28,6 +34,12 @@ public void chat(String text){ } + /** + * Returns a text surrounded by a chat box. + * + * @param text Text to be printed out. + * @return A text surrounded by a chat box. + */ public String coverText(String text){ List textLines; int max; diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 17eb84bf6c..941eba3854 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command to unmark a task. + */ public class UnmarkCommand extends Command { + /** + * Constructor for the unMarkCommand. + * + * @param commandName description of command. + * @param exit checking if program intends to exit. + */ public UnmarkCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the mark command to unmark the task as completed. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 diff --git a/src/test/java/clevernotbot/ParserTest.java b/src/test/java/clevernotbot/ParserTest.java index b518e1079e..7c378628dd 100644 --- a/src/test/java/clevernotbot/ParserTest.java +++ b/src/test/java/clevernotbot/ParserTest.java @@ -28,10 +28,10 @@ public void parseTextTest(){ Command testCommand8 = testParser.parseText(txtTest8); Command testCommand9 = testParser.parseText(txtTest9); - assertTrue(testCommand1 instanceof AddCommandToDo); - assertTrue(testCommand2 instanceof AddCommandDeadLine); + assertTrue(testCommand1 instanceof AddToDoCommand); + assertTrue(testCommand2 instanceof AddDeadLineCommand); assertTrue(testCommand3 instanceof MarkCommand); - assertTrue(testCommand4 instanceof AddCommandEvent); + assertTrue(testCommand4 instanceof AddEventCommand); assertTrue(testCommand5 instanceof UnmarkCommand); assertTrue(testCommand6 instanceof ListCommand); assertTrue(testCommand7 instanceof DeleteCommand); From ecfcad8b5df413292a095bc34cfda0711fd853ca Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 02:56:57 +0800 Subject: [PATCH 12/31] Revert "Add JavaDocs for all classes except CleverNotBot.java ." This reverts commit 189448e3c8033f5f58581fa481a14982c8b068a6. --- ...neCommand.java => AddCommandDeadLine.java} | 27 ++------- ...EventCommand.java => AddCommandEvent.java} | 27 ++------- ...ddToDoCommand.java => AddCommandToDo.java} | 25 ++------ src/main/java/clevernotbot/ByeCommand.java | 17 ------ src/main/java/clevernotbot/CleverNotBot.java | 8 +-- .../clevernotbot/CleverNotBotException.java | 14 ----- src/main/java/clevernotbot/Command.java | 27 --------- src/main/java/clevernotbot/Deadline.java | 58 ------------------- .../java/clevernotbot/DefaultCommand.java | 17 ------ src/main/java/clevernotbot/DeleteCommand.java | 39 ++++--------- src/main/java/clevernotbot/Event.java | 31 ---------- src/main/java/clevernotbot/GreetCommand.java | 17 ------ src/main/java/clevernotbot/ListCommand.java | 17 ------ src/main/java/clevernotbot/MarkCommand.java | 20 +------ src/main/java/clevernotbot/Parser.java | 15 +---- src/main/java/clevernotbot/Storage.java | 25 +------- src/main/java/clevernotbot/Task.java | 47 +-------------- src/main/java/clevernotbot/TaskList.java | 47 --------------- src/main/java/clevernotbot/ToDo.java | 29 ---------- src/main/java/clevernotbot/UI.java | 16 +---- src/main/java/clevernotbot/UnmarkCommand.java | 17 ------ src/test/java/clevernotbot/ParserTest.java | 6 +- 22 files changed, 41 insertions(+), 505 deletions(-) rename src/main/java/clevernotbot/{AddDeadLineCommand.java => AddCommandDeadLine.java} (65%) rename src/main/java/clevernotbot/{AddEventCommand.java => AddCommandEvent.java} (60%) rename src/main/java/clevernotbot/{AddToDoCommand.java => AddCommandToDo.java} (62%) diff --git a/src/main/java/clevernotbot/AddDeadLineCommand.java b/src/main/java/clevernotbot/AddCommandDeadLine.java similarity index 65% rename from src/main/java/clevernotbot/AddDeadLineCommand.java rename to src/main/java/clevernotbot/AddCommandDeadLine.java index c03b6b0b20..6ad726dacf 100644 --- a/src/main/java/clevernotbot/AddDeadLineCommand.java +++ b/src/main/java/clevernotbot/AddCommandDeadLine.java @@ -1,35 +1,18 @@ package clevernotbot; -/** - * Represents a command used to add an Event Task. - */ -public class AddDeadLineCommand extends Command { +public class AddCommandDeadLine extends Command { - /** - * Constructor for the AddDeadLineCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ - public AddDeadLineCommand(String commandName, boolean exit) { + public AddCommandDeadLine(String commandName, boolean exit) { super(commandName, exit); } - /** - * Runs the add deadline command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception when deadline description is empty or not contain /by. - */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.Deadline!", textBox); } else if (!getCommandName().contains("/by")) { - throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); + throw new CleverNotBotException("Please include a /by in your description of Task.Deadline! ", textBox); } else { String searchWord = " /by"; int start = "deadline ".length(); @@ -48,7 +31,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e){ - throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); + throw new CleverNotBotException("Task.Deadline description must not be empty or must contain /by!", textBox); } catch (Exception ex){ throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); diff --git a/src/main/java/clevernotbot/AddEventCommand.java b/src/main/java/clevernotbot/AddCommandEvent.java similarity index 60% rename from src/main/java/clevernotbot/AddEventCommand.java rename to src/main/java/clevernotbot/AddCommandEvent.java index 1677b75b6f..17022bffbe 100644 --- a/src/main/java/clevernotbot/AddEventCommand.java +++ b/src/main/java/clevernotbot/AddCommandEvent.java @@ -1,35 +1,18 @@ package clevernotbot; -/** - * Represents a command used to add an Event Task. - */ -public class AddEventCommand extends Command { +public class AddCommandEvent extends Command { - /** - * Constructor for the AddEventCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ - public AddEventCommand(String commandName, boolean exit) { + public AddCommandEvent(String commandName, boolean exit) { super(commandName, exit); } - /** - * Runs the add event command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. - */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try{ if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Event!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.Event!", textBox); } else if (!getCommandName().contains("/at")) { - throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); + throw new CleverNotBotException("Please include a /at in your description of Task.Deadline! ", textBox); } else { String searchWord = " /at"; int start = "event ".length(); @@ -46,7 +29,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); + throw new CleverNotBotException("Task.Event description must not be empty or must contain /at!", textBox); } } diff --git a/src/main/java/clevernotbot/AddToDoCommand.java b/src/main/java/clevernotbot/AddCommandToDo.java similarity index 62% rename from src/main/java/clevernotbot/AddToDoCommand.java rename to src/main/java/clevernotbot/AddCommandToDo.java index 88ef814365..6ae038cb32 100644 --- a/src/main/java/clevernotbot/AddToDoCommand.java +++ b/src/main/java/clevernotbot/AddCommandToDo.java @@ -2,29 +2,12 @@ import java.util.Arrays; -/** - * Represents a command used to add a ToDo Task. - */ -public class AddToDoCommand extends Command { +public class AddCommandToDo extends Command { - /** - * Constructor for the AddToDoCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ - public AddToDoCommand(String commandName, boolean exit) { + public AddCommandToDo(String commandName, boolean exit) { super(commandName, exit); } - /** - * Runs the add ToDo command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception when todo's description is empty. - */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { @@ -41,10 +24,10 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } else { - throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } } diff --git a/src/main/java/clevernotbot/ByeCommand.java b/src/main/java/clevernotbot/ByeCommand.java index 2bb2a54a98..62a5ecaec2 100644 --- a/src/main/java/clevernotbot/ByeCommand.java +++ b/src/main/java/clevernotbot/ByeCommand.java @@ -1,28 +1,11 @@ package clevernotbot; -/** - * Represents a command used for saying bye. - */ public class ByeCommand extends Command { - /** - * Constructor for the ByeCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ public ByeCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the bye command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Bye. Hope to see you again soon!"); diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index ba82ee39b0..7a79223368 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -13,10 +13,10 @@ public static void main(String[] args) throws CleverNotBotException { hl.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { - String inp = sc.nextLine(); - Command commandToRun = hl.parseText(inp); - commandToRun.run(tasks, textBox, storage); - if (commandToRun.isExitingProgram()) { + String ip = sc.nextLine(); + Command nxtStep = hl.parseText(ip); + nxtStep.run(tasks, textBox, storage); + if (nxtStep.isExitingProgram()) { break; } } diff --git a/src/main/java/clevernotbot/CleverNotBotException.java b/src/main/java/clevernotbot/CleverNotBotException.java index 1a5425eef9..501cb8c0be 100644 --- a/src/main/java/clevernotbot/CleverNotBotException.java +++ b/src/main/java/clevernotbot/CleverNotBotException.java @@ -1,28 +1,14 @@ package clevernotbot; -/** - * Deals with exception - */ public class CleverNotBotException extends Exception{ private String errorMessage; private UI textBox; - /** - * Constructor for CleverNotBotException. - * - * @param errorMessage Error message logged in the system. - * @param textBox For textbox wrapping.(Removed for now) - */ public CleverNotBotException(String errorMessage, UI textBox){ this.errorMessage = errorMessage; this.textBox = textBox; } - /** - * Converts CleverNotBotException to a string. - * - * @return Exception text. - */ @Override /*public String toString(){ return textBox.coverText(errorMessage); diff --git a/src/main/java/clevernotbot/Command.java b/src/main/java/clevernotbot/Command.java index b7294ccef8..0aa99938f3 100644 --- a/src/main/java/clevernotbot/Command.java +++ b/src/main/java/clevernotbot/Command.java @@ -1,48 +1,21 @@ package clevernotbot; -/** - * Represents a command. - */ public abstract class Command { private String commandName; private boolean exit; - /** - * Constructor for the Command. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ public Command(String commandName, boolean exit){ this.commandName = commandName; this.exit = exit; } - /** - * Returns name of Command. - * - * @return Name of Command. - */ public String getCommandName(){ return commandName; } - /** - * Returns true if the program is intending to exit. - * - * @return Exit status. - */ public boolean isExitingProgram(){ return exit; } - /** - * An abstract method of run - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ public abstract void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; } diff --git a/src/main/java/clevernotbot/Deadline.java b/src/main/java/clevernotbot/Deadline.java index 4394372999..7bfee42d8a 100644 --- a/src/main/java/clevernotbot/Deadline.java +++ b/src/main/java/clevernotbot/Deadline.java @@ -3,113 +3,55 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -/** - * Represents a more specific task with time limit attached to it. A Deadline object corresponds to - * a task by a specific time e.g., 02-12-2018 18:00 - */ public class Deadline extends Task{ private String dateTime; private LocalDateTime date; - /** - * Constructor for Deadline. - * - * @param name Name of the Task. - * @param completed The status of the Task. (Completed or not) - * @param dateTime The deadline. - */ public Deadline(String name, boolean completed, String dateTime) { super(name, completed); this.dateTime = dateTime; applyDate(dateTime); } - /** - * Returns the deadline. - * - * @return Time of deadline. - */ @Override public String getTime() { return dateTime; } - /** - * Returns The type of task. - * - * @return Type of task. - */ @Override public String getTaskType() { return "D"; } - /** - * Applies date for the constructor. - * - * @param dateTime String type time of deadline. ("20-04-1990 19:30") - */ private void applyDate(String dateTime) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); this.date = LocalDateTime.parse(dateTime, formatter); } - /** - * Returns date and time. - * - * @return Date and time in MMM d yyyy HH:mm e.g. "Jan 9 1998 19:30". - */ public String getDateTime(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); } - /** - * Return date and time with a specific format. - * - * @param format String of a format e.g. "yyyy-dd-MM HH:mm". - * @return The date and time in a specific format. - */ public String getDateTime(String format){ return date.format(DateTimeFormatter.ofPattern(format)); } - /** - * Return the date only in MMM d yyyy format. - * - * @return Date in MMM d yyyy format. - */ public String getDate(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } - /** - * Toggles the completion of deadline. - * - * @return A toggled version of deadline. (Completed = true -> Completed = false) - */ @Override public Task toggleCompleted(){ return new Deadline(getName(),!isCompleted(), dateTime); } - /** - * Checks the validity of the date and time provided in a string. - * - * @param date Date and time in String. - * @throws Exception If improper date is entered. - */ public static void validDateTime(String date) throws Exception { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); LocalDateTime d = LocalDateTime.parse(date, formatter); } - /** - * Converts deadline to a string. - * - * @return A string that represent a deadline. E.g. [D][X] get a book /by 20-04-1990 19:30. - */ @Override public String toString(){ return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),getDateTime()); diff --git a/src/main/java/clevernotbot/DefaultCommand.java b/src/main/java/clevernotbot/DefaultCommand.java index 54165c2e68..4ae3a01f66 100644 --- a/src/main/java/clevernotbot/DefaultCommand.java +++ b/src/main/java/clevernotbot/DefaultCommand.java @@ -1,28 +1,11 @@ package clevernotbot; -/** - * Represents a command used at default. - */ public class DefaultCommand extends Command { - /** - * Constructor for the DefaultCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ public DefaultCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the default command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("This command doesn't exist!"); diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java index 371407a171..4ba13268ee 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -1,44 +1,27 @@ package clevernotbot; -/** - * Represents a command to delete a task. - */ public class DeleteCommand extends Command { - /** - * Constructor for the DeleteCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ - public DeleteCommand(String commandName, boolean exit) { - super(commandName, exit); + public DeleteCommand(String commandName, boolean exit){ + super(commandName,exit); } - /** - * Runs the command to delete a specific task in task list (tasks). - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception if there is not a valid number or if task does not exist. - */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - try { + try{ String[] desc = getCommandName().split(" "); - if (desc.length <= 1) { - throw new CleverNotBotException("Invalid arguments. Please enter a number!", textBox); + if(desc.length <= 1){ + throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Noted. I've removed this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." - , deletedTask.toString(), tasks.getSize())); - } catch (IndexOutOfBoundsException e) { - throw new CleverNotBotException("The task does not exist!", textBox); + "Noted. I've removed this task:"+ + "\n %s"+ + "\nNow you have %d tasks in the list." + ,deletedTask.toString(),tasks.getSize())); + } catch (IndexOutOfBoundsException e){ + throw new CleverNotBotException("The task does not exist!",textBox); } } diff --git a/src/main/java/clevernotbot/Event.java b/src/main/java/clevernotbot/Event.java index 1bc7e78287..b938686162 100644 --- a/src/main/java/clevernotbot/Event.java +++ b/src/main/java/clevernotbot/Event.java @@ -1,59 +1,28 @@ package clevernotbot; -/** - * Represents a more specific task with time limit attached to it. A Event object corresponds to - * a task with a time range e.g., Aug 6th 2-4pm - */ public class Event extends Task{ private String at; - /** - * Constructor for Event. - * - * @param name Name of the task. - * @param completed The status of the task. (Completed or not) - * @param at The deadline. - */ public Event(String name, boolean completed, String at){ super(name,completed); this.at = at; } - /** - * Returns the Event's time. - * - * @return Time of event. - */ @Override public String getTime() { return at; } - /** - * Returns the type of task. - * - * @return Type of task. - */ @Override public String getTaskType() { return "E"; } - /** - * Toggles the completion of event task. - * - * @return A toggled version of event. (Completed = true -> Completed = false) - */ @Override public Task toggleCompleted(){ return new Event(getName(),!isCompleted(),at); } - /** - * Converts event to a string. - * - * @return A string that represent a event. E.g. [E][X] get a book /at Aug 6th 2-4pm. - */ @Override public String toString(){ return String.format("[E][%s] %s (at: %s)",checkMarked(),getName(),at); diff --git a/src/main/java/clevernotbot/GreetCommand.java b/src/main/java/clevernotbot/GreetCommand.java index 2c21325fca..ef39ae3950 100644 --- a/src/main/java/clevernotbot/GreetCommand.java +++ b/src/main/java/clevernotbot/GreetCommand.java @@ -1,28 +1,11 @@ package clevernotbot; -/** - * Represents a command used for greeting - */ public class GreetCommand extends Command { - /** - * Constructor for the GreetCommand. - * - * @param commandName Description of command. - * @param exit Checking if program intends to exit. - */ public GreetCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the greet command. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); diff --git a/src/main/java/clevernotbot/ListCommand.java b/src/main/java/clevernotbot/ListCommand.java index ed609d3d2b..bc94b96ec9 100644 --- a/src/main/java/clevernotbot/ListCommand.java +++ b/src/main/java/clevernotbot/ListCommand.java @@ -1,28 +1,11 @@ package clevernotbot; -/** - * Represents a command to show what is in the list. - */ public class ListCommand extends Command { - /** - * Constructor for the ListCommand. - * - * @param commandName Description of Command. - * @param exit Checking if program intends to exit. - */ public ListCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the list command to list out every task in list. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 9bdd7c9b81..3f279abdb0 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -1,32 +1,14 @@ package clevernotbot; -/** - * Represents a command to mark a task. - */ public class MarkCommand extends Command { - /** - * Constructor for the MarkCommand. - * - * @param commandName Description of command. - * @param exit Checking if program intends to exit. - */ public MarkCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the mark command to mark the task as completed. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - //mark 3 -> 2, because number 3 is actually idx 2 - int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; + int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { Task markedTask = taskToMark.toggleCompleted(); diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 01a918fc30..0cb37889f9 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -1,16 +1,7 @@ package clevernotbot; -/** - * Deals with making sense of the user command - */ public class Parser { - /** - * Makes sense out of user command. - * - * @param text User command. - * @return A runnable command. - */ public Command parseText(String text) { String[] txtArr = text.split(" "); switch (txtArr[0]) { @@ -21,11 +12,11 @@ public Command parseText(String text) { case "list": return new ListCommand(text, false); case "todo": - return new AddToDoCommand(text, false); + return new AddCommandToDo(text, false); case "deadline": - return new AddDeadLineCommand(text, false); + return new AddCommandDeadLine(text, false); case "event": - return new AddEventCommand(text, false); + return new AddCommandEvent(text, false); case "delete": return new DeleteCommand(text, false); case "greet": diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index b64482e56e..a731d94a8e 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -3,25 +3,14 @@ import java.io.*; import java.util.ArrayList; -/** - * Deals with loading tasks from the file and saving tasks in the file - */ public class Storage { private String fileLocation = "/data/cleverNotBot.txt"; private File file; - /** - * Constructor for Storage. - */ public Storage(){ this.file = new File(this.fileLocation); } - /** - * Gets Task from the saved file. - * - * @return An ArrayList full of tasks. - */ public ArrayList getTasksFromFile() { ArrayList tasks = new ArrayList<>(); String line; @@ -45,11 +34,6 @@ public ArrayList getTasksFromFile() { return tasks; } - /** - * Writes tasks to file. - * - * @param tasks The tasks that needs to put in. - */ public void writeToFile(ArrayList tasks) { try { // if the file above doesn't exist, create it. @@ -85,16 +69,9 @@ public void writeToFile(ArrayList tasks) { } } - /** - * Converts line to Tasks. - * E.g. "D | 0 | return book | 02-12-2022 18:00" -> new Dateline("return book",false,02-12-2022 18:00") - * - * @param line Line that stored in the file. - * @return Task. - */ private Task convertLineToTask(String line) { String[] content = line.split(" \\| "); - /* Debug line + /* debug line System.out.println(file.getAbsolutePath()); System.out.println(String.join(",",content)); */ diff --git a/src/main/java/clevernotbot/Task.java b/src/main/java/clevernotbot/Task.java index bc11b06a80..37c8271133 100644 --- a/src/main/java/clevernotbot/Task.java +++ b/src/main/java/clevernotbot/Task.java @@ -1,78 +1,35 @@ package clevernotbot; -/** - * Represents a string as a Task. A Task object corresponding to - * name of task given and whether if it is completed. - */ public abstract class Task { private final String name; private final boolean completed; - /** - * Constructor for Task. - * - * @param name Name of the task. - * @param completed The status of the task. (Completed or not) - */ + public Task(String name, boolean completed){ this.name = name; this.completed = completed; } - /** - * Returns task's name. - * - * @return Name. - */ public String getName(){ return name; } - /** - * Returns task's completion. - * - * @return Task's completion. - */ public boolean isCompleted(){ return completed; } - /** - * Returns the mark "X" if it is completed and " " if it is not. - * - * @return Mark. - */ public String checkMarked(){ return isCompleted()? "X":" "; } - /** - * An abstract method to get time. - * - * @return Time. - */ public abstract String getTime(); - /** - * An abstract method to get task type. - * - * @return Task type. - */ public abstract String getTaskType(); - /** - * Toggles the completion of Task. - * - * @return A toggled version. (Completed = true -> Completed = false) - */ public abstract Task toggleCompleted(); //return new Task.Task(name,!completed); - /** - * Converts Task to a string. - * - * @return Task's name. - */ + @Override public String toString() { return name; diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index 3dc3e03f34..0560fc367e 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -3,88 +3,41 @@ import java.util.ArrayList; import java.util.Arrays; -/** - * Represents a list for Task. A TaskList object corresponds to - * an ArrayList of task. - */ public class TaskList { private ArrayList tasks; private int size; - /** - * Constructor for the TaskList. - * - * @param tasks A list of task. - */ public TaskList(ArrayList tasks){ this.tasks = tasks; size = tasks.size(); } - /** - * Adds task to TaskList - * - * @param element Task to be inputted. - */ public void addTask(Task element){ tasks.add(element); size++; } - /** - * Adds task by index to TaskList. - * - * @param idx Index to be slotted in. - * @param element Task to be inputted. - */ public void addTaskByIdx(int idx, Task element){ tasks.add(idx, element); size++; } - /** - * Removes task from TaskList. - * - * @param task Task to be removed. - */ public void removeTask(Task task){ tasks.remove((Task)task); size--; } - /** - * Gets Task from TaskList. - * - * @param idx Index that the Task is at. - * @return Task at that index. - */ public Task getTask(int idx){ return tasks.get(idx); } - /** - * Gets an ArrayList from TaskList. - * - * @return An ArrayList. - */ public ArrayList getTaskList(){ return tasks; } - - /** - * Gets size from TaskList. - * - * @return How many Task is in a TaskList. - */ public int getSize(){ return size; } - /** - * Converts TaskList to a string. - * - * @return A string that represent a TaskList. - */ @Override public String toString(){ return Arrays.toString(tasks.toArray()); diff --git a/src/main/java/clevernotbot/ToDo.java b/src/main/java/clevernotbot/ToDo.java index 42b5478f28..c7986df2c9 100644 --- a/src/main/java/clevernotbot/ToDo.java +++ b/src/main/java/clevernotbot/ToDo.java @@ -1,55 +1,26 @@ package clevernotbot; -/** - * Represents a more specific task with no time limit attached to it. - */ public class ToDo extends Task{ - /** - * Constructor for ToDo. - * - * @param name Name of the task. - * @param completed The status of the task. (Completed or not) - */ public ToDo(String name, boolean completed){ super(name,completed); } - /** - * Returns the deadline for Todo which is just infinite. - * - * @return Deadline for Todo. - */ @Override public String getTime() { return "inf"; } - /** - * Returns The type of task. - * - * @return Type of task. - */ @Override public String getTaskType() { return "T"; } - /** - * Toggles the completion of todo task. - * - * @return A toggled version of todo. (Completed = true -> Completed = false) - */ @Override public Task toggleCompleted(){ return new ToDo(getName(),!isCompleted()); } - /** - * Converts ToDo to a string. - * - * @return A string that represent a todo. E.g. [E][X] get a book /at Aug 6th 2-4pm. - */ @Override public String toString(){ return String.format("[T][%s] %s",checkMarked(),getName()); diff --git a/src/main/java/clevernotbot/UI.java b/src/main/java/clevernotbot/UI.java index 985802e266..fdfcbe5186 100644 --- a/src/main/java/clevernotbot/UI.java +++ b/src/main/java/clevernotbot/UI.java @@ -4,16 +4,10 @@ import java.util.Collections; import java.util.List; -/** - * Deals with interactions with the user - */ public class UI { - /** - * Prints a text surrounded by a chat box. - * - * @param text Text to be printed out. - */ + public UI(){} + public void chat(String text){ List textLines; int max; @@ -34,12 +28,6 @@ public void chat(String text){ } - /** - * Returns a text surrounded by a chat box. - * - * @param text Text to be printed out. - * @return A text surrounded by a chat box. - */ public String coverText(String text){ List textLines; int max; diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 941eba3854..17eb84bf6c 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -1,28 +1,11 @@ package clevernotbot; -/** - * Represents a command to unmark a task. - */ public class UnmarkCommand extends Command { - /** - * Constructor for the unMarkCommand. - * - * @param commandName description of command. - * @param exit checking if program intends to exit. - */ public UnmarkCommand(String commandName, boolean exit){ super(commandName,exit); } - /** - * Runs the mark command to unmark the task as completed. - * - * @param tasks The task list used to store all tasks. - * @param textBox UI for the textbox. - * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception. - */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 diff --git a/src/test/java/clevernotbot/ParserTest.java b/src/test/java/clevernotbot/ParserTest.java index 7c378628dd..b518e1079e 100644 --- a/src/test/java/clevernotbot/ParserTest.java +++ b/src/test/java/clevernotbot/ParserTest.java @@ -28,10 +28,10 @@ public void parseTextTest(){ Command testCommand8 = testParser.parseText(txtTest8); Command testCommand9 = testParser.parseText(txtTest9); - assertTrue(testCommand1 instanceof AddToDoCommand); - assertTrue(testCommand2 instanceof AddDeadLineCommand); + assertTrue(testCommand1 instanceof AddCommandToDo); + assertTrue(testCommand2 instanceof AddCommandDeadLine); assertTrue(testCommand3 instanceof MarkCommand); - assertTrue(testCommand4 instanceof AddEventCommand); + assertTrue(testCommand4 instanceof AddCommandEvent); assertTrue(testCommand5 instanceof UnmarkCommand); assertTrue(testCommand6 instanceof ListCommand); assertTrue(testCommand7 instanceof DeleteCommand); From 648ed7e848c9b26aa694808ab2f9664023e4f1e1 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 02:58:49 +0800 Subject: [PATCH 13/31] Add JavaDocs to all non main classes. --- ...dDeadLine.java => AddDeadLineCommand.java} | 27 +++++++-- ...CommandEvent.java => AddEventCommand.java} | 27 +++++++-- ...ddCommandToDo.java => AddToDoCommand.java} | 25 ++++++-- src/main/java/clevernotbot/ByeCommand.java | 17 ++++++ src/main/java/clevernotbot/CleverNotBot.java | 8 +-- .../clevernotbot/CleverNotBotException.java | 14 +++++ src/main/java/clevernotbot/Command.java | 27 +++++++++ src/main/java/clevernotbot/Deadline.java | 58 +++++++++++++++++++ .../java/clevernotbot/DefaultCommand.java | 17 ++++++ src/main/java/clevernotbot/DeleteCommand.java | 39 +++++++++---- src/main/java/clevernotbot/Event.java | 31 ++++++++++ src/main/java/clevernotbot/GreetCommand.java | 17 ++++++ src/main/java/clevernotbot/ListCommand.java | 17 ++++++ src/main/java/clevernotbot/MarkCommand.java | 20 ++++++- src/main/java/clevernotbot/Parser.java | 15 ++++- src/main/java/clevernotbot/Storage.java | 25 +++++++- src/main/java/clevernotbot/Task.java | 47 ++++++++++++++- src/main/java/clevernotbot/TaskList.java | 47 +++++++++++++++ src/main/java/clevernotbot/ToDo.java | 29 ++++++++++ src/main/java/clevernotbot/UI.java | 16 ++++- src/main/java/clevernotbot/UnmarkCommand.java | 17 ++++++ 21 files changed, 502 insertions(+), 38 deletions(-) rename src/main/java/clevernotbot/{AddCommandDeadLine.java => AddDeadLineCommand.java} (65%) rename src/main/java/clevernotbot/{AddCommandEvent.java => AddEventCommand.java} (60%) rename src/main/java/clevernotbot/{AddCommandToDo.java => AddToDoCommand.java} (62%) diff --git a/src/main/java/clevernotbot/AddCommandDeadLine.java b/src/main/java/clevernotbot/AddDeadLineCommand.java similarity index 65% rename from src/main/java/clevernotbot/AddCommandDeadLine.java rename to src/main/java/clevernotbot/AddDeadLineCommand.java index 6ad726dacf..c03b6b0b20 100644 --- a/src/main/java/clevernotbot/AddCommandDeadLine.java +++ b/src/main/java/clevernotbot/AddDeadLineCommand.java @@ -1,18 +1,35 @@ package clevernotbot; -public class AddCommandDeadLine extends Command { +/** + * Represents a command used to add an Event Task. + */ +public class AddDeadLineCommand extends Command { - public AddCommandDeadLine(String commandName, boolean exit) { + /** + * Constructor for the AddDeadLineCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddDeadLineCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add deadline command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when deadline description is empty or not contain /by. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Task.Deadline!", textBox); + throw new CleverNotBotException("Please fill in the description of Deadline!", textBox); } else if (!getCommandName().contains("/by")) { - throw new CleverNotBotException("Please include a /by in your description of Task.Deadline! ", textBox); + throw new CleverNotBotException("Please include a /by in your description of Deadline! ", textBox); } else { String searchWord = " /by"; int start = "deadline ".length(); @@ -31,7 +48,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e){ - throw new CleverNotBotException("Task.Deadline description must not be empty or must contain /by!", textBox); + throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); } catch (Exception ex){ throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); diff --git a/src/main/java/clevernotbot/AddCommandEvent.java b/src/main/java/clevernotbot/AddEventCommand.java similarity index 60% rename from src/main/java/clevernotbot/AddCommandEvent.java rename to src/main/java/clevernotbot/AddEventCommand.java index 17022bffbe..1677b75b6f 100644 --- a/src/main/java/clevernotbot/AddCommandEvent.java +++ b/src/main/java/clevernotbot/AddEventCommand.java @@ -1,18 +1,35 @@ package clevernotbot; -public class AddCommandEvent extends Command { +/** + * Represents a command used to add an Event Task. + */ +public class AddEventCommand extends Command { - public AddCommandEvent(String commandName, boolean exit) { + /** + * Constructor for the AddEventCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddEventCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add event command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try{ if (desc.length == 1) { - throw new CleverNotBotException("Please fill in the description of Task.Event!", textBox); + throw new CleverNotBotException("Please fill in the description of Event!", textBox); } else if (!getCommandName().contains("/at")) { - throw new CleverNotBotException("Please include a /at in your description of Task.Deadline! ", textBox); + throw new CleverNotBotException("Please include a /at in your description of Deadline! ", textBox); } else { String searchWord = " /at"; int start = "event ".length(); @@ -29,7 +46,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , newTask.toString(), tasks.getSize())); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Task.Event description must not be empty or must contain /at!", textBox); + throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); } } diff --git a/src/main/java/clevernotbot/AddCommandToDo.java b/src/main/java/clevernotbot/AddToDoCommand.java similarity index 62% rename from src/main/java/clevernotbot/AddCommandToDo.java rename to src/main/java/clevernotbot/AddToDoCommand.java index 6ae038cb32..88ef814365 100644 --- a/src/main/java/clevernotbot/AddCommandToDo.java +++ b/src/main/java/clevernotbot/AddToDoCommand.java @@ -2,12 +2,29 @@ import java.util.Arrays; -public class AddCommandToDo extends Command { +/** + * Represents a command used to add a ToDo Task. + */ +public class AddToDoCommand extends Command { - public AddCommandToDo(String commandName, boolean exit) { + /** + * Constructor for the AddToDoCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public AddToDoCommand(String commandName, boolean exit) { super(commandName, exit); } + /** + * Runs the add ToDo command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when todo's description is empty. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { @@ -24,10 +41,10 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } else { - throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); } } catch(CleverNotBotException e){ - throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); + throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); } } diff --git a/src/main/java/clevernotbot/ByeCommand.java b/src/main/java/clevernotbot/ByeCommand.java index 62a5ecaec2..2bb2a54a98 100644 --- a/src/main/java/clevernotbot/ByeCommand.java +++ b/src/main/java/clevernotbot/ByeCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used for saying bye. + */ public class ByeCommand extends Command { + /** + * Constructor for the ByeCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public ByeCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the bye command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Bye. Hope to see you again soon!"); diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index 7a79223368..ba82ee39b0 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -13,10 +13,10 @@ public static void main(String[] args) throws CleverNotBotException { hl.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { - String ip = sc.nextLine(); - Command nxtStep = hl.parseText(ip); - nxtStep.run(tasks, textBox, storage); - if (nxtStep.isExitingProgram()) { + String inp = sc.nextLine(); + Command commandToRun = hl.parseText(inp); + commandToRun.run(tasks, textBox, storage); + if (commandToRun.isExitingProgram()) { break; } } diff --git a/src/main/java/clevernotbot/CleverNotBotException.java b/src/main/java/clevernotbot/CleverNotBotException.java index 501cb8c0be..1a5425eef9 100644 --- a/src/main/java/clevernotbot/CleverNotBotException.java +++ b/src/main/java/clevernotbot/CleverNotBotException.java @@ -1,14 +1,28 @@ package clevernotbot; +/** + * Deals with exception + */ public class CleverNotBotException extends Exception{ private String errorMessage; private UI textBox; + /** + * Constructor for CleverNotBotException. + * + * @param errorMessage Error message logged in the system. + * @param textBox For textbox wrapping.(Removed for now) + */ public CleverNotBotException(String errorMessage, UI textBox){ this.errorMessage = errorMessage; this.textBox = textBox; } + /** + * Converts CleverNotBotException to a string. + * + * @return Exception text. + */ @Override /*public String toString(){ return textBox.coverText(errorMessage); diff --git a/src/main/java/clevernotbot/Command.java b/src/main/java/clevernotbot/Command.java index 0aa99938f3..b7294ccef8 100644 --- a/src/main/java/clevernotbot/Command.java +++ b/src/main/java/clevernotbot/Command.java @@ -1,21 +1,48 @@ package clevernotbot; +/** + * Represents a command. + */ public abstract class Command { private String commandName; private boolean exit; + /** + * Constructor for the Command. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public Command(String commandName, boolean exit){ this.commandName = commandName; this.exit = exit; } + /** + * Returns name of Command. + * + * @return Name of Command. + */ public String getCommandName(){ return commandName; } + /** + * Returns true if the program is intending to exit. + * + * @return Exit status. + */ public boolean isExitingProgram(){ return exit; } + /** + * An abstract method of run + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ public abstract void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; } diff --git a/src/main/java/clevernotbot/Deadline.java b/src/main/java/clevernotbot/Deadline.java index 7bfee42d8a..4394372999 100644 --- a/src/main/java/clevernotbot/Deadline.java +++ b/src/main/java/clevernotbot/Deadline.java @@ -3,55 +3,113 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +/** + * Represents a more specific task with time limit attached to it. A Deadline object corresponds to + * a task by a specific time e.g., 02-12-2018 18:00 + */ public class Deadline extends Task{ private String dateTime; private LocalDateTime date; + /** + * Constructor for Deadline. + * + * @param name Name of the Task. + * @param completed The status of the Task. (Completed or not) + * @param dateTime The deadline. + */ public Deadline(String name, boolean completed, String dateTime) { super(name, completed); this.dateTime = dateTime; applyDate(dateTime); } + /** + * Returns the deadline. + * + * @return Time of deadline. + */ @Override public String getTime() { return dateTime; } + /** + * Returns The type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "D"; } + /** + * Applies date for the constructor. + * + * @param dateTime String type time of deadline. ("20-04-1990 19:30") + */ private void applyDate(String dateTime) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); this.date = LocalDateTime.parse(dateTime, formatter); } + /** + * Returns date and time. + * + * @return Date and time in MMM d yyyy HH:mm e.g. "Jan 9 1998 19:30". + */ public String getDateTime(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); } + /** + * Return date and time with a specific format. + * + * @param format String of a format e.g. "yyyy-dd-MM HH:mm". + * @return The date and time in a specific format. + */ public String getDateTime(String format){ return date.format(DateTimeFormatter.ofPattern(format)); } + /** + * Return the date only in MMM d yyyy format. + * + * @return Date in MMM d yyyy format. + */ public String getDate(){ return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } + /** + * Toggles the completion of deadline. + * + * @return A toggled version of deadline. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new Deadline(getName(),!isCompleted(), dateTime); } + /** + * Checks the validity of the date and time provided in a string. + * + * @param date Date and time in String. + * @throws Exception If improper date is entered. + */ public static void validDateTime(String date) throws Exception { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm"); LocalDateTime d = LocalDateTime.parse(date, formatter); } + /** + * Converts deadline to a string. + * + * @return A string that represent a deadline. E.g. [D][X] get a book /by 20-04-1990 19:30. + */ @Override public String toString(){ return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),getDateTime()); diff --git a/src/main/java/clevernotbot/DefaultCommand.java b/src/main/java/clevernotbot/DefaultCommand.java index 4ae3a01f66..54165c2e68 100644 --- a/src/main/java/clevernotbot/DefaultCommand.java +++ b/src/main/java/clevernotbot/DefaultCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used at default. + */ public class DefaultCommand extends Command { + /** + * Constructor for the DefaultCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public DefaultCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the default command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("This command doesn't exist!"); diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java index 4ba13268ee..371407a171 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -1,27 +1,44 @@ package clevernotbot; +/** + * Represents a command to delete a task. + */ public class DeleteCommand extends Command { - public DeleteCommand(String commandName, boolean exit){ - super(commandName,exit); + /** + * Constructor for the DeleteCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public DeleteCommand(String commandName, boolean exit) { + super(commandName, exit); } + /** + * Runs the command to delete a specific task in task list (tasks). + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception if there is not a valid number or if task does not exist. + */ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - try{ + try { String[] desc = getCommandName().split(" "); - if(desc.length <= 1){ - throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); + if (desc.length <= 1) { + throw new CleverNotBotException("Invalid arguments. Please enter a number!", textBox); } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Noted. I've removed this task:"+ - "\n %s"+ - "\nNow you have %d tasks in the list." - ,deletedTask.toString(),tasks.getSize())); - } catch (IndexOutOfBoundsException e){ - throw new CleverNotBotException("The task does not exist!",textBox); + "Noted. I've removed this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , deletedTask.toString(), tasks.getSize())); + } catch (IndexOutOfBoundsException e) { + throw new CleverNotBotException("The task does not exist!", textBox); } } diff --git a/src/main/java/clevernotbot/Event.java b/src/main/java/clevernotbot/Event.java index b938686162..1bc7e78287 100644 --- a/src/main/java/clevernotbot/Event.java +++ b/src/main/java/clevernotbot/Event.java @@ -1,28 +1,59 @@ package clevernotbot; +/** + * Represents a more specific task with time limit attached to it. A Event object corresponds to + * a task with a time range e.g., Aug 6th 2-4pm + */ public class Event extends Task{ private String at; + /** + * Constructor for Event. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + * @param at The deadline. + */ public Event(String name, boolean completed, String at){ super(name,completed); this.at = at; } + /** + * Returns the Event's time. + * + * @return Time of event. + */ @Override public String getTime() { return at; } + /** + * Returns the type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "E"; } + /** + * Toggles the completion of event task. + * + * @return A toggled version of event. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new Event(getName(),!isCompleted(),at); } + /** + * Converts event to a string. + * + * @return A string that represent a event. E.g. [E][X] get a book /at Aug 6th 2-4pm. + */ @Override public String toString(){ return String.format("[E][%s] %s (at: %s)",checkMarked(),getName(),at); diff --git a/src/main/java/clevernotbot/GreetCommand.java b/src/main/java/clevernotbot/GreetCommand.java index ef39ae3950..2c21325fca 100644 --- a/src/main/java/clevernotbot/GreetCommand.java +++ b/src/main/java/clevernotbot/GreetCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command used for greeting + */ public class GreetCommand extends Command { + /** + * Constructor for the GreetCommand. + * + * @param commandName Description of command. + * @param exit Checking if program intends to exit. + */ public GreetCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the greet command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); diff --git a/src/main/java/clevernotbot/ListCommand.java b/src/main/java/clevernotbot/ListCommand.java index bc94b96ec9..ed609d3d2b 100644 --- a/src/main/java/clevernotbot/ListCommand.java +++ b/src/main/java/clevernotbot/ListCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command to show what is in the list. + */ public class ListCommand extends Command { + /** + * Constructor for the ListCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ public ListCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the list command to list out every task in list. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 3f279abdb0..9bdd7c9b81 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -1,14 +1,32 @@ package clevernotbot; +/** + * Represents a command to mark a task. + */ public class MarkCommand extends Command { + /** + * Constructor for the MarkCommand. + * + * @param commandName Description of command. + * @param exit Checking if program intends to exit. + */ public MarkCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the mark command to mark the task as completed. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + //mark 3 -> 2, because number 3 is actually idx 2 + int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; Task taskToMark = tasks.getTask(number); if(taskToMark.checkMarked().equals(" ")) { Task markedTask = taskToMark.toggleCompleted(); diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 0cb37889f9..01a918fc30 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -1,7 +1,16 @@ package clevernotbot; +/** + * Deals with making sense of the user command + */ public class Parser { + /** + * Makes sense out of user command. + * + * @param text User command. + * @return A runnable command. + */ public Command parseText(String text) { String[] txtArr = text.split(" "); switch (txtArr[0]) { @@ -12,11 +21,11 @@ public Command parseText(String text) { case "list": return new ListCommand(text, false); case "todo": - return new AddCommandToDo(text, false); + return new AddToDoCommand(text, false); case "deadline": - return new AddCommandDeadLine(text, false); + return new AddDeadLineCommand(text, false); case "event": - return new AddCommandEvent(text, false); + return new AddEventCommand(text, false); case "delete": return new DeleteCommand(text, false); case "greet": diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index a731d94a8e..b64482e56e 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -3,14 +3,25 @@ import java.io.*; import java.util.ArrayList; +/** + * Deals with loading tasks from the file and saving tasks in the file + */ public class Storage { private String fileLocation = "/data/cleverNotBot.txt"; private File file; + /** + * Constructor for Storage. + */ public Storage(){ this.file = new File(this.fileLocation); } + /** + * Gets Task from the saved file. + * + * @return An ArrayList full of tasks. + */ public ArrayList getTasksFromFile() { ArrayList tasks = new ArrayList<>(); String line; @@ -34,6 +45,11 @@ public ArrayList getTasksFromFile() { return tasks; } + /** + * Writes tasks to file. + * + * @param tasks The tasks that needs to put in. + */ public void writeToFile(ArrayList tasks) { try { // if the file above doesn't exist, create it. @@ -69,9 +85,16 @@ public void writeToFile(ArrayList tasks) { } } + /** + * Converts line to Tasks. + * E.g. "D | 0 | return book | 02-12-2022 18:00" -> new Dateline("return book",false,02-12-2022 18:00") + * + * @param line Line that stored in the file. + * @return Task. + */ private Task convertLineToTask(String line) { String[] content = line.split(" \\| "); - /* debug line + /* Debug line System.out.println(file.getAbsolutePath()); System.out.println(String.join(",",content)); */ diff --git a/src/main/java/clevernotbot/Task.java b/src/main/java/clevernotbot/Task.java index 37c8271133..bc11b06a80 100644 --- a/src/main/java/clevernotbot/Task.java +++ b/src/main/java/clevernotbot/Task.java @@ -1,35 +1,78 @@ package clevernotbot; +/** + * Represents a string as a Task. A Task object corresponding to + * name of task given and whether if it is completed. + */ public abstract class Task { private final String name; private final boolean completed; - + /** + * Constructor for Task. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + */ public Task(String name, boolean completed){ this.name = name; this.completed = completed; } + /** + * Returns task's name. + * + * @return Name. + */ public String getName(){ return name; } + /** + * Returns task's completion. + * + * @return Task's completion. + */ public boolean isCompleted(){ return completed; } + /** + * Returns the mark "X" if it is completed and " " if it is not. + * + * @return Mark. + */ public String checkMarked(){ return isCompleted()? "X":" "; } + /** + * An abstract method to get time. + * + * @return Time. + */ public abstract String getTime(); + /** + * An abstract method to get task type. + * + * @return Task type. + */ public abstract String getTaskType(); + /** + * Toggles the completion of Task. + * + * @return A toggled version. (Completed = true -> Completed = false) + */ public abstract Task toggleCompleted(); //return new Task.Task(name,!completed); - + /** + * Converts Task to a string. + * + * @return Task's name. + */ @Override public String toString() { return name; diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index 0560fc367e..3dc3e03f34 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -3,41 +3,88 @@ import java.util.ArrayList; import java.util.Arrays; +/** + * Represents a list for Task. A TaskList object corresponds to + * an ArrayList of task. + */ public class TaskList { private ArrayList tasks; private int size; + /** + * Constructor for the TaskList. + * + * @param tasks A list of task. + */ public TaskList(ArrayList tasks){ this.tasks = tasks; size = tasks.size(); } + /** + * Adds task to TaskList + * + * @param element Task to be inputted. + */ public void addTask(Task element){ tasks.add(element); size++; } + /** + * Adds task by index to TaskList. + * + * @param idx Index to be slotted in. + * @param element Task to be inputted. + */ public void addTaskByIdx(int idx, Task element){ tasks.add(idx, element); size++; } + /** + * Removes task from TaskList. + * + * @param task Task to be removed. + */ public void removeTask(Task task){ tasks.remove((Task)task); size--; } + /** + * Gets Task from TaskList. + * + * @param idx Index that the Task is at. + * @return Task at that index. + */ public Task getTask(int idx){ return tasks.get(idx); } + /** + * Gets an ArrayList from TaskList. + * + * @return An ArrayList. + */ public ArrayList getTaskList(){ return tasks; } + + /** + * Gets size from TaskList. + * + * @return How many Task is in a TaskList. + */ public int getSize(){ return size; } + /** + * Converts TaskList to a string. + * + * @return A string that represent a TaskList. + */ @Override public String toString(){ return Arrays.toString(tasks.toArray()); diff --git a/src/main/java/clevernotbot/ToDo.java b/src/main/java/clevernotbot/ToDo.java index c7986df2c9..42b5478f28 100644 --- a/src/main/java/clevernotbot/ToDo.java +++ b/src/main/java/clevernotbot/ToDo.java @@ -1,26 +1,55 @@ package clevernotbot; +/** + * Represents a more specific task with no time limit attached to it. + */ public class ToDo extends Task{ + /** + * Constructor for ToDo. + * + * @param name Name of the task. + * @param completed The status of the task. (Completed or not) + */ public ToDo(String name, boolean completed){ super(name,completed); } + /** + * Returns the deadline for Todo which is just infinite. + * + * @return Deadline for Todo. + */ @Override public String getTime() { return "inf"; } + /** + * Returns The type of task. + * + * @return Type of task. + */ @Override public String getTaskType() { return "T"; } + /** + * Toggles the completion of todo task. + * + * @return A toggled version of todo. (Completed = true -> Completed = false) + */ @Override public Task toggleCompleted(){ return new ToDo(getName(),!isCompleted()); } + /** + * Converts ToDo to a string. + * + * @return A string that represent a todo. E.g. [E][X] get a book /at Aug 6th 2-4pm. + */ @Override public String toString(){ return String.format("[T][%s] %s",checkMarked(),getName()); diff --git a/src/main/java/clevernotbot/UI.java b/src/main/java/clevernotbot/UI.java index fdfcbe5186..985802e266 100644 --- a/src/main/java/clevernotbot/UI.java +++ b/src/main/java/clevernotbot/UI.java @@ -4,10 +4,16 @@ import java.util.Collections; import java.util.List; +/** + * Deals with interactions with the user + */ public class UI { - public UI(){} - + /** + * Prints a text surrounded by a chat box. + * + * @param text Text to be printed out. + */ public void chat(String text){ List textLines; int max; @@ -28,6 +34,12 @@ public void chat(String text){ } + /** + * Returns a text surrounded by a chat box. + * + * @param text Text to be printed out. + * @return A text surrounded by a chat box. + */ public String coverText(String text){ List textLines; int max; diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 17eb84bf6c..941eba3854 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -1,11 +1,28 @@ package clevernotbot; +/** + * Represents a command to unmark a task. + */ public class UnmarkCommand extends Command { + /** + * Constructor for the unMarkCommand. + * + * @param commandName description of command. + * @param exit checking if program intends to exit. + */ public UnmarkCommand(String commandName, boolean exit){ super(commandName,exit); } + /** + * Runs the mark command to unmark the task as completed. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception. + */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 From c418254bdb43447f8ca5c3effba794c800bfc01c Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 03:06:36 +0800 Subject: [PATCH 14/31] Add Coding Standard to code. --- .../java/clevernotbot/AddCommandDeadLine.java | 4 +- .../java/clevernotbot/AddCommandEvent.java | 4 +- .../java/clevernotbot/AddCommandToDo.java | 2 +- src/main/java/clevernotbot/ByeCommand.java | 4 +- .../clevernotbot/CleverNotBotException.java | 6 +-- src/main/java/clevernotbot/Deadline.java | 16 +++---- .../java/clevernotbot/DefaultCommand.java | 4 +- src/main/java/clevernotbot/DeleteCommand.java | 22 +++++----- src/main/java/clevernotbot/Event.java | 14 +++--- src/main/java/clevernotbot/GreetCommand.java | 4 +- src/main/java/clevernotbot/ListCommand.java | 9 ++-- src/main/java/clevernotbot/MarkCommand.java | 12 ++--- src/main/java/clevernotbot/Parser.java | 40 ++++++++--------- src/main/java/clevernotbot/Storage.java | 44 +++++++++---------- src/main/java/clevernotbot/Task.java | 10 ++--- src/main/java/clevernotbot/TaskList.java | 19 ++++---- src/main/java/clevernotbot/ToDo.java | 14 +++--- src/main/java/clevernotbot/UI.java | 15 ++++--- src/main/java/clevernotbot/UnmarkCommand.java | 12 ++--- 19 files changed, 129 insertions(+), 126 deletions(-) diff --git a/src/main/java/clevernotbot/AddCommandDeadLine.java b/src/main/java/clevernotbot/AddCommandDeadLine.java index 6ad726dacf..fc3b0d91fb 100644 --- a/src/main/java/clevernotbot/AddCommandDeadLine.java +++ b/src/main/java/clevernotbot/AddCommandDeadLine.java @@ -30,9 +30,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } - } catch (CleverNotBotException e){ + } catch (CleverNotBotException e) { throw new CleverNotBotException("Task.Deadline description must not be empty or must contain /by!", textBox); - } catch (Exception ex){ + } catch (Exception ex) { throw new CleverNotBotException("Incorrect date format! Please enter DD-MM-YYYY HH:mm" + "\nFor example, 22-09-2022 19:40", textBox); } diff --git a/src/main/java/clevernotbot/AddCommandEvent.java b/src/main/java/clevernotbot/AddCommandEvent.java index 17022bffbe..18bd7747d9 100644 --- a/src/main/java/clevernotbot/AddCommandEvent.java +++ b/src/main/java/clevernotbot/AddCommandEvent.java @@ -8,7 +8,7 @@ public AddCommandEvent(String commandName, boolean exit) { public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); - try{ + try { if (desc.length == 1) { throw new CleverNotBotException("Please fill in the description of Task.Event!", textBox); } else if (!getCommandName().contains("/at")) { @@ -28,7 +28,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } - } catch(CleverNotBotException e){ + } catch (CleverNotBotException e) { throw new CleverNotBotException("Task.Event description must not be empty or must contain /at!", textBox); } diff --git a/src/main/java/clevernotbot/AddCommandToDo.java b/src/main/java/clevernotbot/AddCommandToDo.java index 6ae038cb32..83f0ddd301 100644 --- a/src/main/java/clevernotbot/AddCommandToDo.java +++ b/src/main/java/clevernotbot/AddCommandToDo.java @@ -26,7 +26,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot } else { throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } - } catch(CleverNotBotException e){ + } catch (CleverNotBotException e) { throw new CleverNotBotException("Please fill in the description of Task.ToDo!", textBox); } diff --git a/src/main/java/clevernotbot/ByeCommand.java b/src/main/java/clevernotbot/ByeCommand.java index 62a5ecaec2..25fd3668ce 100644 --- a/src/main/java/clevernotbot/ByeCommand.java +++ b/src/main/java/clevernotbot/ByeCommand.java @@ -2,8 +2,8 @@ public class ByeCommand extends Command { - public ByeCommand(String commandName, boolean exit){ - super(commandName,exit); + public ByeCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override diff --git a/src/main/java/clevernotbot/CleverNotBotException.java b/src/main/java/clevernotbot/CleverNotBotException.java index 501cb8c0be..7cfceb8830 100644 --- a/src/main/java/clevernotbot/CleverNotBotException.java +++ b/src/main/java/clevernotbot/CleverNotBotException.java @@ -1,10 +1,10 @@ package clevernotbot; -public class CleverNotBotException extends Exception{ +public class CleverNotBotException extends Exception { private String errorMessage; private UI textBox; - public CleverNotBotException(String errorMessage, UI textBox){ + public CleverNotBotException(String errorMessage, UI textBox) { this.errorMessage = errorMessage; this.textBox = textBox; } @@ -14,7 +14,7 @@ public CleverNotBotException(String errorMessage, UI textBox){ return textBox.coverText(errorMessage); } */ - public String toString(){ + public String toString() { return errorMessage; } } diff --git a/src/main/java/clevernotbot/Deadline.java b/src/main/java/clevernotbot/Deadline.java index 7bfee42d8a..184f4de4e2 100644 --- a/src/main/java/clevernotbot/Deadline.java +++ b/src/main/java/clevernotbot/Deadline.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -public class Deadline extends Task{ +public class Deadline extends Task { private String dateTime; private LocalDateTime date; @@ -29,21 +29,21 @@ private void applyDate(String dateTime) { this.date = LocalDateTime.parse(dateTime, formatter); } - public String getDateTime(){ + public String getDateTime() { return date.format(DateTimeFormatter.ofPattern("MMM d yyyy HH:mm")); } - public String getDateTime(String format){ + public String getDateTime(String format) { return date.format(DateTimeFormatter.ofPattern(format)); } - public String getDate(){ + public String getDate() { return date.format(DateTimeFormatter.ofPattern("MMM d yyyy")); } @Override - public Task toggleCompleted(){ - return new Deadline(getName(),!isCompleted(), dateTime); + public Task toggleCompleted() { + return new Deadline(getName(), !isCompleted(), dateTime); } @@ -53,8 +53,8 @@ public static void validDateTime(String date) throws Exception { } @Override - public String toString(){ - return String.format("[D][%s] %s (by: %s)",checkMarked(),getName(),getDateTime()); + public String toString() { + return String.format("[D][%s] %s (by: %s)", checkMarked(), getName(), getDateTime()); } } diff --git a/src/main/java/clevernotbot/DefaultCommand.java b/src/main/java/clevernotbot/DefaultCommand.java index 4ae3a01f66..4d9a2cf93b 100644 --- a/src/main/java/clevernotbot/DefaultCommand.java +++ b/src/main/java/clevernotbot/DefaultCommand.java @@ -2,8 +2,8 @@ public class DefaultCommand extends Command { - public DefaultCommand(String commandName, boolean exit){ - super(commandName,exit); + public DefaultCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java index 4ba13268ee..37bd69b60c 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -2,26 +2,26 @@ public class DeleteCommand extends Command { - public DeleteCommand(String commandName, boolean exit){ - super(commandName,exit); + public DeleteCommand(String commandName, boolean exit) { + super(commandName, exit); } public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - try{ + try { String[] desc = getCommandName().split(" "); - if(desc.length <= 1){ - throw new CleverNotBotException("Invalid arguments. Please enter a number!",textBox); + if (desc.length <= 1) { + throw new CleverNotBotException("Invalid arguments. Please enter a number!", textBox); } Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Noted. I've removed this task:"+ - "\n %s"+ - "\nNow you have %d tasks in the list." - ,deletedTask.toString(),tasks.getSize())); - } catch (IndexOutOfBoundsException e){ - throw new CleverNotBotException("The task does not exist!",textBox); + "Noted. I've removed this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." + , deletedTask.toString(), tasks.getSize())); + } catch (IndexOutOfBoundsException e) { + throw new CleverNotBotException("The task does not exist!", textBox); } } diff --git a/src/main/java/clevernotbot/Event.java b/src/main/java/clevernotbot/Event.java index b938686162..5d906d0693 100644 --- a/src/main/java/clevernotbot/Event.java +++ b/src/main/java/clevernotbot/Event.java @@ -1,10 +1,10 @@ package clevernotbot; -public class Event extends Task{ +public class Event extends Task { private String at; - public Event(String name, boolean completed, String at){ - super(name,completed); + public Event(String name, boolean completed, String at) { + super(name, completed); this.at = at; } @@ -19,12 +19,12 @@ public String getTaskType() { } @Override - public Task toggleCompleted(){ - return new Event(getName(),!isCompleted(),at); + public Task toggleCompleted() { + return new Event(getName(), !isCompleted(), at); } @Override - public String toString(){ - return String.format("[E][%s] %s (at: %s)",checkMarked(),getName(),at); + public String toString() { + return String.format("[E][%s] %s (at: %s)", checkMarked(), getName(), at); } } diff --git a/src/main/java/clevernotbot/GreetCommand.java b/src/main/java/clevernotbot/GreetCommand.java index ef39ae3950..d1113f51aa 100644 --- a/src/main/java/clevernotbot/GreetCommand.java +++ b/src/main/java/clevernotbot/GreetCommand.java @@ -2,8 +2,8 @@ public class GreetCommand extends Command { - public GreetCommand(String commandName, boolean exit){ - super(commandName,exit); + public GreetCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override diff --git a/src/main/java/clevernotbot/ListCommand.java b/src/main/java/clevernotbot/ListCommand.java index bc94b96ec9..6fdccc15ce 100644 --- a/src/main/java/clevernotbot/ListCommand.java +++ b/src/main/java/clevernotbot/ListCommand.java @@ -2,14 +2,15 @@ public class ListCommand extends Command { - public ListCommand(String commandName, boolean exit){ - super(commandName,exit); + public ListCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - if (tasks.getSize() < 1) { textBox.chat("There is no task currently assigned."); - }else { + if (tasks.getSize() < 1) { + textBox.chat("There is no task currently assigned."); + } else { int counter = 1; StringBuilder op = new StringBuilder(); for (Task task : tasks.getTaskList()) { diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 3f279abdb0..4d9c187b37 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -2,21 +2,21 @@ public class MarkCommand extends Command { - public MarkCommand(String commandName, boolean exit){ - super(commandName,exit); + public MarkCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToMark = tasks.getTask(number); - if(taskToMark.checkMarked().equals(" ")) { + if (taskToMark.checkMarked().equals(" ")) { Task markedTask = taskToMark.toggleCompleted(); tasks.removeTask(taskToMark); tasks.addTaskByIdx(number, markedTask); textBox.chat(String.format("Nice! I've marked this task as done:\n [%s] %s", - markedTask.checkMarked(),markedTask.getName())); - } else{ + markedTask.checkMarked(), markedTask.getName())); + } else { textBox.chat("Hey! This task is already marked!"); } diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 0cb37889f9..4fd4f160f2 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -5,26 +5,26 @@ public class Parser { public Command parseText(String text) { String[] txtArr = text.split(" "); switch (txtArr[0]) { - case "mark": - return new MarkCommand(text, false); - case "unmark": - return new UnmarkCommand(text, false); - case "list": - return new ListCommand(text, false); - case "todo": - return new AddCommandToDo(text, false); - case "deadline": - return new AddCommandDeadLine(text, false); - case "event": - return new AddCommandEvent(text, false); - case "delete": - return new DeleteCommand(text, false); - case "greet": - return new GreetCommand(text, false); - case "bye": - return new ByeCommand(text, true); - default: - return new DefaultCommand(text, false); + case "mark": + return new MarkCommand(text, false); + case "unmark": + return new UnmarkCommand(text, false); + case "list": + return new ListCommand(text, false); + case "todo": + return new AddCommandToDo(text, false); + case "deadline": + return new AddCommandDeadLine(text, false); + case "event": + return new AddCommandEvent(text, false); + case "delete": + return new DeleteCommand(text, false); + case "greet": + return new GreetCommand(text, false); + case "bye": + return new ByeCommand(text, true); + default: + return new DefaultCommand(text, false); } } diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index a731d94a8e..f98b907785 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -7,28 +7,28 @@ public class Storage { private String fileLocation = "/data/cleverNotBot.txt"; private File file; - public Storage(){ + public Storage() { this.file = new File(this.fileLocation); } public ArrayList getTasksFromFile() { ArrayList tasks = new ArrayList<>(); String line; - try{ + try { BufferedReader reader = new BufferedReader(new FileReader(fileLocation)); - while((line = reader.readLine()) != null){ + while ((line = reader.readLine()) != null) { Task task = convertLineToTask(line); tasks.add(task); } - } catch (FileNotFoundException e){ + } catch (FileNotFoundException e) { System.out.println("Error! File does not exist! Creating a new file at location!"); - try{ + try { file.getParentFile().mkdirs(); file.createNewFile(); - } catch (IOException errorCreate){ + } catch (IOException errorCreate) { System.out.println("An error has occurred when trying to create new file"); } - } catch (IOException errorObtain){ + } catch (IOException errorObtain) { System.out.println("An error has occurred when trying to obtain data from the save file."); } return tasks; @@ -37,34 +37,34 @@ public ArrayList getTasksFromFile() { public void writeToFile(ArrayList tasks) { try { // if the file above doesn't exist, create it. - if(!file.getParentFile().exists()){ + if (!file.getParentFile().exists()) { file.getParentFile().mkdir(); } FileWriter fw = new FileWriter(file); StringBuilder op = new StringBuilder(); int counter = 0; - for (Task task: tasks){ + for (Task task : tasks) { String taskToStorage = ""; - if (task.getTaskType().equals("T")){ + if (task.getTaskType().equals("T")) { taskToStorage = String.format("%s | %d | %s", - task.getTaskType(),task.isCompleted()? 1:0,task.getName()); - } else if(task.getTaskType().equals("D") || task.getTaskType().equals("E")){ + task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName()); + } else if (task.getTaskType().equals("D") || task.getTaskType().equals("E")) { taskToStorage = String.format("%s | %d | %s | %s", - task.getTaskType(),task.isCompleted()? 1:0,task.getName(),task.getTime()); + task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName(), task.getTime()); } else { System.out.println("Warning! Illegal entries has been detected!"); } op.append(taskToStorage); counter++; - if(counter < tasks.size()){ + if (counter < tasks.size()) { op.append("\n"); } } String result = op.toString(); fw.write(result); fw.close(); - } catch(IOException e){ + } catch (IOException e) { System.out.println("An error has occurred during saving of file!"); } } @@ -77,13 +77,13 @@ private Task convertLineToTask(String line) { */ //"1".equals(content[1]) is to convert it to boolean switch (content[0]) { - case "T": - return new ToDo(content[2], "1".equals(content[1])); - case "D": - return new Deadline(content[2], "1".equals(content[1]), content[3]); - default: - // new event - return new Event(content[2], "1".equals(content[1]), content[3]); + case "T": + return new ToDo(content[2], "1".equals(content[1])); + case "D": + return new Deadline(content[2], "1".equals(content[1]), content[3]); + default: + // new event + return new Event(content[2], "1".equals(content[1]), content[3]); } } diff --git a/src/main/java/clevernotbot/Task.java b/src/main/java/clevernotbot/Task.java index 37c8271133..87b9728f27 100644 --- a/src/main/java/clevernotbot/Task.java +++ b/src/main/java/clevernotbot/Task.java @@ -5,21 +5,21 @@ public abstract class Task { private final boolean completed; - public Task(String name, boolean completed){ + public Task(String name, boolean completed) { this.name = name; this.completed = completed; } - public String getName(){ + public String getName() { return name; } - public boolean isCompleted(){ + public boolean isCompleted() { return completed; } - public String checkMarked(){ - return isCompleted()? "X":" "; + public String checkMarked() { + return isCompleted() ? "X" : " "; } public abstract String getTime(); diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index 0560fc367e..b27f131b81 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -7,39 +7,40 @@ public class TaskList { private ArrayList tasks; private int size; - public TaskList(ArrayList tasks){ + public TaskList(ArrayList tasks) { this.tasks = tasks; size = tasks.size(); } - public void addTask(Task element){ + public void addTask(Task element) { tasks.add(element); size++; } - public void addTaskByIdx(int idx, Task element){ + public void addTaskByIdx(int idx, Task element) { tasks.add(idx, element); size++; } - public void removeTask(Task task){ - tasks.remove((Task)task); + public void removeTask(Task task) { + tasks.remove((Task) task); size--; } - public Task getTask(int idx){ + public Task getTask(int idx) { return tasks.get(idx); } - public ArrayList getTaskList(){ + public ArrayList getTaskList() { return tasks; } - public int getSize(){ + + public int getSize() { return size; } @Override - public String toString(){ + public String toString() { return Arrays.toString(tasks.toArray()); } diff --git a/src/main/java/clevernotbot/ToDo.java b/src/main/java/clevernotbot/ToDo.java index c7986df2c9..a5e2c0f784 100644 --- a/src/main/java/clevernotbot/ToDo.java +++ b/src/main/java/clevernotbot/ToDo.java @@ -1,9 +1,9 @@ package clevernotbot; -public class ToDo extends Task{ +public class ToDo extends Task { - public ToDo(String name, boolean completed){ - super(name,completed); + public ToDo(String name, boolean completed) { + super(name, completed); } @Override @@ -17,12 +17,12 @@ public String getTaskType() { } @Override - public Task toggleCompleted(){ - return new ToDo(getName(),!isCompleted()); + public Task toggleCompleted() { + return new ToDo(getName(), !isCompleted()); } @Override - public String toString(){ - return String.format("[T][%s] %s",checkMarked(),getName()); + public String toString() { + return String.format("[T][%s] %s", checkMarked(), getName()); } } diff --git a/src/main/java/clevernotbot/UI.java b/src/main/java/clevernotbot/UI.java index fdfcbe5186..c25574db53 100644 --- a/src/main/java/clevernotbot/UI.java +++ b/src/main/java/clevernotbot/UI.java @@ -6,12 +6,13 @@ public class UI { - public UI(){} + public UI() { + } - public void chat(String text){ + public void chat(String text) { List textLines; int max; - if (text == null){ + if (text == null) { textLines = Collections.singletonList("null"); max = 4; } else { @@ -22,16 +23,16 @@ public void chat(String text){ System.out.println("|" + " ".repeat(max + 10) + "|"); for (int i = 0; i < textLines.size(); i++) { int curr = textLines.get(i).length(); - System.out.println("|" + " ".repeat(5) + textLines.get(i) + " ".repeat(5 + max-curr) + "|"); + System.out.println("|" + " ".repeat(5) + textLines.get(i) + " ".repeat(5 + max - curr) + "|"); } System.out.println("|" + "_".repeat(max + 10) + "|"); } - public String coverText(String text){ + public String coverText(String text) { List textLines; int max; - if (text == null){ + if (text == null) { textLines = Collections.singletonList("null"); max = 4; } else { @@ -43,7 +44,7 @@ public String coverText(String text){ op.append("|").append(" ".repeat(max + 10)).append("|"); for (int i = 0; i < textLines.size(); i++) { int curr = textLines.get(i).length(); - op.append("|").append(" ".repeat(5)).append(textLines.get(i)).append(" ".repeat(5 + max-curr)).append("|"); + op.append("|").append(" ".repeat(5)).append(textLines.get(i)).append(" ".repeat(5 + max - curr)).append("|"); } op.append("|").append("_".repeat(max + 10)).append("|"); return op.toString(); diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 17eb84bf6c..073a02bd96 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -2,21 +2,21 @@ public class UnmarkCommand extends Command { - public UnmarkCommand(String commandName, boolean exit){ - super(commandName,exit); + public UnmarkCommand(String commandName, boolean exit) { + super(commandName, exit); } @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - int number = Integer. parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 + int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 Task taskToUnmark = tasks.getTask(number); - if(taskToUnmark.checkMarked().equals("X")) { + if (taskToUnmark.checkMarked().equals("X")) { Task unmarkedTask = taskToUnmark.toggleCompleted(); tasks.removeTask(taskToUnmark); tasks.addTaskByIdx(number, unmarkedTask); textBox.chat(String.format("OK, I've marked this task as not done yet:\n [%s] %s", - unmarkedTask.checkMarked(),unmarkedTask.getName())); - } else{ + unmarkedTask.checkMarked(), unmarkedTask.getName())); + } else { textBox.chat("Hey! This task is already unmarked!"); } From 68f3e8dce3a2f6e1e174178d8162d38fdcd59522 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 03:43:12 +0800 Subject: [PATCH 15/31] Add Level 9 --- src/main/java/clevernotbot/FindCommand.java | 50 +++++++++++++++++++++ src/main/java/clevernotbot/Parser.java | 2 + src/main/java/clevernotbot/TaskList.java | 16 +++++++ 3 files changed, 68 insertions(+) create mode 100644 src/main/java/clevernotbot/FindCommand.java diff --git a/src/main/java/clevernotbot/FindCommand.java b/src/main/java/clevernotbot/FindCommand.java new file mode 100644 index 0000000000..4ea00798c1 --- /dev/null +++ b/src/main/java/clevernotbot/FindCommand.java @@ -0,0 +1,50 @@ +package clevernotbot; + +import java.util.ArrayList; + +/** + * Represents a command used to find all tasks in TaskList. + */ +public class FindCommand extends Command { + + /** + * Constructor for the FindCommand. + * + * @param commandName Description of Command. + * @param exit Checking if program intends to exit. + */ + public FindCommand(String commandName, boolean exit) { + super(commandName, exit); + } + + /** + * Runs the add event command. + * + * @param tasks The task list used to store all tasks. + * @param textBox UI for the textbox. + * @param storage The data where it is stored. + * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. + */ + @Override + public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + String[] desc = getCommandName().split(" ", 2); + if (desc.length == 1) { + throw new CleverNotBotException("Please fill in the search word!", textBox); + } + ArrayList result = tasks.findTasks(desc[1].trim()); + StringBuilder op = new StringBuilder(); + if (result.size() == 0) { + op.append(String.format("No task contains %s", desc[1].trim())); + } else { + int counter = 1; + op.append("Here are the matching tasks in your list:\n"); + for (Task task : result) { + op.append(counter++); + op.append("."); + op.append(task.toString()); + op.append("\n"); + } + textBox.chat(op.toString()); + } + } +} diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 0cb37889f9..7f3a343bae 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -5,6 +5,8 @@ public class Parser { public Command parseText(String text) { String[] txtArr = text.split(" "); switch (txtArr[0]) { + case "find": + return new FindCommand(text, false); case "mark": return new MarkCommand(text, false); case "unmark": diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index 0560fc367e..2c6496a3f9 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -31,6 +31,22 @@ public Task getTask(int idx){ return tasks.get(idx); } + /** + * Returns an ArrayList of task with the search word provided. + * + * @param searchWord The word that you want to search in the list. + * @return An ArrayList of task with the search word provided. + */ + public ArrayList findTasks(String searchWord){ + ArrayList taskArr = new ArrayList<>(); + for (Task task: tasks) { + if((task.getName().toLowerCase()).contains(searchWord.toLowerCase())) { + taskArr.add(task); + } + } + return taskArr; + } + public ArrayList getTaskList(){ return tasks; } From 0ea15bfe488e6d8cdd467d5aac9fcd3e75fa92d7 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 2 Sep 2022 04:11:25 +0800 Subject: [PATCH 16/31] Update MarkCommand.java Update UnmarkCommand.java --- src/main/java/clevernotbot/MarkCommand.java | 29 +++++++++++-------- src/main/java/clevernotbot/UnmarkCommand.java | 28 +++++++++++------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 8c575aa6bf..98c297ba01 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -25,18 +25,23 @@ public MarkCommand(String commandName, boolean exit) { */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - //mark 3 -> 2, because number 3 is actually idx 2 - int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; - Task taskToMark = tasks.getTask(number); - if (taskToMark.checkMarked().equals(" ")) { - Task markedTask = taskToMark.toggleCompleted(); - tasks.removeTask(taskToMark); - tasks.addTaskByIdx(number, markedTask); - textBox.chat(String.format("Nice! I've marked this task as done:\n [%s] %s", - markedTask.checkMarked(), markedTask.getName())); - } else { - textBox.chat("Hey! This task is already marked!"); + try { + //mark 3 -> 2, because number 3 is actually idx 2 + int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; + Task taskToMark = tasks.getTask(number); + if (taskToMark.checkMarked().equals(" ")) { + Task markedTask = taskToMark.toggleCompleted(); + tasks.removeTask(taskToMark); + tasks.addTaskByIdx(number, markedTask); + textBox.chat(String.format("Nice! I've marked this task as done:\n [%s] %s", + markedTask.checkMarked(), markedTask.getName())); + } else { + textBox.chat("Hey! This task is already marked!"); + } + } catch (IndexOutOfBoundsException ex) { + String exceptionErrorMessage = String.format( + "Invalid number. Please input the number from 1 - %d", tasks.getSize()); + throw new CleverNotBotException(exceptionErrorMessage, textBox); } - } } diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 89d57a3ad8..9f10db132a 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -25,17 +25,23 @@ public UnmarkCommand(String commandName, boolean exit) { */ @Override public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; //mark 3 -> 3, because number 3 is actually idx 2 - Task taskToUnmark = tasks.getTask(number); - if (taskToUnmark.checkMarked().equals("X")) { - Task unmarkedTask = taskToUnmark.toggleCompleted(); - tasks.removeTask(taskToUnmark); - tasks.addTaskByIdx(number, unmarkedTask); - textBox.chat(String.format("OK, I've marked this task as not done yet:\n [%s] %s", - unmarkedTask.checkMarked(), unmarkedTask.getName())); - } else { - textBox.chat("Hey! This task is already unmarked!"); + try { + //unmark 3 -> 2, because number 3 is actually idx 2 + int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; + Task taskToUnmark = tasks.getTask(number); + if (taskToUnmark.checkMarked().equals("X")) { + Task unmarkedTask = taskToUnmark.toggleCompleted(); + tasks.removeTask(taskToUnmark); + tasks.addTaskByIdx(number, unmarkedTask); + textBox.chat(String.format("OK, I've marked this task as not done yet:\n [%s] %s", + unmarkedTask.checkMarked(), unmarkedTask.getName())); + } else { + textBox.chat("Hey! This task is already unmarked!"); + } + } catch (IndexOutOfBoundsException ex) { + String exceptionErrorMessage = String.format( + "Invalid number. Please input the number from 1 - %d", tasks.getSize()); + throw new CleverNotBotException(exceptionErrorMessage, textBox); } - } } From 48d0376a57031dd773055e8a82e2e7a3637cc30f Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Sun, 4 Sep 2022 19:46:19 +0800 Subject: [PATCH 17/31] Add catch for non numeric number after command such as `mark a` `unmark a` `delete a` --- src/main/java/clevernotbot/AddDeadLineCommand.java | 6 +++--- src/main/java/clevernotbot/AddEventCommand.java | 6 +++--- src/main/java/clevernotbot/AddToDoCommand.java | 6 +++--- src/main/java/clevernotbot/CleverNotBot.java | 6 +++--- src/main/java/clevernotbot/DeleteCommand.java | 2 ++ src/main/java/clevernotbot/MarkCommand.java | 2 ++ src/main/java/clevernotbot/TaskList.java | 1 - src/main/java/clevernotbot/UnmarkCommand.java | 2 ++ src/test/java/clevernotbot/ParserTest.java | 6 +++--- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/clevernotbot/AddDeadLineCommand.java b/src/main/java/clevernotbot/AddDeadLineCommand.java index 830d648d89..90c83b9c79 100644 --- a/src/main/java/clevernotbot/AddDeadLineCommand.java +++ b/src/main/java/clevernotbot/AddDeadLineCommand.java @@ -42,9 +42,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e) { diff --git a/src/main/java/clevernotbot/AddEventCommand.java b/src/main/java/clevernotbot/AddEventCommand.java index 2c6a26f061..a5de4f8b07 100644 --- a/src/main/java/clevernotbot/AddEventCommand.java +++ b/src/main/java/clevernotbot/AddEventCommand.java @@ -40,9 +40,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } } catch (CleverNotBotException e) { diff --git a/src/main/java/clevernotbot/AddToDoCommand.java b/src/main/java/clevernotbot/AddToDoCommand.java index f23b4083ee..842bd672be 100644 --- a/src/main/java/clevernotbot/AddToDoCommand.java +++ b/src/main/java/clevernotbot/AddToDoCommand.java @@ -36,9 +36,9 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); textBox.chat(String.format( - "Got it. I've added this task:" + - "\n %s" + - "\nNow you have %d tasks in the list." + "Got it. I've added this task:" + + "\n %s" + + "\nNow you have %d tasks in the list." , newTask.toString(), tasks.getSize())); } else { throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index ba82ee39b0..fb6c294913 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -9,12 +9,12 @@ public static void main(String[] args) throws CleverNotBotException { Storage storage = new Storage(); TaskList tasks = new TaskList(storage.getTasksFromFile()); Scanner sc = new Scanner(System.in); - Parser hl = new Parser(); + Parser parser = new Parser(); - hl.parseText("greet").run(tasks, textBox, storage); + parser.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { String inp = sc.nextLine(); - Command commandToRun = hl.parseText(inp); + Command commandToRun = parser.parseText(inp); commandToRun.run(tasks, textBox, storage); if (commandToRun.isExitingProgram()) { break; diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/clevernotbot/DeleteCommand.java index 371407a171..dadb6b40a7 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/clevernotbot/DeleteCommand.java @@ -39,6 +39,8 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot , deletedTask.toString(), tasks.getSize())); } catch (IndexOutOfBoundsException e) { throw new CleverNotBotException("The task does not exist!", textBox); + } catch(NumberFormatException ex) { + throw new CleverNotBotException("Input a valid number!",textBox); } } diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/clevernotbot/MarkCommand.java index 98c297ba01..40949538f9 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/clevernotbot/MarkCommand.java @@ -42,6 +42,8 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot String exceptionErrorMessage = String.format( "Invalid number. Please input the number from 1 - %d", tasks.getSize()); throw new CleverNotBotException(exceptionErrorMessage, textBox); + } catch(NumberFormatException ex) { + throw new CleverNotBotException("Input a valid number!",textBox); } } } diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/clevernotbot/TaskList.java index fe71f71f2f..11d2f35a83 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/clevernotbot/TaskList.java @@ -106,5 +106,4 @@ public int getSize() { public String toString() { return Arrays.toString(tasks.toArray()); } - } diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/clevernotbot/UnmarkCommand.java index 9f10db132a..a5cebcc249 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/clevernotbot/UnmarkCommand.java @@ -42,6 +42,8 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot String exceptionErrorMessage = String.format( "Invalid number. Please input the number from 1 - %d", tasks.getSize()); throw new CleverNotBotException(exceptionErrorMessage, textBox); + } catch(NumberFormatException ex) { + throw new CleverNotBotException("Input a valid number!",textBox); } } } diff --git a/src/test/java/clevernotbot/ParserTest.java b/src/test/java/clevernotbot/ParserTest.java index b518e1079e..7c378628dd 100644 --- a/src/test/java/clevernotbot/ParserTest.java +++ b/src/test/java/clevernotbot/ParserTest.java @@ -28,10 +28,10 @@ public void parseTextTest(){ Command testCommand8 = testParser.parseText(txtTest8); Command testCommand9 = testParser.parseText(txtTest9); - assertTrue(testCommand1 instanceof AddCommandToDo); - assertTrue(testCommand2 instanceof AddCommandDeadLine); + assertTrue(testCommand1 instanceof AddToDoCommand); + assertTrue(testCommand2 instanceof AddDeadLineCommand); assertTrue(testCommand3 instanceof MarkCommand); - assertTrue(testCommand4 instanceof AddCommandEvent); + assertTrue(testCommand4 instanceof AddEventCommand); assertTrue(testCommand5 instanceof UnmarkCommand); assertTrue(testCommand6 instanceof ListCommand); assertTrue(testCommand7 instanceof DeleteCommand); From 2beda4223742f12f4206df1dca87e20a9fcc29b4 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Fri, 9 Sep 2022 07:41:19 +0800 Subject: [PATCH 18/31] Refactored Storage.java --- src/main/java/clevernotbot/CleverNotBot.java | 8 ++- src/main/java/clevernotbot/Parser.java | 2 + src/main/java/clevernotbot/Storage.java | 52 +++++++++++++++---- .../AddDeadLineCommand.java | 9 +++- .../AddEventCommand.java | 9 +++- .../AddToDoCommand.java | 9 +++- .../{clevernotbot => command}/ByeCommand.java | 7 ++- .../{clevernotbot => command}/Command.java | 7 ++- .../DefaultCommand.java | 7 ++- .../DeleteCommand.java | 8 ++- .../FindCommand.java | 8 ++- .../GreetCommand.java | 7 ++- .../ListCommand.java | 8 ++- .../MarkCommand.java | 8 ++- .../UnmarkCommand.java | 8 ++- .../CleverNotBotException.java | 4 +- .../java/{clevernotbot => task}/Deadline.java | 2 +- .../java/{clevernotbot => task}/Event.java | 2 +- .../java/{clevernotbot => task}/Task.java | 2 +- .../java/{clevernotbot => task}/TaskList.java | 2 +- .../java/{clevernotbot => task}/ToDo.java | 2 +- src/test/java/clevernotbot/ParserTest.java | 1 + .../{clevernotbot => event}/ToDoTest.java | 5 +- .../{clevernotbot => task}/TaskListTest.java | 2 +- 24 files changed, 146 insertions(+), 33 deletions(-) rename src/main/java/{clevernotbot => command}/AddDeadLineCommand.java (93%) rename src/main/java/{clevernotbot => command}/AddEventCommand.java (92%) rename src/main/java/{clevernotbot => command}/AddToDoCommand.java (91%) rename src/main/java/{clevernotbot => command}/ByeCommand.java (85%) rename src/main/java/{clevernotbot => command}/Command.java (89%) rename src/main/java/{clevernotbot => command}/DefaultCommand.java (86%) rename src/main/java/{clevernotbot => command}/DeleteCommand.java (92%) rename src/main/java/{clevernotbot => command}/FindCommand.java (91%) rename src/main/java/{clevernotbot => command}/GreetCommand.java (86%) rename src/main/java/{clevernotbot => command}/ListCommand.java (89%) rename src/main/java/{clevernotbot => command}/MarkCommand.java (92%) rename src/main/java/{clevernotbot => command}/UnmarkCommand.java (92%) rename src/main/java/{clevernotbot => exception}/CleverNotBotException.java (94%) rename src/main/java/{clevernotbot => task}/Deadline.java (99%) rename src/main/java/{clevernotbot => task}/Event.java (98%) rename src/main/java/{clevernotbot => task}/Task.java (98%) rename src/main/java/{clevernotbot => task}/TaskList.java (99%) rename src/main/java/{clevernotbot => task}/ToDo.java (98%) rename src/test/java/{clevernotbot => event}/ToDoTest.java (92%) rename src/test/java/{clevernotbot => task}/TaskListTest.java (98%) diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index fb6c294913..76cc6b0b04 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -1,5 +1,9 @@ package clevernotbot; +import command.Command; +import exception.CleverNotBotException; +import task.TaskList; + import java.util.Scanner; public class CleverNotBot { @@ -13,8 +17,8 @@ public static void main(String[] args) throws CleverNotBotException { parser.parseText("greet").run(tasks, textBox, storage); while (sc.hasNext()) { - String inp = sc.nextLine(); - Command commandToRun = parser.parseText(inp); + String input = sc.nextLine(); + Command commandToRun = parser.parseText(input); commandToRun.run(tasks, textBox, storage); if (commandToRun.isExitingProgram()) { break; diff --git a/src/main/java/clevernotbot/Parser.java b/src/main/java/clevernotbot/Parser.java index 9dd12bbc18..375f5e0d0a 100644 --- a/src/main/java/clevernotbot/Parser.java +++ b/src/main/java/clevernotbot/Parser.java @@ -1,5 +1,7 @@ package clevernotbot; +import command.*; + /** * Deals with making sense of the user command */ diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index aba7196d0b..2dc0d27ed1 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -1,5 +1,10 @@ package clevernotbot; +import task.Deadline; +import task.Event; +import task.Task; +import task.ToDo; + import java.io.*; import java.util.ArrayList; @@ -24,10 +29,15 @@ public Storage() { */ public ArrayList getTasksFromFile() { ArrayList tasks = new ArrayList<>(); - String line; + try { BufferedReader reader = new BufferedReader(new FileReader(fileLocation)); - while ((line = reader.readLine()) != null) { + while (true) { + String line = reader.readLine(); + boolean hasNextLine = (line != null); + if (!hasNextLine){ + break; + } Task task = convertLineToTask(line); tasks.add(task); } @@ -59,18 +69,23 @@ public void writeToFile(ArrayList tasks) { FileWriter fw = new FileWriter(file); StringBuilder op = new StringBuilder(); int counter = 0; + final String TODO_PREFIX = "T"; + final String DEADLINE_PREFIX = "D"; + final String EVENT_PREFIX = "E"; for (Task task : tasks) { String taskToStorage = ""; - if (task.getTaskType().equals("T")) { + String prefix = task.getTaskType(); + switch(prefix){ + case TODO_PREFIX: taskToStorage = String.format("%s | %d | %s", task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName()); - } else if (task.getTaskType().equals("D") || task.getTaskType().equals("E")) { + case DEADLINE_PREFIX: + case EVENT_PREFIX: taskToStorage = String.format("%s | %d | %s | %s", task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName(), task.getTime()); - } else { + default: System.out.println("Warning! Illegal entries has been detected!"); } - op.append(taskToStorage); counter++; if (counter < tasks.size()) { @@ -93,21 +108,36 @@ public void writeToFile(ArrayList tasks) { * @return Task. */ private Task convertLineToTask(String line) { + // This is to make it in a form of [prefix,marked,name,dateTime] + // In order to get the individual data. String[] content = line.split(" \\| "); /* Debug line System.out.println(file.getAbsolutePath()); System.out.println(String.join(",",content)); */ - //"1".equals(content[1]) is to convert it to boolean - switch (content[0]) { + String prefix = content[0]; + String markInStringFormat = content[1]; + String name = content[2]; + // content[3] is dateTime + switch (prefix) { case "T": - return new ToDo(content[2], "1".equals(content[1])); + return new ToDo(name, isMarked(markInStringFormat)); case "D": - return new Deadline(content[2], "1".equals(content[1]), content[3]); + return new Deadline(name, isMarked(markInStringFormat), content[3]); default: // new event - return new Event(content[2], "1".equals(content[1]), content[3]); + return new Event(name, isMarked(markInStringFormat), content[3]); } } + /** + * Returns that it is marked if the marked col is "1" + * + * @param number Marked col store in the txt. + * @return Marked or not. + */ + private boolean isMarked(String number) { + return "1".equals(number); + } + } diff --git a/src/main/java/clevernotbot/AddDeadLineCommand.java b/src/main/java/command/AddDeadLineCommand.java similarity index 93% rename from src/main/java/clevernotbot/AddDeadLineCommand.java rename to src/main/java/command/AddDeadLineCommand.java index 90c83b9c79..cdf846bff3 100644 --- a/src/main/java/clevernotbot/AddDeadLineCommand.java +++ b/src/main/java/command/AddDeadLineCommand.java @@ -1,4 +1,11 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Deadline; +import task.Task; +import task.TaskList; /** * Represents a command used to add an Event Task. diff --git a/src/main/java/clevernotbot/AddEventCommand.java b/src/main/java/command/AddEventCommand.java similarity index 92% rename from src/main/java/clevernotbot/AddEventCommand.java rename to src/main/java/command/AddEventCommand.java index a5de4f8b07..3b51665415 100644 --- a/src/main/java/clevernotbot/AddEventCommand.java +++ b/src/main/java/command/AddEventCommand.java @@ -1,4 +1,11 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Event; +import task.Task; +import task.TaskList; /** * Represents a command used to add an Event Task. diff --git a/src/main/java/clevernotbot/AddToDoCommand.java b/src/main/java/command/AddToDoCommand.java similarity index 91% rename from src/main/java/clevernotbot/AddToDoCommand.java rename to src/main/java/command/AddToDoCommand.java index 842bd672be..c752198ef6 100644 --- a/src/main/java/clevernotbot/AddToDoCommand.java +++ b/src/main/java/command/AddToDoCommand.java @@ -1,4 +1,11 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; +import task.ToDo; import java.util.Arrays; diff --git a/src/main/java/clevernotbot/ByeCommand.java b/src/main/java/command/ByeCommand.java similarity index 85% rename from src/main/java/clevernotbot/ByeCommand.java rename to src/main/java/command/ByeCommand.java index 5a307df9d2..833fd19cc3 100644 --- a/src/main/java/clevernotbot/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -1,4 +1,9 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.TaskList; /** * Represents a command used for saying bye. diff --git a/src/main/java/clevernotbot/Command.java b/src/main/java/command/Command.java similarity index 89% rename from src/main/java/clevernotbot/Command.java rename to src/main/java/command/Command.java index 1715669651..9f7a5d1129 100644 --- a/src/main/java/clevernotbot/Command.java +++ b/src/main/java/command/Command.java @@ -1,4 +1,9 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.TaskList; /** * Represents a command. diff --git a/src/main/java/clevernotbot/DefaultCommand.java b/src/main/java/command/DefaultCommand.java similarity index 86% rename from src/main/java/clevernotbot/DefaultCommand.java rename to src/main/java/command/DefaultCommand.java index f3388ee52e..bd04604aa6 100644 --- a/src/main/java/clevernotbot/DefaultCommand.java +++ b/src/main/java/command/DefaultCommand.java @@ -1,4 +1,9 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.TaskList; /** * Represents a command used at default. diff --git a/src/main/java/clevernotbot/DeleteCommand.java b/src/main/java/command/DeleteCommand.java similarity index 92% rename from src/main/java/clevernotbot/DeleteCommand.java rename to src/main/java/command/DeleteCommand.java index dadb6b40a7..6865985581 100644 --- a/src/main/java/clevernotbot/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,4 +1,10 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; /** * Represents a command to delete a task. diff --git a/src/main/java/clevernotbot/FindCommand.java b/src/main/java/command/FindCommand.java similarity index 91% rename from src/main/java/clevernotbot/FindCommand.java rename to src/main/java/command/FindCommand.java index 4ea00798c1..2d2f30a768 100644 --- a/src/main/java/clevernotbot/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -1,4 +1,10 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; import java.util.ArrayList; diff --git a/src/main/java/clevernotbot/GreetCommand.java b/src/main/java/command/GreetCommand.java similarity index 86% rename from src/main/java/clevernotbot/GreetCommand.java rename to src/main/java/command/GreetCommand.java index 1016ecd292..f827c6b3e2 100644 --- a/src/main/java/clevernotbot/GreetCommand.java +++ b/src/main/java/command/GreetCommand.java @@ -1,4 +1,9 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.TaskList; /** * Represents a command used for greeting diff --git a/src/main/java/clevernotbot/ListCommand.java b/src/main/java/command/ListCommand.java similarity index 89% rename from src/main/java/clevernotbot/ListCommand.java rename to src/main/java/command/ListCommand.java index e45f306c83..f90948e54b 100644 --- a/src/main/java/clevernotbot/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -1,4 +1,10 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; /** * Represents a command to show what is in the list. diff --git a/src/main/java/clevernotbot/MarkCommand.java b/src/main/java/command/MarkCommand.java similarity index 92% rename from src/main/java/clevernotbot/MarkCommand.java rename to src/main/java/command/MarkCommand.java index 40949538f9..ea1788c387 100644 --- a/src/main/java/clevernotbot/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -1,4 +1,10 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; /** * Represents a command to mark a task. diff --git a/src/main/java/clevernotbot/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java similarity index 92% rename from src/main/java/clevernotbot/UnmarkCommand.java rename to src/main/java/command/UnmarkCommand.java index a5cebcc249..ea377759bb 100644 --- a/src/main/java/clevernotbot/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -1,4 +1,10 @@ -package clevernotbot; +package command; + +import clevernotbot.Storage; +import clevernotbot.UI; +import exception.CleverNotBotException; +import task.Task; +import task.TaskList; /** * Represents a command to unmark a task. diff --git a/src/main/java/clevernotbot/CleverNotBotException.java b/src/main/java/exception/CleverNotBotException.java similarity index 94% rename from src/main/java/clevernotbot/CleverNotBotException.java rename to src/main/java/exception/CleverNotBotException.java index 81ad56d5e4..d8e8c8c169 100644 --- a/src/main/java/clevernotbot/CleverNotBotException.java +++ b/src/main/java/exception/CleverNotBotException.java @@ -1,4 +1,6 @@ -package clevernotbot; +package exception; + +import clevernotbot.UI; /** * Deals with exception diff --git a/src/main/java/clevernotbot/Deadline.java b/src/main/java/task/Deadline.java similarity index 99% rename from src/main/java/clevernotbot/Deadline.java rename to src/main/java/task/Deadline.java index e32da67de0..b96901f704 100644 --- a/src/main/java/clevernotbot/Deadline.java +++ b/src/main/java/task/Deadline.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/clevernotbot/Event.java b/src/main/java/task/Event.java similarity index 98% rename from src/main/java/clevernotbot/Event.java rename to src/main/java/task/Event.java index 80417b9442..3cc838ae64 100644 --- a/src/main/java/clevernotbot/Event.java +++ b/src/main/java/task/Event.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; /** * Represents a more specific task with time limit attached to it. A Event object corresponds to diff --git a/src/main/java/clevernotbot/Task.java b/src/main/java/task/Task.java similarity index 98% rename from src/main/java/clevernotbot/Task.java rename to src/main/java/task/Task.java index 564f968476..0add811957 100644 --- a/src/main/java/clevernotbot/Task.java +++ b/src/main/java/task/Task.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; /** * Represents a string as a Task. A Task object corresponding to diff --git a/src/main/java/clevernotbot/TaskList.java b/src/main/java/task/TaskList.java similarity index 99% rename from src/main/java/clevernotbot/TaskList.java rename to src/main/java/task/TaskList.java index 11d2f35a83..1b76ee8e8c 100644 --- a/src/main/java/clevernotbot/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/clevernotbot/ToDo.java b/src/main/java/task/ToDo.java similarity index 98% rename from src/main/java/clevernotbot/ToDo.java rename to src/main/java/task/ToDo.java index 3a3223b2ff..db93e8e7bd 100644 --- a/src/main/java/clevernotbot/ToDo.java +++ b/src/main/java/task/ToDo.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; /** * Represents a more specific task with no time limit attached to it. diff --git a/src/test/java/clevernotbot/ParserTest.java b/src/test/java/clevernotbot/ParserTest.java index 7c378628dd..7b0eb6a625 100644 --- a/src/test/java/clevernotbot/ParserTest.java +++ b/src/test/java/clevernotbot/ParserTest.java @@ -1,5 +1,6 @@ package clevernotbot; +import command.*; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/clevernotbot/ToDoTest.java b/src/test/java/event/ToDoTest.java similarity index 92% rename from src/test/java/clevernotbot/ToDoTest.java rename to src/test/java/event/ToDoTest.java index 0e927e7fee..f81405d79f 100644 --- a/src/test/java/clevernotbot/ToDoTest.java +++ b/src/test/java/event/ToDoTest.java @@ -1,6 +1,9 @@ -package clevernotbot; +package event; import org.junit.jupiter.api.Test; +import task.Task; +import task.ToDo; + import static org.junit.jupiter.api.Assertions.assertEquals; public class ToDoTest { diff --git a/src/test/java/clevernotbot/TaskListTest.java b/src/test/java/task/TaskListTest.java similarity index 98% rename from src/test/java/clevernotbot/TaskListTest.java rename to src/test/java/task/TaskListTest.java index a2c032821a..cd2e000ef4 100644 --- a/src/test/java/clevernotbot/TaskListTest.java +++ b/src/test/java/task/TaskListTest.java @@ -1,4 +1,4 @@ -package clevernotbot; +package task; import org.junit.jupiter.api.Test; From 0e7cc9f1200968377d2c7289dbea5c01fa0ae7e0 Mon Sep 17 00:00:00 2001 From: lolfoollorS Date: Sun, 18 Sep 2022 11:18:28 +0800 Subject: [PATCH 19/31] Add Level-10 Gui --- build.gradle | 15 +++ docs/README.md | 6 + src/main/java/clevernotbot/ChatBot.java | 56 ++++++++++ src/main/java/clevernotbot/CleverNotBot.java | 32 +++--- src/main/java/clevernotbot/DialogBox.java | 67 +++++++++++ src/main/java/clevernotbot/Launcher.java | 12 ++ src/main/java/clevernotbot/Main.java | 36 ++++++ src/main/java/clevernotbot/MainWindow.java | 104 ++++++++++++++++++ src/main/java/clevernotbot/Storage.java | 5 +- src/main/java/command/AddDeadLineCommand.java | 6 +- src/main/java/command/AddEventCommand.java | 6 +- src/main/java/command/AddToDoCommand.java | 9 +- src/main/java/command/ByeCommand.java | 5 +- src/main/java/command/Command.java | 3 +- src/main/java/command/DefaultCommand.java | 5 +- src/main/java/command/DeleteCommand.java | 11 +- src/main/java/command/FindCommand.java | 5 +- src/main/java/command/GreetCommand.java | 5 +- src/main/java/command/ListCommand.java | 7 +- src/main/java/command/MarkCommand.java | 16 +-- src/main/java/command/UnmarkCommand.java | 16 +-- src/main/java/task/Task.java | 1 - src/main/resources/css/styles.css | 7 ++ src/main/resources/images/ChatBubble.png | Bin 0 -> 28118 bytes .../resources/images/CleverNotBotNormal.png | Bin 0 -> 5647 bytes .../resources/images/CleverNotBotTaskIcon.png | Bin 0 -> 7334 bytes src/main/resources/images/Nyan_Cat_BG.png | Bin 0 -> 131005 bytes src/main/resources/images/User.png | Bin 0 -> 76265 bytes src/main/resources/images/aboutRobot.png | Bin 0 -> 7446 bytes src/main/resources/view/AboutBot.fxml | 22 ++++ src/main/resources/view/DialogBox.fxml | 23 ++++ src/main/resources/view/MainWindow.fxml | 54 +++++++++ 32 files changed, 478 insertions(+), 56 deletions(-) create mode 100644 src/main/java/clevernotbot/ChatBot.java create mode 100644 src/main/java/clevernotbot/DialogBox.java create mode 100644 src/main/java/clevernotbot/Launcher.java create mode 100644 src/main/java/clevernotbot/Main.java create mode 100644 src/main/java/clevernotbot/MainWindow.java create mode 100644 src/main/resources/css/styles.css create mode 100644 src/main/resources/images/ChatBubble.png create mode 100644 src/main/resources/images/CleverNotBotNormal.png create mode 100644 src/main/resources/images/CleverNotBotTaskIcon.png create mode 100644 src/main/resources/images/Nyan_Cat_BG.png create mode 100644 src/main/resources/images/User.png create mode 100644 src/main/resources/images/aboutRobot.png create mode 100644 src/main/resources/view/AboutBot.fxml create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/build.gradle b/build.gradle index 1a6c38ecfe..0677cddd41 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,21 @@ repositories { dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' + + String javaFxVersion = '11' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { diff --git a/docs/README.md b/docs/README.md index 8077118ebe..cd50e624c3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,11 @@ # User Guide +Clevernotbot is a **free desktop java app for managing your task, optimized for use via a Command Line Interface** (CLI) while still having the benefits of a Graphical User Interface (GUI). +- Quick Start +- Features + - Viewing help: help +- FAQ +- Command Summary ## Features ### Feature-ABC diff --git a/src/main/java/clevernotbot/ChatBot.java b/src/main/java/clevernotbot/ChatBot.java new file mode 100644 index 0000000000..027b034487 --- /dev/null +++ b/src/main/java/clevernotbot/ChatBot.java @@ -0,0 +1,56 @@ +package clevernotbot; + +import command.Command; +import exception.CleverNotBotException; +import task.TaskList; + +import java.util.Scanner; + +public class ChatBot { + private UI uI = new UI(); + private Storage storage = new Storage(); + private TaskList tasks = new TaskList(storage.getTasksFromFile()); + private Scanner sc = new Scanner(System.in); + private Parser parser = new Parser(); + private boolean isExitProgram = false; + + public ChatBot() { + + } + + public void startChatBot() { + greetUser(); + while (sc.hasNext()) { + String input = sc.nextLine(); + String reply = getResponse(input); + uI.chat(reply); + if (isExitProgram) { + break; + } + } + + } + + private String greetUser() { + return getResponse("greet"); + } + + /** + * Returns a string response to the User for any input that the User place + * + * @param input User input + * @return A corresponding response from chatbot. + */ + public String getResponse(String input) { + try { + Command commandToRun = parser.parseText(input); + assert commandToRun != null; // assert that command is not null + isExitProgram = commandToRun.isExitingProgram(); + String reply = commandToRun.run(tasks, uI, storage).trim(); + return reply; + } catch (CleverNotBotException e) { + return e.toString(); + } + } + +} diff --git a/src/main/java/clevernotbot/CleverNotBot.java b/src/main/java/clevernotbot/CleverNotBot.java index 76cc6b0b04..d730e634ca 100644 --- a/src/main/java/clevernotbot/CleverNotBot.java +++ b/src/main/java/clevernotbot/CleverNotBot.java @@ -4,27 +4,33 @@ import exception.CleverNotBotException; import task.TaskList; -import java.util.Scanner; public class CleverNotBot { - public static void main(String[] args) throws CleverNotBotException { - UI textBox = new UI(); + public static void main(String[] args) { + ChatBot chatBot = new ChatBot(); + chatBot.startChatBot(); + } + + /** + * Returns a string response to the User for any input that the User place + * + * @param input User input + * @return A corresponding response from chatbot. + */ + public String getResponse(String input) { + UI uI = new UI(); Storage storage = new Storage(); TaskList tasks = new TaskList(storage.getTasksFromFile()); - Scanner sc = new Scanner(System.in); Parser parser = new Parser(); - - parser.parseText("greet").run(tasks, textBox, storage); - while (sc.hasNext()) { - String input = sc.nextLine(); + try { Command commandToRun = parser.parseText(input); - commandToRun.run(tasks, textBox, storage); - if (commandToRun.isExitingProgram()) { - break; - } + assert commandToRun != null; // assert that command can not be null + String reply = commandToRun.run(tasks, uI, storage).trim(); + return reply; + } catch(CleverNotBotException e) { + return e.toString(); } - } } diff --git a/src/main/java/clevernotbot/DialogBox.java b/src/main/java/clevernotbot/DialogBox.java new file mode 100644 index 0000000000..74919dc67f --- /dev/null +++ b/src/main/java/clevernotbot/DialogBox.java @@ -0,0 +1,67 @@ +package clevernotbot; + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Region; + +/** + * 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(); + } + int lines = text.split("\n").length; + if(lines > 7) { + int extraLines = lines - 7; + dialog.setMinSize(393,138 + extraLines * 25); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getCleverNotBotDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} diff --git a/src/main/java/clevernotbot/Launcher.java b/src/main/java/clevernotbot/Launcher.java new file mode 100644 index 0000000000..f174a1f2e0 --- /dev/null +++ b/src/main/java/clevernotbot/Launcher.java @@ -0,0 +1,12 @@ +package clevernotbot; + +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/clevernotbot/Main.java b/src/main/java/clevernotbot/Main.java new file mode 100644 index 0000000000..fd7e16b852 --- /dev/null +++ b/src/main/java/clevernotbot/Main.java @@ -0,0 +1,36 @@ +package clevernotbot; + +import java.io.IOException; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for CleverNotBot using FXML. + */ +public class Main extends Application { + + private CleverNotBot cleverNotBot = new CleverNotBot(); + + @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.getIcons().add(new Image("/images/CleverNotBotTaskIcon.png")); + String css = this.getClass().getResource("/css/styles.css").toExternalForm(); + scene.getStylesheets().add(css); + stage.setScene(scene); + stage.setTitle("CleverNotBot Chat-Bot"); + fxmlLoader.getController().setCleverNotBot(cleverNotBot); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/clevernotbot/MainWindow.java b/src/main/java/clevernotbot/MainWindow.java new file mode 100644 index 0000000000..45ebaf6529 --- /dev/null +++ b/src/main/java/clevernotbot/MainWindow.java @@ -0,0 +1,104 @@ +package clevernotbot; + +import javafx.application.Platform; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +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.stage.Stage; + +import java.awt.*; +import java.io.IOException; +import java.net.URI; + +/** + * 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 CleverNotBot cleverNotBot; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/User.png")); + private Image cleverNotBotImage = new Image(this.getClass().getResourceAsStream("/images/CleverNotBotNormal.png")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setCleverNotBot(CleverNotBot cNB) { + cleverNotBot = cNB; + String greetUserMessage = cleverNotBot.getResponse("greet"); + dialogContainer.getChildren().add(DialogBox.getCleverNotBotDialog(greetUserMessage, cleverNotBotImage)); + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing CleverNotBot's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = cleverNotBot.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getCleverNotBotDialog(response, cleverNotBotImage) + ); + userInput.clear(); + if (isExit(input)) { + userInput.setEditable(false); + userInput.setPromptText("Please press X on the top right hand to exit"); + } + } + + private boolean isExit(String input){ + return input.equals("bye"); + } + + @FXML + public void handleCloseButtonAction(ActionEvent event) { + Platform.exit(); + } + + @FXML + public void aboutButtonAction(ActionEvent event) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/view/AboutBot.fxml")); + Parent root1 = (Parent) fxmlLoader.load(); + Stage stage = new Stage(); + stage.setTitle("About Us"); + Scene scene = new Scene(root1); + stage.getIcons().add(new Image("/images/CleverNotBotTaskIcon.png")); + stage.setScene(scene); + stage.show(); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + @FXML + public void visitButtonAction() { + try { + Desktop.getDesktop().browse(new URI("https://github.com/LolfoollorS/ip")); + } catch (Exception e) { + e.printStackTrace(); + } + + } +} diff --git a/src/main/java/clevernotbot/Storage.java b/src/main/java/clevernotbot/Storage.java index 2dc0d27ed1..1da285b256 100644 --- a/src/main/java/clevernotbot/Storage.java +++ b/src/main/java/clevernotbot/Storage.java @@ -75,16 +75,19 @@ public void writeToFile(ArrayList tasks) { for (Task task : tasks) { String taskToStorage = ""; String prefix = task.getTaskType(); - switch(prefix){ + switch(prefix.trim()){ case TODO_PREFIX: taskToStorage = String.format("%s | %d | %s", task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName()); + break; case DEADLINE_PREFIX: case EVENT_PREFIX: taskToStorage = String.format("%s | %d | %s | %s", task.getTaskType(), task.isCompleted() ? 1 : 0, task.getName(), task.getTime()); + break; default: System.out.println("Warning! Illegal entries has been detected!"); + System.out.println(prefix); } op.append(taskToStorage); counter++; diff --git a/src/main/java/command/AddDeadLineCommand.java b/src/main/java/command/AddDeadLineCommand.java index cdf846bff3..f5cdc29036 100644 --- a/src/main/java/command/AddDeadLineCommand.java +++ b/src/main/java/command/AddDeadLineCommand.java @@ -30,7 +30,7 @@ public AddDeadLineCommand(String commandName, boolean exit) { * @param storage The data where it is stored. * @throws CleverNotBotException Gives an exception when deadline description is empty or not contain /by. */ - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { @@ -48,11 +48,11 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task newTask = new Deadline(commandName, false, dateTime); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); - textBox.chat(String.format( + return String.format( "Got it. I've added this task:" + "\n %s" + "\nNow you have %d tasks in the list." - , newTask.toString(), tasks.getSize())); + , newTask.toString(), tasks.getSize()); } } catch (CleverNotBotException e) { throw new CleverNotBotException("Deadline description must not be empty or must contain /by!", textBox); diff --git a/src/main/java/command/AddEventCommand.java b/src/main/java/command/AddEventCommand.java index 3b51665415..57bf7f3d53 100644 --- a/src/main/java/command/AddEventCommand.java +++ b/src/main/java/command/AddEventCommand.java @@ -30,7 +30,7 @@ public AddEventCommand(String commandName, boolean exit) { * @param storage The data where it is stored. * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. */ - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length == 1) { @@ -46,11 +46,11 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task newTask = new Event(commandName, false, at); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); - textBox.chat(String.format( + return String.format( "Got it. I've added this task:" + "\n %s" + "\nNow you have %d tasks in the list." - , newTask.toString(), tasks.getSize())); + , newTask.toString(), tasks.getSize()); } } catch (CleverNotBotException e) { throw new CleverNotBotException("Event description must not be empty or must contain /at!", textBox); diff --git a/src/main/java/command/AddToDoCommand.java b/src/main/java/command/AddToDoCommand.java index c752198ef6..64d1dd26dc 100644 --- a/src/main/java/command/AddToDoCommand.java +++ b/src/main/java/command/AddToDoCommand.java @@ -30,9 +30,10 @@ public AddToDoCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. - * @throws CleverNotBotException Gives an exception when todo's description is empty. + * @return A String type response. + * @throws CleverNotBotException */ - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" "); try { if (desc.length != 1) { @@ -42,11 +43,11 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task newTask = new ToDo(joinDesc, false); tasks.addTask(newTask); storage.writeToFile(tasks.getTaskList()); - textBox.chat(String.format( + return String.format( "Got it. I've added this task:" + "\n %s" + "\nNow you have %d tasks in the list." - , newTask.toString(), tasks.getSize())); + , newTask.toString(), tasks.getSize()); } else { throw new CleverNotBotException("Please fill in the description of ToDo!", textBox); } diff --git a/src/main/java/command/ByeCommand.java b/src/main/java/command/ByeCommand.java index 833fd19cc3..998baebf33 100644 --- a/src/main/java/command/ByeCommand.java +++ b/src/main/java/command/ByeCommand.java @@ -26,10 +26,11 @@ public ByeCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - textBox.chat("Bye. Hope to see you again soon!"); + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + return "Bye. Hope to see you again soon!"; } } diff --git a/src/main/java/command/Command.java b/src/main/java/command/Command.java index 9f7a5d1129..1c193d2a38 100644 --- a/src/main/java/command/Command.java +++ b/src/main/java/command/Command.java @@ -47,7 +47,8 @@ public boolean isExitingProgram() { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ - public abstract void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; + public abstract String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException; } diff --git a/src/main/java/command/DefaultCommand.java b/src/main/java/command/DefaultCommand.java index bd04604aa6..ebf1373a59 100644 --- a/src/main/java/command/DefaultCommand.java +++ b/src/main/java/command/DefaultCommand.java @@ -26,10 +26,11 @@ public DefaultCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - textBox.chat("This command doesn't exist!"); + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + return "This command doesn't exist!"; } } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 6865985581..83275b575b 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -27,9 +27,10 @@ public DeleteCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception if there is not a valid number or if task does not exist. */ - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { try { String[] desc = getCommandName().split(" "); if (desc.length <= 1) { @@ -38,15 +39,15 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task deletedTask = tasks.getTask(Integer.parseInt(desc[1]) - 1); // Task.Task 3 is in idx 2 tasks.removeTask(deletedTask); storage.writeToFile(tasks.getTaskList()); - textBox.chat(String.format( + return String.format( "Noted. I've removed this task:" + "\n %s" + "\nNow you have %d tasks in the list." - , deletedTask.toString(), tasks.getSize())); + , deletedTask.toString(), tasks.getSize()); } catch (IndexOutOfBoundsException e) { throw new CleverNotBotException("The task does not exist!", textBox); - } catch(NumberFormatException ex) { - throw new CleverNotBotException("Input a valid number!",textBox); + } catch (NumberFormatException ex) { + throw new CleverNotBotException("Input a valid number!", textBox); } } diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java index 2d2f30a768..57e69cbab6 100644 --- a/src/main/java/command/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -29,10 +29,11 @@ public FindCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception when event's description is empty or not contain /at. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { String[] desc = getCommandName().split(" ", 2); if (desc.length == 1) { throw new CleverNotBotException("Please fill in the search word!", textBox); @@ -50,7 +51,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot op.append(task.toString()); op.append("\n"); } - textBox.chat(op.toString()); } + return op.toString(); } } diff --git a/src/main/java/command/GreetCommand.java b/src/main/java/command/GreetCommand.java index f827c6b3e2..61caf66b30 100644 --- a/src/main/java/command/GreetCommand.java +++ b/src/main/java/command/GreetCommand.java @@ -26,10 +26,11 @@ public GreetCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { - textBox.chat("Hello! I'm CleverNotBot\n What can I do for you?"); + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + return "Hello! I'm CleverNotBot\n What can I do for you?"; } } diff --git a/src/main/java/command/ListCommand.java b/src/main/java/command/ListCommand.java index f90948e54b..348af0d169 100644 --- a/src/main/java/command/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -27,12 +27,13 @@ public ListCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { if (tasks.getSize() < 1) { - textBox.chat("There is no task currently assigned."); + return "There is no task currently assigned."; } else { int counter = 1; StringBuilder op = new StringBuilder(); @@ -42,7 +43,7 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot op.append(task.toString()); op.append("\n"); } - textBox.chat(op.toString()); + return op.toString(); } } } diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java index ea1788c387..2d605bed02 100644 --- a/src/main/java/command/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -27,10 +27,11 @@ public MarkCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { try { //mark 3 -> 2, because number 3 is actually idx 2 int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; @@ -39,17 +40,18 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task markedTask = taskToMark.toggleCompleted(); tasks.removeTask(taskToMark); tasks.addTaskByIdx(number, markedTask); - textBox.chat(String.format("Nice! I've marked this task as done:\n [%s] %s", - markedTask.checkMarked(), markedTask.getName())); + storage.writeToFile(tasks.getTaskList()); + return String.format("Nice! I've marked this task as done:\n [%s] %s", + markedTask.checkMarked(), markedTask.getName()); } else { - textBox.chat("Hey! This task is already marked!"); + return "Hey! This task is already marked!"; } } catch (IndexOutOfBoundsException ex) { String exceptionErrorMessage = String.format( - "Invalid number. Please input the number from 1 - %d", tasks.getSize()); + "Please input the number from 1 - %d", tasks.getSize()); throw new CleverNotBotException(exceptionErrorMessage, textBox); - } catch(NumberFormatException ex) { - throw new CleverNotBotException("Input a valid number!",textBox); + } catch (NumberFormatException ex) { + throw new CleverNotBotException("Please input a valid number!", textBox); } } } diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java index ea377759bb..5d9bedc3c1 100644 --- a/src/main/java/command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -27,10 +27,11 @@ public UnmarkCommand(String commandName, boolean exit) { * @param tasks The task list used to store all tasks. * @param textBox UI for the textbox. * @param storage The data where it is stored. + * @return A String type response. * @throws CleverNotBotException Gives an exception. */ @Override - public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { + public String run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBotException { try { //unmark 3 -> 2, because number 3 is actually idx 2 int number = Integer.parseInt(getCommandName().split(" ")[1]) - 1; @@ -39,17 +40,18 @@ public void run(TaskList tasks, UI textBox, Storage storage) throws CleverNotBot Task unmarkedTask = taskToUnmark.toggleCompleted(); tasks.removeTask(taskToUnmark); tasks.addTaskByIdx(number, unmarkedTask); - textBox.chat(String.format("OK, I've marked this task as not done yet:\n [%s] %s", - unmarkedTask.checkMarked(), unmarkedTask.getName())); + storage.writeToFile(tasks.getTaskList()); + return String.format("OK, I've marked this task as not done yet:\n [%s] %s", + unmarkedTask.checkMarked(), unmarkedTask.getName()); } else { - textBox.chat("Hey! This task is already unmarked!"); + return "Hey! This task is already unmarked!"; } } catch (IndexOutOfBoundsException ex) { String exceptionErrorMessage = String.format( - "Invalid number. Please input the number from 1 - %d", tasks.getSize()); + "Please input the number from 1 - %d", tasks.getSize()); throw new CleverNotBotException(exceptionErrorMessage, textBox); - } catch(NumberFormatException ex) { - throw new CleverNotBotException("Input a valid number!",textBox); + } catch (NumberFormatException ex) { + throw new CleverNotBotException("Please input a valid number!", textBox); } } } diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 0add811957..d5a0046ac4 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -66,7 +66,6 @@ public String checkMarked() { * @return A toggled version. (Completed = true -> Completed = false) */ public abstract Task toggleCompleted(); - //return new Task.Task(name,!completed); /** * Converts Task to a string. diff --git a/src/main/resources/css/styles.css b/src/main/resources/css/styles.css new file mode 100644 index 0000000000..ecc7c94aa2 --- /dev/null +++ b/src/main/resources/css/styles.css @@ -0,0 +1,7 @@ +#dialog{ + -fx-background-image: url("/images/ChatBubble.png"); + -fx-background-repeat: stretch; + -fx-background-size: auto; + -fx-background-position: center center; + -fx-text-fill:"white" +} diff --git a/src/main/resources/images/ChatBubble.png b/src/main/resources/images/ChatBubble.png new file mode 100644 index 0000000000000000000000000000000000000000..85eb6b9b4c72d4d25321b582f6a7e71841f39939 GIT binary patch literal 28118 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 Br{Vwr literal 0 HcmV?d00001 diff --git a/src/main/resources/images/CleverNotBotNormal.png b/src/main/resources/images/CleverNotBotNormal.png new file mode 100644 index 0000000000000000000000000000000000000000..cf92a15faf64352e4fd19d360b0d3cd0f5ea6590 GIT binary patch literal 5647 zcmai2dpy(o|KHs2m$?)rGsIDhmD`xh%*6$YDXdJX zTtX>or9(_A`x-N=X2}vyDkvAdq-4$v=o5T;B9=&p z5{S{Hcoghy>vb5E6p4ZbntPghQk{q~BwSho(J#%*KO!wQ!a5RWZzp5RKmr7DM0z-s z5l4pH95J4r2*{iLL!QVW{V((@$iL{RF%&u_F@{3@spTIg{e=Iu5eWBx-@*u|{x@My z&;MIIF76+0B+{Lefx!Kdgn!udr-DTPR4NhfOH8CBB}5RNlYwyPu10Ppj!4(I@Mxk3 zF+Q3egMyivTK)$TNQztmtStU|zQROKT1j0%JPFW^_zMd93j@dyra;xKWOP+g@PEfv zqK)(+F^J?K3<*e8BEb7o-(O(x-@reuTt%HIWJ-b`&2Czh57c|t>*~!Ap+QPyZVe*3pNE{N_ONvUxgwp{jgeg$Zrq;%0=Kf}u zNQ4#A%zBfl71H#Fi>uN=|3rq6C=jzp3^k(*CJ>wG*Mx)%rq)N35h91*0ZVB9kJBk*mQ3ocMtzQljW7;R!^? zXrQ!EFvqAU5>ObaP@k2afts0E{}Iuj8&YD30NMW@Q25_H`O`96_`hub;rQQX39#?S zGhjvm!w&v)+5wB7^O6`349Nsw8fJQQwt_%l773_@f7Jj8WXMV4Tyb}DRLZ%ocQ8;d zLtRGQvC_gwQzs^ZBNX4w!OZP0EOEd6jsbVfs0-U<$hHX0{wDsr%%hA7!;GMVO_g~E zCixhg(xtvTdzOdG!&B5R-l!@ZjFr$S?%(~*wIMN_))Tyl7FFOXq&Xd|@0Zw^;jeXi zG3X9snDXetzBgk7s<~4#K~ve?ssVj6-qQCj5(A1-vWAah3}JgVj{Mpqp8eJXwc}Y} z(S-gti(uK$d&Al}eah_oVvQ)QWe4`0<+_!L1%Jleb)7%gas1V`6Rz*0zJFf`$d_+* z7tDs9+iP)nG5*}}ft$y|_h@Ng$Jdg*sV7V(qZPuRJAJHce2D~gOO)*@ZkjXMK}Ij1 z)f_}S_iT*H>lDtao?LTgUP80P9ku*)@;NwT`hCFT-&zz=38UQiqNK>^$p*&X+|XjTWws$m)f`ucL;WSoF&s+DRQ&%)5PQa z6XoUUQHyuu7ebl>Y~Ic+mX9sZznx(vUp}if8{=YASaG=4w`-oAzW#}i+9F7Xg{YTV z3myT{#V@b|n3D1D@!q*KMxKurfOSw<+;$nEmvBw{)-VwDG~!Lc5cXKc5t<@&m*GUR z&G45?+he_^YR#?UUNv^O4AAwBGOPWzC0W zpCw!rA@0~EG|aklmT4FMShGSDCN|A1VO45O0jbWGais;NRyGbxm^1GnLY9s7NYqZC{I&PQC~{wf1q1b&4M3#Yu@B z<8`5xhlfRiKwl)b8F%Z@#F)i+62?3?*=TOUW9k}w-7suxSV4ZWsEwM5C%cN zj~$)*OeL=gGo|WR6etlSF$Wjt@Ro)XNYNayfzH({6yD3p+f|n0)Vr@m0>!w$EH^tz z*=eyC_8$xq$rstuCXgQ=+HgDak#g#6;ICIg&3{uwzwc>368_jtXr1+ZvQ4n5cYcqL zW5ZLl|ODzHui@N&-GX=Q1w@UvRq0xWYW21>XJXtOIdd*~kxth~v zm~n}yI?eO@$#LFO*Td<}Emv=Zv?&Cs=o`K6+Hxl0KdfG zou4P^U%8fT8}dZInZPy%aa;wU&F&Tg-vUxP^72ltQaE35i?z&31jaz5b^SGFAGV{} zGdC}ET6Il}(dz~~{=zN4{%Id5=RD4$r8k4eeyZW1VF^ATmg{TOc9hnqRP;+)@mU;R z?Y^T%VEJxjG0y0+V=hY8%3VW}da@H#m455Z)_j#6NnRFN zlUnO1TlB$Et8Qnv(L|`rjt3IL2#haf5f67mk`X@Dho=u@eeYKo_A}s5yRCN*#8f{V zl+a5yp3~ODw8$LKxwGUMwG2Hm37RyV=n{>FjjnlaJzfoaHGiw%)PWo9sz;*tN*02o zJE|l0i^(nE715Q;Hc<7O7~;sj;Qm^PF5Rni`rty$%~+qVJn0T|79u{HI1&`5Gbb~c zv}FxXY-lh9b>VWiTZQXxtVWCS+)j0EzFyYc=#C1?6zV8#Qsg?;chi0kV{_lGr_3tC zn>oC<+^~AqQ&HdeCP-@Abb%{%ZEn^$3=?Soyl&w|YGW79WyV%0B+vU*J7}~>Qct&} zHOMVnikhHt?A|PV*4_}^s>jgIHPZ!ym2G?h(CC@29*pxr`40_jvtND4?_KowRL(IP z64B8&<_r4x0!!%AoE)&C;Y7b*SJFE?{3D){r+U3DUr#*W5vlSH@4bKz)Il!YsOnRY zA3l(E??Exm+i=2b^V_rfN;w@0VkQfC?KO7M@)d>?3Lq0P1(&PJ1~oy7orljza7!gc zOF{QQ4M#6AO_B++Rusvq3v(d7fu*%*>_GMVGhMOX!f3WJFxW>!P_;v`ShkbeN9V?K z;x|IRo@x0k69%nJ_jbHf$L;0K9@4;3(pO=F0V>KfYcs45G{rMy>VU zPSBP(h3}g0djT_=Xm*r&cm$&tg+!d+aiSqTSV7N5(-E!haOd*&j+0gjOZv}DZ8LGN z`I}2F*37A<>2B3|6w+q9bypcHOQ`9n@mTA%sMY#huT%^Ie*5fx==}CPnP#m?kT1lhEk#DtCKzi zjDv+&dB?SN9|)G#u#%2iO&pW$<*i{!k51+E?wvghkVG3zm|#!-;^qlAnAi*XDn^SC zqk7|TUg)dPSi_44HyS^?@ami9&;`|$%k1d- z(L>p-^%eSD$UC8?PNZRth@aERC@J)msSu*SiE+pIs=?R?{A82e&F?B)>+!m8p&E-i zzNOUq!XqEcIY-LfS)S;EDPy5ld$dtqe$mjetxX5f?76+zIdn0tRJVEg4ExpqYU>3) zm=9#!0NGMLB%(Aj)-$e1++nXbmaJ-OE0%rgBmVSQy^Na!b+`oNEs;N~8Ro|hB!v79 z`=oyUILTx^bF(OKT}KE(Rg(LuizTaBTKH{bQ^D^Cs(rvsA!=-asuEj~C(Gy!LFxW} zzdoXrV4dq$dQmF*?N|0|!ENIs?u4`I_l{xA3XjWXDvhr%o?7U3o*`F>UDD@@{L=Im zf8uDQZ(ghPFYajQy+wEY|jVtd!n~k-h9D>!P&!yhF*xJH)L~Odztr!2q0E(TrM4a6NXz(qucDIFjDW<4-GW zhxGDvZVy`^0_W_LC2xf6mGsq0H1Q=oQRMk)v~1T{^g6e7bIFOz$6&ps727!7z@bk` z)Y_%2fR?hbKk|^Em9MJ3Kl`YDo)i0 zl@!w?!RDh=QD5^;TDWc=jBQ1f_W)C-Mqk1w7ume!*@Kdd?T|xnx-#7KniciwGh*b- zI}6-1m27#5{fbqyZK@w#_6_J-_^Wc+Hm%KaNteDB6x$G-s+EUNK!%wjR|{_$$H)6? za$le+k#QMA_wl)PI(>+T#;j&HvhfSrp+ndZ{bt2RgfH2!byDs98(GqfmjyIdvHu<| z%~&6wmgDbfK={V#ZB$vOsn@LgF2Wj0!NMbh&ymm7(7GztlED`Z3FEgLD}xE*;oJi! z?$Ty$mA*C;F2>X%Es`%g6Ks6JTGn+4^10`dgGgw`fVQ*>UiZiiAK|SftU-)ghtY(W z^P{Y%(j@Ar9H)2wc7}Y?_;(^MbUK%TJ?T&jRSzDk&1lk=SCJn#4Z-an@7d#%0J+Sgv!+H22*XsRoa65k}o!^0z0Qk2yOKK0LE zM3;bfJ$(xt9^S<-a9u;Jp_;0g70Qv@!Wv}><92s+0_1pj5>oC?7FG^0EXWdO3r9l1 z+qI2g5ZoFHHV{m0(aX z?_ZBK;qEYmp)4H08Ut(+6f7e2A3~#l3V(z4%c>g68ZgTLbKYMfB^en_G|C2!0Av_# zg$E!dIT;~dQ6V8NKJH%uoZ~2_Hc#LCA5VKF`tF<#L>;e`CxP<|%*{}{?I z>Hi^=UlaZ#lz;5(pP~GM_+KDNK>h*aFNJ?AYQPeHJp+m*P<0`{%PuhZUASRLpjxAW zvRvt2g~7wa_k#n}_y;BM@YteUqIx-GwW!*q_+{qXi89#2;sXOB8JLA=_<5;l__I#N zyX(GX+qA9MCkl+QPux>RoEY!WzSA34rnqO+l{ETtSt3iGZ`pP0+vIlrGIqQA(KVK# z7h1z4xmbDJu|(I#WZf6=e&UOVv=Z@AM>{GlKT0*%G>f^Q%`k3_1I<1JS?k zscdK#As*YECxt6E`x2UCOF%i%V#2#K-|XK+nB`9Q>bXVY<<*?@J4RaIMx3~B60B1X zHr$a>Dw{$`S0me_eDJ0vVMU8h39Wy2b~qGFx=))|E1~)0Q4(ZxcJgs=9lT*Xd1)D6 zWNVJowA*~zKf|DZPp+q)q};&?Z8q3s;#5P{<7TXQ%}0gI*^Bd1uYxB3Wzu-fa?O>o zUdf#?k5`O>(>=h?PBVbo3vF9)RX&VN2JUpsNC0S`* z_ms_4w?{gQ)9q5MN-;TJ!mBoARH2-7V4cZ%a0fYl`_Ot-Fp)tDtrk_lh}X6kHLc1+ z!<@{=oYJmOXxLyy+Ff=rG;F5u!)o7_z`z`}&n&ScxIfO6dqsOOX?vTH#?zGdzH`@! z8gT^n7E~i)(+LXPlRh#M1KSnBX{Rm0bldb*1^wT3^cEHLVxQ&N(_N~kdi;j%!hE_^ ze}UIY8dK#_c=#93;+LS{cosLA*D)3XO7Dy>7U)lSXq9m(v6MzfzMP*ZDy>7$#IaP% zA@y+%h5c-F(28p;F@$&_va;;dQJn=xorv^oJ_>*72XX-nKF2TkF!F^yg_&SxLCRjFvuj7L6p+guVCT=i|BQ_{wz+8*2uIP~5Z!vvtTCz6p5`;?E>v z=uuwoh|-L>L%J9rZoj+dKbn5)!%#k2mV<~=F?hszrk<8gKyjVoL;3nH^9RYh6?bKH z3$&us8LmE7)@!y+w-y!&Vy_6yQjjS&B$P}~?aEdmF3`Vq%?~frE@ry^7(7}j6&=sY zaA4@^qx5bh#Id`^LGXv`RF?K?BEN9#$q6Vll;F*3h3PqE4X6 zRhR5+;^XDf8&F0CDoX*Ss>L{!mbR76=xP@e&TaMW;C{Bd7%k!pm+h1k`ve_Mr@^Bf zG45ad8+PptTsI>wAGmzt==fBr;mdQ2aJwf~!IaRnb zceds5MdzWvaEId|p_=oCZFl#}lCI|!j_gVrMIh$t(Ah`)c={B|Dkt|KI7asI`)F;K zEX*pF?~c!jewnc^6J^xu_CkN7uhPJs9I_-8Wa%X@4r6=nLu-ZIU5+VoxhKPK^Ah;I zuKoBCXVW`z8_ldn@17M&+?T%$YhlkMNk$CQ|6W{DpllO&DVQb zH`(j3Cv;#0WjT~*qDIuv71GI~GVk?nP!tQZ=i7EWXqoW zoVE*Wq|FL;AsT(+^r&JYS3ywBH)Qoz^m??Rd9<+(aJ{%v$ym<$FaQV7lA>64k01D1Va9Lu0u3$I~VoA;HwSBe6x3|C3}#f{;lA5FbrWL z$%+=V~G%kzwLnl|nHQO&FtCK=2#Ec5?8}43o%*;ZT{{CvR3deDVZhb2{9xBFi z6l4p5?^eVGRcLbAxb>^G1C__!q`hW0wu1;_JXpph>*&P$r*PmjE2yRQ!bd)f&$8qXA@5;U$aE8;7 z)8Ml(rifgvnfXle{g>ej;#)P(9$2`DHHhv68=@4~j~Xj%w>D(sM*^NE(21#j zWV8yU<9SygZJG`%)%v_=uG z*PKv%zFJxPBro}u^s}}1U3y>f?6?g@lD8A%Ga~qTEMEmiWeM!B7$JKvdWEiM58G0j z+`8i7S9(!-+N)BKZu9%+*9H*DQ<0F*+8+KR>j&Co^ki~W7rzV&A|?`BlSq%oxXOj@T2SNX=-$dOrpTu zRHg&GK#9Isn2PS;pa?ha{Szm44#&iT!7^ptV$ZFrJw8mMNRvkojebG*Via#H;iZ~o zI;u3i-4EUR`zzzg$>X@WsmckblLUBSD%9B;%?^4bi0vpYPT4_ zZJ7v4y$yb=pl?M)Cd7|5ykd2SEA#9zpTJG#8BRoN6k~>}$2`yKDz$q1Dpq^=ZHQ&3 zCAEWZgnSWBH4V9@+u8iw?uOLd!>lb6Ql*oX|>>4$bclOVob?Pu(Wh#XwkGP-AV&}A3LtzT^6L&XxqiW}sItaAe1cfjUC%cgP`>VtN{e;b1zcy7JA}&A+px9js^*pvqZFICLIsak;e>dE*$oGxl!*#bb4lwYoaKn9>=rfl=_+zWfDljw<`Gh_R3h`d&gkZA{aCwU(rjGLX?z6%z3_M^gTOwO>cWo zcNV2A)+e&wav4-nS>!ay1Ow1+Kr=|qR|w&odHwcOFXC&-n7&-!S3NPgo1Kl8Oz7{L zn@mP6?k!DxQ*ZAKsJ%FoOThX^LE~-`dzGhNTd4+Ykc8>SH)&!i&gb=iyt$B>75?m& zZv=fU&S{~AEJwA+E#Lcs6Hr)Gw8gD;i)YuHQ#xiogvAhRbwJ|{8P-O>>s%&$Xfj(^ zz{73sYL=5G#yqrn{3>TPL5wSX{&i)ki>*+vgxhp3#{${+Yi#qc({V9gY+=REsqdl) zGRk+Z6w`#w4w4TJ>D87t-3B;kaE6ec51jk%H59S!v#uxk?c~O?povk#7d)9DxM?&a z5f3&Y4hZj^vkDn*+AX*9n_tb261>gG8sl@g_9!i@Xl>cHT$st^ZH4GfzMC`N)a@Dm z9}0}=!gEH4g(u2QE{4S~0#ySPZ$c;W>gfj=Wj2nz`Jlz(x-+E1r*t>$R1NOU?0UfE zDfJ_Ff^_nAPK}qkVl~Di1||+l7ft-ejkJxa=7u^qkF52zp|th}`Zr9)rn{ar8<9yr zaIXq^o!0QapHbTTL@T;EK`SfF=K=eXBK1n@iUI5~qZUM+9nt5QB=8MUUzEkxw9!kM zcwph9?VzQ<)LvFOE(TrhKHYX3` z4v{h%_)O2GoZqtE{6fAQ$(rHvHHzz23j<>crk@g1w3~y21g*KBIS5>t%Ee?4%zrvr zdwd^mAKKUDtaq^P4!c%vAGlb6>r5<<_vm?jr41#0fLy zTYYs{c7a)8lRb4x-s>EucT)ixOhVwyuVqtDCLfV4T;g9m(5=C~wLVe|Z;wXsC?-hc z(wlPyS1!{bHkI`=t)8iR=0-Zt_u`YTp0t@HC6Qcl_r>iE!oMMx`5dks>PGX^<|RrA zDu-)_ul_;qW`kvo)?q=Mi3Y2X4Cj_-JuuG9CA zHL!n>KwY^G)%jt7M@q*%bJ+8}z>l2P7KB-qR;NZRAFa}>raOlgPE9)G;o%g`N+g~e zm_vXDHdK{GjF8k1kA#+i(0Dp1K&<8auH*H$6D#hE?kA6dhr zPPUF;i$pc1R-50pIC+YB=1~@0kt_DcSc=RUKJ5NSIa3$W{naJ1db6e_bH+Dp@n1g% zvH?e(h_8Bx83e8^3>H8fwMptPlszFxTCz8KOW=ihVEE1IYT`^T)a-R{@X$IlkokP5 zhW_Cnc@+72_sQ>PyffO0BSTL|bfl_2UaxidG+XF4SNN6hCNpB} z_NOieE5idF)l#7h5poXNEt=H0#vSE}yU)sJ8sf2W>!4c(QMGb$wV?OKUEzptV)pW~|U4 zTXJ=!!jRCI^`KH1K}100r|9%9;PR#TolpA%OiaVQnxZmXo#~&H?V|}@R*jV=2JPb@ zdZM?tBemo#Gt(RN5Ag{4O7)t3q*(<@l*LFY>Z1e_@xy5kOd z+PNJo#jU`u5yy7bZ@rg3^?GOJB|;gZXq*%=-<~{7K6!ic^D+B1GOoE*TL?Mjmjqj< zG4^fJ?b)MZka!5tz7}(FB*O>J_^s-IOK%Tu9-%hQlb!zAq z?^x8|s>V^K_lPQ6^y^o^V0)iG+L}faOYT}drzdH#r;b#X;}g@Tpm((1<**gSB3Sv) zoGG(Ehl1{VR6i?fd}h^gVXDeO)9oC;!9KjYoiCy%C$h2>Y2I~=VYInKB>Xyh_hiTs zq}XYYC{s%}&`g}4Z<(LD3LciGH%ege%g0L{UrCPL7v35p^X7%%S5J1)n$z1Xu!T2! z_)9mL=!}=AEX@6-tu6eL+}REW;z!O`uPce;pJ3S-G7Al7^`+^!NDC{hfzS_J&k(B)93B z0VarStE({8Lf1fr_a^h9pdwQR&acxNoIkRer7@FVp=zunbZ?|d2mPFZWFg`SlbH6U&`i0lTjs0Xm#mzdT-@`CgllT`eu1Mps5?(tWeV^{x(8H#y|{q^Cg<7 z2-MNq3Q}h+ZiEVmW(RJZ)&^f`tk>GAQ{PyN?U#@|WXa3VmiX>Yu}5?Jt92DUaND08 zyV9MWeE-KPo|lp-%k?YQgn4HxIIi9*Ts#zqT)(-NOc|!m%IxOLvrHTdF#E%I7p?QI z!oZBfX%$+%Pb}fmNKE|VMmXgwZ4XuG z=DyET`_Z+Y?BJYQ`!(4q^`aRkb?iwc9Dj6wcjH6P6^0bH)hr@C9w0;XpNw(NF59|z z(OO#V;41l64mmiD(%Rd&L{EI|C4m-6i~a45tCXQ()SL+n8ryd&&s(^qUNxsA76fsb zu_(0mU}^q&GytTP0P%|#9nbM^Jq$lkym?ETC<7*OcW=7=-GkfAj%-SW0FgfCIiGCJ*e3j!M@;sS{5A>q5Zu9xOrz-avTwiXr9 z6#JJ%axwWO7s@M@**5sjXTml}cCyIKIA`KTkfR9T)(p56uW{XJ0j z+4|WxHoq%p2fWZ1oIJaKuQyy=!!p`x00Z2OfbzF{x@$Q6<2LMCx`TLgJVYAO?V-)$b6()Qzbh%-`#c|Q@@%w*t>(?6gS;D(iLuu4 zUyK!*z#34WCykQ6Y0o0`ybqNq&yLcmxXq&{vQ5DhO6vW4Ke}Ti_)1h_MC|pOnAtiw z8@{57h(?IpDq(P*2ehA{EVeq|$&4am`{OBB!wdgFjpM z)?D%1RAb1;oC-zqAqiQDuyq!x#C{HhB`dI?$q&s0{%k!f$ zqGFe?UQs7OCu6yRvkuW`=BJv*GDlgbWi!5Wj3<{ZbUByaNQJYX|GlUrr!HIg;E~_| E12~d1CIA2c literal 0 HcmV?d00001 diff --git a/src/main/resources/images/Nyan_Cat_BG.png b/src/main/resources/images/Nyan_Cat_BG.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa1858b9b4ffb6148833f1fb5fa628967c5b122 GIT binary patch literal 131005 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

q4itmL?>!GQqmG@AWef_TpV$=?;|6q)9NO({ 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

)A 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