Cleanup:

- compareTo()/Comparable<T> 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 fcaadf8ccb43000591b17665bdb1e7b4d4824515..884145717cb1a8b858277292723d934289ebce07 100644 (file)
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 e905316a232cc3f743e47c1d041b3c782fa666f1..c06f26338a644f05dc23d0100e3b2efc31d0f98f 100644 (file)
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 491e05fe48abdfd78e100c25d0edaeaaa7496143..863522c3b521c41ed1e3f639940e44b1dbf22cf9 100644 (file)
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 dc2dd02d9cd39d704a2e768236326978daa7fd86..526277318a6c61b573483bcf2486fb4ba3263e6f 100644 (file)
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 23ef19d3e26ecc03e092895707158a0296bb95bf..097890ccbac9f229dc08c9aa1dd3e6ca12696ce6 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index f2ad1c85d97e64c5a60b7580b4a440554a198134..3f35cb503dc349a077aa978ba857bb1175b5c861 100644 (file)
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 8f2a52866c7ad118b28db9a470c105f6fc62f655..70a1a6a6565139b666bc696a133750c5800a8b3b 100644 (file)
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 221f558c88c722e38e98a8f00c55f365f4cf1498..d453cc6e2ed5caff242d519a97bb61fe244d2da0 100644 (file)
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 7dad4a093ec73a3f597125d3068b39e293fae567..ac9a868224d0246b408fd2ad6c03bb853492f544 100644 (file)
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 f637271c38803627467b683fb564c07db7c11532..dd11c240493a216c77ed2b313e537ab78f64da1e 100644 (file)
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 7ff7cba5e1f2cbfd2029a8d71b7645968d5b9171..948695f5fd588f330c70bf80577b777dcd90a586 100644 (file)
--- 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<Addressbook> {
+public class UserAddressbook implements Addressbook {
 
        /**
         * Serial number
@@ -115,8 +115,8 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
        /**
         * Public constructor with address book name
         * <p>
-        * @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<Addressbook> {
                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 d5ad0545d62cc2a5d96d154db7d9769f8399b4b9..a90c3b9bb56a73a08e9f26652048c37914bbbb26 100644 (file)
--- 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<AddressbookEntry> {
+public class UserAddressbookEntry implements AddressbookEntry {
 
        /**
         * Serial number
@@ -95,14 +95,9 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
        @OneToOne (targetEntity = UserAddressbook.class, optional = false, cascade = CascadeType.REFRESH)
        private Addressbook addressbookId;
 
-       @Override
-       public int compareTo (final AddressbookEntry addressbookEntry) {
-               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 (null == object) {
                        return false;
                } else if (this.getClass() != object.getClass()) {
                        return false;

diff --git a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
index 4373faebb2fc6181ecba775a975ca5f5f5f17487..e988dc36a10277bd23d8d696ca0e44ab5ae8cff6 100644 (file)
--- a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
+++ b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
@@ -58,7 +58,7 @@ import org.mxchange.jusercore.model.user.User;
                        )
                }
 )
-public class AddressbookShare implements ShareableAddressbook, Comparable<ShareableAddressbook> {
+public class AddressbookShare implements ShareableAddressbook {
 
        /**
         * Serial number
@@ -151,14 +151,9 @@ public class AddressbookShare implements ShareableAddressbook, Comparable<Sharea
        public AddressbookShare () {
        }
 
-       @Override
-       public int compareTo (final ShareableAddressbook share) {
-               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 (null == object) {
                        return false;
                } else if (this.getClass() != object.getClass()) {
                        return false;

diff --git a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
index a3edc657a153fdb134c33898ba8dee24923bca37..97be57db9b54f76154aa3638347989091f4f9d99 100644 (file)
--- a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
+++ b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
@@ -105,7 +105,7 @@ public class AddressbookIdValidator extends BaseLongValidator {
                        addressbook = this.addressbookBean.getAddressbookById(addressbookId);
 
                        // Is it set?
-                       if (addressbook == null) {
+                       if (null == addressbook) {
                                // Is null?!
                                throw new NullPointerException(MessageFormat.format("addressbook for id={0} is null", addressbookId)); //NOI18N
                        }