[W5.4r][W09-A3]ZHAO PENGYU

doc/UserGuide.md

@@ -98,7 +98,11 @@ Examples:
 
 ## Clearing all entries : `clear`
 Clears all entries from the address book.<br>
-Format: `clear`  
+Format: `clear`
+
+## Sorts all entries:'sort'
+Sorts all entries in the address book.<br>
+Format:'sort'
 
 ## Exiting the program : `exit`
 Exits the program.<br>

src/seedu/addressbook/commands/Command.java

@@ -36,6 +36,10 @@ public static String getMessageForPersonListShownSummary(List<? extends ReadOnly
         return String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, personsDisplayed.size());
     }
 
+    public static String getMessageForPersonSortShownSummary(List<? extends ReadOnlyPerson> personDisplayed){
+        return String.format(Messages.MESSAGE_PERSONS_SORTED_OVERVIEW,personDisplayed.size());
+    }
+
     /**
      * Executes the command and returns the result.
      */

src/seedu/addressbook/commands/HelpCommand.java

@@ -16,6 +16,7 @@ public class HelpCommand extends Command {
             + "\n" + ClearCommand.MESSAGE_USAGE
             + "\n" + FindCommand.MESSAGE_USAGE
             + "\n" + ListCommand.MESSAGE_USAGE
+            + "\n" + SortCommand.MESSAGE_USAGE
             + "\n" + ViewCommand.MESSAGE_USAGE
             + "\n" + ViewAllCommand.MESSAGE_USAGE
             + "\n" + HelpCommand.MESSAGE_USAGE

src/seedu/addressbook/commands/SortCommand.java

@@ -0,0 +1,28 @@
+package seedu.addressbook.commands;
+
+import com.sun.org.apache.regexp.internal.RE;
+import seedu.addressbook.data.person.Person;
+import seedu.addressbook.data.person.ReadOnlyPerson;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.*;
+
+public class SortCommand extends Command {
+    public static final String COMMAND_WORD = "sort";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ":\n"
+            + "Sort the address book.\n\t"
+            + "Example:" + COMMAND_WORD;
+
+    public static final String MESSAGE_SUCCESS = "sort successfually!";
+
+    public CommandResult execute() {
+        addressBook.sort();
+        List<ReadOnlyPerson> allpersons = addressBook.getAllPersons().immutableListView();
+        return new CommandResult(String.format(MESSAGE_SUCCESS), allpersons);
+    }
+}
+
+
+

src/seedu/addressbook/common/Messages.java

@@ -9,6 +9,7 @@ public class Messages {
     public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
     public static final String MESSAGE_PERSON_NOT_IN_ADDRESSBOOK = "Person could not be found in address book";
     public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+    public static final String MESSAGE_PERSONS_SORTED_OVERVIEW = "%1$d persons listed!";
     public static final String MESSAGE_PROGRAM_LAUNCH_ARGS_USAGE = "Launch command format: " +
             "java seedu.addressbook.Main [STORAGE_FILE_PATH]";
     public static final String MESSAGE_WELCOME = "Welcome to your Address Book!";

src/seedu/addressbook/data/AddressBook.java

@@ -120,6 +120,9 @@ public UniqueTagList getAllTags() {
         return new UniqueTagList(allTags);
     }
 
+    public void sort(){
+        allPersons.sort();
+    }
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object

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

@@ -74,6 +74,9 @@ public List<ReadOnlyPerson> immutableListView() {
         return Collections.unmodifiableList(internalList);
     }
 
+    public List<Person> getInternalList() {
+        return internalList;
+    }
 
     /**
      * Checks if the list contains an equivalent person as the given argument.
@@ -113,6 +116,21 @@ public void clear() {
         internalList.clear();
     }
 
+    /**
+     * Sorts all persons in list.
+     */
+    public void sort(){
+        Collections.sort(internalList,compare);
+    }
+
+    public Comparator<Person> compare = new Comparator<Person>(){
+        public int compare(Person First, Person Second){
+            String firstName= First.getName().fullName;
+            String secondName= Second.getName().fullName;
+            return firstName.compareTo(secondName);
+        }
+    };
+
     @Override
     public Iterator<Person> iterator() {
         return internalList.iterator();

src/seedu/addressbook/parser/Parser.java

@@ -69,6 +69,9 @@ public Command parseCommand(String userInput) {
             case FindCommand.COMMAND_WORD:
                 return prepareFind(arguments);
 
+            case SortCommand.COMMAND_WORD:
+                return new SortCommand();
+
             case ListCommand.COMMAND_WORD:
                 return new ListCommand();
 

test/java/seedu/addressbook/logic/LogicTest.java

@@ -457,6 +457,24 @@ public void execute_find_matchesIfAnyKeywordPresent() throws Exception {
                                 expectedList);
     }
 
+    @Test
+    public void execute_sort() throws Exception{
+        TestDataHelper helper= new TestDataHelper();
+
+        Person first=helper.generatePersonWithName("Peng");
+        Person second= helper.generatePersonWithName("Zhao");
+        List<Person> Persons=helper.generatePersonList(first,second);
+        AddressBook unsorted=helper.generateAddressBook(Persons);
+        helper.addToAddressBook(addressBook, Persons);
+
+        unsorted.sort();
+        List<? extends ReadOnlyPerson> sorted= unsorted.getAllPersons().immutableListView();
+        assertCommandBehavior("sort",
+                String.format(SortCommand.MESSAGE_SUCCESS),
+                unsorted,
+                true,
+                sorted);
+    }
     /**
      * A utility class to generate test data.
      */

test/java/seedu/addressbook/parser/ParserTest.java

@@ -59,6 +59,11 @@ public void listCommand_parsedCorrectly() {
         parseAndAssertCommandType(input, ListCommand.class);
     }
 
+    @Test
+    public void sortCommand_parsedCorrectly(){
+        final String input="sort";
+        parseAndAssertCommandType(input,SortCommand.class);
+    }
     @Test
     public void exitCommand_parsedCorrectly() {
         final String input = "exit";