Introduced Gender enum which replaces the old char

[jbonuscard-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 2c9494ba812137d68af8c272ef71db5380a245dc..b3bcab4c964c6d34e98535990ca827405e37308e 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -16,7 +16,6 @@
  */
 package org.mxchange.addressbook.client.gui;
 
-import org.mxchange.addressbook.model.gender.GenderComboBoxModel;
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -28,6 +27,7 @@ import java.awt.event.WindowEvent;
 import java.text.MessageFormat;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
@@ -38,11 +38,13 @@ import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.TableModel;
 import org.mxchange.addressbook.BaseFrameworkSystem;
 import org.mxchange.addressbook.application.AddressbookApplication;
 import org.mxchange.addressbook.client.Client;
+import org.mxchange.addressbook.contact.Gender;
 import org.mxchange.addressbook.exceptions.FrameAlreadyInitializedException;
 import org.mxchange.addressbook.model.contact.ContactTableModel;
 
@@ -281,17 +283,54 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame
                
                // Init 3 panels:
                // 1) Panel "name" input boxes
-               JPanel panel = new JPanel();
-               panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+               JPanel namePanel = new JPanel();
+               namePanel.setLayout(new BoxLayout(namePanel, BoxLayout.Y_AXIS));
                
                // Set border to titled version
-               panel.setBorder(new TitledBorder(this.generateBorderTitle("name")));
+               namePanel.setBorder(new TitledBorder(this.generateBorderTitle("name")));
 
                // Add some input boxes for "name" panel
-               JComboBox<String> gender = new JComboBox<>(new GenderComboBoxModel(this.getClient()));
+               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(panel);
+               this.addContact.add(namePanel);
                
                // Only for developing:
                /* DEBUG: */ this.addContact.setVisible(true);