X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FMain.java;h=17cf896c521dc308a5b1fb595f539beb48bb3963;hb=822afd4fe0aa1669db1e3be57b277f8aff977254;hp=a6c37f903c9b263f14a5a3cf117d7ce42a192e15;hpb=5bdd299653b9c3f29a817a555ae6a17eac41b75b;p=Persons_Comparator.git

diff --git a/src/Main.java b/src/Main.java
index a6c37f9..17cf896 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,24 +1,11 @@
-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;
+import java.util.ArrayList;
 
 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");
@@ -33,7 +20,7 @@ public class Main {
         personArrayList.add(person6);
         Person person7 = new Person("Bob", "United States of America", 162, 75, "green");
         personArrayList.add(person7);
-        Person person8 = new Person("Jonh", "United Kingdom", 176, 102, "brown");
+        Person person8 = new Person("John", "United Kingdom", 176, 102, "brown");
         personArrayList.add(person8);
         Person person9 = new Person("Kithe", "Germany", 166, 69, "black");
         personArrayList.add(person9);
@@ -45,13 +32,13 @@ public class Main {
         personArrayList.add(person12);
         Person person13 = new Person("Rodolphe", "Germany", 212, 108, "black");
         personArrayList.add(person13);
-        Person person14 = new Person("Rodolphe", "Norway", 212, 108, "blue");
+        Person person14 = new Person("Rodolphe", "Norway", 173, 83, "blue");
         personArrayList.add(person14);
         Person person15 = new Person("Abdel", "Mali", 168, 52, "black");
         personArrayList.add(person15);
-        Person person16 = new Person("Sherrazade", "Mali", 148, 48, "black");
+        Person person16 = new Person("Shéhérazade", "Mali", 148, 48, "black");
         personArrayList.add(person16);
-        Person person17 = new Person("Aifa", "Mali", 149, 49, "black");
+        Person person17 = new Person("Aïfa", "Mali", 149, 49, "black");
         personArrayList.add(person17);
         Person person18 = new Person("Roberto", "Brasil", 168, 56, "brown");
         personArrayList.add(person18);
@@ -77,9 +64,9 @@ public class Main {
         personArrayList.add(person28);
         Person person29 = new Person("Ange", "France", 175, 62, "green");
         personArrayList.add(person29);
-        Person person30 = new Person("Aurelie", "France", 163, 59, "green");
+        Person person30 = new Person("Aurélie", "France", 163, 59, "green");
         personArrayList.add(person30);
-        Person person31 = new Person("Audrey", "United Kingdom", 163, 69, "blue");
+        Person person31 = new Person("Audrey", "United Kingdom", 169, 69, "green");
         personArrayList.add(person31);
         Person person32 = new Person("Anthony", "United Kingdom", 176, 69, "black");
         personArrayList.add(person32);
@@ -87,52 +74,16 @@ public class Main {
         personArrayList.add(person33);
 
         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);
-
+        PersonView emptyPersonView = new PersonView(emptyPerson, personArrayList);
 
         //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);
+                MainWindowsView mainWindows = MainWindowsView.getInstance();
+                mainWindows.setMainWindowsView(programName, emptyPersonView);
                 mainWindows.showGUI();
             }
-        }); */
+        });
     }
 }