Merge branch 'branch-Level-10'

raydenlim · Sep 7, 2023 · 30a4a56 · 30a4a56
2 parents d468a7c + 7f4a827
commit 30a4a56
Show file tree

Hide file tree

Showing 70 changed files with 725 additions and 587 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,46 @@ repositories {
 dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+
+    String javaFxVersion = '17.0.7'
+
+    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'
+}
+
+configurations {
+    // Define a configuration named 'runtime' that selects the appropriate classifier
+    runtime {
+        if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+                if (details.requested.group == 'org.openjfx') {
+                    details.useTarget "org.openjfx:javafx-base:17.0.7:win"
+                }
+            }
+        } else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
+            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+                if (details.requested.group == 'org.openjfx') {
+                    details.useTarget "org.openjfx:javafx-base:17.0.7:mac"
+                }
+            }
+        } else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
+            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+                if (details.requested.group == 'org.openjfx') {
+                    details.useTarget "org.openjfx:javafx-base:17.0.7:linux"
+                }
+            }
+        }
+    }
 }
 
 test {

diff --git a/data/tasks.txt b/data/tasks.txt
@@ -1,8 +1,8 @@
-[T][ ] hi
-[E][X] nragwighl (from: 12 Dec 1212 00:00 to: 12 Dec 1212 00:00)
-[T][ ] hey
-[T][X] hello
-[D][ ] toilet (by: 12 Dec 1212 12:12)
-[E][ ] sleep (from: 12 Dec 1212 00:00 to: 13 Dec 1212 00:00)
-[T][ ] heyyyy
-[T][ ] heyyyyyyyyyyyyyy
+[T][ ] hehe
+[T][ ] lol
+[A][ ] lol
+[A][ ] move
+[A][ ] move1
+[A][ ] move2
+[A][ ] move 21
+[A][ ] move22
diff --git a/javadocs/allclasses-index.html b/javadocs/allclasses-index.html
@@ -223,7 +223,7 @@ <h1 title="All&amp;nbsp;Classes" class="title">All&nbsp;Classes</h1>
 </th>
 </tr>
 <tr id="i18" class="altColor">
-<td class="colFirst"><a href="taskList/TaskList.html" title="class in taskList">TaskList</a></td>
+<td class="colFirst"><a href="tasklist/TaskList.html" title="class in tasklist">TaskList</a></td>
 <th class="colLast" scope="row">
 <div class="block">The `TaskList` class represents a collection of tasks in the BloopBot application.</div>
 </th>

diff --git a/javadocs/allclasses.html b/javadocs/allclasses.html
@@ -40,7 +40,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="parser/Parser.html" title="class in parser">Parser</a></li>
 <li><a href="storage/Storage.html" title="class in storage">Storage</a></li>
 <li><a href="task/Task.html" title="class in task">Task</a></li>
-<li><a href="taskList/TaskList.html" title="class in taskList">TaskList</a></li>
+<li><a href="tasklist/TaskList.html" title="class in tasklist">TaskList</a></li>
 <li><a href="task/TaskType.html" title="enum in task">TaskType</a></li>
 <li><a href="task/ToDo.html" title="class in task">ToDo</a></li>
 <li><a href="command/ToDoCommand.html" title="class in command">ToDoCommand</a></li>

diff --git a/javadocs/allpackages-index.html b/javadocs/allpackages-index.html
@@ -128,7 +128,7 @@ <h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colFirst" scope="row"><a href="taskList/package-summary.html">taskList</a></th>
+<th class="colFirst" scope="row"><a href="tasklist/package-summary.html">tasklist</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">

diff --git a/javadocs/command/AddCommand.html b/javadocs/command/AddCommand.html
@@ -195,7 +195,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
        <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
        <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)</code></th>
 <td class="colLast">
@@ -258,23 +258,23 @@ <h4>AddCommand</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="execute(taskList.TaskList,ui.Ui,storage.Storage)">
+<a id="execute(tasklist.TaskList,ui.Ui,storage.Storage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execute</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
                     <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
                     <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)
              throws <a href="../duke/DukeException.html" title="class in duke">DukeException</a></pre>
 <div class="block">Executes the "Add" command by adding the specified task to the task list,
  displaying a message indicating the task has been added, and saving the updated task list to storage.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Command.html#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
+<dd><code><a href="Command.html#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>taskList</code> - The task list to which the task should be added.</dd>
+<dd><code>tasklist</code> - The task list to which the task should be added.</dd>
 <dd><code>ui</code> - The user interface for displaying feedback to the user.</dd>
 <dd><code>storage</code> - The storage component for saving the updated task list.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

diff --git a/javadocs/command/ByeCommand.html b/javadocs/command/ByeCommand.html
@@ -194,7 +194,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
        <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
        <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)</code></th>
 <td class="colLast">
@@ -251,22 +251,22 @@ <h4>ByeCommand</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="execute(taskList.TaskList,ui.Ui,storage.Storage)">
+<a id="execute(tasklist.TaskList,ui.Ui,storage.Storage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execute</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
                     <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
                     <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)
              throws <a href="../duke/DukeException.html" title="class in duke">DukeException</a></pre>
 <div class="block">Executes the "Bye" command by displaying a goodbye message to the user and saving the task list to storage.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Command.html#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
+<dd><code><a href="Command.html#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>taskList</code> - The task list (not used in this command).</dd>
+<dd><code>tasklist</code> - The task list (not used in this command).</dd>
 <dd><code>ui</code> - The user interface for displaying the goodbye message.</dd>
 <dd><code>storage</code> - The storage component for saving the task list (optional).</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

diff --git a/javadocs/command/Command.html b/javadocs/command/Command.html
@@ -194,7 +194,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>abstract void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
        <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
        <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)</code></th>
 <td class="colLast">
@@ -251,21 +251,21 @@ <h4>Command</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="execute(taskList.TaskList,ui.Ui,storage.Storage)">
+<a id="execute(tasklist.TaskList,ui.Ui,storage.Storage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execute</h4>
-<pre class="methodSignature">public abstract&nbsp;void&nbsp;execute&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<pre class="methodSignature">public abstract&nbsp;void&nbsp;execute&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
                              <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
                              <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)
                       throws <a href="../duke/DukeException.html" title="class in duke">DukeException</a></pre>
 <div class="block">Executes the specific command by performing the associated action on the task list, user interface, and storage.
  Subclasses override this method to define the behavior of their respective commands.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>taskList</code> - The task list on which the command should operate.</dd>
+<dd><code>tasklist</code> - The task list on which the command should operate.</dd>
 <dd><code>ui</code> - The user interface for displaying feedback to the user.</dd>
 <dd><code>storage</code> - The storage component for saving or retrieving data (not used in all commands).</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

diff --git a/javadocs/command/DeadLineCommand.html b/javadocs/command/DeadLineCommand.html
@@ -196,7 +196,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
        <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
        <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)</code></th>
 <td class="colLast">
@@ -261,23 +261,23 @@ <h4>DeadLineCommand</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="execute(taskList.TaskList,ui.Ui,storage.Storage)">
+<a id="execute(tasklist.TaskList,ui.Ui,storage.Storage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execute</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
                     <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
                     <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)
              throws <a href="../duke/DukeException.html" title="class in duke">DukeException</a></pre>
 <div class="block">Executes the "Deadline" command by creating a deadline task, adding it to the task list,
  and saving the updated list to storage. It also displays a message indicating that the task has been added.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Command.html#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
+<dd><code><a href="Command.html#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>taskList</code> - The task list to which the deadline task should be added.</dd>
+<dd><code>tasklist</code> - The task list to which the deadline task should be added.</dd>
 <dd><code>ui</code> - The user interface for displaying feedback to the user.</dd>
 <dd><code>storage</code> - The storage component for saving the updated task list.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

diff --git a/javadocs/command/DeleteCommand.html b/javadocs/command/DeleteCommand.html
@@ -196,7 +196,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></span>&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
        <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
        <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)</code></th>
 <td class="colLast">
@@ -259,23 +259,23 @@ <h4>DeleteCommand</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="execute(taskList.TaskList,ui.Ui,storage.Storage)">
+<a id="execute(tasklist.TaskList,ui.Ui,storage.Storage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execute</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../taskList/TaskList.html" title="class in taskList">TaskList</a>&nbsp;taskList,
+<pre class="methodSignature">public&nbsp;void&nbsp;execute&#8203;(<a href="../tasklist/TaskList.html" title="class in tasklist">TaskList</a>&nbsp;tasklist,
                     <a href="../ui/Ui.html" title="class in ui">Ui</a>&nbsp;ui,
                     <a href="../storage/Storage.html" title="class in storage">Storage</a>&nbsp;storage)
              throws <a href="../duke/DukeException.html" title="class in duke">DukeException</a></pre>
 <div class="block">Executes the "Delete" command by deleting the specified task from the task list,
  displaying a message about the deleted task, and saving the updated task list to storage.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Command.html#execute(taskList.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
+<dd><code><a href="Command.html#execute(tasklist.TaskList,ui.Ui,storage.Storage)">execute</a></code>&nbsp;in class&nbsp;<code><a href="Command.html" title="class in command">Command</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>taskList</code> - The task list from which the task should be deleted.</dd>
+<dd><code>tasklist</code> - The task list from which the task should be deleted.</dd>
 <dd><code>ui</code> - The user interface for displaying feedback to the user.</dd>
 <dd><code>storage</code> - The storage component for saving the updated task list.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>