Updated copyright year

[addressbook-swing.git] / src / org / mxchange / addressbook / client / console / ConsoleClient.java

diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index 19d9c747ac56305df4a45288b102677331221d64..4fd9b35e2293146aa110eb1f741d4ad2300564ee 100644 (file)
--- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016, 2020 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,9 +32,9 @@ import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.addressbook.menu.item.console.ConsoleMenuItem;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jcontacts.contact.gender.Gender;
-import org.mxchange.jcontacts.contact.gender.GenderUtils;
-import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
+import org.mxchange.jcontacts.contact.title.PersonalTitleUtils;
+import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException;
 import org.mxchange.jcore.application.Application;
 import org.mxchange.jcore.exceptions.MenuInitializationException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
@@ -103,11 +103,11 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                        throw new NullPointerException("contact is null"); //NOI18N
                }
 
-               // Get translated gender as the user may want to see "Mr.", "Mrs."
-               String gender = GenderUtils.getTranslatedGender(contact);
+               // Get translated title as the user may want to see "Mr.", "Mrs."
+               String title = PersonalTitleUtils.getTranslatedPersonalTitle(contact);
 
-               // Now put all together: gender, surname, family name
-               this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", gender, contact.getContactFirstName(), contact.getContactFamilyName()));
+               // Now put all together: title, surname, family name
+               this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", title, contact.getContactFirstName(), contact.getContactFamilyName()));
 
                // Trace message
                this.getLoggerBeanLocal().logTrace("EXIT!"); //NOI18N
@@ -193,8 +193,8 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                // Get manager and cast it
                ContactFacade manager = (ContactFacade) this.getFacade();
 
-               // Gender:
-               Gender gender = manager.enterOwnGender();
+               // PersonalTitle:
+               PersonalTitle title = manager.enterOwnPersonalTitle();
 
                // Surname
                String firstName = manager.enterOwnFirstName();
@@ -203,7 +203,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                String familyName = manager.enterOwnFamilyName();
 
                // Update contact instance
-               contact.setContactGender(gender);
+               contact.setContactPersonalTitle(title);
                contact.setContactFirstName(firstName);
                contact.setContactFamilyName(familyName);
 
@@ -265,8 +265,8 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                // Get manager and cast it
                ContactFacade manager = (ContactFacade) this.getFacade();
 
-               // First ask for gender
-               Gender gender = manager.enterOwnGender();
+               // First ask for title
+               PersonalTitle title = manager.enterOwnPersonalTitle();
 
                // 2nd for first name
                String firstName = manager.enterOwnFirstName();
@@ -275,7 +275,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                String familyName = manager.enterOwnFamilyName();
 
                // Construct UserContact instance
-               Contact contact = new UserContact(gender, firstName, familyName);
+               Contact contact = new UserContact(title, firstName, familyName);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("contact={0} - EXIT!", contact)); //NOI18N
@@ -317,7 +317,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                                try {
                                        // Enter/add own data
                                        manager.doEnterOwnData();
-                               } catch (final ContactAlreadyAddedException ex) {
+                               } catch (final BusinessDataAlreadyAddedException ex) {
                                        // Already added
                                        this.outputMessage("Sie haben bereits Ihre eigenen Daten eingegeben.");
                                }
@@ -402,23 +402,23 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
        }
 
        @Override
-       public Gender enterGender (final String message) {
+       public PersonalTitle enterPersonalTitle (final String message) {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("message={0} - CALLED!", message)); //NOI18N
 
                // Get valid chars
-               char[] validChars = Gender.validChars();
+               char[] validChars = PersonalTitle.validChars();
 
                // Debug message
                //* NOISY-DEBUG: */ System.out.println(validChars);
                // Call inner method
-               char gender = this.enterChar(validChars, message);
+               char title = this.enterChar(validChars, message);
 
-               // Now get a Gender instance back
-               Gender g = Gender.fromChar(gender);
+               // Now get a PersonalTitle instance back
+               PersonalTitle g = PersonalTitle.fromChar(title);
 
                // g must not be null
-               assert (g instanceof Gender) : "g is not set."; //NOI18N
+               assert (g instanceof PersonalTitle) : "g is not set."; //NOI18N
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("g={0} - EXIT!", g)); //NOI18N