Put each view inside its own panel and add each panel to the main panel.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/EyeView.java b/src/EyeView.java
index f976a4e81187fea41e49e8ed4086e00bc9a01f0e..a80a31a768ed5d4f21abdfd690b1aa9939a28ebc 100644 (file)
--- a/src/EyeView.java
+++ b/src/EyeView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class EyeView extends JComponent {
+public class EyeView extends JPanel {
     private Eye eyeObj;
     private JLabel label;
     private JComboBox colorsList;
@@ -13,8 +13,7 @@ public class EyeView extends JComponent {
         this.label = new JLabel();
         this.label.setText("Eyes color");
         this.colorsList = new JComboBox<>(this.getEyeObj().getColorsList());
-        if (this.getEyeObj().getStrColor() != null)
-            this.colorsList.setSelectedItem(this.getEyeObj().getStrColor());
+        this.colorsList.setSelectedItem(this.getEyeObj().getStrColor());
         add(label);
         add(colorsList);
     }

diff --git a/src/FirstnameView.java b/src/FirstnameView.java
index 8634dc71ac715b2b868398aae1331d2ccf1d48e2..b7b85680290a51ca5c6c28e21bf1c92db3cdd3fe 100644 (file)
--- a/src/FirstnameView.java
+++ b/src/FirstnameView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class FirstnameView extends JComponent {
+public class FirstnameView extends JPanel {
     private Firstname firstnameObj;
     private JTextField textField;
     private JLabel label;

diff --git a/src/Main.java b/src/Main.java
index 5bac73ebab3fa905a7284370d082a79ba12e49a1..361c00e88361eba731b55758b5c697e8faab326c 100644 (file)
--- a/src/Main.java
+++ b/src/Main.java
@@ -17,7 +17,8 @@ public class Main {
         Person person4 = new Person("Sophia", "Brasil", 155, 57, "blue");
         personArrayList.add(person4);
 
-        Person emptyPerson = new Person();
+        //Person emptyPerson = new Person();
+        Person emptyPerson = person2;
         emptyPerson.setPersonArrayList(personArrayList);
         PersonView emptyPersonView = new PersonView(emptyPerson);
 

diff --git a/src/MainWindowsView.java b/src/MainWindowsView.java
index dbe2eedaf9beaee2f2f75da5c24374cbfa21121e..c3688ba206e60bf9f7ef80b3bf9a145d71e8893e 100644 (file)
--- a/src/MainWindowsView.java
+++ b/src/MainWindowsView.java
@@ -26,7 +26,7 @@ public class MainWindowsView extends JFrame {
         });
         fileMenu.add(exit);
 
-        //Get all Swing/AWT primitive components in the views and add them to the panel.
+        //Get all Swing/AWT primitive components in the views and add them to the main panel.
         ArrayList<Component> components = new ArrayList<>();
         for (int i = 0; i < panel.getComponentCount(); i++) {
             if ((panel.getComponent(i) instanceof Container)) {

diff --git a/src/OriginView.java b/src/OriginView.java
index 695a90cc53b7e41e9d53c50d4c770a91c36fb62d..3c3b5183367901c7062e77b33ca7beaad310052c 100644 (file)
--- a/src/OriginView.java
+++ b/src/OriginView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class OriginView extends JComponent {
+public class OriginView extends JPanel {
     private Origin originObj;
     private JLabel label;
 

diff --git a/src/SizeView.java b/src/SizeView.java
index 18e5016661c23d699b6c945bd99babce3a33e37d..01736157cc9e624ca89a498a372cd4713d2c2cb5 100644 (file)
--- a/src/SizeView.java
+++ b/src/SizeView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class SizeView extends JComponent {
+public class SizeView extends JPanel {
     private Size sizeObj;
     private JLabel label;
 

diff --git a/src/WeightView.java b/src/WeightView.java
index 1576b62e2e836d77e3433b3c49e32e092ab79bc2..9e7ef20d8c0744377cef894240f2e82f6ce0f60e 100644 (file)
--- a/src/WeightView.java
+++ b/src/WeightView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class WeightView extends JComponent {
+public class WeightView extends JPanel {
     private Weight weightObj;
     private JLabel label;