Tidied up save/load app state code (#115).

gbmhunter · Apr 24, 2016 · a0727b4 · a0727b4
1 parent a7ef063
commit a0727b4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/Main.java b/src/Main.java
@@ -112,14 +112,16 @@ public void start(Stage primaryStage) throws Exception{
 
         primaryStage.setMaximized(true);
 
+        //====== SAVING/LOADING APP STATE =====//
+
         // Install event handler for when the app is closed
         primaryStage.setOnCloseRequest((windowEvent) -> {
-                this.saveCalculatorState();
+                //this.saveCalculatorState();
             }
         );
 
         // Load saved calculator state (if any)
-        loadCalculatorState();
+        //loadCalculatorState();
 
         // Show the NinjaCalc app
         primaryStage.show();
@@ -131,19 +133,18 @@ private void saveCalculatorState() {
 
         try {
             // Write to disk with FileOutputStream
-            FileOutputStream f_out = new
+            FileOutputStream fileOS = new
                     FileOutputStream(appStateFileName);
 
             // Write object with ObjectOutputStream
-            ObjectOutputStream obj_out = new
-                    ObjectOutputStream(f_out);
+            ObjectOutputStream objOS = new
+                    ObjectOutputStream(fileOS);
 
             // Write object out to disk
-            obj_out.writeObject(controller.getOpenCalculators());
-
-            obj_out.close();
+            objOS.writeObject(controller.getOpenCalculators());
 
-            f_out.close();
+            objOS.close();
+            fileOS.close();
         } catch (FileNotFoundException e) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("FileNotFoundException");