Fix the country name fetching from CSV.

[Persons_Comparator.git] / src / Main.java

diff --git a/src/Main.java b/src/Main.java
index 221d09c15b67fcdcb2e507412a40b98ec0b26aa6..fa1f1993dbac3f08489add9de8afb48c764880dd 100644 (file)
--- a/src/Main.java
+++ b/src/Main.java
@@ -6,21 +6,21 @@ public class Main {
         String programName = "Person Comparator";
 
         ArrayList<Person> personArrayList = new ArrayList<>();
-        Person person1 = new Person("Alan", "United States of America", 180, 95, "black");
+        Person person1 = new Person("Alan", "United States", 180, 95, "black");
         personArrayList.add(person1);
         Person person2 = new Person("Brice", "France", 190, 82, "brown");
         personArrayList.add(person2);
         Person person3 = new Person("Alexandre", "France", 175, 73, "green");
         personArrayList.add(person3);
-        Person person4 = new Person("Sophia", "Brasil", 155, 57, "blue");
+        Person person4 = new Person("Sophia", "Brazil", 155, 57, "blue");
         personArrayList.add(person4);
-        Person person5 = new Person("Sylvain", "Italie", 181, 75, "brown");
+        Person person5 = new Person("Sylvain", "Italy", 181, 75, "brown");
         personArrayList.add(person5);
-        Person person6 = new Person("Merlin", "United States of America", 210, 88, "blue");
+        Person person6 = new Person("Merlin", "United States", 210, 88, "blue");
         personArrayList.add(person6);
-        Person person7 = new Person("Bob", "United States of America", 162, 75, "green");
+        Person person7 = new Person("Bob", "United States", 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);
@@ -32,15 +32,15 @@ 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");
+        Person person18 = new Person("Roberto", "Brazil", 168, 56, "brown");
         personArrayList.add(person18);
         Person person19 = new Person("Batista", "France", 158, 52, "black");
         personArrayList.add(person19);
@@ -64,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);
@@ -74,14 +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();
             }
         });