[T6A1][F14-B3] Leslie

src/seedu/addressbook/logic/Logic.java

@@ -5,6 +5,7 @@
 import seedu.addressbook.data.AddressBook;
 import seedu.addressbook.data.person.ReadOnlyPerson;
 import seedu.addressbook.parser.Parser;
+import seedu.addressbook.storage.Storage;
 import seedu.addressbook.storage.StorageFile;
 
 import java.util.Collections;
@@ -17,41 +18,37 @@
 public class Logic {
 
 
-    private StorageFile storage;
+    private Storage storage;
     private AddressBook addressBook;
 
     /** The list of person shown to the user most recently.  */
     private List<? extends ReadOnlyPerson> lastShownList = Collections.emptyList();
 
     public Logic() throws Exception{
-        setStorage(initializeStorage());
+    	setStorage(initializeStorage());
         setAddressBook(storage.load());
     }
 
-    Logic(StorageFile storageFile, AddressBook addressBook){
-        setStorage(storageFile);
+    Logic(Storage storage, AddressBook addressBook){
+        setStorage(storage);
         setAddressBook(addressBook);
     }
 
-    void setStorage(StorageFile storage){
+    void setStorage(Storage storage){
         this.storage = storage;
     }
 
     void setAddressBook(AddressBook addressBook){
         this.addressBook = addressBook;
     }
 
-    /**
-     * Creates the StorageFile object based on the user specified path (if any) or the default storage path.
-     * @throws StorageFile.InvalidStorageFilePathException if the target file path is incorrect.
-     */
-    private StorageFile initializeStorage() throws StorageFile.InvalidStorageFilePathException {
-        return new StorageFile();
-    }
-
     public String getStorageFilePath() {
         return storage.getPath();
     }
+
+	private Storage initializeStorage() throws StorageFile.InvalidStorageFilePathException {
+        return new StorageFile();
+    }
 
     /**
      * Unmodifiable view of the current last shown list.
@@ -88,6 +85,8 @@ private CommandResult execute(Command command) throws Exception {
         storage.save(addressBook);
         return result;
     }
+
+
 
     /** Updates the {@link #lastShownList} if the result contains a list of Persons. */
     private void recordResult(CommandResult result) {

src/seedu/addressbook/storage/Storage.java

@@ -0,0 +1,14 @@
+package seedu.addressbook.storage;
+
+import seedu.addressbook.data.AddressBook;
+import seedu.addressbook.storage.StorageFile.StorageOperationException;
+
+public abstract class Storage {
+
+	public abstract void save(AddressBook addressBook) throws StorageOperationException;
+
+	public abstract AddressBook load() throws StorageOperationException;
+
+	public abstract String getPath();
+
+}

src/seedu/addressbook/storage/StorageFile.java

@@ -15,7 +15,7 @@
 /**
  * Represents the file used to store address book data.
  */
-public class StorageFile {
+public class StorageFile extends Storage {
 
     /** Default file path used if the user doesn't provide the file name. */
     public static final String DEFAULT_STORAGE_FILEPATH = "addressbook.txt";

src/seedu/addressbook/storage/StorageStub.java

@@ -0,0 +1,29 @@
+package seedu.addressbook.storage;
+
+import seedu.addressbook.data.AddressBook;
+import seedu.addressbook.storage.StorageFile.StorageOperationException;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class StorageStub extends Storage {
+
+	public StorageStub(String path) {
+	}
+
+	@Override
+	public void save(AddressBook addressBook) throws StorageOperationException {
+
+	}
+
+	@Override
+	public AddressBook load() throws StorageOperationException {
+ 		return null;
+	}
+
+	@Override
+	public String getPath() {
+		return null;
+	}
+
+ }

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

@@ -12,7 +12,7 @@
 import seedu.addressbook.data.person.*;
 import seedu.addressbook.data.tag.Tag;
 import seedu.addressbook.data.tag.UniqueTagList;
-import seedu.addressbook.storage.StorageFile;
+import seedu.addressbook.storage.StorageStub;
 
 import java.util.*;
 
@@ -28,16 +28,16 @@ public class LogicTest {
     @Rule
     public TemporaryFolder saveFolder = new TemporaryFolder();
 
-    private StorageFile saveFile;
+    private StorageStub saveStub;
     private AddressBook addressBook;
     private Logic logic;
 
     @Before
     public void setup() throws Exception {
-        saveFile = new StorageFile(saveFolder.newFile("testSaveFile.txt").getPath());
+        saveStub = new StorageStub(saveFolder.newFile("testsaveStub.txt").getPath());
         addressBook = new AddressBook();
-        saveFile.save(addressBook);
-        logic = new Logic(saveFile, addressBook);
+        saveStub.save(addressBook);
+        logic = new Logic(saveStub, addressBook);
     }
 
     @Test
@@ -90,7 +90,7 @@ private void assertCommandBehavior(String inputCommand,
         //Confirm the state of data is as expected
         assertEquals(expectedAddressBook, addressBook);
         assertEquals(lastShownList, logic.getLastShownList());
-        assertEquals(addressBook, saveFile.load());
+        assertEquals(addressBook, saveStub.load());
     }