Merge e5125ba into e2aa291

CS2103-AY1819S2-W14-3 · Apr 13, 2019 · 1ef00e4 · 1ef00e4
2 parents e2aa291 + e5125ba
commit 1ef00e4
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 625 deletions.
diff --git a/docs/diagrams/SaveSequenceDiagram.pptx b/docs/diagrams/SaveSequenceDiagram.pptx
diff --git a/docs/diagrams/StatsSequenceDiagram.pptx b/docs/diagrams/StatsSequenceDiagram.pptx
diff --git a/docs/images/SaveSequenceDiag.PNG b/docs/images/SaveSequenceDiag.PNG
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
@@ -20,8 +20,6 @@
 import seedu.address.model.ModelManager;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.UserPrefs;
-import seedu.address.storage.AddressBookStorage;
-import seedu.address.storage.JsonAddressBookStorage;
 import seedu.address.storage.JsonStatisticsStorage;
 import seedu.address.storage.JsonUserPrefsStorage;
 import seedu.address.storage.StatisticsStorage;
@@ -56,7 +54,6 @@ public void init() throws Exception {
 
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         UserPrefs userPrefs = initPrefs(userPrefsStorage);
-        AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
         StatisticsStorage statisticsStorage = new JsonStatisticsStorage(userPrefs.getStatisticsFilePath());
         storage = new StorageManager(userPrefsStorage, statisticsStorage);
 

diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/seedu/address/storage/AddressBookStorage.java
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/seedu/address/storage/JsonAdaptedTag.java
diff --git a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java b/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
diff --git a/src/main/java/seedu/address/storage/JsonStatisticsStorage.java b/src/main/java/seedu/address/storage/JsonStatisticsStorage.java
@@ -20,8 +20,6 @@ public class JsonStatisticsStorage implements StatisticsStorage {
 
     private static final Logger logger = LogsCenter.getLogger(JsonStatisticsStorage.class);
 
-    private static final String DEFAULT_BACKUP_PATH = ".backup.json";
-
     private Path filePath;
 
     public JsonStatisticsStorage(Path filePath) {
@@ -79,11 +77,7 @@ public void saveStatisticsData(PlayerStatistics statisticsData, Path filePath) t
         String enemyShipsDestroyed = String.valueOf(statisticsData.getEnemyShipsDestroyed());
         String attacksMade = String.valueOf(statisticsData.getAttacksMade());
 
-        //JsonUtil.saveJsonFile(new JsonSerializableAddressBook(addressBook), filePath);
-
         JsonUtil.saveJsonFile(new JsonSerializableStatistics(hitCount, missCount, movesMade,
                                         enemyShipsDestroyed, attacksMade), filePath);
-
-        //System.out.println("Saving to JsonFile in JsonStatisticsStorage");
     }
 }