Introduced initNamePanel() + added entering surname, family name and displays gender...

[jaddressbook-lib.git] / Addressbook / src / org / mxchange / addressbook / client / gui / AddressbookFrame.java

diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
index b3bcab4c964c6d34e98535990ca827405e37308e..bf0810d779c3f4af00bf93e5bd0d7fee50a3f1ab 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -272,7 +272,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame
                this.addContact.setAutoRequestFocus(true);
                
                // Initial dimension
-               this.addContact.setSize(400, 300);
+               this.addContact.setSize(500, 400);
                
                /*
                 * Add listener which asks for confirmation, if data has been entered
@@ -282,58 +282,8 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame
                 */
                
                // Init 3 panels:
-               // 1) Panel "name" input boxes
-               JPanel namePanel = new JPanel();
-               namePanel.setLayout(new BoxLayout(namePanel, BoxLayout.Y_AXIS));
-               
-               // Set border to titled version
-               namePanel.setBorder(new TitledBorder(this.generateBorderTitle("name")));
-
-               // Add some input boxes for "name" panel
-               JComboBox<Gender> gender = new JComboBox<>(new DefaultComboBoxModel<Gender>());
-
-               // Panel for gender
-               JPanel gPanel = new JPanel();
-               gPanel.setLayout(new GridLayout(1, 2));
-
-               // Set tooltip text
-               gPanel.setToolTipText(this.getBundle().getString("AddressbookFrame.gender.tooltipText"));
-
-               // Gender text field
-               JLabel gLabel = new JLabel(this.getBundle().getString("AddressbookFrame.gender.text"));
-
-               // Add both to gender panel
-               gPanel.add(gLabel);
-               gPanel.add(gender);
-
-               // Add panel to north of "name" panel
-               namePanel.add(gPanel, BorderLayout.NORTH);
-
-               // Panel for surname
-               JPanel sPanel = new JPanel();
-               sPanel.setLayout(new GridLayout(1, 2));
-
-               // Set too tip text
-               sPanel.setToolTipText(this.getBundle().getString("AddressbookFrame.surname.tooltipText"));
-
-               // New label for surname is not needed
-               JLabel sLabel = new JLabel(this.getBundle().getString("AddressbookFrame.surname.text"));
-
-               // And input box
-               JTextField surname = new JTextField(20);
-
-               // Add both to surname panel
-               sPanel.add(sLabel);
-               sPanel.add(surname);
-
-               // Add surname panel to "name" panel
-               namePanel.add(sPanel, BorderLayout.CENTER);
-
-               // Finally add panel to dialog
-               this.addContact.add(namePanel);
-               
-               // Only for developing:
-               /* DEBUG: */ this.addContact.setVisible(true);
+               // 1) "Name" panel
+               initNamePanel();
        }
 
        /**
@@ -478,6 +428,87 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame
                this.frame.add(menuBar, BorderLayout.NORTH);
        }
 
+       /**
+        * Initializes name panel
+        */
+       private void initNamePanel () {
+               // 1) Panel "name" input boxes
+               JPanel namePanel = new JPanel();
+               namePanel.setLayout(new BoxLayout(namePanel, BoxLayout.Y_AXIS));
+               
+               // Set border to titled version
+               namePanel.setBorder(new TitledBorder(this.generateBorderTitle("name")));
+               
+               // Get all genders
+               Gender[] genders = Gender.values();
+               
+               // Init gender combo box
+               JComboBox<Gender> gender = new JComboBox<>(new DefaultComboBoxModel<>(genders));
+               
+               // Panel for gender
+               JPanel gPanel = new JPanel();
+               gPanel.setLayout(new GridLayout(1, 2));
+               
+               // Set tooltip text
+               gPanel.setToolTipText(this.getBundle().getString("AddressbookFrame.gender.tooltipText"));
+               
+               // Gender text field
+               JLabel gLabel = new JLabel(this.getBundle().getString("AddressbookFrame.gender.text"));
+               
+               // Add both to gender panel
+               gPanel.add(gLabel);
+               gPanel.add(gender);
+               
+               // Add gender panel to "name" panel
+               namePanel.add(gPanel);
+               
+               // Panel for surname
+               JPanel sPanel = new JPanel();
+               sPanel.setLayout(new GridLayout(1, 2));
+               
+               // Set too tip text
+               sPanel.setToolTipText(this.getBundle().getString("AddressbookFrame.surname.tooltipText"));
+               
+               // New label for surname is not needed
+               JLabel sLabel = new JLabel(this.getBundle().getString("AddressbookFrame.surname.text"));
+               
+               // And input box
+               JTextField surname = new JTextField(20);
+               
+               // Add both to surname panel
+               sPanel.add(sLabel);
+               sPanel.add(surname);
+               
+               // Add surname panel to "name" panel
+               namePanel.add(sPanel);
+               
+               // Panel for surname
+               JPanel fPanel = new JPanel();
+               fPanel.setLayout(new GridLayout(1, 2));
+               
+               // Set too tip text
+               fPanel.setToolTipText(this.getBundle().getString("AddressbookFrame.familyName.tooltipText"));
+               
+               // New label for surname is not needed
+               JLabel fLabel = new JLabel(this.getBundle().getString("AddressbookFrame.familyName.text"));
+               
+               // And input box
+               JTextField familyName = new JTextField(20);
+               
+               // Add both to surname panel
+               fPanel.add(fLabel);
+               fPanel.add(familyName);
+               
+               // Add family namepanel to "name" panel
+               namePanel.add(fPanel);
+               
+               // Finally add panel to dialog
+               this.addContact.add(namePanel);
+               
+               // Only for developing:
+               /* DEBUG: */ this.addContact.setVisible(true);
+       }
+
        /**
         * Initialize other dialogs (e.g. "Add contact")
         */