[W6.4d][F14-A3] Quentin Khoo

src/seedu/addressbook/commands/AddCommand.java

@@ -36,6 +36,7 @@ public AddCommand(String name,
                       String email, boolean isEmailPrivate,
                       String address, boolean isAddressPrivate,
                       Set<String> tags) throws IllegalValueException {
+        super(true);
         final Set<Tag> tagSet = new HashSet<>();
         for (String tagName : tags) {
             tagSet.add(new Tag(tagName));
@@ -50,6 +51,7 @@ public AddCommand(String name,
     }
 
     public AddCommand(Person toAdd) {
+        super(true);
         this.toAdd = toAdd;
     }
 

src/seedu/addressbook/commands/ClearCommand.java

@@ -11,6 +11,10 @@ public class ClearCommand extends Command {
 
     public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
 
+    public ClearCommand() {
+        super(true);
+    }
+
     @Override
     public CommandResult execute() {
         addressBook.clear();

src/seedu/addressbook/commands/Command.java

@@ -15,15 +15,18 @@ public abstract class Command {
     protected AddressBook addressBook;
     protected List<? extends ReadOnlyPerson> relevantPersons;
     private int targetIndex = -1;
+    private boolean isMutating;
 
     /**
      * @param targetIndex last visible listing index of the target person
      */
-    public Command(int targetIndex) {
+    public Command(int targetIndex, boolean isMutating) {
         this.setTargetIndex(targetIndex);
+        this.isMutating = isMutating;
     }
 
-    protected Command() {
+    protected Command(boolean isMutating) {
+        this.isMutating = isMutating;
     }
 
     /**
@@ -70,4 +73,6 @@ public int getTargetIndex() {
     public void setTargetIndex(int targetIndex) {
         this.targetIndex = targetIndex;
     }
+
+    public boolean isMutating() { return isMutating; }
 }

src/seedu/addressbook/commands/DeleteCommand.java

@@ -21,7 +21,7 @@ public class DeleteCommand extends Command {
 
 
     public DeleteCommand(int targetVisibleIndex) {
-        super(targetVisibleIndex);
+        super(targetVisibleIndex, true);
     }
 
 

src/seedu/addressbook/commands/ExitCommand.java

@@ -11,6 +11,9 @@ public class ExitCommand extends Command {
             + "Example: " + COMMAND_WORD;
     public static final String MESSAGE_EXIT_ACKNOWEDGEMENT = "Exiting Address Book as requested ...";
 
+    public ExitCommand() {
+        super(false);
+    }
     @Override
     public CommandResult execute() {
         return new CommandResult(MESSAGE_EXIT_ACKNOWEDGEMENT);

src/seedu/addressbook/commands/FindCommand.java

@@ -20,6 +20,7 @@ public class FindCommand extends Command {
     private final Set<String> keywords;
 
     public FindCommand(Set<String> keywords) {
+        super(false);
         this.keywords = keywords;
     }
 

src/seedu/addressbook/commands/HelpCommand.java

@@ -21,6 +21,9 @@ public class HelpCommand extends Command {
             + "\n" + HelpCommand.MESSAGE_USAGE
             + "\n" + ExitCommand.MESSAGE_USAGE;
 
+    public HelpCommand() {
+        super(false);
+    }
     @Override
     public CommandResult execute() {
         return new CommandResult(MESSAGE_ALL_USAGES);

src/seedu/addressbook/commands/IncorrectCommand.java

@@ -9,6 +9,7 @@ public class IncorrectCommand extends Command{
     public final String feedbackToUser;
 
     public IncorrectCommand(String feedbackToUser){
+        super(false);
         this.feedbackToUser = feedbackToUser;
     }
 

src/seedu/addressbook/commands/ListCommand.java

@@ -16,6 +16,9 @@ public class ListCommand extends Command {
             + "Displays all persons in the address book as a list with index numbers.\n\t"
             + "Example: " + COMMAND_WORD;
 
+    public ListCommand() {
+        super(false);
+    }
 
     @Override
     public CommandResult execute() {

src/seedu/addressbook/commands/ViewAllCommand.java

@@ -21,7 +21,7 @@ public class ViewAllCommand extends Command {
 
 
     public ViewAllCommand(int targetVisibleIndex) {
-        super(targetVisibleIndex);
+        super(targetVisibleIndex, false);
     }
 
 

src/seedu/addressbook/commands/ViewCommand.java

@@ -21,7 +21,7 @@ public class ViewCommand extends Command {
 
 
     public ViewCommand(int targetVisibleIndex) {
-        super(targetVisibleIndex);
+        super(targetVisibleIndex, false);
     }
 
 

src/seedu/addressbook/logic/Logic.java

@@ -85,7 +85,9 @@ public CommandResult execute(String userCommandText) throws Exception {
     private CommandResult execute(Command command) throws Exception {
         command.setData(addressBook, lastShownList);
         CommandResult result = command.execute();
-        storage.save(addressBook);
+        if (command.isMutating()) {
+            storage.save(addressBook);
+        }
         return result;
     }
 

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

@@ -12,6 +12,7 @@
 import seedu.addressbook.data.person.*;
 import seedu.addressbook.data.tag.Tag;
 import seedu.addressbook.data.tag.UniqueTagList;
+import seedu.addressbook.parser.Parser;
 import seedu.addressbook.storage.StorageFile;
 
 import java.util.*;
@@ -77,6 +78,8 @@ private void assertCommandBehavior(String inputCommand,
                                       boolean isRelevantPersonsExpected,
                                       List<? extends ReadOnlyPerson> lastShownList) throws Exception {
 
+        //Parse command to determine if command is mutating
+        Command command = new Parser().parseCommand(inputCommand);
         //Execute the command
         CommandResult r = logic.execute(inputCommand);
 
@@ -90,7 +93,9 @@ private void assertCommandBehavior(String inputCommand,
         //Confirm the state of data is as expected
         assertEquals(expectedAddressBook, addressBook);
         assertEquals(lastShownList, logic.getLastShownList());
-        assertEquals(addressBook, saveFile.load());
+        if (command.isMutating()) {
+            assertEquals(addressBook, saveFile.load());
+        }
     }