Refactor settings

Make update check / show file container name persistent

Author: rcx

src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java

@@ -89,8 +89,8 @@ public static void main(String[] args)
                 return;
             if (CLI == CommandLineInput.OPEN_FILE)
             {
-                viewer = new MainViewerGUI();
                 Settings.loadGUI();
+                viewer = new MainViewerGUI();
                 Boot.boot();
                 BytecodeViewer.BOOT(args, false);
             }

src/main/java/the/bytecode/club/bytecodeviewer/Setting.java

@@ -0,0 +1,39 @@
+package the.bytecode.club.bytecodeviewer;
+
+/**
+ * Used to handle loading/saving the GUI (options).
+ *
+ * @author Konloch
+ */
+public class Setting
+{
+    private String key;
+    private String value;
+
+    public Setting(String key, String value)
+    {
+        this.key = key;
+        this.value = value;
+        Settings.ALL_SETTINGS.put(this.key, this);
+    }
+
+    public String get()
+    {
+        return this.value;
+    }
+
+    public boolean getBool()
+    {
+        return Boolean.parseBoolean(this.value);
+    }
+
+    public void set(Object value)
+    {
+        this.value = value.toString();
+    }
+
+    public boolean isEmpty()
+    {
+        return this.value == null || this.value.isEmpty();
+    }
+}

src/main/java/the/bytecode/club/bytecodeviewer/Settings.java

@@ -14,36 +14,14 @@
  *
  * @author Konloch
  */
-public class Settings<T>
+public class Settings
 {
-    private static final Map<String, Settings> ALL_SETTINGS = new HashMap<>();
+    static final Map<String, Setting> ALL_SETTINGS = new HashMap<>();
 
-    public static final Settings<String> JAVA_LOCATION = new Settings<>("javalocation");
-    public static final Settings<String> PATH = new Settings<>("path");
-
-    private String key;
-    private T value;
-
-    public Settings(String key)
-    {
-        this.key = key;
-        ALL_SETTINGS.put(this.key, this);
-    }
-
-    public T get()
-    {
-        return this.value;
-    }
-
-    public void set(T value)
-    {
-        this.value = value;
-    }
-
-    public boolean isEmpty()
-    {
-        return this.value == null || (this.value instanceof String && ((String) this.value).isEmpty());
-    }
+    public static final Setting JAVA_LOCATION = new Setting("javalocation", "");
+    public static final Setting PATH = new Setting("path", "");
+    public static final Setting SHOW_CONTAINER_NAME = new Setting("showfilename", "false");
+    public static final Setting DO_UPDATE_CHECK = new Setting("doupdatecheck", "true");
 
     public static void saveGUI()
     {
@@ -59,11 +37,11 @@ public static void saveGUI()
                 settings.add("settings", new JsonObject());
             }
             JsonObject rootSettings = settings.get("settings").asObject();
-            for (Map.Entry<String, Settings> setting : Settings.ALL_SETTINGS.entrySet())
+            for (Map.Entry<String, Setting> setting : Settings.ALL_SETTINGS.entrySet())
             {
                 if (setting.getValue().get() != null)
                 {
-                    rootSettings.add(setting.getKey(), setting.getValue().get().toString());
+                    rootSettings.add(setting.getKey(), setting.getValue().get());
                 }
             }
             FileOutputStream out = new FileOutputStream(BytecodeViewer.settingsFile);
@@ -95,7 +73,7 @@ public static void loadGUI()
             if (settings.get("settings") != null)
             {
                 JsonObject rootSettings = settings.get("settings").asObject();
-                for (Map.Entry<String, Settings> setting : Settings.ALL_SETTINGS.entrySet())
+                for (Map.Entry<String, Setting> setting : Settings.ALL_SETTINGS.entrySet())
                 {
                     if (rootSettings.get(setting.getKey()) != null)
                     {

src/main/java/the/bytecode/club/bytecodeviewer/gui/FileChooser.java

@@ -1,18 +1,18 @@
 package the.bytecode.club.bytecodeviewer.gui;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.Settings;
+import the.bytecode.club.bytecodeviewer.Setting;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
 import java.io.File;
 
 public class FileChooser
 {
-    private Settings<String> target;
+    private Setting target;
     private String message;
 
-    public FileChooser(Settings<String> target, String message)
+    public FileChooser(Setting target, String message)
     {
         this.target = target;
         this.message = message;

src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java

@@ -263,7 +263,8 @@ else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_B
 
         settingsMenu.add(new JSeparator());
 
-        mntmUpdateCheck.setSelected(true);
+        mntmUpdateCheck.setSelected(Settings.DO_UPDATE_CHECK.getBool());
+        mntmUpdateCheck.addActionListener(e -> Settings.DO_UPDATE_CHECK.set(mntmUpdateCheck.isSelected()));
         settingsMenu.add(mntmUpdateCheck);
 
         settingsMenu.add(new JSeparator());
@@ -389,7 +390,7 @@ else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_B
         viewMenu.add(mnFontSize);
         mnFontSize.add(fontSpinner);
 
-        viewMenu.add(mnShowContainer);
+        mnShowContainer.setSelected(Settings.SHOW_CONTAINER_NAME.getBool());
         mnShowContainer.addItemListener(e -> {
             JTabbedPane tabs = workPane.tabs;
             Component[] components = tabs.getComponents();
@@ -404,7 +405,10 @@ else if ((oldState & Frame.MAXIMIZED_BOTH) != 0 && (newState & Frame.MAXIMIZED_B
                     workPane.tabs.setTitleAt(idx, c.getName());
                 }
             }
+            Settings.SHOW_CONTAINER_NAME.set(mnShowContainer.isSelected());
         });
+        viewMenu.add(mnShowContainer);
+
         panelGroup1.setSelected(allDecompilersRev.get(panelGroup1).get(Decompiler.FERNFLOWER).getModel(), true);
         panelGroup2.setSelected(allDecompilersRev.get(panelGroup2).get(Decompiler.BYTECODE).getModel(), true);
         panelGroup3.setSelected(allDecompilersRev.get(panelGroup3).get(null).getModel(), true);