Merge pull request #228 from Exprescode/master

Display game save location.
AY1920S1-CS2113T-F14-2 · Oct 31, 2019 · b9ef7a1 · b9ef7a1
2 parents 90ebd81 + 04feee6
commit b9ef7a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/commands/CommandGameSave.java b/src/main/java/commands/CommandGameSave.java
@@ -13,9 +13,10 @@ public class CommandGameSave extends Command {
     @Override
     public void execute(Farmio farmio) throws FarmioFatalException {
         Ui ui = farmio.getUi();
-        if (farmio.getStorage().storeFarmerPartial(farmio.getFarmer())) {
+        String location = farmio.getStorage().storeFarmerPartial(farmio.getFarmer());
+        if (location != null) {
             farmio.getSimulation().simulate();
-            ui.show("Game saved successfully!");
+            ui.show("Game saved successfully!\nGame save location:\n" + location);
         } else {
             farmio.getSimulation().simulate();
             ui.show("Game save failed!! Try again later.");

diff --git a/src/main/java/farmio/Storage.java b/src/main/java/farmio/Storage.java
@@ -99,9 +99,9 @@ public boolean storeFarmer(Farmer farmer) {
      * @param farmer Farmer instance to be updated to from json data.
      * @return True if save is successful.
      */
-    public boolean storeFarmerPartial(Farmer farmer) {
+    public String storeFarmerPartial(Farmer farmer) {
         if(jsonFarmer == null){
-            return false;
+            return null;
         }
         FileWriter file;
         try {
@@ -110,9 +110,9 @@ public boolean storeFarmerPartial(Farmer farmer) {
             file.write(jsonFarmer.toJSONString());
             file.close();
         } catch (IOException e) {
-            return false;
+            return null;
         }
-        return true;
+        return appDir.concat(jsonName);
     }
 
     /**