From 25cf79234279f4cbc2dc91000c40a41f887a4c10 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 6 Oct 2015 13:58:16 +0200 Subject: [PATCH] =?utf8?q?companyName=20is=20already=20in=20jcontacts-busi?= =?utf8?q?ness-core=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../mxchange/jcontacts/contact/Contact.java | 14 ------------- .../jcontacts/contact/UserContact.java | 20 +------------------ 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/org/mxchange/jcontacts/contact/Contact.java b/src/org/mxchange/jcontacts/contact/Contact.java index 89a269c..1ecef44 100644 --- a/src/org/mxchange/jcontacts/contact/Contact.java +++ b/src/org/mxchange/jcontacts/contact/Contact.java @@ -91,20 +91,6 @@ public interface Contact extends Serializable { */ public void setComment (final String comment); - /** - * Company name - *

- * @return the companyName - */ - public String getCompanyName (); - - /** - * Company name - *

- * @param companyName the companyName to set - */ - public void setCompanyName (final String companyName); - /** * Id number *

diff --git a/src/org/mxchange/jcontacts/contact/UserContact.java b/src/org/mxchange/jcontacts/contact/UserContact.java index 0225e98..546787a 100644 --- 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 { @Column (name = "comment") private String comment; - /** - * Company name - */ - @Column (name = "company_name", nullable = false) - private String companyName; - /** * Id number */ @@ -180,9 +174,8 @@ public class UserContact implements Contact, Comparable { * @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; @@ -227,7 +220,6 @@ public class UserContact implements Contact, Comparable { // - 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()); @@ -311,16 +303,6 @@ public class UserContact implements Contact, Comparable { 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; -- 2.39.5