Show a warning message if database is corrupted

src/main/java/seedu/address/MainApp.java

@@ -15,8 +15,10 @@
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.Logic;
 import seedu.address.logic.LogicManager;
+import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
+import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.UserPrefs;
 import seedu.address.storage.AddressBookStorage;
 import seedu.address.storage.JsonAddressBookStorage;
@@ -32,34 +34,39 @@
  */
 public class MainApp extends Application {
 
-    public static final Version VERSION = new Version(0, 2, 2, true);
+    public static final Version VERSION = new Version(1, 3, 0, true);
 
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 
-    protected Ui ui;
-    protected Logic logic;
-    protected Storage storage;
-    protected Model model;
-    protected Config config;
+    private Ui ui;
+    private Storage storage;
+    private Model model;
+
+    private String initialWelcomeMessage;
 
     @Override
     public void init() throws Exception {
-        logger.info("=============================[ Initializing AddressBook ]===========================");
+        logger.info("=============================[ Initializing AssetBook ]===========================");
         super.init();
 
         AppParameters appParameters = AppParameters.parse(getParameters());
-        config = initConfig(appParameters.getConfigPath());
+        Config config = initConfig(appParameters.getConfigPath());
         initLogging(config);
 
+        // initialize user preferences
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         UserPrefs userPrefs = initPrefs(userPrefsStorage);
+
+        // initialize storage
         AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
         storage = new StorageManager(addressBookStorage, userPrefsStorage);
+        ReadOnlyAddressBook initialAddressBook = initAddressBook(storage);
 
-        model = new ModelManager(storage.readInitialAddressBook(), userPrefs);
-
-        logic = new LogicManager(model, storage);
+        // initialize model and logic
+        model = new ModelManager(initialAddressBook, userPrefs);
+        Logic logic = new LogicManager(model, storage);
 
+        // initialize ui
         ui = new UiManager(logic);
     }
 
@@ -72,7 +79,7 @@
      * The default file path {@code Config#DEFAULT_CONFIG_FILE} will be used instead
      * if {@code configFilePath} is null.
      */
-    protected Config initConfig(Path configFilePath) {
+    private static Config initConfig(Path configFilePath) {
         Config initializedConfig;
         Path configFilePathUsed;
 
@@ -111,7 +118,7 @@
      * or a new {@code UserPrefs} with default configuration if errors occur when
      * reading from the file.
      */
-    protected UserPrefs initPrefs(UserPrefsStorage storage) {
+    private static UserPrefs initPrefs(UserPrefsStorage storage) {
         Path prefsFilePath = storage.getUserPrefsFilePath();
         logger.info("Using preference file : " + prefsFilePath);
 
@@ -138,19 +145,40 @@
         return initializedPrefs;
     }
 
+    /**
+     * Reads the filepath stored within a {@cide Storage} object and returns a {@code ReadOnlyAddressBook}.
+     *
+     * @param storage the storage object.
+     * @return a read-only address book.
+     */
+    private ReadOnlyAddressBook initAddressBook(Storage storage) {
+        ReadOnlyAddressBook initialAddressBook;
+        try {
+            initialAddressBook = storage.readInitialAddressBook();
+            initialWelcomeMessage = "Data file loaded successfully.";
+        } catch (DataLoadingException e) {
+            initialAddressBook = new AddressBook();
+            initialWelcomeMessage = "WARNING!! Entering a command will override the old data file.\n"
+                    + e.getMessage();
+        }
+        return initialAddressBook;
+    }
+
     @Override
     public void start(Stage primaryStage) {
-        logger.info("Starting AddressBook " + MainApp.VERSION);
+        logger.info("Starting AssetBook " + MainApp.VERSION);
         ui.start(primaryStage);
+        ui.showMessage(initialWelcomeMessage);
     }
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping Address Book ] =============================");
+        logger.info("============================ [ Stopping Asset Book ] =============================");
         try {
             storage.saveUserPrefs(model.getUserPrefs());
         } catch (IOException e) {
             logger.severe("Failed to save preferences " + StringUtil.getDetails(e));
         }
     }
+
 }

src/main/java/seedu/address/commons/exceptions/DataLoadingException.java

@@ -8,4 +8,7 @@ public DataLoadingException(Exception cause) {
         super(cause);
     }
 
+    public DataLoadingException(String message) {
+        super(message);
+    }
 }

src/main/java/seedu/address/storage/Storage.java

@@ -30,5 +30,6 @@ public interface Storage extends AddressBookStorage, UserPrefsStorage {
     @Override
     void saveAddressBook(ReadOnlyAddressBook addressBook) throws StorageException;
 
-    ReadOnlyAddressBook readInitialAddressBook();
+    ReadOnlyAddressBook readInitialAddressBook() throws DataLoadingException;
+
 }

src/main/java/seedu/address/storage/StorageManager.java

@@ -7,7 +7,6 @@
 
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.commons.exceptions.DataLoadingException;
-import seedu.address.model.AddressBook;
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.UserPrefs;
@@ -18,6 +17,7 @@
  * Manages storage of AddressBook data in local storage.
  */
 public class StorageManager implements Storage {
+
     private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
     private AddressBookStorage addressBookStorage;
     private UserPrefsStorage userPrefsStorage;
@@ -84,25 +84,22 @@ public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) thro
      * address book.
      */
     @Override
-    public ReadOnlyAddressBook readInitialAddressBook() {
-        logger.info("Using data file : " + getAddressBookFilePath());
-
+    public ReadOnlyAddressBook readInitialAddressBook() throws DataLoadingException {
         Optional<ReadOnlyAddressBook> addressBookOptional;
-        ReadOnlyAddressBook initialAddressBook;
         try {
             addressBookOptional = readAddressBook();
             if (addressBookOptional.isEmpty()) {
                 logger.info("Creating a new data file " + getAddressBookFilePath()
                         + " populated with a sample AddressBook.");
             }
-            initialAddressBook = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
         } catch (DataLoadingException e) {
-            logger.warning("Data file at " + getAddressBookFilePath() + " could not be loaded."
-                    + " Will be starting with an empty AddressBook.");
-            initialAddressBook = new AddressBook();
+            String errorMessage = "Data file at " + getAddressBookFilePath() + " could not be loaded."
+                    + " Will be starting with an empty AddressBook.";
+            logger.warning(errorMessage);
+            throw new DataLoadingException(errorMessage);
         }
 
-        return initialAddressBook;
+        return addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
     }
 
 }

src/main/java/seedu/address/ui/MainWindow.java

@@ -28,13 +28,13 @@
 
     private final Logger logger = LogsCenter.getLogger(getClass());
 
-    private Stage primaryStage;
-    private Logic logic;
+    private final Stage primaryStage;
+    private final Logic logic;
 
     // Independent Ui parts residing in this Ui container
-    private PersonListPanel personListPanel;
-    private ResultDisplay resultDisplay;
-    private HelpWindow helpWindow;
+    private final PersonListPanel personListPanel;
+    private final ResultDisplay resultDisplay = new ResultDisplay();
+    private final HelpWindow helpWindow = new HelpWindow();
 
     @FXML
     private StackPane commandBoxPlaceholder;
@@ -60,13 +60,16 @@
         // Set dependencies
         this.primaryStage = primaryStage;
         this.logic = logic;
+        this.personListPanel = new PersonListPanel(logic.getFilteredPersonList());
 
         // Configure the UI
         setWindowDefaultSize(logic.getGuiSettings());
 
         setAccelerators();
 
-        helpWindow = new HelpWindow();
+        primaryStage.show(); // This should be called before creating other UI parts
+
+        fillInnerParts();
     }
 
     public Stage getPrimaryStage() {
@@ -110,11 +113,9 @@
     /**
      * Fills up all the placeholders of this window.
      */
-    void fillInnerParts() {
-        personListPanel = new PersonListPanel(logic.getFilteredPersonList());
+    private void fillInnerParts() {
         personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
 
-        resultDisplay = new ResultDisplay();
         resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
 
         StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath());
@@ -148,10 +149,6 @@
         }
     }
 
-    void show() {
-        primaryStage.show();
-    }
-
     /**
      * Closes the application.
      */
@@ -164,10 +161,6 @@
         primaryStage.hide();
     }
 
-    public PersonListPanel getPersonListPanel() {
-        return personListPanel;
-    }
-
     /**
      * Executes the command and returns the result.
      *
@@ -178,10 +171,10 @@
         try {
             commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult);
-            resultDisplay.setFeedbackToUser(commandResult);
+            showMessage(commandResult);
         } catch (CommandException | ParseException | StorageException e) {
             logger.info("An error occurred while executing command: " + commandText);
-            resultDisplay.setFeedbackToUser(e.getMessage());
+            showMessage(e.getMessage());
             throw e;
         }
 
@@ -193,4 +186,9 @@
         }
         return commandResult;
     }
+
+    public void showMessage(String msg) {
+        resultDisplay.setFeedbackToUser(msg);
+    }
+
 }

src/main/java/seedu/address/ui/Ui.java

@@ -10,4 +10,6 @@ public interface Ui {
     /** Starts the UI (and the App).  */
     void start(Stage primaryStage);
 
+    void showMessage(String msg);
+
 }

src/main/java/seedu/address/ui/UiManager.java

@@ -22,7 +22,7 @@
     private static final Logger logger = LogsCenter.getLogger(UiManager.class);
     private static final String ICON_APPLICATION = "/images/address_book_32.png";
 
-    private Logic logic;
+    private final Logic logic;
     private MainWindow mainWindow;
 
     /**
@@ -41,8 +41,6 @@
 
         try {
             mainWindow = new MainWindow(primaryStage, logic);
-            mainWindow.show(); //This should be called before creating other UI parts
-            mainWindow.fillInnerParts();
 
         } catch (Throwable e) {
             logger.severe(StringUtil.getDetails(e));
@@ -85,4 +83,9 @@
         System.exit(1);
     }
 
+    @Override
+    public void showMessage(String msg) {
+        mainWindow.showMessage(msg);
+    }
+
 }

src/test/java/seedu/address/storage/StorageManagerTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static seedu.address.model.util.SampleDataUtil.getSampleAddressBook;
 import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
 
@@ -82,23 +83,22 @@ public void getUserPrefsFilePath() {
     }
 
     @Test
-    public void readInitialAddressBook_noDataFile_sampleAddressBook() {
+    public void readInitialAddressBook_noDataFile_sampleAddressBook() throws DataLoadingException {
         addressBookStorage = new JsonAddressBookStorage(Paths.get("unavailable"));
         storageManager = new StorageManager(addressBookStorage, userPrefsStorage);
         ReadOnlyAddressBook retrieved = storageManager.readInitialAddressBook();
         assertEquals(getSampleAddressBook(), retrieved);
     }
 
     @Test
-    public void readInitialAddressBook_corruptedDataFile_emptyAddressBook() {
+    public void readInitialAddressBook_corruptedDataFile_throwsDataLoadingException() {
         storageManager = new StorageManager(addressBookStorage, userPrefsStorage) {
             @Override
             public Optional<ReadOnlyAddressBook> readAddressBook() throws DataLoadingException {
-                throw new DataLoadingException(null);
+                throw new DataLoadingException("");
             }
         };
-        ReadOnlyAddressBook retrieved = storageManager.readInitialAddressBook();
-        assertEquals(new AddressBook(), new AddressBook(retrieved));
+        assertThrows(DataLoadingException.class, () -> storageManager.readInitialAddressBook());
     }
 
 }