Auto-formatted whole project

[jcontacts-core.git] / src / org / mxchange / jcontacts / contact / UserContact.java

diff --git a/src/org/mxchange/jcontacts/contact/UserContact.java b/src/org/mxchange/jcontacts/contact/UserContact.java
index 47554565789d91bf89924f6fbe5d043b7e9e625f..bfb6ab659f0f409ceacd44779a42e37e015c7237 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/UserContact.java
+++ b/src/org/mxchange/jcontacts/contact/UserContact.java
@@ -75,12 +75,6 @@ public class UserContact implements Contact, Comparable<Contact> {
        @Column (name = "comment")
        private String comment;
 
-       /**
-        * Company name
-        */
-       @Column (name = "company_name", nullable = false)
-       private String companyName;
-
        /**
         * Id number
         */
@@ -172,7 +166,7 @@ public class UserContact implements Contact, Comparable<Contact> {
         * ZIP code
         */
        @Column (name = "zip_code", nullable = false, length = 6)
-       private Long zipCode;
+       private Integer zipCode;
 
        /**
         * Constructor for gender and names
@@ -180,9 +174,8 @@ public class UserContact implements Contact, Comparable<Contact> {
         * @param gender Gender instance
         * @param firstName First name
         * @param familyName Family name
-        * @param companyName Company name
         */
-       public UserContact (final Gender gender, final String firstName, final String familyName, final String companyName) {
+       public UserContact (final Gender gender, final String firstName, final String familyName) {
                // Set all
                this.gender = gender;
                this.firstName = firstName;
@@ -199,6 +192,7 @@ public class UserContact implements Contact, Comparable<Contact> {
         * Compares two contacts with each other
         * <p>
         * @param contact Contact comparator
+        * <p>
         * @return Comparison value
         */
        @Override
@@ -227,7 +221,6 @@ public class UserContact implements Contact, Comparable<Contact> {
                // - base data
                this.setFirstName(contact.getFirstName());
                this.setFamilyName(contact.getFamilyName());
-               this.setCompanyName(contact.getCompanyName());
                this.setStreet(contact.getStreet());
                this.setZipCode(contact.getZipCode());
                this.setCity(contact.getCity());
@@ -249,6 +242,7 @@ public class UserContact implements Contact, Comparable<Contact> {
         * Check if contacts are same or throw an exception
         * <p>
         * @param object Other possible contact class
+        * <p>
         * @return Whether both contacts are same TODO Needs a lot improvements
         */
        @Override
@@ -266,9 +260,9 @@ public class UserContact implements Contact, Comparable<Contact> {
                Contact contact = (Contact) object;
 
                // Now test some data TODO Definedly needs improvement
-               return ((this.getGender().equals(contact.getGender()))
-                               && (this.getFirstName().toLowerCase().equals(contact.getFirstName().toLowerCase()))
-                               && (this.getFamilyName().toLowerCase().equals(contact.getFamilyName().toLowerCase())));
+               return ((this.getGender().equals(contact.getGender())) &&
+                               (this.getFirstName().toLowerCase().equals(contact.getFirstName().toLowerCase())) &&
+                               (this.getFamilyName().toLowerCase().equals(contact.getFamilyName().toLowerCase())));
        }
 
        @Override
@@ -311,16 +305,6 @@ public class UserContact implements Contact, Comparable<Contact> {
                this.comment = comment;
        }
 
-       @Override
-       public String getCompanyName () {
-               return this.companyName;
-       }
-
-       @Override
-       public void setCompanyName (final String companyName) {
-               this.companyName = companyName;
-       }
-
        @Override
        public Long getContactId () {
                return this.contactId;
@@ -448,12 +432,12 @@ public class UserContact implements Contact, Comparable<Contact> {
        }
 
        @Override
-       public Long getZipCode () {
+       public Integer getZipCode () {
                return this.zipCode;
        }
 
        @Override
-       public void setZipCode (final Long zipCode) {
+       public void setZipCode (final Integer zipCode) {
                this.zipCode = zipCode;
        }