Merge pull request #184 from RadieonAjax/branch-BugFixes

Fix archive and loading bug for undo and redo

Author: RadieonAjax

src/main/java/seedu/address/logic/LogicManager.java

@@ -97,7 +97,10 @@ public void setGuiSettings(GuiSettings guiSettings) {
     private void updateModelWithStorage(Command command, Storage storage, Model model) throws CommandException {
         try {
             if (command instanceof LoadCommand) {
-                model.setAddressBook(storage.readAddressBook(((LoadCommand) command).getLoadPath()).get());
+                ReadOnlyAddressBook readOnlyAddressBook = storage.readAddressBook(((LoadCommand) command)
+                        .getLoadPath()).get();
+                model.setAddressBook(readOnlyAddressBook);
+                model.updateAddressBook(readOnlyAddressBook);
             }
         } catch (DataLoadingException e) {
             throw new CommandException(String.format(LOAD_ERROR_FORMAT, e.getMessage()), e);

src/main/java/seedu/address/logic/commands/ArchiveCommand.java

@@ -5,7 +5,6 @@
 
 import java.nio.file.Path;
 
-import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 /**
  * Archives the address book.
@@ -33,7 +32,6 @@ public Path getArchivePath() {
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        model.setAddressBook(new AddressBook());
         model.clearAddressBook();
         return new CommandResult(String.format(MESSAGE_SUCCESS, archivePath));
     }

src/main/java/seedu/address/model/Model.java

@@ -114,6 +114,12 @@ public interface Model {
      */
     void redoAddressBook();
 
+    /**
+     * Update and initializes the address book with a given address book.
+     * This clears and updates the entire undo/redo stack.
+     */
+    void updateAddressBook(ReadOnlyAddressBook addressBook);
+
     /**
      * Returns {@code true} if there are states to undo in the address book.
      *

src/main/java/seedu/address/model/ModelManager.java

@@ -142,6 +142,12 @@ public void undoAddressBook() {
         logger.info("Undid last action in address book.");
     }
 
+    @Override
+    public void updateAddressBook(ReadOnlyAddressBook addressBook) {
+        versionedAddressBook.resetData(addressBook);
+        versionedAddressBook.update(addressBook);
+    }
+
     @Override
     public void redoAddressBook() {
         versionedAddressBook.redo();
@@ -157,7 +163,8 @@ public void saveAddressBook() {
 
     @Override
     public void clearAddressBook() {
-        this.setAddressBook(versionedAddressBook.clear());
+        versionedAddressBook.clear();
+        this.setAddressBook(new AddressBook());
         logger.info("Cleared the address book.");
     }
 

src/main/java/seedu/address/model/VersionedAddressBook.java

@@ -9,7 +9,7 @@
  */
 public class VersionedAddressBook extends AddressBook {
 
-    private final List<ReadOnlyAddressBook> addressBookStateList;
+    private List<ReadOnlyAddressBook> addressBookStateList;
     private int currentStatePointer;
 
     /**
@@ -78,8 +78,22 @@ public void redo() {
     /**
      * Clears all states from the Versioned Address Book.
      */
-    public VersionedAddressBook clear() {
-        return new VersionedAddressBook(new AddressBook());
+    public void clear() {
+        this.addressBookStateList = new ArrayList<>();
+        this.currentStatePointer = 0;
+        AddressBook newState = new AddressBook();
+        addressBookStateList.add(newState);
+    }
+
+    /**
+     * Updates the addressBookStateList with a new state - used exclusively by LoadCommand
+     * @param readOnlyAddressBook new state to be saved
+     */
+    public void update(ReadOnlyAddressBook readOnlyAddressBook) {
+        this.addressBookStateList = new ArrayList<>();
+        this.currentStatePointer = 0;
+        AddressBook newState = new AddressBook(readOnlyAddressBook);
+        addressBookStateList.add(newState);
     }
 
     /**

src/test/java/seedu/address/logic/commands/AddCommandTest.java

@@ -168,6 +168,11 @@ public void redoAddressBook() {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public void updateAddressBook(ReadOnlyAddressBook addressBook) {
+            throw new AssertionError("This method should not be called.");
+        }
+
         @Override
         public void saveAddressBook() {
             throw new AssertionError("This method should not be called.");

src/test/java/seedu/address/logic/commands/GradeCommandTest.java

@@ -211,6 +211,12 @@ public boolean canUndoAddressBook() {
         public void redoAddressBook() {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void updateAddressBook(ReadOnlyAddressBook addressBook) {
+            throw new AssertionError("This method should not be called.");
+        }
+
         @Override
         public void undoAddressBook() {
             throw new AssertionError("This method should not be called.");