[W5.7][T16-4]Rezky Arizaputra

docs/UserGuide.adoc

@@ -131,6 +131,12 @@ Views the 2nd person in the address book.
 `view 1` +
 Views the 1st person in the results of the `find` command.
 
+== Sorting all persons : `sort`
+
+Sorts the list of all people in address book lexicographically. Shows sorted list next time `list` is entered.
+Format: `sort`
+
+
 == View all details of a person : `viewall`
 
 Displays all details (including private details) of the specified person. +

src/seedu/addressbook/commands/HelpCommand.java

@@ -20,6 +20,7 @@ public CommandResult execute() {
                 + "\n" + FindCommand.MESSAGE_USAGE
                 + "\n" + ListCommand.MESSAGE_USAGE
                 + "\n" + ViewCommand.MESSAGE_USAGE
+                + "\n" + SortingCommand.MESSAGE_USAGE
                 + "\n" + ViewAllCommand.MESSAGE_USAGE
                 + "\n" + HelpCommand.MESSAGE_USAGE
                 + "\n" + ExitCommand.MESSAGE_USAGE

src/seedu/addressbook/commands/SortingCommand.java

@@ -0,0 +1,18 @@
+package seedu.addressbook.commands;
+
+/**
+ * Sort the list of people in address book
+ */
+public class SortCommand extends Command {
+     public static final String COMMAND_WORD = "sort";
+     public static final String MESSAGE_USAGE = COMMAND_WORD
+            + "Sorts all people in address book. \n"
+            + "Example: " + COMMAND_WORD;
+
+     public static final String MESSAGE_SORTED = "Address book is sorted";
+     @Override
+    public CommandResult execute() {
+        addressBook.sort();
+        return new CommandResult(MESSAGE_SORTED);
+    }
+}

src/seedu/addressbook/commands/SortingCommandTest.java

@@ -0,0 +1,86 @@
+ package seedu.addressbook.commands;
+
+ import org.junit.Before;
+ import org.junit.Test;
+ import seedu.addressbook.data.AddressBook;
+ import seedu.addressbook.data.person.*;
+ import seedu.addressbook.util.TestUtil;
+
+ import java.util.Collections;
+ import java.util.List;
+
+ import static org.junit.Assert.*;
+ public class SortCommandTest {
+
+ private AddressBook addressBook;
+
+ private List<ReadOnlyPerson> sortedList;
+
+ public void setUp() throws Exception {
+         Person SamAl = new Person(new Name("Sam Al"), new Phone("65234567", false),
+                 new Email("[email protected]", false), new Address("395C Bukit Road", false), Collections.emptySet());
+         Person SamUl = new Person(new Name("Sam Ul"), new Phone("95234567", false),
+                 new Email("[email protected]", false), new Address("33G Bata Road", false), Collections.emptySet());
+         Person SamIl = new Person(new Name("Sam Il"), new Phone("65345566", false),
+                 new Email("[email protected]", false), new Address("55G Paku Road", false), Collections.emptySet());
+         Person SamEl = new Person(new Name("Sam El"), new Phone("65121122", false),
+                new Email("[email protected]", false), new Address("44H Buana Road", false),
+                Collections.emptySet());
+
+         addressBook = TestUtil.createAddressBook(SamAl, SamUl, SamIl, SamEl);
+
+
+         sortedList = TestUtil.createList(SamAl, SamEl, SamIl, SamUl);
+ }
+
+   @Test
+ public void execute_addressBookIsSorted() {
+         assertSortSuccessful(addressBook, sortedList);
+ }
+
+ /**
+   * Creates a new sorting command.
+   *
+   */
+ private SortingCommand createSortingCommand(AddressBook addressBook,
+                                             List<ReadOnlyPerson> displayList) {
+
+         SortingCommand command = new SortingCommand();
+         command.setData(addressBook, displayList);
+
+         return command;
+ }
+  /**
+    * Asserts that the address book is successfully sorted.
+    *
+    * The addressBook passed in will not be modified (no side effects).
+    */
+  private void assertSortingSuccessful(AddressBook addressBook,
+                                       List<ReadOnlyPerson> displayList) {
+         AddressBook expectedAddressBook = TestUtil.clone(addressBook);
+         expectedAddressBook.sort();
+         String expectedMessage = SortingCommand.MESSAGE_SORTED;
+
+         AddressBook actualAddressBook = TestUtil.clone(addressBook);
+
+         SortingCommand command = createSortingCommand(actualAddressBook, displayList);
+         assertCommandBehaviour(command, expectedMessage, expectedAddressBook, actualAddressBook);
+
+  }
+
+  /**
+    * Executes the command, and checks that the execution was what we had expected.
+    */
+  private void assertCommandBehaviour(SortingCommand sortCommand, String expectedMessage,
+                                         AddressBook expectedAddressBook, AddressBook actualAddressBook) {
+
+         CommandResult result = sortCommand.execute();
+
+         assertEquals(expectedMessage, result.feedbackToUser);
+         assertEquals(expectedAddressBook.getAllPersons(), actualAddressBook.getAllPersons());
+  }
+
+
+
+
+ }

src/seedu/addressbook/data/AddressBook.java

@@ -67,6 +67,11 @@ public void clear() {
     public UniquePersonList getAllPersons() {
         return new UniquePersonList(allPersons);
     }
+
+    /**
+     * Sorts all persons in address book.
+     */
+    public void sort() {allPersons.sort(); }
 
     @Override
     public boolean equals(Object other) {

src/seedu/addressbook/data/person/CompareName.java

@@ -0,0 +1,11 @@
+package seedu.addressbook.data.person;
+
+import java.util.Comparator;
+
+class CompareName implements Comparator<Person>{
+    @Override
+    public int compare(Person p1, Person p2) {
+        return p1.getName().toString()
+                .compareToIgnoreCase(p2.getName().toString());
+    }
+}

src/seedu/addressbook/data/person/UniquePersonList.java

@@ -128,6 +128,11 @@ public void remove(ReadOnlyPerson toRemove) throws PersonNotFoundException {
     public void clear() {
         internalList.clear();
     }
+
+    /**
+     * Sorts all people in the list.
+     */
+    public void sort() {Collections.sort(internalList, new CompareName()); }
 
     @Override
     public Iterator<Person> iterator() {
@@ -141,3 +146,5 @@ public boolean equals(Object other) {
                         && this.internalList.equals(((UniquePersonList) other).internalList));
     }
 }
+
+

src/seedu/addressbook/parser/Parser.java

@@ -22,6 +22,7 @@
 import seedu.addressbook.commands.ListCommand;
 import seedu.addressbook.commands.ViewAllCommand;
 import seedu.addressbook.commands.ViewCommand;
+import seedu.addressbook.commands.SortingCommand;
 import seedu.addressbook.data.exception.IllegalValueException;
 
 /**
@@ -90,6 +91,9 @@ public Command parseCommand(String userInput) {
 
         case ViewCommand.COMMAND_WORD:
             return prepareView(arguments);
+
+        case SortingCommand.COMMAND_WORD:
+            return new SortingCommand();
 
         case ViewAllCommand.COMMAND_WORD:
             return prepareViewAll(arguments);