removed superflous columns (see share POJO/POJI)

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index 2d1b88fdd9fcd8c5d2fca5c2a3a1a649ef074bab..39d1c594c11c04e8294e30fd05b2b7caa8595b14 100644 (file)
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index a6242e313134c45ad52f4d3c69d2552097c7f611..a5d222b5e458841311e097be654fba5408b3bc86 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java
index 6dd8a505802833373efa6f87e560f6e426ca35ed..354bdc9ce72debadc3abb8e91342caaa7c9d3752 100644 (file)
--- a/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java
+++ b/src/org/mxchange/addressbook/model/addressbook/entry/AddressbookEntry.java
@@ -21,7 +21,6 @@ import java.util.Calendar;
 import org.mxchange.addressbook.model.addressbook.Addressbook;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontactsbusiness.BusinessContact;
-import org.mxchange.jusercore.model.user.User;
 
 /**
  * A POJI for addressbook entries
@@ -86,35 +85,6 @@ public interface AddressbookEntry extends Serializable {
         */
        void setAddressbookEntryPrivateContact (final Contact addressbookEntryPrivateContact);
 
-       /**
-        * Getter for user who has added this entry to his/her addressbook
-        * <p>
-        * @return User who has added this entry
-        */
-       User getAddressbookEntryUserSharer ();
-
-       /**
-        * Setter for user who has added this entry to his/her addressbook
-        * <p>
-        * @param addressbookEntryUserAdded User who has added this entry
-        */
-       void setAddressbookEntryUserSharer (final User addressbookEntryUserAdded);
-
-       /**
-        * Getter for user who has initially created the address book entry
-        * <p>
-        * @return User who has created initially this address book entry
-        */
-       User getAddressbookEntryUserOwner ();
-
-       /**
-        * Setter for user who has initially created the address book entry
-        * <p>
-        * @param addressbookEntryUserOrigin User who has created initially this
-        * address book entry
-        */
-       void setAddressbookEntryUserOwner (final User addressbookEntryUserOrigin);
-
        /**
         * Getter for address book
         * <p>

diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
index 968bbbb9ca60a753403f550f465ce146464912f2..3b73258b057f9e5d4ff32e046c7a6c2fe65038ed 100644 (file)
--- a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
+++ b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
@@ -38,8 +38,6 @@ 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.jusercore.model.user.LoginUser;
-import org.mxchange.jusercore.model.user.User;
 
 /**
  * A POJO for address book entries
@@ -90,24 +88,10 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
        @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL)
        private Contact addressbookEntryPrivateContact;
 
-       /**
-        * Connection to table "users" (who has initially created this entry
-        */
-       @JoinColumn (name = "entry_owner_user_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.ALL)
-       private User addressbookEntryUserOwner;
-
-       /**
-        * Connection to table "users" (who has added this entry)
-        */
-       @JoinColumn (name = "entry_sharer_user_id", updatable = false)
-       @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.ALL)
-       private User addressbookEntryUserSharer;
-
        /**
         * Connection to table "addressbooks"
         */
-       @JoinColumn (name = "addressbook_id", nullable = false, updatable = false)
+       @JoinColumn (name = "entry_addressbook_id", nullable = false, updatable = false)
        @OneToOne (targetEntity = UserAddressbook.class, optional = false, cascade = CascadeType.ALL)
        private Addressbook addressbookId;
 
@@ -130,10 +114,6 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
                        return false;
                } else if (!Objects.equals(this.getAddressbookEntryPrivateContact(), other.getAddressbookEntryPrivateContact())) {
                        return false;
-               } else if (!Objects.equals(this.getAddressbookEntryUserOwner(), other.getAddressbookEntryUserOwner())) {
-                       return false;
-               } else if (!Objects.equals(this.getAddressbookEntryUserSharer(), other.getAddressbookEntryUserSharer())) {
-                       return false;
                } else if (!Objects.equals(this.getAddressbookId(), other.getAddressbookId())) {
                        return false;
                }
@@ -181,26 +161,6 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
                this.addressbookEntryPrivateContact = addressbookEntryPrivateContact;
        }
 
-       @Override
-       public User getAddressbookEntryUserSharer () {
-               return this.addressbookEntryUserSharer;
-       }
-
-       @Override
-       public void setAddressbookEntryUserSharer (final User addressbookEntryUserSharer) {
-               this.addressbookEntryUserSharer = addressbookEntryUserSharer;
-       }
-
-       @Override
-       public User getAddressbookEntryUserOwner () {
-               return this.addressbookEntryUserOwner;
-       }
-
-       @Override
-       public void setAddressbookEntryUserOwner (final User addressbookEntryUserOwner) {
-               this.addressbookEntryUserOwner = addressbookEntryUserOwner;
-       }
-
        @Override
        public Addressbook getAddressbookId () {
                return this.addressbookId;
@@ -216,8 +176,6 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
                int hash = 3;
                hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryBusinessContact());
                hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryPrivateContact());
-               hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryUserOwner());
-               hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryUserSharer());
                hash = 19 * hash + Objects.hashCode(this.getAddressbookId());
                return hash;
        }