X-Git-Url: https://git.piment-noir.org/?p=Persons_Comparator.git;a=blobdiff_plain;f=src%2FMainWindowsView.java;fp=src%2FMainWindowsView.java;h=703792124cb31db55c285d7cd3ff79d65e9c00ec;hp=df6839f9813916af37709317683a550835ca2046;hb=6187b5ec050a664484d54283fd2612bfaf34cea3;hpb=3fc1aed88123babd636df3a0de26a4a87e472497

diff --git a/src/MainWindowsView.java b/src/MainWindowsView.java
index df6839f..7037921 100644
--- a/src/MainWindowsView.java
+++ b/src/MainWindowsView.java
@@ -7,12 +7,18 @@ import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 
 public class MainWindowsView extends JFrame {
+    private static MainWindowsView ourInstance = new MainWindowsView();
+    private PersonView currentPersonView;
 
-    MainWindowsView(String title, PersonView view) {
+    private MainWindowsView() {
+    }
+
+    public void setMainWindowsView(String title, PersonView personView) {
+        this.currentPersonView = personView;
         Container panel = getContentPane();
         //Create and set up the window.
         setTitle(title);
-        setSize(view.getDimension());
+        setSize(getCurrentPersonView().getDimension());
         setLocationRelativeTo(null);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -29,11 +35,19 @@ public class MainWindowsView extends JFrame {
             panel.add(component);
         }
 
-        panel.add(view.getNorthPanel(), BorderLayout.NORTH);
-        panel.add(view.getSouthPanel(), BorderLayout.SOUTH);
-        panel.add(view.getEastPanel(), BorderLayout.EAST);
-        panel.add(view.getWestPanel(), BorderLayout.WEST);
-        panel.add(view.getPersonPanel(), BorderLayout.CENTER);
+        panel.add(getCurrentPersonView().getNorthPanel(), BorderLayout.NORTH);
+        panel.add(getCurrentPersonView().getSouthPanel(), BorderLayout.SOUTH);
+        panel.add(getCurrentPersonView().getEastPanel(), BorderLayout.EAST);
+        panel.add(getCurrentPersonView().getWestPanel(), BorderLayout.WEST);
+        panel.add(getCurrentPersonView().getPersonPanel(), BorderLayout.CENTER);
+    }
+
+    public static MainWindowsView getInstance() {
+        return ourInstance;
+    }
+
+    public PersonView getCurrentPersonView() {
+        return currentPersonView;
     }
 
     /**
@@ -85,7 +99,7 @@ public class MainWindowsView extends JFrame {
         System.out.println("Created GUI on EDT? " +
                 SwingUtilities.isEventDispatchThread());
         //Display the window.
-        //this.pack();
+        this.pack();
         this.setVisible(true);
     }
 }
\ No newline at end of file