From 677d6a799bde367675000145614795411041eccf Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 6 Oct 2015 08:17:35 +0200 Subject: [PATCH] =?utf8?q?sorted=20members=20Signed-off-by:Roland=20H?= =?utf8?q?=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../jusercore/model/user/LoginUser.java | 36 +++++++++---------- .../mxchange/jusercore/model/user/User.java | 28 +++++++-------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 12580f1..b460de3 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -55,6 +55,14 @@ public class LoginUser implements User { @OneToOne (targetEntity = UserContact.class, optional = false) private Contact contact; + /** + * Account status + */ + @Basic (optional = false) + @Column (name = "user_account_status", nullable = false) + @Enumerated (value = EnumType.STRING) + private UserAccountStatus userAccountStatus; + /** * Confirmation key */ @@ -96,14 +104,6 @@ public class LoginUser implements User { @Column (name = "user_password_hash") private String userPasswordHash; - /** - * Account status - */ - @Basic (optional = false) - @Column (name = "user_account_status", nullable = false) - @Enumerated (EnumType.STRING) - private UserAccountStatus userAccountStatus; - /** * Default constructor */ @@ -134,6 +134,16 @@ public class LoginUser implements User { this.contact = contact; } + @Override + public UserAccountStatus getUserAccountStatus () { + return this.userAccountStatus; + } + + @Override + public void setUserAccountStatus (final UserAccountStatus userAccountStatus) { + this.userAccountStatus = userAccountStatus; + } + @Override public String getUserConfirmKey () { return this.userConfirmKey; @@ -193,14 +203,4 @@ public class LoginUser implements User { public void setUserPasswordHash (final String userPasswordHash) { this.userPasswordHash = userPasswordHash; } - - @Override - public UserAccountStatus getUserAccountStatus () { - return this.userAccountStatus; - } - - @Override - public void setUserAccountStatus (final UserAccountStatus userAccountStatus) { - this.userAccountStatus = userAccountStatus; - } } diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java index b397f11..01941bc 100644 --- a/src/org/mxchange/jusercore/model/user/User.java +++ b/src/org/mxchange/jusercore/model/user/User.java @@ -49,6 +49,20 @@ public interface User extends Serializable { */ public void setContact (final Contact contact); + /** + * Getter for account status + *

+ * @return Account status + */ + public UserAccountStatus getUserAccountStatus (); + + /** + * Setter for account status + *

+ * @param customerStatus Account status + */ + public void setUserAccountStatus (final UserAccountStatus customerStatus); + /** * Getter for confirmation key *

@@ -132,18 +146,4 @@ public interface User extends Serializable { * @param customerPasswordHash Password hash */ public void setUserPasswordHash (final String customerPasswordHash); - - /** - * Getter for account status - *

- * @return Account status - */ - public UserAccountStatus getUserAccountStatus (); - - /** - * Setter for account status - *

- * @param customerStatus Account status - */ - public void setUserAccountStatus (final UserAccountStatus customerStatus); } -- 2.39.5