[W6.1d][T15-B2] Cheng Jin Ting

src/seedu/addressbook/commands/AddCommand.java

@@ -66,5 +66,8 @@ public CommandResult execute() {
             return new CommandResult(MESSAGE_DUPLICATE_PERSON);
         }
     }
-
+@Override
+    public boolean isMutating () {
+        return true ;
+}
 }

src/seedu/addressbook/commands/ClearCommand.java

@@ -16,4 +16,9 @@ public CommandResult execute() {
         addressBook.clear();
         return new CommandResult(MESSAGE_SUCCESS);
     }
+
+    @Override
+    public boolean isMutating () {
+        return true ;
+    }
 }

src/seedu/addressbook/commands/Command.java

@@ -70,4 +70,8 @@ public int getTargetIndex() {
     public void setTargetIndex(int targetIndex) {
         this.targetIndex = targetIndex;
     }
+
+
+    //Making the method abstract forces all child classes to declare whether it is a mutating command or not, rather than depend on an arbitrary decision made in the parent class.
+    public abstract boolean isMutating () ;
 }

src/seedu/addressbook/commands/DeleteCommand.java

@@ -39,4 +39,9 @@ public CommandResult execute() {
         }
     }
 
+    @Override
+    public boolean isMutating () {
+        return true ;
+    }
+
 }

src/seedu/addressbook/commands/ExitCommand.java

@@ -16,4 +16,8 @@ public CommandResult execute() {
         return new CommandResult(MESSAGE_EXIT_ACKNOWEDGEMENT);
     }
 
+    @Override
+    public boolean isMutating () {
+        return false ;
+    }
 }

src/seedu/addressbook/commands/FindCommand.java

@@ -53,4 +53,9 @@ private List<ReadOnlyPerson> getPersonsWithNameContainingAnyKeyword(Set<String>
         return matchedPersons;
     }
 
+    @Override
+    public boolean isMutating () {
+        return false ;
+    }
+
 }

src/seedu/addressbook/commands/HelpCommand.java

@@ -25,4 +25,9 @@ public class HelpCommand extends Command {
     public CommandResult execute() {
         return new CommandResult(MESSAGE_ALL_USAGES);
     }
+
+    @Override
+    public boolean isMutating () {
+        return false ;
+    }
 }

src/seedu/addressbook/commands/IncorrectCommand.java

@@ -17,4 +17,8 @@ public CommandResult execute() {
         return new CommandResult(feedbackToUser);
     }
 
+    @Override
+    public boolean isMutating () {
+        return false;
+    }
 }

src/seedu/addressbook/commands/ListCommand.java

@@ -22,4 +22,9 @@ public CommandResult execute() {
         List<ReadOnlyPerson> allPersons = addressBook.getAllPersons().immutableListView();
         return new CommandResult(getMessageForPersonListShownSummary(allPersons), allPersons);
     }
+
+    @Override
+    public boolean isMutating () {
+        return false;
+    }
 }

src/seedu/addressbook/commands/ViewAllCommand.java

@@ -37,4 +37,10 @@ public CommandResult execute() {
             return new CommandResult(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
     }
+
+
+    @Override
+    public boolean isMutating () {
+        return false;
+    }
 }

src/seedu/addressbook/commands/ViewCommand.java

@@ -37,5 +37,8 @@ public CommandResult execute() {
             return new CommandResult(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
     }
-
+    @Override
+    public boolean isMutating () {
+        return 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

@@ -13,6 +13,7 @@
 import seedu.addressbook.data.tag.Tag;
 import seedu.addressbook.data.tag.UniqueTagList;
 import seedu.addressbook.storage.StorageFile;
+import seedu.addressbook.parser.Parser;
 
 import java.util.*;
 
@@ -90,7 +91,11 @@ private void assertCommandBehavior(String inputCommand,
         //Confirm the state of data is as expected
         assertEquals(expectedAddressBook, addressBook);
         assertEquals(lastShownList, logic.getLastShownList());
-        assertEquals(addressBook, saveFile.load());
+        //to create a new Command instance
+        if (new Parser().parseCommand(inputCommand).isMutating()) {
+            assertEquals(addressBook, saveFile.load());
+        }
+
     }