Continued:

[juser-login-core.git] / src / org / mxchange / jusercore / events / login / UserLoginEvent.java

diff --git a/src/org/mxchange/jusercore/events/login/UserLoginEvent.java b/src/org/mxchange/jusercore/events/login/UserLoginEvent.java
index 3973a414ccd4554d2f820ed435bd2b279a7e5e94..2ad452bda8405a67f0c156e799f2739b60f7dc0b 100644 (file)
--- a/src/org/mxchange/jusercore/events/login/UserLoginEvent.java
+++ b/src/org/mxchange/jusercore/events/login/UserLoginEvent.java
@@ -16,10 +16,11 @@
  */
 package org.mxchange.jusercore.events.login;
 
+import java.text.MessageFormat;
 import org.mxchange.jusercore.model.user.User;
 
 /**
- * This event is fired when the user has logged in
+ * This event is fired when the loggedInUser has logged in
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
@@ -33,20 +34,33 @@ public class UserLoginEvent implements UserLoggedInEvent {
        /**
         * User instance
         */
-       private final User user;
+       private final User loggedInUser;
 
        /**
-        * Constructor with updated user instance
+        * Constructor with updated loggedInUser instance
         * <p>
-        * @param user Updated user instance
+        * @param loggedInUser Updated loggedInUser instance
         */
-       public UserLoginEvent (final User user) {
-               // Set user
-               this.user = user;
+       public UserLoginEvent (final User loggedInUser) {
+               // Is the logged-in user instance valid?
+               if (null == loggedInUser) {
+                       // Throw NPE
+                       throw new NullPointerException("loggedInUser is null"); //NOI18N
+               } else if (loggedInUser.getUserId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("loggedInUser.userId is null"); //NOI18N
+               } else if (loggedInUser.getUserId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("loggedInUser.userId={0} is invalid.", loggedInUser.getUserId())); //NOI18N
+               }
+
+               // Set loggedInUser
+               this.loggedInUser = loggedInUser;
        }
 
        @Override
-       public User getUser () {
-               return this.user;
+       public User getLoggedInUser () {
+               return this.loggedInUser;
        }
+
 }