Fix edit to work with list and find

CS2103AUG2016-F09-C3 · Oct 28, 2016 · a3c169c · a3c169c
1 parent 3a4bd6a
commit a3c169c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/src/main/java/seedu/flexitrack/logic/commands/EditCommand.java b/src/main/java/seedu/flexitrack/logic/commands/EditCommand.java
@@ -82,8 +82,8 @@ public CommandResult execute() {
                 }
                 storeOldDataChanged.add(oldData); 
             }
-            editedTask = model.editTask(targetIndex - 1, arguments);
-        } catch (TaskNotFoundException pnfe) {
+            editedTask = model.editTask(lastShownList.get(targetIndex - 1), arguments);
+        } catch (IndexOutOfBoundsException ioobe) {
             indicateAttemptToExecuteIncorrectCommand();
             return new CommandResult(Messages.MESSAGE_INVALID_TASK_DISPLAYED_INDEX);
         } catch (IllegalEditException iee) {

diff --git a/src/main/java/seedu/flexitrack/model/FlexiTrack.java b/src/main/java/seedu/flexitrack/model/FlexiTrack.java
@@ -103,8 +103,8 @@ public void addTask(Task p) throws DuplicateTaskException {
      * @throws UniqueTaskList.DuplicateTaskException if an equivalent task already exists.
      * @throws TaskNotFoundException if specified task is not found.
      */
-    public Task editTask(int taskToEdit, String[] args)
-            throws TaskNotFoundException, IllegalEditException, IllegalValueException {
+    public Task editTask(ReadOnlyTask taskToEdit, String[] args)
+            throws IllegalEditException, IllegalValueException {
         return task.edit(taskToEdit, args);
     }
   //@@author

diff --git a/src/main/java/seedu/flexitrack/model/Model.java b/src/main/java/seedu/flexitrack/model/Model.java
@@ -68,8 +68,8 @@ public interface Model {
      * 
      * @throws TaskNotFoundException
      */
-    Task editTask(int taskToEdit, String[] args)
-            throws UniqueTaskList.TaskNotFoundException, UniqueTaskList.IllegalEditException, IllegalValueException;
+    Task editTask(ReadOnlyTask taskToEdit, String[] args)
+            throws UniqueTaskList.IllegalEditException, IllegalValueException;
 
     //@@author
     /**

diff --git a/src/main/java/seedu/flexitrack/model/ModelManager.java b/src/main/java/seedu/flexitrack/model/ModelManager.java
@@ -105,8 +105,8 @@ public void unmarkTask(ReadOnlyTask targetIndex) throws IllegalValueException {
      * @throws UniqueTaskList.DuplicateTaskException if an equivalent task already exists.
      * @throws TaskNotFoundException if specified task is not found.
      */
-    public Task editTask(int taskToEdit, String[] args)
-            throws TaskNotFoundException, IllegalEditException, IllegalValueException {
+    public Task editTask(ReadOnlyTask taskToEdit, String[] args)
+            throws IllegalEditException, IllegalValueException {
         Task editedTask = flexiTracker.editTask(taskToEdit, args);
         indicateFlexiTrackerChanged();
         return editedTask;

diff --git a/src/main/java/seedu/flexitrack/model/task/UniqueTaskList.java b/src/main/java/seedu/flexitrack/model/task/UniqueTaskList.java
@@ -132,24 +132,18 @@ public void sort(){
      * edit
      * -----------------------------------------------------
      * finds the target task to be edited by the specified index and edits the task using the given argument array
-     * @param targetIndex
+     * @param taskToEdit
      * @param args: Array of edit parameters
      * @return The new duration if the item being edited is an event, or "" if it is a floating task or task
      * @throws IllegalEditException
      * @throws TaskNotFoundException
      * @throws IllegalValueException
      */
-    public Task edit(int targetIndex, String[] args)
-            throws IllegalEditException, TaskNotFoundException, IllegalValueException {
-        assert targetIndex >= 0;
-        Task editTask;
-
-        try {
-            editTask = internalList.get(targetIndex);
-        } catch (IndexOutOfBoundsException ioobe) {
-            throw new TaskNotFoundException();
-        }
-
+    public Task edit(ReadOnlyTask taskToEdit, String[] args)
+            throws IllegalEditException, IllegalValueException {
+        assert taskToEdit != null;
+        int targetIndex = internalList.indexOf(taskToEdit);
+        Task editTask = internalList.get(targetIndex);
         checkForIllegalFloatingTaskEdit(args, editTask);
         editTaskParameters(editTask, args);
         internalList.set(targetIndex, editTask);