From 4d0021f2efa04c7216fad9350f2ff9fa4c1b00f9 Mon Sep 17 00:00:00 2001
From: Konloch <konloch@gmail.com>
Date: Thu, 15 Jul 2021 00:55:18 -0700
Subject: [PATCH] Cleanup

---
 .../bytecodeviewer/SettingsSerializer.java    | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java b/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java
index b314b9ba..05405682 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java
@@ -49,7 +49,8 @@ public class SettingsSerializer
     
     public static synchronized void saveSettings()
     {
-        try {
+        try
+        {
             DiskWriter.replaceFile(settingsName, "BCV: " + VERSION, false);
             save(BytecodeViewer.viewer.rbr.isSelected());
             save(BytecodeViewer.viewer.rsy.isSelected());
@@ -200,6 +201,37 @@ public class SettingsSerializer
         }
     }
     
+    /**
+     * Preload data used to configure the looks and components of the application
+     */
+    public static void preloadSettingsFile()
+    {
+        try
+        {
+            settingsFileExists = new File(settingsName).exists();
+            
+            if(!settingsFileExists)
+                return;
+            
+            //precache the file
+            DiskReader.loadString(settingsName, 0, true);
+            
+            //process the cached file
+            Configuration.lafTheme = LAFTheme.valueOf(asString(127));
+            Configuration.rstaTheme = RSTATheme.valueOf(asString(128));
+            //line 129 is used normal loading
+            Configuration.language = Language.valueOf(asString(130));
+        }
+        catch (ArrayIndexOutOfBoundsException e)
+        {
+            //ignore because errors are expected, first start up and outdated settings.
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+    
     //utilizes the Disk Reader's caching system.
     public static void loadSettings()
     {
@@ -356,36 +388,13 @@ public class SettingsSerializer
             Configuration.javaTools = asString(134);
             Configuration.python2Extra = asString(135);
             Configuration.python3Extra = asString(136);
-        } catch (Exception e) {
-            //ignore because errors are expected, first start up and outdated settings.
-            e.printStackTrace();
         }
-    }
-    
-    /**
-     * Preload data used to configure the looks and components of the application
-     */
-    public static void preloadSettingsFile()
-    {
-        try
+        catch (ArrayIndexOutOfBoundsException e)
         {
-            settingsFileExists = new File(settingsName).exists();
-            
-            if(!settingsFileExists)
-                return;
-            
-            //precache the file
-            DiskReader.loadString(settingsName, 0, true);
-            
-            //process the cached file
-            Configuration.lafTheme = LAFTheme.valueOf(asString(127));
-            Configuration.rstaTheme = RSTATheme.valueOf(asString(128));
-            //line 129 is used normal loading
-            Configuration.language = Language.valueOf(asString(130));
+            //ignore because errors are expected, first start up and outdated settings.
         }
         catch (Exception e)
         {
-            //ignore because errors are expected, first start up and outdated settings.
             e.printStackTrace();
         }
     }