From 9302e37b092c85e7381c4dce56901de749fe63ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 22 Jul 2017 23:02:53 +0200 Subject: [PATCH] it is now personal title, not gender MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/user/activity/LogableUserActivity.java | 8 ++++---- .../model/user/activity/UserActivityLog.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java b/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java index 226faa7..cfed88f 100644 --- a/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java +++ b/src/org/mxchange/jusercore/model/user/activity/LogableUserActivity.java @@ -18,7 +18,7 @@ package org.mxchange.jusercore.model.user.activity; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jusercore.model.user.User; /** @@ -159,14 +159,14 @@ public interface LogableUserActivity extends Serializable { *

* @return Contact gender */ - Gender getActivityContactGender (); + PersonalTitle getActivityContactPersonalTitle (); /** * Setter for contact gender *

- * @param activityContactGender Contact gender + * @param activityContactPersonalTitle Contact gender */ - void setActivityContactGender (final Gender activityContactGender); + void setActivityContactPersonalTitle (final PersonalTitle activityContactPersonalTitle); @Override boolean equals (final Object object); diff --git a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java index f89309a..c0de715 100644 --- a/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java +++ b/src/org/mxchange/jusercore/model/user/activity/UserActivityLog.java @@ -37,7 +37,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; @@ -84,12 +84,12 @@ public class UserActivityLog implements LogableUserActivity { private String activityContactFirstName; /** - * Gender instance + * Personal title instance */ @Basic (optional = false) @Column (name = "activity_contact_gender", nullable = false, updatable = false) @Enumerated (EnumType.STRING) - private Gender activityContactGender; + private PersonalTitle activityContactPersonalTitle; /** * Primary key @@ -217,7 +217,7 @@ public class UserActivityLog implements LogableUserActivity { // Set all user/contact fields this.activityUserName = activityUser.getUserName(); - this.activityContactGender = activityUser.getUserContact().getContactGender(); + this.activityContactPersonalTitle = activityUser.getUserContact().getContactPersonalTitle(); this.activityContactFirstName = activityUser.getUserContact().getContactFirstName(); this.activityContactFamilyName = activityUser.getUserContact().getContactFamilyName(); } @@ -305,13 +305,13 @@ public class UserActivityLog implements LogableUserActivity { } @Override - public Gender getActivityContactGender () { - return this.activityContactGender; + public PersonalTitle getactivityContactPersonalTitle () { + return this.activityContactPersonalTitle; } @Override - public void setActivityContactGender (final Gender activityContactGender) { - this.activityContactGender = activityContactGender; + public void setactivityContactPersonalTitle (final PersonalTitle activityContactPersonalTitle) { + this.activityContactPersonalTitle = activityContactPersonalTitle; } @Override -- 2.39.5