From: Roland Häder <roland@mxchange.org>
Date: Thu, 20 Apr 2017 09:40:30 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=28570bcdd1899bc6dafc7a095addbab7ef8dbead;p=jfinancials-war.git

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 0e792316..9ea97178 100644
--- 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 88aa123d..df40b397 100644
--- 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 c124de90..9f0bff86 100644
--- 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 c92d2d31..4d56fb9c 100644
--- 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 4dd62ed5..3d4415d5 100644
--- 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 8218e807..b67a1be7 100644
--- 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