From 8bc1ef7e5e1989de6be08d72891b6c4ff5da2f5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Jul 2017 21:14:04 +0200 Subject: [PATCH] It is now BusinessBasicData which is merged from BusinessContact and the same class' methods and fields. --- .../model/addressbook/entry/AddressbookEntry.java | 6 +++--- .../addressbook/entry/UserAddressbookEntry.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/mxchange/jaddressbook/model/addressbook/entry/AddressbookEntry.java b/src/org/mxchange/jaddressbook/model/addressbook/entry/AddressbookEntry.java index b30fb82..af605a8 100644 --- a/src/org/mxchange/jaddressbook/model/addressbook/entry/AddressbookEntry.java +++ b/src/org/mxchange/jaddressbook/model/addressbook/entry/AddressbookEntry.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Calendar; import org.mxchange.jaddressbook.model.addressbook.Addressbook; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontactsbusiness.BusinessContact; +import org.mxchange.jcontactsbusiness.BusinessBasicData; /** * A POJI for addressbook entries @@ -48,14 +48,14 @@ public interface AddressbookEntry extends Serializable { *

* @return Business contact */ - BusinessContact getAddressbookEntryBusinessContact (); + BusinessBasicData getAddressbookEntryBusinessContact (); /** * Setter for business contact *

* @param addressbookEntryBusinessContact Business contact */ - void setAddressbookEntryBusinessContact (final BusinessContact addressbookEntryBusinessContact); + void setAddressbookEntryBusinessContact (final BusinessBasicData addressbookEntryBusinessContact); /** * Getter for entry created timestamp diff --git a/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java index c01ff06..e3c461e 100644 --- a/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java +++ b/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java @@ -37,8 +37,8 @@ import org.mxchange.jaddressbook.model.addressbook.Addressbook; import org.mxchange.jaddressbook.model.addressbook.UserAddressbook; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontactsbusiness.BusinessContact; -import org.mxchange.jcontactsbusiness.CompanyContact; +import org.mxchange.jcontactsbusiness.CompanyBasicData; +import org.mxchange.jcontactsbusiness.BusinessBasicData; /** * A POJO for address book entries @@ -65,8 +65,8 @@ public class UserAddressbookEntry implements AddressbookEntry { * Connection to table "business_contacts" (commercial contacts) */ @JoinColumn (name = "entry_business_contact_id", updatable = false) - @OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH) - private BusinessContact addressbookEntryBusinessContact; + @OneToOne (targetEntity = CompanyBasicData.class, cascade = CascadeType.REFRESH) + private BusinessBasicData addressbookEntryBusinessContact; /** * When this address book entry has been created @@ -131,12 +131,12 @@ public class UserAddressbookEntry implements AddressbookEntry { } @Override - public BusinessContact getAddressbookEntryBusinessContact () { + public BusinessBasicData getAddressbookEntryBusinessContact () { return this.addressbookEntryBusinessContact; } @Override - public void setAddressbookEntryBusinessContact (final BusinessContact addressbookEntryBusinessContact) { + public void setAddressbookEntryBusinessContact (final BusinessBasicData addressbookEntryBusinessContact) { this.addressbookEntryBusinessContact = addressbookEntryBusinessContact; } -- 2.39.5