From ed1c5e2828b6902496e483cc6285f72022438219 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 16:46:48 +0200 Subject: [PATCH] Continued: - fixed imports - CSS classes are now dash-separated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/org/mxchange/jusercore/model/user/LoginUser.java | 4 ++-- src/org/mxchange/jusercore/model/user/User.java | 2 +- src/org/mxchange/jusercore/model/user/UserUtils.java | 4 ++-- .../jusercore/model/user/status/UserAccountStatus.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index e400dc4..0bfc4a8 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -37,8 +37,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.UserContact; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java index 09e4f33..5560fc6 100644 --- a/src/org/mxchange/jusercore/model/user/User.java +++ b/src/org/mxchange/jusercore/model/user/User.java @@ -19,7 +19,7 @@ package org.mxchange.jusercore.model.user; import java.io.Serializable; import java.util.Calendar; import java.util.Locale; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; diff --git a/src/org/mxchange/jusercore/model/user/UserUtils.java b/src/org/mxchange/jusercore/model/user/UserUtils.java index 13a643b..ba7b3f1 100644 --- a/src/org/mxchange/jusercore/model/user/UserUtils.java +++ b/src/org/mxchange/jusercore/model/user/UserUtils.java @@ -23,8 +23,8 @@ import java.text.MessageFormat; import java.util.Calendar; import java.util.Properties; import java.util.Random; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactUtils; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.ContactUtils; /** * An utilities class for users diff --git a/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java b/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java index d1cc53c..4ae60ce 100644 --- a/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java +++ b/src/org/mxchange/jusercore/model/user/status/UserAccountStatus.java @@ -28,17 +28,17 @@ public enum UserAccountStatus implements Serializable { /** * Unconfirmed (default) */ - UNCONFIRMED("USER_ACCOUNT_STATUS_UNCONFIRMED", "user_status_unconfirmed"), //NOI18N + UNCONFIRMED("USER_ACCOUNT_STATUS_UNCONFIRMED", "user-status-unconfirmed"), //NOI18N /** * Confirmed (email address validated) */ - CONFIRMED("USER_ACCOUNT_STATUS_CONFIRMED", "user_status_confirmed"), //NOI18N + CONFIRMED("USER_ACCOUNT_STATUS_CONFIRMED", "user-status-confirmed"), //NOI18N /** * Locked (maybe violated T&C) */ - LOCKED("USER_ACCOUNT_STATUS_LOCKED", "user_status_locked"); //NOI18N + LOCKED("USER_ACCOUNT_STATUS_LOCKED", "user-status-locked"); //NOI18N /** * Message key -- 2.39.5