X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain.java;h=f7714fdedc3d30c35b4b4292de8bb055c0b23c75;hb=5687dc10a68b52d28b63151d8c16a45775ef2e77;hp=221d09c15b67fcdcb2e507412a40b98ec0b26aa6;hpb=9b3bfcdd95253a04ed12a676ee29a9d777c1e496;p=Persons_Comparator.git diff --git a/src/Main.java b/src/Main.java index 221d09c..f7714fd 100644 --- a/src/Main.java +++ b/src/Main.java @@ -20,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); @@ -36,9 +36,9 @@ public class Main { 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); @@ -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,8 +74,7 @@ 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.