Merge branch 'master' of /home/sylvain/IdeaProjects/Persons_Comparator with conflicts.

diff --git a/src/Country.java b/src/Country.java
index 0dffb2ccd4537d9501d41536eef1b2c2fb64dc1b..08c4da2a88fad39e7be1945a93f02bb4a998d7d1 100644 (file)
--- a/src/Country.java
+++ b/src/Country.java
@@ -36,7 +36,7 @@ public class Country {
         private String pt;
         private String nl;
         private String hr;
-        private String fa;
+
 
         // Getter Methods
 
@@ -76,9 +76,7 @@ public class Country {
             return hr;
         }
 
-        public String getFa() {
-            return fa;
-        }
+
 
         // Setter Methods
 
@@ -118,9 +116,7 @@ public class Country {
             this.hr = hr;
         }
 
-        public void setFa(String fa) {
-            this.fa = fa;
-        }
+
     }
 
 

diff --git a/src/Main.java b/src/Main.java
index 221d09c15b67fcdcb2e507412a40b98ec0b26aa6..a6c37f903c9b263f14a5a3cf117d7ce42a192e15 100644 (file)
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,11 +1,24 @@
-import java.util.ArrayList;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.MalformedJsonException;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+
+import static com.google.gson.internal.Streams.parse;
 
 public class Main {
 
     public static void main(String[] args) {
-        String programName = "Person Comparator";
+        /* String programName = "Person Comparator"; */
 
-        ArrayList<Person> personArrayList = new ArrayList<>();
+
+       /* ArrayList<Person> personArrayList = new ArrayList<>();
         Person person1 = new Person("Alan", "United States of America", 180, 95, "black");
         personArrayList.add(person1);
         Person person2 = new Person("Brice", "France", 190, 82, "brown");
@@ -76,14 +89,50 @@ public class Main {
         Person emptyPerson = new Person();
         emptyPerson.setPersonArrayList(personArrayList);
         PersonView emptyPersonView = new PersonView(emptyPerson);
+        */
+
+
+        Gson gson = new Gson();
+        String continent = "coutryTry.json";
+
+        //JsonReader reader = new JsonReader(new StringReader(rep));
+
+
+
+            JsonElement jsonelement;
+            try {
+                String reader;
+                reader = "{/home/sylvain/IdeaProjects/Persons_Comparator/data/coutryTry.json}";
+
+                JsonReader jsonreader;
+                jsonreader = new JsonReader(new StringReader(reader));
+                jsonelement = parse(jsonreader);
+                jsonreader.setLenient(true);
+                if (!jsonelement.isJsonNull() && jsonreader.peek() != JsonToken.END_DOCUMENT) {
+                    throw new JsonSyntaxException("Did not consume the entire document.");
+                }
+                Region region = gson.fromJson(reader,Region.class);
+                List<Country> country = region.getCountry();
+                System.out.println(country);
+            } catch (MalformedJsonException malformedjsonexception) {
+                throw new JsonSyntaxException(malformedjsonexception);
+            } catch (IOException ioexception) {
+                throw new JsonIOException(ioexception);
+            } catch (NumberFormatException numberformatexception) {
+                throw new JsonSyntaxException(numberformatexception);
+            }
+
+
+        //File path = new File(rep+continent);
+
 
         //Schedule a job for the event-dispatching thread:
         //creating and showing this application's GUI.
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
+        /* javax.swing.SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 MainWindowsView mainWindows = new MainWindowsView(programName, emptyPersonView);
                 mainWindows.showGUI();
             }
-        });
+        }); */
     }
 }

diff --git a/src/Origin.java b/src/Origin.java
index 7d3e855c30ca7cb28690d408ffb61df29bde6ce9..efce11a79dc6b71678f2338afa05b8dac78e713a 100644 (file)
--- a/src/Origin.java
+++ b/src/Origin.java
@@ -13,6 +13,7 @@ public class Origin implements Comparable<Origin> {
             {"Australia"} /* Oceania */
     };
 
+
     Origin() {
     }
 

diff --git a/src/Region.java b/src/Region.java
index 927cffa53a15daa6d1ff67d68f54ff132e869cff..1deb36d938721e772dba6902620f455859b13f58 100644 (file)
--- a/src/Region.java
+++ b/src/Region.java
@@ -1,38 +1,15 @@
-import com.google.gson.Gson;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.TreeMap;
 
 public class Region extends TreeMap<String, ArrayList<Country>> {
+    private List<Country> country;
 
-    public Region() {
+    public void setCountry(List<Country> origins) {
+        this.country = country;
     }
 
-    @SuppressWarnings("SpellCheckingInspection")
-    public void lectureOrigine(String continent, String pays) {
-        Gson gson = new Gson();
-        Region r = new Region();
-        String contenu = "";
-        try {
-            InputStream flux = new FileInputStream(continent + ".json");
-            InputStreamReader lecture = new InputStreamReader(flux);
-            BufferedReader buff = new BufferedReader(lecture);
-            String ligne;
-            while ((ligne = buff.readLine()) != null) {
-                contenu += ligne;
-            }
-            buff.close();
-        } catch (Exception e) {
-            System.out.println(e.toString());
-        }
-        System.out.println("les information du pays" + pays + " du fichier est : " + contenu);
-        // maintenant je veux deserialiser
-        Origin coords3 = gson.fromJson(contenu, Origin.class);
-        //Coordonnees co = gson.fromJson(json,Coordonnees.class);
-        System.out.println("Resultat = " + coords3);
+    public List<Country> getCountry() {
+        return country;
     }
 }