Work on Region, RegionView, countries.csv, Country

[Persons_Comparator.git] / src / Main.java

diff --git a/src/Main.java b/src/Main.java
index f7714fdedc3d30c35b4b4292de8bb055c0b23c75..194ff31cfe087196c593cd53d19e03a63f1b142b 100644 (file)
--- a/src/Main.java
+++ b/src/Main.java
@@ -32,7 +32,7 @@ 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);
@@ -75,12 +75,16 @@ public class Main {
 
         Person emptyPerson = new Person();
         PersonView emptyPersonView = new PersonView(emptyPerson, personArrayList);
+        Region r = new Region();
+        r.getCsvFile();
+
 
         //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();
             }
         });