Merge pull request #139 from CS2103AUG2016-W13-C4/refactor-more-hx

Refactor more hx

Author: fisherhx

docs/DeveloperGuide.md

@@ -280,7 +280,7 @@ is better than these alternatives.<br>
 a. Include those libraries in the repo (this bloats the repo size)<br>
 b. Require developers to download those libraries manually (this creates extra work for developers)<br>
 
-//@@author A0139655U
+<!-- @@author A0139655U -->
 ## Appendix A : User Stories
 
 Priorities: High - `* * *` Medium - `* *`  Low - `*`
@@ -309,13 +309,15 @@ Priority | As a ... | I want to ... | So that I can...
 
 (For all use cases below, the **System** is the `Task Manager` and the **Actor** is the `user`, unless specified otherwise)
 
+<!-- @@author A0139655U -->
 #### Use case: UC01 - Add a task
 
 **MSS**
 
 1. User enters an `add` command, specifying details of the task to be added
 2. TaskManager parses the `add` command, and adds the task to the current task list
 3. TaskManager saves the current task list to storage and updates the GUI to display the updated list with the newly added task<br>
+
 Use case ends
 
 **Extensions**
@@ -333,8 +335,11 @@ Use case resumes at step 2
 
 3a. User identifies a mistake in the details of the task added
 > 3a1. User edits the task details (UC03)<br>
-  Use case ends
 
+> Use case ends
+
+
+<!-- @@author -->
 
 
 #### Use case: UC02 - List all undone tasks
@@ -344,6 +349,7 @@ Use case resumes at step 2
 1. User enters the `list` command
 2. TaskManager parses the `list` command
 3. TaskManager removes any filters for the task list and updates the GUI to display the entire list of undone tasks<br>
+
 Use case ends
 
 **Extensions**
@@ -357,7 +363,7 @@ Use case ends
 
 > Use case ends
 
-
+<!-- @@author A0139552B -->
 #### Use case: UC03 - Edit an undone task
 
 **MSS**
@@ -367,7 +373,8 @@ Use case ends
 3. User enters the `edit` command, specifying the `INDEX` of the task in the list to be edited, the fields to be edited and their new values
 4. TaskManager parses the `edit` command and looks for the task in the list
 5. TaskManager edits the requested fields on the specified task according to the command entered
-6. TaskManager updates the GUI to display the new list of undone tasks<br>
+6. TaskManager updates the GUI to display the new list of undone tasks and highlight the newly edited task <br>
+
 Use case ends
 
 **Extensions**
@@ -391,6 +398,7 @@ Use case ends
 >4b1. TaskManager displays an error message on the GUI, informing the user of the correct format for the `edit` command and an example `edit` command <br>
  Use case resumes at step 3
 
+<!-- @@author -->
 
 #### Use case: UC04 - Delete an undone task
 
@@ -462,4 +470,5 @@ Todo.txt | <ol> <li> Works on many platforms, can be accessed on devices that su
 Google Calendar | <ol> <li> Can be synced to mobile devices </li> <li> Alerts via notifications on phones </li> <li> Switches between views easily </li> <li> Minimalistic interface </li>  </ol>  | <ol> <li> Requires an Internet connection to be used </li> <li> Cannot be brought up with a keyboard shortcut </li> </ol> 
 Remember the milk | <ol> <li> Able to support email, text, IM, Twitter, and mobile notifications </li> <li> Able to share lists and tasks with others</li> <li> Synchronises across on all devices </li> <li> Organize with priorities, due dates, repeats, lists, tags </li> <li> Search tasks and notes, and save favorite searches </li> <li> Integrates with Gmail, Google Calendar, Twitter, Evernote, and more </li>  </ol> | <ol> <li> Free version lacks features: E.g. splitting into subtasks </li> <li> Lack keyboard shortcuts</li> </ol>
 
+<!-- @@author A0139552B -->
 <strong>Summary:</strong> We observed that these products have very good features, but we realise that none of these products have the specific combination of features that caters to our target audience. Therefore, we are incorporating some of the good features such as minimalistic interface and ability to sync with multiple computers while designing DearJim carefully to avoid the pitfalls found in these products, to make a targeted product for our intended audience.

src/test/java/guitests/EditCommandTest.java

@@ -48,24 +48,11 @@ public void edit() throws IllegalValueException {
         aliceTask.setPriority(Priority.MEDIUM);       
         assertTrue(personListPanel.isListMatching(aliceTask));
 
-        //test to check reset function
-        commandBox.runCommand("edit 1 -reset start end repeat");
-        aliceTask.setStartDate(null);
-        aliceTask.setEndDate(null);       
-        aliceTask.setRecurrence(null);        
-        assertTrue(personListPanel.isListMatching(aliceTask));
-
         //edit of priority parameter only
         commandBox.runCommand("edit 1 -low");
         aliceTask.setPriority(Priority.LOW);             
         assertTrue(personListPanel.isListMatching(aliceTask));
 
-        //ensure that reset command will overwrite any previous edit
-        commandBox.runCommand("edit 1 from 10am -reset start");
-        aliceTask.setStartDate(DateTime.convertStringToDate("10am"));
-        aliceTask.setStartDate(null);
-        assertTrue(personListPanel.isListMatching(aliceTask));
-
         //test to edit only the name
         commandBox.runCommand("edit 1 Trying out new things from the list");
         aliceTask.setName(new Name("Trying out new things from the list"));
@@ -81,6 +68,29 @@ public void edit() throws IllegalValueException {
 
     }
 
+    @Test
+    public void editCheckReset() throws IllegalValueException{
+        
+        TestTask[] currentList = td.getTypicalTasks();
+        assertClearCommandSuccess();
+
+        TestTask aliceTask = new TestTask(td.alice);
+        assertAddSuccess(aliceTask);
+        
+        //test to check reset function
+        commandBox.runCommand("edit 1 -reset start end repeat");
+        aliceTask.setStartDate(null);
+        aliceTask.setEndDate(null);       
+        aliceTask.setRecurrence(null);        
+        assertTrue(personListPanel.isListMatching(aliceTask));
+        
+        //ensure that reset command will overwrite any previous edit
+        commandBox.runCommand("edit 1 from 10am -reset start");
+        aliceTask.setStartDate(DateTime.convertStringToDate("10am"));
+        aliceTask.setStartDate(null);
+        assertTrue(personListPanel.isListMatching(aliceTask));
+    }
+    
     @Test
     public void editCheckInvalid(){
         TestTask[] currentList = td.getTypicalTasks();
@@ -94,30 +104,6 @@ public void editCheckInvalid(){
         assertResultMessage(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
 
     }
-/*
-    @Test
-    public void editCheckSort() throws IllegalValueException {
-        TestTask[] currentList = td.getTypicalTasks();
-        TestTask personToAdd = td.hoon;
-        assertAddSuccess(personToAdd, currentList);
-        currentList = TestUtil.addFloatingTasksToList(currentList, personToAdd);
-        
-        commandBox.runCommand("edit 2 Call Alice from 2pm to 3pm repeat every day -high");
-        personToAdd.setName(new Name("Call Alice"));
-        personToAdd.setStartDate(DateTime.convertStringToDate("2pm"));
-        personToAdd.setEndDate(DateTime.convertStringToDate("3pm"));
-        try {
-        	personToAdd.setRecurrence(new RecurrenceRate("1", "day"));
-        } catch (IllegalValueException e) {
-            assert false : "The test data provided cannot be invalid";
-        }
-        personToAdd.setPriority(Priority.HIGH);    
-        //TODO
-        //update currentList after the edit
-        assertTrue(personListPanel.isListMatching(currentList));
-        
-    }
-*/    
 
     /**
      * Runs the add command to add the specified task and confirms the result is correct.