From: Roland Haeder <roland@mxchange.org>
Date: Sat, 12 Mar 2016 11:44:48 +0000 (+0100)
Subject: Cleanup:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c368e124992b4f6ad8b9a5c3e7e4e9ba977239ff;p=jjobs-lib.git

Cleanup:
- compareTo()/Comparable<T> was used back in the TDGP times and is no longer needed
- value first, then variable on comparison to avoid accidently assignments
- updated jar(s)
---

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index fcaadf8..8841457 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 e905316..c06f263 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 491e05f..863522c 100644
Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ
diff --git a/lib/jcore.jar b/lib/jcore.jar
index 23ef19d..097890c 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index f2ad1c8..3f35cb5 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 8f2a528..70a1a6a 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 221f558..d453cc6 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 7dad4a0..ac9a868 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 f637271..dd11c24 100644
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ
diff --git a/src/org/mxchange/jjobs/model/addressbook/UserAddressbook.java b/src/org/mxchange/jjobs/model/addressbook/UserAddressbook.java
index 274cb9a..12e7279 100644
--- a/src/org/mxchange/jjobs/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/jjobs/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
@@ -137,14 +137,9 @@ 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 (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;
diff --git a/src/org/mxchange/jjobs/model/addressbook/entry/AddressbookEntry.java b/src/org/mxchange/jjobs/model/addressbook/entry/AddressbookEntry.java
index e40e55f..b09a796 100644
--- a/src/org/mxchange/jjobs/model/addressbook/entry/AddressbookEntry.java
+++ b/src/org/mxchange/jjobs/model/addressbook/entry/AddressbookEntry.java
@@ -18,9 +18,9 @@ package org.mxchange.jjobs.model.addressbook.entry;
 
 import java.io.Serializable;
 import java.util.Calendar;
-import org.mxchange.jjobs.model.addressbook.Addressbook;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontactsbusiness.BusinessContact;
+import org.mxchange.jjobs.model.addressbook.Addressbook;
 
 /**
  * A POJI for addressbook entries
diff --git a/src/org/mxchange/jjobs/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/jjobs/model/addressbook/entry/UserAddressbookEntry.java
index 5768462..806d19c 100644
--- a/src/org/mxchange/jjobs/model/addressbook/entry/UserAddressbookEntry.java
+++ b/src/org/mxchange/jjobs/model/addressbook/entry/UserAddressbookEntry.java
@@ -51,7 +51,7 @@ import org.mxchange.jjobs.model.addressbook.UserAddressbook;
 				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/jjobs/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/jjobs/model/addressbook/shared/AddressbookShare.java
index e9ca309..e79863a 100644
--- a/src/org/mxchange/jjobs/model/addressbook/shared/AddressbookShare.java
+++ b/src/org/mxchange/jjobs/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/jjobs/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java
index cab1eb3..d521a7f 100644
--- a/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java
+++ b/src/org/mxchange/jjobs/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
 			}