[T3A3][F11-A1]Anshul Aggarwal

.gitignore

@@ -1,6 +1,6 @@
 # Default storage file for addressbook : don't need to cleanup when running from IDE
 
-addressbook.txt
+addressbook.xml
 
 # Compiled classfiles
 bin/

README.md

@@ -1,3 +1,5 @@
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ad7aa7caa7ba4d40aef9440b16ea68d6)](https://www.codacy.com/app/se-edu/addressbook-level2?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level2&utm_campaign=Badge_Grade)
+
 # AddressBook (Level 2)
 * This is a CLI (Command Line Interface) Address Book application **written in OOP fashion**. 
 * It is a Java sample application intended for students learning Software Engineering while using Java as 
@@ -19,4 +21,4 @@
 
 * **Bug reports, Suggestions** : Post in our [issue tracker](https://github.com/se-edu/addressbook-level2/issues)
   if you noticed bugs or have suggestions on how to improve.
-* **Contributing** : We welcome pull requests. Follow the process described [here](https://github.com/oss-generic/process)
+* **Contributing** : We welcome pull requests. Follow the process described [here](https://github.com/oss-generic/process)

doc/UserGuide.md

@@ -123,13 +123,13 @@ Address book data are saved in the hard disk automatically after any command tha
 There is no need to save manually.
 
 #### Changing the save location
-Address book data are saved in a file called `addressbook.txt` in the project root folder.
+Address book data are saved in a file called `addressbook.xml` in the project root folder.
 You can change the location by specifying the file path as a program argument.
 
 Example: 
-* `java seedu.addressbook.Main mydata.txt`
+* `java seedu.addressbook.Main mydata.xml`
 
-> The file name must end in `.txt` for it to be acceptable to the program.
+> The file name must end in `.xml` for it to be acceptable to the program.
 >
 > When running the program inside Eclipse, you can set command line parameters 
   before running the program.

src/seedu/addressbook/Main.java

@@ -99,7 +99,7 @@ private void recordResult(CommandResult result) {
 
     /**
      * Executes the command and returns the result.
-     * 
+     *
      * @param command user command
      * @return result of the command
      */
@@ -126,4 +126,4 @@ private StorageFile initializeStorage(String[] launchArgs) throws InvalidStorage
     }
 
 
-}
+}

src/seedu/addressbook/commands/ClearCommand.java

@@ -1,8 +1,5 @@
 package seedu.addressbook.commands;
 
-import seedu.addressbook.common.Utils;
-
-
 /**
  * Clears the address book.
  */

src/seedu/addressbook/commands/Command.java

@@ -32,7 +32,7 @@ protected Command() {
      * @param personsDisplayed used to generate summary
      * @return summary message for persons displayed
      */
-    protected String getMessageForPersonListShownSummary(List<? extends ReadOnlyPerson> personsDisplayed) {
+    public static String getMessageForPersonListShownSummary(List<? extends ReadOnlyPerson> personsDisplayed) {
         return String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, personsDisplayed.size());
     }
 

src/seedu/addressbook/commands/FindCommand.java

@@ -1,8 +1,12 @@
 package seedu.addressbook.commands;
 
-import seedu.addressbook.data.person.ReadOnlyPerson;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import java.util.*;
+import seedu.addressbook.data.person.ReadOnlyPerson;
 
 /**
  * Finds and lists all persons in address book whose name contains any of the argument keywords.

src/seedu/addressbook/commands/IncorrectCommand.java

@@ -4,11 +4,11 @@
 /**
  * Represents an incorrect command. Upon execution, produces some feedback to the user.
  */
-public class IncorrectCommand extends Command{
+public class IncorrectCommand extends Command {
 
     public final String feedbackToUser;
 
-    public IncorrectCommand(String feedbackToUser){
+    public IncorrectCommand(String feedbackToUser) {
         this.feedbackToUser = feedbackToUser;
     }
 

src/seedu/addressbook/common/Utils.java

@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 
 /**

src/seedu/addressbook/data/AddressBook.java

@@ -143,4 +143,12 @@ public UniquePersonList getAllPersons() {
     public UniqueTagList getAllTags() {
         return new UniqueTagList(allTags);
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof AddressBook // instanceof handles nulls
+                        && this.allPersons.equals(((AddressBook) other).allPersons)
+                        && this.allTags.equals(((AddressBook) other).allTags));
+    }
 }

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

@@ -21,11 +21,12 @@ public class Address {
      * @throws IllegalValueException if given address string is invalid.
      */
     public Address(String address, boolean isPrivate) throws IllegalValueException {
+        String trimmedAddress = address.trim();
         this.isPrivate = isPrivate;
-        if (!isValidAddress(address)) {
+        if (!isValidAddress(trimmedAddress)) {
             throw new IllegalValueException(MESSAGE_ADDRESS_CONSTRAINTS);
         }
-        this.value = address;
+        this.value = trimmedAddress;
     }
 
     /**
@@ -55,4 +56,4 @@ public int hashCode() {
     public boolean isPrivate() {
         return isPrivate;
     }
-}
+}

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

@@ -23,11 +23,11 @@ public class Email {
      */
     public Email(String email, boolean isPrivate) throws IllegalValueException {
         this.isPrivate = isPrivate;
-        email = email.trim();
-        if (!isValidEmail(email)) {
+        String trimmedEmail = email.trim();
+        if (!isValidEmail(trimmedEmail)) {
             throw new IllegalValueException(MESSAGE_EMAIL_CONSTRAINTS);
         }
-        this.value = email;
+        this.value = trimmedEmail;
     }
 
     /**
@@ -58,4 +58,4 @@ public int hashCode() {
     public boolean isPrivate() {
         return isPrivate;
     }
-}
+}

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

@@ -14,7 +14,6 @@ public class Name {
     public static final String EXAMPLE = "John Doe";
     public static final String MESSAGE_NAME_CONSTRAINTS = "Person names should be spaces or alphabetic characters";
     public static final String NAME_VALIDATION_REGEX = "[\\p{Alpha} ]+";
-
     public final String fullName;
 
     /**
@@ -23,11 +22,11 @@ public class Name {
      * @throws IllegalValueException if given name string is invalid.
      */
     public Name(String name) throws IllegalValueException {
-        name = name.trim();
-        if (!isValidName(name)) {
+        String trimmedName = name.trim();
+        if (!isValidName(trimmedName)) {
             throw new IllegalValueException(MESSAGE_NAME_CONSTRAINTS);
         }
-        this.fullName = name;
+        this.fullName = trimmedName;
     }
 
     /**

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

@@ -22,11 +22,11 @@ public class Phone {
      */
     public Phone(String phone, boolean isPrivate) throws IllegalValueException {
         this.isPrivate = isPrivate;
-        phone = phone.trim();
-        if (!isValidPhone(phone)) {
+        String trimmedPhone = phone.trim();
+        if (!isValidPhone(trimmedPhone)) {
             throw new IllegalValueException(MESSAGE_PHONE_CONSTRAINTS);
         }
-        this.value = phone;
+        this.value = trimmedPhone;
     }
 
     /**

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

@@ -21,7 +21,8 @@ public interface ReadOnlyPerson {
     UniqueTagList getTags();
 
     /**
-     * Returns true if the values inside this object is same as those of the other (Note: interfaces cannot override .equals)
+     * Returns true if the values inside this object is same as those of the other
+     * (Note: interfaces cannot override .equals)
      */
     default boolean isSameStateAs(ReadOnlyPerson other) {
         return other == this // short circuit if same object

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

@@ -1,9 +1,16 @@
 package seedu.addressbook.data.person;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 import seedu.addressbook.common.Utils;
 import seedu.addressbook.data.exception.DuplicateDataException;
 
-import java.util.*;
+
 
 /**
  * A list of persons. Does not allow null elements or duplicates.
@@ -118,4 +125,10 @@ public Iterator<Person> iterator() {
         return internalList.iterator();
     }
 
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof UniquePersonList // instanceof handles nulls
+                        && this.internalList.equals(((UniquePersonList) other).internalList));
+    }
 }

src/seedu/addressbook/data/tag/Tag.java

@@ -19,11 +19,11 @@ public class Tag {
      * @throws IllegalValueException if the given tag name string is invalid.
      */
     public Tag(String name) throws IllegalValueException {
-        name = name.trim();
-        if (!isValidTagName(name)) {
+        String trimmedName = name.trim();
+        if (!isValidTagName(trimmedName)) {
             throw new IllegalValueException(MESSAGE_TAG_CONSTRAINTS);
         }
-        this.tagName = name;
+        this.tagName = trimmedName;
     }
 
     /**

src/seedu/addressbook/data/tag/UniqueTagList.java

@@ -1,9 +1,17 @@
 package seedu.addressbook.data.tag;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 import seedu.addressbook.common.Utils;
 import seedu.addressbook.data.exception.DuplicateDataException;
 
-import java.util.*;
 
 /**
  * A list of tags. Does not allow nulls or duplicates.
@@ -126,8 +134,8 @@ public void mergeFrom(UniqueTagList tags) {
      * @throws TagNotFoundException if no such Tag could be found in the list.
      */
     public void remove(Tag toRemove) throws TagNotFoundException {
-        final boolean TagFoundAndDeleted = internalList.remove(toRemove);
-        if (!TagFoundAndDeleted) {
+        final boolean tagFoundAndDeleted = internalList.remove(toRemove);
+        if (!tagFoundAndDeleted) {
             throw new TagNotFoundException();
         }
     }
@@ -152,4 +160,11 @@ public Iterator<Tag> iterator() {
         return internalList.iterator();
     }
 
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof UniqueTagList // instanceof handles nulls
+                        && this.internalList.equals(((UniqueTagList) other).internalList));
+    }
+
 }

src/seedu/addressbook/parser/Parser.java

@@ -3,7 +3,11 @@
 import seedu.addressbook.commands.*;
 import seedu.addressbook.data.exception.IllegalValueException;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -58,35 +62,36 @@ public Command parseCommand(String userInput) {
 
         final String commandWord = matcher.group("commandWord");
         final String arguments = matcher.group("arguments");
+
         switch (commandWord) {
 
-            case AddCommand.COMMAND_WORD:
-                return prepareAdd(arguments);
+        case AddCommand.COMMAND_WORD:
+            return prepareAdd(arguments);
 
-            case DeleteCommand.COMMAND_WORD:
-                return prepareDelete(arguments);
+        case DeleteCommand.COMMAND_WORD:
+            return prepareDelete(arguments);
 
-            case ClearCommand.COMMAND_WORD:
-                return new ClearCommand();
+        case ClearCommand.COMMAND_WORD:
+            return new ClearCommand();
 
-            case FindCommand.COMMAND_WORD:
-                return prepareFind(arguments);
+        case FindCommand.COMMAND_WORD:
+            return prepareFind(arguments);
 
-            case ListCommand.COMMAND_WORD:
-                return new ListCommand();
+        case ListCommand.COMMAND_WORD:
+            return new ListCommand();
 
-            case ViewCommand.COMMAND_WORD:
-                return prepareView(arguments);
+        case ViewCommand.COMMAND_WORD:
+            return prepareView(arguments);
 
-            case ViewAllCommand.COMMAND_WORD:
-                return prepareViewAll(arguments);
+        case ViewAllCommand.COMMAND_WORD:
+            return prepareViewAll(arguments);
 
-            case ExitCommand.COMMAND_WORD:
-                return new ExitCommand();
+        case ExitCommand.COMMAND_WORD:
+            return new ExitCommand();
 
-            case HelpCommand.COMMAND_WORD: // Fallthrough
-            default:
-                return new HelpCommand();
+        case HelpCommand.COMMAND_WORD: // Fallthrough
+        default:
+            return new HelpCommand();
         }
     }
 
@@ -96,7 +101,7 @@ public Command parseCommand(String userInput) {
      * @param args full command args string
      * @return the prepared command
      */
-    private Command prepareAdd(String args){
+    private Command prepareAdd(String args) {
         final Matcher matcher = PERSON_DATA_ARGS_FORMAT.matcher(args.trim());
         // Validate arg string format
         if (!matcher.matches()) {
@@ -236,4 +241,4 @@ private Command prepareFind(String args) {
     }
 
 
-}
+}