Merge pull request #162 from ngchisern/branch-clear-command

Update clear command

docs/UserGuide.md

@@ -29,7 +29,7 @@ Some example commands you can try:
    * **`list`**: List all clients.
    * **`add`**`n/John Doe g/Male p/98765432 e/[email protected] m/170_80_100 a/311, Clementi Ave 2, #02-25 r/loves blue t/friends t/owesMoney`: Adds a client named `John Doe`.
    * **`delete`**`2`: Deletes the 2nd client shown in the current client list.
-   * **`clear`**: Deletes all clients.
+   * **`clear`**: Deletes all existing data.
    * **`exit`**: Exits the app.
 6. Refer to the [Features](#features) below to learn more about the commands.
 

src/main/java/seedu/address/logic/commands/ClearCommand.java

@@ -4,20 +4,24 @@
 
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
+import seedu.address.model.OrderBook;
+import seedu.address.model.TaskBook;
 
 /**
  * Clears the address book.
  */
 public class ClearCommand extends Command {
 
     public static final String COMMAND_WORD = "clear";
-    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+    public static final String MESSAGE_SUCCESS = "All data has been cleared!";
 
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.setAddressBook(new AddressBook());
+        model.setTaskBook(new TaskBook());
+        model.setOrderBook(new OrderBook());
         return new CommandResult(MESSAGE_SUCCESS, CommandResult.DisplayState.CLIENT);
     }
 }

src/main/java/seedu/address/model/AddressBook.java

@@ -102,7 +102,7 @@ public void removePerson(Person key) {
 
     @Override
     public String toString() {
-        return persons.asUnmodifiableObservableList().size() + " persons; ";
+        return persons.asUnmodifiableObservableList().size() + " persons";
     }
 
     @Override

src/main/java/seedu/address/model/ModelManager.java

@@ -349,8 +349,12 @@ public boolean equals(Object obj) {
         // state check
         ModelManager other = (ModelManager) obj;
         return addressBook.equals(other.addressBook)
+                && taskBook.equals(other.taskBook)
+                && orderBook.equals(other.orderBook)
                 && userPrefs.equals(other.userPrefs)
-                && filteredPersons.equals(other.filteredPersons);
+                && filteredPersons.equals(other.filteredPersons)
+                && filteredTasks.equals(other.filteredTasks)
+                && filteredOrders.equals(other.filteredOrders);
     }
 
     @Override

src/main/java/seedu/address/model/OrderBook.java

@@ -93,7 +93,7 @@ public void sortOrders(Comparator<Order> comparator) {
 
     @Override
     public String toString() {
-        return orders.asUnmodifiableObservableList().size() + " orders.";
+        return orders.asUnmodifiableObservableList().size() + " orders";
     }
 
     @Override

src/main/java/seedu/address/model/TaskBook.java

@@ -86,12 +86,23 @@ public boolean hasTask(Task task) {
     @Override
     public String toString() {
         return tasks.asUnmodifiableObservableList().size() + " tasks";
-        // TODO: refine later
     }
 
     @Override
     public ObservableList<Task> getTaskList() {
         return tasks.asUnmodifiableObservableList();
     }
 
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof TaskBook // instanceof handles nulls
+                && tasks.equals(((TaskBook) other).tasks));
+    }
+
+    @Override
+    public int hashCode() {
+        return tasks.hashCode();
+    }
+
 }

src/test/java/seedu/address/logic/commands/ClearCommandTest.java

@@ -10,6 +10,8 @@
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
+import seedu.address.model.OrderBook;
+import seedu.address.model.TaskBook;
 import seedu.address.model.UserPrefs;
 
 public class ClearCommandTest {
@@ -30,6 +32,8 @@ public void execute_nonEmptyAddressBook_success() {
                 getTypicalTaskBook(), getTypicalOrderBook(), new UserPrefs());
 
         expectedModel.setAddressBook(new AddressBook());
+        expectedModel.setTaskBook(new TaskBook());
+        expectedModel.setOrderBook(new OrderBook());
 
         assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
     }