Merge pull request #68 from Hailinx/master

Add collate comments
CS2103AUG2017-T10-B1 · Nov 2, 2017 · 539c3f0 · 539c3f0
2 parents 75c32f0 + 1a67d1c
commit 539c3f0
Show file tree

Hide file tree

Showing 86 changed files with 4,553 additions and 50 deletions.
diff --git a/collated/main/Hailinx.md b/collated/main/Hailinx.md
diff --git a/collated/main/qihao27.md b/collated/main/qihao27.md
@@ -494,37 +494,12 @@ import seedu.address.model.person.exceptions.NoPersonFoundException;
 ###### \java\seedu\address\model\ModelManager.java
 ``` java
     @Override
-    public void addTodoItem(ReadOnlyPerson target, TodoItem todoItem)
-            throws DuplicatePersonException, PersonNotFoundException, DuplicateTodoItemException {
-        requireAllNonNull(target, todoItem);
-
-        addressBook.addTodoItem(target, todoItem);
-        indicateAddressBookChanged();
-    }
-
-    @Override
-    public void deleteTodoItem(ReadOnlyPerson target, TodoItem todoItem)
-            throws DuplicatePersonException, PersonNotFoundException {
-        requireAllNonNull(target, todoItem);
-
-        addressBook.deleteTodoItem(target, todoItem);
-        indicateAddressBookChanged();
-    }
-
-    @Override
-    public void resetTodoItem(ReadOnlyPerson target)
-            throws DuplicatePersonException, PersonNotFoundException {
-        requireNonNull(target);
+    public void sortPerson(String option) throws NoPersonFoundException {
+        requireNonNull(option);
 
-        addressBook.resetTodoItem(target);
+        addressBook.sortPerson(option);
         indicateAddressBookChanged();
     }
-
-    @Override
-    public void updateTodoItemList() {
-        raise(new ShowAllTodoItemsEvent());
-    }
-
 ```
 ###### \java\seedu\address\model\person\exceptions\NoPersonFoundException.java
 ``` java
@@ -702,10 +677,6 @@ import seedu.address.commons.events.ui.NewResultCheckEvent;
 ``` java
         alert.getDialogPane().getStylesheets().add("view/LightTheme.css");
 ```
-###### \resources\view\default.html
-``` html
-    <link rel="stylesheet" href="LightTheme.css">
-```
 ###### \resources\view\Extensions.css
 ``` css
     -fx-background: transparent;

diff --git a/collated/test/Aaron.md b/collated/test/Aaron.md
@@ -0,0 +1,9 @@
+# Aaron
+###### \java\seedu\address\logic\commands\AddCommandTest.java
+``` java
+        @Override
+        public void favouritePerson(ReadOnlyPerson target, ReadOnlyPerson favouritedPerson)
+                throws DuplicatePersonException {
+            fail("This method should not be called.");
+        }
+```