Introduced Gender enum which replaces the old char

[jbonuscard-lib.git] / Addressbook / src / org / mxchange / addressbook / contact / BaseContact.java

diff --git a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
index f03a3c1bdf20c1ded94ccacfb5eb68ceeefbb4d0..aa82551e7b7fbf62a73382ed5acd107c4313afa0 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
+++ b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
@@ -75,10 +75,9 @@ public class BaseContact extends BaseFrameworkSystem {
        private String faxNumber;
 
        /**
-        * Gender code of the contact: - M = Mr. (male) - F = Mrs. (female) - C =
-        * Company
+        * Gender instance
         */
-       private char gender;
+       private Gender gender;
 
        /**
         * House number
@@ -139,7 +138,7 @@ public class BaseContact extends BaseFrameworkSystem {
                Contact contact = (Contact) object;
 
                // Now test some data @todo Definedly needs improvement
-               return ((this.getGender() == contact.getGender())
+               return ((this.getGender().equals(contact.getGender()))
                                && (this.getSurname().toLowerCase().equals(contact.getSurname().toLowerCase()))
                                && (this.getFamilyName().toLowerCase().equals(contact.getFamilyName().toLowerCase())));
        }
@@ -244,7 +243,7 @@ public class BaseContact extends BaseFrameworkSystem {
                String csvString = String.format(
                                "\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\"\n",
                                this.isOwnContact(),
-                               this.getGender(),
+                               this.getGender().getDatabaseValue(),
                                this.getSurname(),
                                this.getFamilyName(),
                                this.getCompanyName(),
@@ -323,7 +322,7 @@ public class BaseContact extends BaseFrameworkSystem {
         *
         * @return the gender
         */
-       public char getGender () {
+       public Gender getGender () {
                return this.gender;
        }
 
@@ -332,7 +331,7 @@ public class BaseContact extends BaseFrameworkSystem {
         *
         * @param gender the gender to set
         */
-       private void setGender (final char gender) {
+       private void setGender (final Gender gender) {
                this.gender = gender;
        }
 
@@ -392,15 +391,15 @@ public class BaseContact extends BaseFrameworkSystem {
 
                // "Translate" it
                switch (this.getGender()) {
-                       case 'M': // Mr.
+                       case MALE: // Mr.
                                translated = "Herr";
                                break;
 
-                       case 'F': // Mrs.
+                       case FEMALE: // Mrs.
                                translated = "Frau";
                                break;
 
-                       case 'C': // "Company"
+                       case COMPANY: // "Company"
                                translated = "Firma";
                                break;
 
@@ -435,7 +434,7 @@ public class BaseContact extends BaseFrameworkSystem {
        public int hashCode () {
                int hash = 7;
                hash = 79 * hash + Objects.hashCode(this.getFamilyName());
-               hash = 79 * hash + this.getGender();
+               hash = 79 * hash + this.getGender().hashCode();
                hash = 79 * hash + Objects.hashCode(this.getSurname());
                return hash;
        }
@@ -497,9 +496,10 @@ public class BaseContact extends BaseFrameworkSystem {
         * @param familyName Family name
         * @param companyName Company name
         */
-       public void updateNameData (final char gender, final String surname, final String familyName, final String companyName) {
+       public void updateNameData (final Gender gender, final String surname, final String familyName, final String companyName) {
                // Set all
                this.setGender(gender);
+
                if (surname != null) {
                        this.setSurname(surname);
                }