From: Roland Haeder Date: Sat, 12 Mar 2016 11:41:01 +0000 (+0100) Subject: Cleanup: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=29c90e477787dc2a65eff4726002440fa75c5c80;p=jaddressbook-lib.git Cleanup: - compareTo()/Comparable was used back in the TDGP times and is no longer needed - updated jar(s) --- diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index fcaadf8c..88414571 100644 Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index e905316a..c06f2633 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index 491e05fe..863522c3 100644 Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar index dc2dd02d..52627731 100644 Binary files a/lib/jcore-swing.jar and b/lib/jcore-swing.jar differ diff --git a/lib/jcore.jar b/lib/jcore.jar index 23ef19d3..097890cc 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f2ad1c85..3f35cb50 100644 Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 8f2a5286..70a1a6a6 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 221f558c..d453cc6e 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 7dad4a09..ac9a8682 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index f637271c..dd11c240 100644 Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java index 7ff7cba5..948695f5 100644 --- a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java +++ b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java @@ -53,7 +53,7 @@ import org.mxchange.jusercore.model.user.User; @NamedQuery (name = "SearchAddressbookById", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookId = :id") } ) -public class UserAddressbook implements Addressbook, Comparable { +public class UserAddressbook implements Addressbook { /** * Serial number @@ -115,8 +115,8 @@ public class UserAddressbook implements Addressbook, Comparable { /** * Public constructor with address book name *

- * @param addressbookName Address book name - * @param addressbookUser User instance + * @param addressbookName Address book name + * @param addressbookUser User instance * @param addressbookCreated When this entry has been created */ public UserAddressbook (final String addressbookName, final User addressbookUser, final Calendar addressbookCreated) { @@ -137,14 +137,11 @@ public class UserAddressbook implements Addressbook, Comparable { this.addressbookStatus = AddressbokStatus.UNLOCKED; } - @Override - public int compareTo (final Addressbook addressbook) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public boolean equals (final Object object) { - if (object == null) { + if (this == object) { + return true; + } else if (null == object) { return false; } else if (this.getClass() != object.getClass()) { return false; diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java index d5ad0545..a90c3b9b 100644 --- a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java +++ b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java @@ -51,7 +51,7 @@ import org.mxchange.jcontactsbusiness.CompanyContact; name = "SearchUsersAddressbookEntries", query = "SELECT e FROM addressbook_entries AS e INNER JOIN addressbooks AS a ON e.addressbookId = a WHERE e.addressbookId = :addressbook AND a.addressbookUser = :owner ORDER BY e.addressbookEntryId ASC") ) -public class UserAddressbookEntry implements AddressbookEntry, Comparable { +public class UserAddressbookEntry implements AddressbookEntry { /** * Serial number @@ -95,14 +95,9 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable { +public class AddressbookShare implements ShareableAddressbook { /** * Serial number @@ -151,14 +151,9 @@ public class AddressbookShare implements ShareableAddressbook, Comparable