From b44662f6a5c06cd5d66ac7005cb051cd41e32cba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 23 Apr 2017 14:08:13 +0200 Subject: [PATCH] no recruiter here MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../helper/AddressbookWebRequestHelperBean.java | 2 +- .../beans/user/AddressbookUserWebSessionBean.java | 14 +++++++------- .../mxchange/localization/bundle_en_US.properties | 2 +- web/resources/css/cssLayout.css | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java b/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java index 704b770a..4d9ed6a3 100644 --- a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java +++ b/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java @@ -311,7 +311,7 @@ public class AddressbookWebRequestHelperBean implements AddressbookWebRequestHel // Default key is "unused" String messageKey = "CONTACT_IS_UNUSED"; //NOI18N - // Check user/recruiter + // Check user contact boolean isUserContact = this.userController.isContactFound(contact); // Check user first diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index 338ae7f0..d1c466fd 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -550,23 +550,23 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp // Is all data set? if (this.getUserName() == null) { // Throw NPE - throw new NullPointerException("recruiterName is null"); //NOI18N + throw new NullPointerException("userName is null"); //NOI18N } else if (this.getUserName().isEmpty()) { // Is empty - throw new IllegalStateException("recruiterName is empty."); //NOI18N + throw new IllegalStateException("userName is empty."); //NOI18N } - // Create new recruiter instance - User recruiter = new LoginUser(); + // Create new user instance + User user = new LoginUser(); // Update all data ... - recruiter.setUserName(this.getUserName()); + user.setUserName(this.getUserName()); // Trace message - //* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: recruiter={1} - EXIT!", this.getClass().getSimpleName(), recruiter)); + //* NOISY-DEBUG */ System.out.println(MessageFormat.format("{0}.createUserLogin: user={1} - EXIT!", this.getClass().getSimpleName(), user)); // Return the new instance - return recruiter; + return user; } @Override diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 87907ed0..f3a7b58a 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -486,7 +486,7 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this. LINK_GUEST_TERMS_CONDITIONS=Terms & Conditions LINK_GUEST_PRIVACY_STATEMENTS=privacy statements -ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the recruiter's contact data: +ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the user's contact data: ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email address: ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1 diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 69402ba6..457d841a 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -280,7 +280,7 @@ ul.footer_nav li.footer_copyright { color: #00aa00; } -.user_status_confirmed, .customer_status_confirmed, .recruiter_status_confirmed { +.user_status_confirmed, .customer_status_confirmed { color: #00aa00; } @@ -288,7 +288,7 @@ ul.footer_nav li.footer_copyright { color: #00aaaa; } -.user_status_locked, .customer_status_locked, .recruiter_status_locked { +.user_status_locked, .customer_status_locked { color: #aa0000; } -- 2.39.5