X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FMain.java;h=17cf896c521dc308a5b1fb595f539beb48bb3963;hb=7add5cb9b2213df01b559a59f39b033e27f50e72;hp=5a894684ea8c281381fed54cfb78f7409315e791;hpb=829bb0cf20bdd2171f867bfcae5ced5b5ad8cc5e;p=Persons_Comparator.git

diff --git a/src/Main.java b/src/Main.java
index 5a89468..17cf896 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -3,8 +3,6 @@ import java.util.ArrayList;
 public class Main {
 
     public static void main(String[] args) {
-        //Schedule a job for the event-dispatching thread:
-        //creating and showing this application's GUI.
         String programName = "Person Comparator";
 
         ArrayList<Person> personArrayList = new ArrayList<>();
@@ -16,13 +14,13 @@ public class Main {
         personArrayList.add(person3);
         Person person4 = new Person("Sophia", "Brasil", 155, 57, "blue");
         personArrayList.add(person4);
-        Person person5 = new Person("Sylvain", "Italie", 181, 75, "brow");
+        Person person5 = new Person("Sylvain", "Italie", 181, 75, "brown");
         personArrayList.add(person5);
         Person person6 = new Person("Merlin", "United States of America", 210, 88, "blue");
         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);
@@ -34,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);
@@ -66,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);
@@ -76,12 +74,14 @@ public class Main {
         personArrayList.add(person33);
 
         Person emptyPerson = new Person();
-        emptyPerson.setPersonArrayList(personArrayList);
-        PersonView emptyPersonView = new PersonView(emptyPerson);
+        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() {
             public void run() {
-                MainWindowsView mainWindows = new MainWindowsView(programName, emptyPersonView);
+                MainWindowsView mainWindows = MainWindowsView.getInstance();
+                mainWindows.setMainWindowsView(programName, emptyPersonView);
                 mainWindows.showGUI();
             }
         });