fixed save file encoding

zmilla93 · Oct 17, 2021 · 1ca0e44 · 1ca0e44
1 parent 337bc2a
commit 1ca0e44
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/main/java/com/slimtrade/core/managers/SaveManager.java b/src/main/java/com/slimtrade/core/managers/SaveManager.java
@@ -7,6 +7,8 @@
 
 import java.awt.*;
 import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 public class SaveManager {
@@ -44,7 +46,8 @@ public class SaveManager {
     // File Stuff
     private FileReader fr;
     private BufferedReader br;
-    private FileWriter fw;
+    private Writer fw;
+    private BufferedWriter bw;
     private Gson gson;
 
     // TODO : OPTIMIZE :    Combine all saving and loading functions into one using wildcars?
@@ -150,7 +153,7 @@ public void loadPinsFromDisk() {
     private String getJsonString(String path) {
         StringBuilder builder = new StringBuilder();
         try {
-            br = new BufferedReader(new FileReader(path));
+            br = new BufferedReader(new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8));
             while (br.ready()) {
                 builder.append(br.readLine());
             }
@@ -163,7 +166,7 @@ private String getJsonString(String path) {
 
     public void saveSettingsToDisk() {
         try {
-            fw = new FileWriter(savePath);
+            fw = new OutputStreamWriter(new FileOutputStream(savePath), StandardCharsets.UTF_8);
             fw.write(gson.toJson(settingsSaveFile));
             fw.close();
         } catch (IOException e) {
@@ -173,7 +176,7 @@ public void saveSettingsToDisk() {
 
     public void saveStashToDisk() {
         try {
-            fw = new FileWriter(stashSavePath);
+            fw = new OutputStreamWriter(new FileOutputStream(stashSavePath), StandardCharsets.UTF_8);
             fw.write(gson.toJson(stashSaveFile));
             fw.close();
         } catch (IOException e) {
@@ -183,7 +186,7 @@ public void saveStashToDisk() {
 
     public void saveOverlayToDisk() {
         try {
-            fw = new FileWriter(overlaySavePath);
+            fw = new OutputStreamWriter(new FileOutputStream(overlaySavePath), StandardCharsets.UTF_8);
             fw.write(gson.toJson(overlaySaveFile));
             fw.close();
         } catch (IOException e) {
@@ -193,7 +196,7 @@ public void saveOverlayToDisk() {
 
     public void saveScannerToDisk() {
         try {
-            fw = new FileWriter(scannerSavePath);
+            fw = new OutputStreamWriter(new FileOutputStream(scannerSavePath), StandardCharsets.UTF_8);
             fw.write(gson.toJson(scannerSaveFile));
             fw.close();
         } catch (IOException e) {
@@ -203,7 +206,7 @@ public void saveScannerToDisk() {
 
     public void savePinsToDisk() {
         try {
-            fw = new FileWriter(pinSavePath);
+            fw = new OutputStreamWriter(new FileOutputStream(pinSavePath), StandardCharsets.UTF_8);
             fw.write(gson.toJson(pinSaveFile));
             fw.close();
         } catch (IOException e) {

diff --git a/src/main/java/com/slimtrade/gui/options/general/BasicsPanel.java b/src/main/java/com/slimtrade/gui/options/general/BasicsPanel.java
@@ -19,6 +19,8 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 public class BasicsPanel extends ContainerPanel implements ISaveable, IColorable {
 
@@ -208,11 +210,22 @@ private void updateQuickPasteVis() {
 
     @Override
     public void save() {
+        byte[] source = characterInput.getText().getBytes(Charset.defaultCharset());
+        System.out.println("C1:" + (int)characterInput.getText().charAt(0));
+        System.out.println("src" + source);
+        String good = new String(source);
+        System.out.println("GOOD: " + good);
+
+        System.out.println("charSET:" + Charset.defaultCharset());
+//        System.out.println("data:" + data);
+        System.out.println("charText:" + characterInput.getText());
+        System.out.println("thrd:" + SwingUtilities.isEventDispatchThread());
         String characterName = characterInput.getText().replaceAll("\\s+", "");
         if (characterName.equals("")) {
             characterName = null;
         }
         ColorTheme colorTheme = (ColorTheme) colorThemeCombo.getSelectedItem();
+        System.out.println("charName:" + characterName);
         App.saveManager.settingsSaveFile.characterName = characterName;
         App.saveManager.settingsSaveFile.showGuildName = guildCheckbox.isSelected();
         App.saveManager.settingsSaveFile.folderOffset = folderOffsetCheckbox.isSelected();