From: Roland Haeder <roland@mxchange.org>
Date: Sat, 12 Mar 2016 11:46:03 +0000 (+0100)
Subject: Cleanup:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4cb825df82468df74542f1273a6c9e713044e627;p=juser-core.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-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.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/src/org/mxchange/jusercore/container/login/UserLoginContainer.java b/src/org/mxchange/jusercore/container/login/UserLoginContainer.java
index 9b00368..267f70a 100644
--- a/src/org/mxchange/jusercore/container/login/UserLoginContainer.java
+++ b/src/org/mxchange/jusercore/container/login/UserLoginContainer.java
@@ -41,9 +41,9 @@ public class UserLoginContainer implements LoginContainer {
 	private String userPassword;
 
 	/**
-	 * Constructot with user instance and unencrypted password
+	 * Constructor with user instance and unencrypted password
 	 * <p>
-	 * @param user User instance
+	 * @param user         User instance
 	 * @param userPassword Unencrypted password
 	 */
 	public UserLoginContainer (final User user, final String userPassword) {
diff --git a/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java b/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java
index e039b2c..ad516c2 100644
--- a/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java
+++ b/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java
@@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.User;
 			@Index (name = "email_change_user", columnList = "email_change_user")
 		}
 )
-public class EmailAddressChange implements ChangeableEmailAddress, Comparable<ChangeableEmailAddress> {
+public class EmailAddressChange implements ChangeableEmailAddress {
 
 	/**
 	 * Serial number
@@ -110,16 +110,11 @@ public class EmailAddressChange implements ChangeableEmailAddress, Comparable<Ch
 		this.emailChangeStatus = EmailChangeStatus.NEW;
 	}
 
-	@Override
-	public int compareTo (final ChangeableEmailAddress emailAddress) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 	@Override
 	public boolean equals (final Object object) {
 		if (this == object) {
 			return true;
-		} else if (object == null) {
+		} else if (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;
@@ -127,7 +122,7 @@ public class EmailAddressChange implements ChangeableEmailAddress, Comparable<Ch
 
 		final ChangeableEmailAddress otherEmail = (ChangeableEmailAddress) object;
 
-		if (!Objects.equals(this.getEmailChangeId(), otherEmail.getEmailChangeId())) {
+		if (!Objects.equals(this.getEmailAddress(), otherEmail.getEmailAddress())) {
 			return false;
 		}
 
@@ -137,8 +132,8 @@ public class EmailAddressChange implements ChangeableEmailAddress, Comparable<Ch
 	@Override
 	public int hashCode () {
 		int hash = 5;
-		hash = 71 * hash + Objects.hashCode(this.emailChangeId);
-		hash = 71 * hash + Objects.hashCode(this.emailChangeUser);
+		hash = 71 * hash + Objects.hashCode(this.getEmailAddress());
+		hash = 71 * hash + Objects.hashCode(this.getEmailChangeUser());
 		return hash;
 	}
 
diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index 5f4baba..c974976 100644
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -74,7 +74,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus;
 			@NamedQuery (name = "AllMemberPublicUsers", query = "SELECT u FROM users AS u WHERE u.userAccountStatus = :status AND u.userProfileMode IN (:public, :members) ORDER BY u.userId ASC")
 		}
 )
-public class LoginUser implements User, Comparable<User> {
+public class LoginUser implements User {
 
 	/**
 	 * Serial number
@@ -169,11 +169,6 @@ public class LoginUser implements User, Comparable<User> {
 		this.userProfileMode = ProfileMode.INVISIBLE;
 	}
 
-	@Override
-	public int compareTo (final User user) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 	@Override
 	public void copyAll (final User user) {
 		// Copy also contact data
@@ -190,7 +185,7 @@ public class LoginUser implements User, Comparable<User> {
 
 	@Override
 	public boolean equals (final Object object) {
-		if (object == null) {
+		if (null == object) {
 			return false;
 		}
 		if (this.getClass() != object.getClass()) {
diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java
index 4956567..915fbcf 100644
--- a/src/org/mxchange/jusercore/model/user/User.java
+++ b/src/org/mxchange/jusercore/model/user/User.java
@@ -190,22 +190,9 @@ public interface User extends Serializable {
 	 */
 	void setUserUpdated (final Calendar userUpdated);
 
-	/**
-	 * Checks if object is a User instance and whether it matches with this
-	 * object.
-	 * <p>
-	 * @param object Object to be checked
-	 * <p>
-	 * @return Whether it matches this object
-	 */
 	@Override
 	boolean equals (final Object object);
 
-	/**
-	 * Hash code calculation for this object
-	 * <p>
-	 * @return Hash code for this object
-	 */
 	@Override
 	int hashCode ();
 }