From 6d61fbfa9eb5560500a580f8866a0304e84befbf Mon Sep 17 00:00:00 2001 From: m-aslam-mj2 Date: Thu, 1 Nov 2018 01:51:59 +0800 Subject: [PATCH 1/2] Fixed bug with storage controller. Removed sample data. Signed-off-by: m-aslam-mj2 --- src/main/java/seedu/address/MainApp.java | 3 +-- src/main/java/seedu/address/model/StorageController.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java index a5da39e19cab..a5142e79acaa 100644 --- a/src/main/java/seedu/address/MainApp.java +++ b/src/main/java/seedu/address/MainApp.java @@ -27,7 +27,6 @@ import seedu.address.model.StorageController; import seedu.address.model.UserPrefs; import seedu.address.model.student.StudentManager; -import seedu.address.model.util.SampleDataUtil; import seedu.address.storage.AddressBookStorage; import seedu.address.storage.JsonUserPrefsStorage; import seedu.address.storage.Storage; @@ -95,7 +94,7 @@ private Model initModelManager(Storage storage, UserPrefs userPrefs) { if (!addressBookOptional.isPresent()) { logger.info("Data file not found. Will be starting with a sample AddressBook"); } - initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook); + initialData = new AddressBook(); } catch (DataConversionException e) { logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook"); initialData = new AddressBook(); diff --git a/src/main/java/seedu/address/model/StorageController.java b/src/main/java/seedu/address/model/StorageController.java index ff79c33639e3..3a5abe535f36 100644 --- a/src/main/java/seedu/address/model/StorageController.java +++ b/src/main/java/seedu/address/model/StorageController.java @@ -144,6 +144,7 @@ public static void retrieveData() { * This method creates files for all datasets if they do not exist on the local filesystem. */ private static void createFiles() { + new File(BASE_DIRECTORY).mkdirs(); File classes = new File(storageClasses); File courses = new File(storageCourses); File modules = new File(storageModules); From 18e81c277e9deebfb5c2bd03d97d4a7486bd73be Mon Sep 17 00:00:00 2001 From: m-aslam-mj2 Date: Thu, 1 Nov 2018 01:52:34 +0800 Subject: [PATCH 2/2] changed ver no Signed-off-by: m-aslam-mj2 --- src/main/java/seedu/address/MainApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java index a5142e79acaa..76860b8c7a29 100644 --- a/src/main/java/seedu/address/MainApp.java +++ b/src/main/java/seedu/address/MainApp.java @@ -41,7 +41,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(1, 2, 1, true); + public static final Version VERSION = new Version(1, 3, 0, true); private static final Logger logger = LogsCenter.getLogger(MainApp.class);