other projects will have more than one login, not just users (Java files)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
index d6c1ddc7e5b1d1fdc3c8096a20f6c451e859f253..69ee86729322099f89a00160b4c3197469ac1d96 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
@@ -561,9 +561,9 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                Contact contact = this.userLoginController.getLoggedInUser().getUserContact();
 
                // It should be there, so run some tests on it
-               assert (contact instanceof Contact) : "Instance loginController.loggedInUser.userContact is null"; //NOI18N
-               assert (contact.getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null"; //NOI18N
-               assert (contact.getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N
+               assert (contact instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (contact.getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (contact.getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N
 
                // Update all fields
                contact.setContactGender(this.getGender());

diff --git a/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java
index 80dc72035ebd073961e13469f66199b30f14cf4b..145bfcd2d3c5481828f7e7082543e2cd080caced 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java
@@ -128,12 +128,12 @@ public class FinancialsEmailChangeWebSessionBean extends BaseFinancialsControlle
                User user = this.userLoginController.getLoggedInUser();
 
                // It should be there, so run some tests on it
-               assert (user instanceof User) : "Instance loginController.loggedInUser is null"; //NOI18N
-               assert (user.getUserId() instanceof Long) : "Instance loginController.loggedInUser.userId is null"; //NOI18N
-               assert (user.getUserId() > 0) : MessageFormat.format("loginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
-               assert (user.getUserContact() instanceof Contact) : "Instance loginController.loggedInUser.userContact is null"; //NOI18N
-               assert (user.getUserContact().getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null"; //NOI18N
-               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
+               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null"; //NOI18N
+               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null"; //NOI18N
+               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
+               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
 
                // Check if the email address is already enqueued
                if (this.isEmailAddressQueued(this.getEmailAddress())) {

diff --git a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
index c6cabd0e746b466801bb5dcca684aa7d6f94f9b2..c05a8f1c258bb970d6bfd0bcb3cf8bb9f646186a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
@@ -57,7 +57,7 @@ import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("loginController")
+@Named ("userLoginController")
 @SessionScoped
 public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController implements FinancialsUserLoginWebSessionController {
 

diff --git a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java
index 23bf1e14aaa7fa1f9bdae9f525b4aa2abfeae185..29a1f54e702b76228926fd6d69a2de916c96a2f2 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java
@@ -46,7 +46,7 @@ public class FinancialsUserProfileWebRequestBean extends BaseFinancialsControlle
         * Login controller
         */
        @Inject
-       private FinancialsUserLoginWebSessionController loginController;
+       private FinancialsUserLoginWebSessionController userLoginController;
 
        /**
         * User controller
@@ -111,7 +111,7 @@ public class FinancialsUserProfileWebRequestBean extends BaseFinancialsControlle
 
                // Check all conditions (except for admin)
                return ((profileMode.equals(ProfileMode.PUBLIC)) ||
-                               (this.loginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
+                               (this.userLoginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
        }
 
 }

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
index 26383bec2eb832ebb70c553804eb58a861796a79..db668607345d159a5f5bafba5bc9b4004fcc0c5e 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
@@ -504,12 +504,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.contactController.updateContactDataFromController(user.getUserContact());
 
                // It should be there, so run some tests on it
-               assert (user instanceof User) : "Instance loginController.loggedInUser is null";
-               assert (user.getUserId() instanceof Long) : "Instance loginController.loggedInUser.userId is null";
-               assert (user.getUserId() > 0) : MessageFormat.format("loginController.loggedInUser.userId={0} is invalid", user.getUserId());
-               assert (user.getUserContact() instanceof Contact) : "Instance loginController.loggedInUser.userContact is null";
-               assert (user.getUserContact().getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null";
-               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId());
+               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null";
+               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null";
+               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId());
+               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null";
+               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null";
+               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId());
 
                // Update all fields
                user.setUserProfileMode(this.getUserProfileMode());

diff --git a/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java b/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java
index dc1a130ab409f3ba1eead9ef329c6659cc97839b..9a5e46992311a625c838a8080d92ef7a8743c139 100644 (file)
--- a/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java
@@ -46,7 +46,7 @@ public class FinancialsUserPasswordValidator extends BaseStringValidator impleme
         * User login controller
         */
        @Inject
-       private FinancialsUserLoginWebSessionController loginController;
+       private FinancialsUserLoginWebSessionController userLoginController;
 
        @Override
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
@@ -60,10 +60,10 @@ public class FinancialsUserPasswordValidator extends BaseStringValidator impleme
                super.preValidate(context, component, value, requiredFields, false);
 
                // value is known to be an entered password, so instance login container
-               LoginContainer container = new UserLoginContainer(this.loginController.getLoggedInUser(), (String) value);
+               LoginContainer container = new UserLoginContainer(this.userLoginController.getLoggedInUser(), (String) value);
 
                // Test it here
-               if (!UserUtils.ifPasswordMatches(container, this.loginController.getLoggedInUser())) {
+               if (!UserUtils.ifPasswordMatches(container, this.userLoginController.getLoggedInUser())) {
                        // Password mismatches
                        throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
                }