Please cherry-pick:

- renamed methods as they are for user-only cases
- set only locale when really there (not null)

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 0e792316f7a491a8ff83cd9cf60d4a94d53374ca..9ea97178d8d585e2c7a14ac307d0408bfea2db12 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
@@ -405,7 +405,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
index 88aa123d3dcfc0fbd4283f67a722f786faff0a1a..df40b397d1fed75f8ca78b46c55e82e5271dd5c6 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
@@ -121,7 +121,7 @@ public interface FinancialsContactWebSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Creates an instance from all properties

diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
index c124de909000d5f355dc449a206f56ba2e6acd28..9f0bff86e5f851865b65e20d2199346ccc67a35c 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
@@ -50,7 +50,7 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
        private Locale locale;
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -66,12 +66,15 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
                        throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N
                }
 
-               // Set locale here
-               this.setLocale(event.getLoggedInUser().getUserLocale());
+               // Is the locale set?
+               if (event.getLoggedInUser().getUserLocale() instanceof Locale) {
+                       // Set locale here
+                       this.setLocale(event.getLoggedInUser().getUserLocale());
+               }
        }
 
        @Override
-       public void afterUserLogout (@Observes final ObservableUserLogoutEvent event) {
+       public void afterUserLogoutEvent (@Observes final ObservableUserLogoutEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
index c92d2d319fb4cd3032f2791d394eb97dd7ef4eed..4d56fb9c43b9fbaa17d306c75be7d3aa0cc3bd9d 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
@@ -33,14 +33,14 @@ public interface FinancialsLocalizationSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Event observer for logged-out user
         * <p>
         * @param event Event instance
         */
-       void afterUserLogout (final ObservableUserLogoutEvent event);
+       void afterUserLogoutEvent (final ObservableUserLogoutEvent event);
 
        /**
         * Getter for locale

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
index 4dd62ed52c06d3f4a7a34ad5b6116a66cbe1ff39..3d4415d53929f7f94c83049d23dd350436f42201 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
@@ -289,7 +289,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
index 8218e80790c20ca395491b96ef24acb937a2eb3b..b67a1be71c4d43aa38614f3df7183e40651da63b 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
@@ -91,7 +91,7 @@ public interface FinancialsUserWebSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * All users