diff --git a/.classpath b/.classpath
index 24f7940f0b2a76fb7a3dceb2567a0f005aa4f72a..6533fa623c1c6061f382ccc4fcd8a7fa5e7142c5 100644
--- a/.classpath
+++ b/.classpath
@@ -6,11 +6,12 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry kind="lib" path="jcalendar-1.4.jar"/>
- <classpathentry kind="lib" path="miglayout15-swing.jar" sourcepath="miglayout-src.zip"/>
- <classpathentry kind="lib" path="gson-2.6.2.jar"/>
- <classpathentry kind="lib" path="json-simple-1.1.jar"/>
+ <classpathentry kind="lib" path="libs/gson-2.10.1.jar"/>
+ <classpathentry kind="lib" path="libs/jcalendar-1.4.jar"/>
+ <classpathentry kind="lib" path="libs/jgoodies-forms-1.8.0.jar"/>
+ <classpathentry kind="lib" path="libs/jgoodies-forms-1.8.0-sources.jar"/>
+ <classpathentry kind="lib" path="libs/json-simple-1.1.jar"/>
+ <classpathentry kind="lib" path="libs/miglayout15-swing.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/gson-2.6.2.jar b/gson-2.6.2.jar
deleted file mode 100644
index 9d78626d859f45baf408ae02cda8852a0e1798f1..0000000000000000000000000000000000000000
Binary files a/gson-2.6.2.jar and /dev/null differ
diff --git a/libs/gson-2.10.1.jar b/libs/gson-2.10.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a88c5bd9b5f17af70ab9601a781388418e0b772f
Binary files /dev/null and b/libs/gson-2.10.1.jar differ
diff --git a/jcalendar-1.4.jar b/libs/jcalendar-1.4.jar
similarity index 100%
rename from jcalendar-1.4.jar
rename to libs/jcalendar-1.4.jar
diff --git a/jgoodies-forms-1.8.0-sources.jar b/libs/jgoodies-forms-1.8.0-sources.jar
similarity index 100%
rename from jgoodies-forms-1.8.0-sources.jar
rename to libs/jgoodies-forms-1.8.0-sources.jar
diff --git a/jgoodies-forms-1.8.0.jar b/libs/jgoodies-forms-1.8.0.jar
similarity index 100%
rename from jgoodies-forms-1.8.0.jar
rename to libs/jgoodies-forms-1.8.0.jar
diff --git a/json-simple-1.1.jar b/libs/json-simple-1.1.jar
similarity index 100%
rename from json-simple-1.1.jar
rename to libs/json-simple-1.1.jar
diff --git a/miglayout15-swing.jar b/libs/miglayout15-swing.jar
similarity index 100%
rename from miglayout15-swing.jar
rename to libs/miglayout15-swing.jar
diff --git a/src/AppJ_V03.java b/src/AppJ_V03.java
index 210f770c701a6fb255c44c8a1d0fb3235f2431d7..ea6a6fd40650174d5099ca33c92b17cea7511829 100644
--- a/src/AppJ_V03.java
+++ b/src/AppJ_V03.java
@@ -5,65 +5,61 @@
//
import java.awt.BorderLayout;
import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.FlowLayout;
+import java.awt.Font;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
-import java.awt.Font;
-import java.awt.Dimension;
-import java.awt.Color;
-import java.awt.Container;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.AbstractListModel;
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
+import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import javax.swing.SpinnerNumberModel;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JSpinner;
-import javax.swing.JTextArea;
-import javax.swing.JList;
-import javax.swing.AbstractListModel;
-import javax.swing.ButtonGroup;
-import javax.swing.JScrollPane;
+import javax.swing.border.MatteBorder;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.function.Consumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.toedter.calendar.JDateChooser;
-import com.google.gson.*;
import com.google.gson.Gson;
-
-import javax.swing.border.Border;
-import javax.swing.border.MatteBorder;
+import com.google.gson.GsonBuilder;
+import com.toedter.calendar.JDateChooser;
/**
* ======================================================================================================
* JFrame
@@ -483,13 +479,14 @@ public class AppJ_V03 extends JFrame {
if(srcfile.exists() || srcfile1.exists() || srcfile2.exists()) {
Object obj1 = null;
+ System.out.println("Default Charset=" + Charset.defaultCharset());
if(srcfile.exists()) {
File file = new File(srcfile.toString());
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy, HH:mm:ss");
dt = "Last modified : " + sdf.format(file.lastModified()) ;
//
JSONParser parser = new JSONParser();
- obj1 = parser.parse(new FileReader(srcfile));
+ obj1 = parser.parse(new FileReader(srcfile)); // #Anchor 1 , StandardCharsets.UTF_8
} else if(srcfile1.exists()){
//
File file = new File(srcfile1.toString());