From 2a721f228e4fa53863a1cc178ce912aa7c3a963a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 6 Oct 2015 09:33:54 +0200
Subject: [PATCH] =?utf8?q?updated=20jars=20+=20renamed=20property=20Signed?=
=?utf8?q?-off-by:Roland=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
src/org/mxchange/jusercore/model/user/LoginUser.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index b460de3..c592e6e 100644
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -53,7 +53,7 @@ public class LoginUser implements User {
*/
@JoinColumn (name = "contact_id", nullable = false, updatable = false, unique = true)
@OneToOne (targetEntity = UserContact.class, optional = false)
- private Contact contact;
+ private Contact userContact;
/**
* Account status
@@ -113,7 +113,7 @@ public class LoginUser implements User {
@Override
public void copyAll (final User user) {
// Copy also contact data
- this.getContact().copyAll(user.getContact());
+ this.getUserContact().copyAll(user.getUserContact());
// Copy other data
this.setUserConfirmKey(user.getUserConfirmKey());
@@ -125,13 +125,13 @@ public class LoginUser implements User {
}
@Override
- public Contact getContact () {
- return this.contact;
+ public Contact getUserContact () {
+ return this.userContact;
}
@Override
- public void setContact (final Contact contact) {
- this.contact = contact;
+ public void setUserContact (final Contact userContact) {
+ this.userContact = userContact;
}
@Override
--
2.39.5