From e1c19f6b0fcad3e117c27fa87a159652daf5d690 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 22 Oct 2015 10:01:41 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20last=20locked=20reason?=
 =?utf8?q?=20-=20updated=20jar(s)=20Signed-off-by:Roland=20H=C3=A4der=20<r?=
 =?utf8?q?oland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcontacts-core.jar                        | Bin 20873 -> 21164 bytes
 .../jusercore/model/user/LoginUser.java       |  34 +++++++++++++-----
 .../mxchange/jusercore/model/user/User.java   |  18 ++++++++--
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 6b3619e1b879be6ab4b7b20ecf765dde842559b6..39ba8b2afd0485a67193d21df02299ba987fe176 100644
GIT binary patch
delta 5466
zcma)A33yc175>jmlF3YNm=HpO2}wv;l1zYvKuE~SW*~$tkch0Zga{~LZBn(?b_%po
z*CJ1`r4|&iZh)2vi&_`7t=2*-)uN@<LKmt?U7%WPY3(`py$mytH{aL!zPb0@?VSId
zyZ!gw@*wSch?3iy+;Ki25g6Dy=dR>JcN%AvTXc3bS7+x6-P~s6P?^r#sY>UYXp+v~
zpxS;sXj=SdujIMBfXi#-x~hH69?bBd$%C0jReDuuo9lFZzJEnm&y;J{_AKq}=~&gX
zx{KiNj;=Ab4c=gQy{}VI=xuL2UE&Ag2-WDX^BQF9ycW5}IbZ%LZfd|Z0EFqBy3iQq
z&a}|g+b3if0rD?3mQud4Fex**%7;cu^I`-Ilq6k}3=a)Tq)U8=r%WH0vyxCiSw0#}
z**?mlTqzEbhCGq-MH(v7Fp-9fG(w~TkqSjB5-A{3u}C9D8YR-`B_fuHSSr#Ok;+6G
zE7CZT%0(J4QiVvBB2Dm6m4~WDtdYtZA0|?*6o>ezj_M`R#e8F}s%R3YbTU(<W=UEk
zX_chSL$f?IJCWLbm_!}o=4GO8j+c|mMdw@}&7=7qTHv9DMsZ^xbY9))$yS|Flb382
z7x&0yhI-QKT~r;q&voYind#8B!40m|-RM==gu4{(M3=&M&}AH&Tprww!wSE~YaUvp
z@DsYiLyHwHp`{9c#;Xc{k><BWdPk&lBK<?8f8le5f8)HuFQo35QujLEQ1~s5DSU{J
z6h6jTg+Jni!b$u|;b-`{!pnF?;SgR_cnLpMIFciSe<g$8#9Io#!*PXwiu4(d69UEq
zl*=nA$vB%^yz;L&#SrnVhn6Yol!0xSr7#~06qbumS4*-M*C^b8uPUs=dWD;%?pEBU
zum$%jY{d^0eu!-f4@kp<k~}2+9>yaIk7E~Mq;axtq_JyAS?+FHuJ9j<=LG*%)Fr{&
zhy5P9Qqc-pX&jm{z(~paIM~Shp#U>55SeJgOx`2SdXKblJwxR3Y%ZsBsh#DHZd`^r
zEL`4&xtPbb?19xMhf531K8tV#7Z!J736^qm7nY%uE7(!1??BGm;YLTW8&_h*e5}N(
zMqI^xI1W}HKbKasZOiT&E^>UV#v&g4C2qWy%U|w7H+r~VoZ$P4Xu8hSdA%rhNkpw-
zC0ts_f9`jq?h<6Aaf0+~VWc<V>oV*cT?pcv+?S`q8a<4SZeUrrhokT<wyZUN+cfHu
zd9y}@{p`j@(?jj6OO~+i5(Fe}VXZnS-MA&HGcN&4Uqp;=?~CyrVdN5H-XIZu?Rvi(
zrI&Y9(CQrJn&r=C(;tJo@O0medssa$L~BHZYu^*C-|zFDm#Nhyg>y^SeSNLGeyvvR
zi`eJM*xu*N{ZY>FI=@)ejy_eq0j$;}&aGv#lR@&Puo`6DMopBq_9L$4JtKWa@fwQo
z<WW;MyYpDeAlXvfT*Cc!V-KfK82;hIgHLi@I^sD!#!KfdczNgd!*LA2@9|@<4R9@x
zhP?=JE)vI?M~fu0<I<8W0JqlME1J1(Ea%cIK5zgeid+y=K0V+BD?O>zXDG9mrJrP1
ziw5J>;WIj9Kn^^d{+$ti06)$mmk+%>e1dX5oGSR(6V(zIU_uz<1RTIY*76kB#>4IJ
zFEM!<&uGOfN8H^dimTX7kPAL?BaPyaL-8o21eB2nHRMABC83S@P$NH<Qwr8nf80Q+
zSWg2YjBW@U-C!9dIT*F2r3F{%@Ma=`Ee(Q)GU25xq);|eDGwPmOlum#p#vX3eIcHQ
z=kPph$iQT+)1@6zi1Q|%$5anqm?)v;qnlF+wM?lQ>RyzHYi6huxRMuSv9@6kGoSg^
z=sNB$;Y$b<??Z`grl^$3!I%ht6T&DHtOJ$gI<a&`A}JLl!3$78<&H@B9&$obYDZGV
zNUCEXF^_GM3osgqF}+CXIgnt0>KzgAjp>A7j2*#LMsR5i1m<NxIATYD_+X$HWzo|D
zYIH=x*RK<jGCPtMM$#GsiFxIaFbPwaF*}e}Aok4|v^!cpir+|Y<BmXvj+fr2G?(qn
zi($vSy-28rg*kHe$JrfT<Y<;D%0&(bc^!_kd%TR1bjCnpUWg>T#Q{mV9mxtuB+PfL
z!N!i_w1^n2X3J}0ST-+H;-k{G?)cd2#dy2rYaK2B!C}%R2IK89xQ>xr9|MVbNs|yn
zhZw}!k=*2ngo$Ne40=aK#$X*=ULV7<dH0jhO9#spcFQ+AT4q{m4Zd(3Nen9NF}RJ9
z+#UmoNi0a{vI7#g9mys~Buuld!HpN7FcP;N$vuo@OAI6?Z6PpE7G;Kibb7=owAIn@
z-|+55Az-^MyWQ<<_x>1m&8wO49!}dMAg55JJp?-)k-U#HPDm>4NFHS*kHtV@GArVX
z`vX&#F|=f0#ID-IW1omI)}&k{PZzrv>_nB_iIAfc{N%aF30YB9b}tSxlBZ%IG3g!2
zW6J?awH?W`j!5{CW(|&BQPp-NFEWysVjwZOBQf#ONQ_`<<cfOP(eS5X!%-`_#%}j8
z+dUG)uE|PCUV`=r$cn19hv29q5`IEnG#NY>wRR-O7|EM4keD=><hg6=3Pus1Iy(}R
zzAEl3B+%qmB=2M=Bz1NqCm4yzP)%|f$$Lz)O+k5!TFUNa3MVA0VK3^pA|tRLg@-V4
zE0UkVq<N{64`9mkDV~~?)~uD>H2NT>F6k>2?#HF!La}bi5}xkXblIeir;thSBAebr
zfKH==-p5orgP>qG(KT59WupjR2+`4ukqLPwhzPxmO^D)n&Ltd)fxT#OI9fhoiu!59
z1SVQ)<;~3GfypwfCO4C1A)fr$i@fnC*eBrg2u;=mq)fs-rr9QKtz|T#(Hkg!0R{Up
zP27&)i>QoP3EnX8^fE^mcAOYwqTct~DA#@gsRJ-#Kc;VmC+=ayxkISGFtM8cuu}6?
z;7XoIa1(z6gp0h)_a#r#p9gAKl6BM3P07@cA!)(C0IrGr4$zO|&D6hpC^k!(pZ)wC
zrquZ~fGe@_!q+(dKp1*t?C>P{Vi<a@?x<G_JEtFx)87!gn=9p0qp_#CUgsY*m*_md
zrBb&qYMHF_9W66-{$a~3olj|Pwtsuv);e<t8;Sn*#~$_lcCKqrGM;SB;}1Cfjdxm=
zw$s#><$7+MRBx_NHny~-YVD76?WuaRc96fViCk&!@V8PUWmcB!=|*Eo>oB9VX|S<o
LR(it57P0a_?<;WM

delta 5122
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

diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index c8a56c4..b69c1db 100644
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -29,6 +29,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToOne;
@@ -124,11 +125,18 @@ public class LoginUser implements User {
 	private Long userId;
 
 	/**
-	 * "locked" timestamp
+	 * Last "locked" timestamp
 	 */
 	@Temporal (TemporalType.TIMESTAMP)
-	@Column (name = "user_locked")
-	private Calendar userLocked;
+	@Column (name = "user_last_locked")
+	private Calendar userLastLocked;
+
+	/**
+	 * Last locked reason
+	 */
+	@Lob
+	@Column(name = "user_last_locked_reason")
+	private String lastLockedReason;
 
 	/**
 	 * User name
@@ -163,7 +171,7 @@ public class LoginUser implements User {
 		this.setUserEncryptedPassword(user.getUserEncryptedPassword());
 		this.setUserAccountStatus(user.getUserAccountStatus());
 		this.setUserCreated(user.getUserCreated());
-		this.setUserLocked(user.getUserLocked());
+		this.setUserLastLocked(user.getUserLastLocked());
 	}
 
 	@Override
@@ -181,6 +189,16 @@ public class LoginUser implements User {
 				(Objects.equals(this.getUserId(), other.getUserId())));
 	}
 
+	@Override
+	public String getLastLockedReason () {
+		return this.lastLockedReason;
+	}
+
+	@Override
+	public void setLastLockedReason (final String lastLockedReason) {
+		this.lastLockedReason = lastLockedReason;
+	}
+
 	@Override
 	public UserAccountStatus getUserAccountStatus () {
 		return this.userAccountStatus;
@@ -242,13 +260,13 @@ public class LoginUser implements User {
 	}
 
 	@Override
-	public Calendar getUserLocked () {
-		return this.userLocked;
+	public Calendar getUserLastLocked () {
+		return this.userLastLocked;
 	}
 
 	@Override
-	public void setUserLocked (final Calendar userLocked) {
-		this.userLocked = userLocked;
+	public void setUserLastLocked (final Calendar userLastLocked) {
+		this.userLastLocked = userLastLocked;
 	}
 
 	@Override
diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java
index 9bc1e8f..04c7a37 100644
--- a/src/org/mxchange/jusercore/model/user/User.java
+++ b/src/org/mxchange/jusercore/model/user/User.java
@@ -125,14 +125,28 @@ public interface User extends Serializable {
 	 * <p>
 	 * @return "locked" timestamp
 	 */
-	Calendar getUserLocked ();
+	Calendar getUserLastLocked ();
 
 	/**
 	 * Getter for "locked" timestamp
 	 * <p>
 	 * @param userLocked "locked" timestamp
 	 */
-	void setUserLocked (final Calendar userLocked);
+	void setUserLastLocked (final Calendar userLocked);
+
+	/**
+	 * Getter for reason of last locked
+	 * <p>
+	 * @return Reason of last locked
+	 */
+	public String getLastLockedReason ();
+
+	/**
+	 * Setter for reason of last locked
+	 * <p>
+	 * @param lastLockedReason Reason of last locked
+	 */
+	public void setLastLockedReason (final String lastLockedReason);
 
 	/**
 	 * Getter for user name
-- 
2.39.5