From 4cb825df82468df74542f1273a6c9e713044e627 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 12 Mar 2016 12:46:03 +0100 Subject: [PATCH] Cleanup: - compareTo()/Comparable 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) --- lib/jcontacts-core.jar | Bin 21291 -> 20592 bytes lib/jcore.jar | Bin 13656 -> 13656 bytes lib/jcoreee.jar | Bin 18919 -> 18919 bytes .../container/login/UserLoginContainer.java | 4 ++-- .../email_address/EmailAddressChange.java | 15 +++++---------- .../jusercore/model/user/LoginUser.java | 9 ++------- .../mxchange/jusercore/model/user/User.java | 13 ------------- 7 files changed, 9 insertions(+), 32 deletions(-) diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index e905316a232cc3f743e47c1d041b3c782fa666f1..c06f26338a644f05dc23d0100e3b2efc31d0f98f 100644 GIT binary patch delta 5503 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 A)Bpeg delta 6081 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 diff --git a/lib/jcore.jar b/lib/jcore.jar index 23ef19d3e26ecc03e092895707158a0296bb95bf..097890ccbac9f229dc08c9aa1dd3e6ca12696ce6 100644 GIT binary patch delta 415 zcmcbSbt8*6z?+$ci-CcIf#G~g&O}}f=5s*GVm>p7cS{~j{m}qXlhqmZz;pzo6`1B^ zQkiVP!an%`BNv!|meCR_ZVILynasd+6_XQ)-n^gbBoCO;&F{_xW?U7##Rz6>5`GL} z%n*If3>ImUyao}8mR5!+Zj|kWFnAUGA&hvXT@W=gD!vd#j%qR+So2^e=Cd0Ff$127 za4@~iAPh|N8%BfaT*G)Uecmt>Osg9Og6V3bd@%jiC<{zS8E1p(6UGpA3MLSBB_m{20QR zA^MydEYc)-4I&aPtqf7zDBB5P@GAI281YKGAZlb(d?Ab+)nqoX_DkAR8JU3|nw+I; z0TP(JRM#F%KiAa<(~^1+@en;bFn_9^7npve=L)8^^gY3JnLdQSPu~s9XEz7}(=i6& zV0xQD7?|caj0V%WhVfwfykRJqRyPU+)73`#VEV057MPAQ&IZ#bj3Me2Od#q?Od#?P GP09iJ1B1^1 diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f2ad1c85d97e64c5a60b7580b4a440554a198134..3f35cb503dc349a077aa978ba857bb1175b5c861 100644 GIT binary patch delta 407 zcmaDpneq8#M&1B#W)?061`Y;>ODQ=Mc{P|X0x666%pl$^c`)@y14K<$XEXrQQH+*g zdK#k@n7+(t52jZ#8BD(GF2aLs;N+h`!2}QX$#a;vpo)CK^iL*7Fm2214x%@=GoNPz zGa|XnI0S(r9y5b(u}bqWFo3Y#!1)DLX`D^kSCx}z|ob^EpCObG=faz*y2QaQMPTR51`c8dqoXWf#)w6S|8n4a(60H&2ZGQf1N PM;VxA^UMO%#hxVqi5-{X delta 407 zcmaDpneq8#M&1B#W)?061`Y-W#on}uyc*03K+0l1n7Snorv88hC#y3WfVh*R7%jo{ zG)5~heVNf7Os`}zn0(h=ga>XQNbyggV1ftxPJFE zJWcPigGDrLQ(2jT-kLno$pR!W`HU09seI1*V7`MhM7-MB0nFd$>?+Sol4OwV_30Mkky8DP5C PqYO;5d1is>V$Tu)*g=4B 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 *

- * @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 { +public class EmailAddressChange implements ChangeableEmailAddress { /** * Serial number @@ -110,16 +110,11 @@ public class EmailAddressChange implements ChangeableEmailAddress, Comparable { +public class LoginUser implements User { /** * Serial number @@ -169,11 +169,6 @@ public class LoginUser implements User, Comparable { 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 { @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. - *

- * @param object Object to be checked - *

- * @return Whether it matches this object - */ @Override boolean equals (final Object object); - /** - * Hash code calculation for this object - *

- * @return Hash code for this object - */ @Override int hashCode (); } -- 2.39.5