renamed to better names

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

diff --git a/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
index 6a46380aee77f430b64b8e3775a45fb9f62f6d86..ac62a0e569ed70c068c4e1b8b571d43a95ccf96c 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
@@ -31,7 +31,6 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcoreee.utils.FacesUtils;
-import org.mxchange.jusercore.events.confirmation.ConfirmedUserAccountEvent;
 import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
 import org.mxchange.jusercore.exceptions.UserStatusConfirmedException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
@@ -40,6 +39,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
 import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
 
 /**
  * A web request bean for confirmation link handling
@@ -82,7 +82,7 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsCont
         */
        @Inject
        @Any
-       private Event<UserConfirmedAccountEvent> userConfirmedEvent;
+       private Event<ObservableUserConfirmedAccountEvent> userConfirmedEvent;
 
        /**
         * Default constructor
@@ -203,7 +203,7 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsCont
                }
 
                // Fire event that the user has confirmed account
-               this.userConfirmedEvent.fire(new ConfirmedUserAccountEvent(updatedUser));
+               this.userConfirmedEvent.fire(new UserConfirmedAccountEvent(updatedUser));
 
                // Set it again in helper
                this.beanHelper.setUser(updatedUser);

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
index d2c309df2637a80f9a28d5c487b0daca4f971506..dab40736847030c67b38ac24e9f276a27f0886e9 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
@@ -38,8 +38,6 @@ import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.add.AdminContactAddedEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminContactUpdatedEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcountry.data.Country;
@@ -52,6 +50,8 @@ import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An administrative user bean (controller)
@@ -72,7 +72,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
         */
        @Inject
        @Any
-       private Event<AdminAddedContactEvent> addedContactEvent;
+       private Event<ObservableAdminAddedContactEvent> addedContactEvent;
 
        /**
         * Administrative contact EJB
@@ -236,7 +236,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
         */
        @Inject
        @Any
-       private Event<AdminUpdatedContactEvent> updatedContactEvent;
+       private Event<ObservableAdminUpdatedContactEvent> updatedContactEvent;
 
        /**
         * ZIP code
@@ -302,7 +302,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
                }
 
                // Fire event
-               this.addedContactEvent.fire(new AdminContactAddedEvent(updatedContact));
+               this.addedContactEvent.fire(new AdminAddedContactEvent(updatedContact));
 
                // Clear this bean
                this.clear();
@@ -394,7 +394,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
                Contact updatedContact = this.contactBean.updateContactData(contact, this.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // Fire event
-               this.updatedContactEvent.fire(new AdminContactUpdatedEvent(updatedContact));
+               this.updatedContactEvent.fire(new AdminUpdatedContactEvent(updatedContact));
 
                // Clear bean
                this.clear();
@@ -427,7 +427,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
                Contact updatedContact = this.contactBean.updateContactData(contact, this.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // Fire event
-               this.updatedContactEvent.fire(new AdminContactUpdatedEvent(updatedContact));
+               this.updatedContactEvent.fire(new AdminUpdatedContactEvent(updatedContact));
 
                // Clear bean
                this.clear();

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
index 69ee86729322099f89a00160b4c3197469ac1d96..582deecefbca82842e4e5357e679aa1a72193fbe 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
@@ -38,8 +38,6 @@ import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
@@ -49,15 +47,17 @@ import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * A general contact bean (controller)
@@ -252,7 +252,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterAdminAddedContact (@Observes final AdminAddedContactEvent event) {
+       public void afterAdminAddedContact (@Observes final ObservableAdminAddedContactEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("contactController.afterAdminAddedContact(): event={0} - CALLED!", event)); //NOI18N
 
@@ -282,7 +282,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
+       public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("contactController.afterAdminAddedUserEvent(): event={0} - CALLED!", event)); //NOI18N
 
@@ -306,7 +306,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterAdminLinkedUser (@Observes final AdminLinkedUserEvent event) {
+       public void afterAdminLinkedUser (@Observes final ObservableAdminLinkedUserEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -333,7 +333,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterAdminUpdatedContactDataEvent (@Observes final AdminUpdatedContactEvent event) {
+       public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -360,7 +360,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
+       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -393,7 +393,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterUserConfirmedAccount (@Observes final UserConfirmedAccountEvent event) {
+       public void afterUserConfirmedAccount (@Observes final ObservableUserConfirmedAccountEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -414,7 +414,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
        }
 
        @Override
-       public void afterUserLogin (@Observes final UserLoggedInEvent event) {
+       public void afterUserLogin (@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 ae554ec53946cdfc1e3c397cb06540acaa0289cd..88aa123d3dcfc0fbd4283f67a722f786faff0a1a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
@@ -22,16 +22,16 @@ import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.gender.Gender;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An interface for user beans
@@ -58,14 +58,14 @@ public interface FinancialsContactWebSessionController extends Serializable {
         * <p>
         * @param event Event being fired
         */
-       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
+       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
 
        /**
         * Event observer when user confirmed account.
         * <p>
         * @param event Event being fired
         */
-       void afterUserConfirmedAccount (final UserConfirmedAccountEvent event);
+       void afterUserConfirmedAccount (final ObservableUserConfirmedAccountEvent event);
 
        /**
         * Updates all data from bean in given contact instance
@@ -91,7 +91,7 @@ public interface FinancialsContactWebSessionController extends Serializable {
         * <p>
         * @param event User registration event
         */
-       void afterRegistrationEvent (final UserRegisteredEvent event);
+       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
 
        /**
         * Observes events being fired when an administrator has added a new
@@ -99,7 +99,7 @@ public interface FinancialsContactWebSessionController extends Serializable {
         * <p>
         * @param event Event being fired
         */
-       void afterAdminAddedContact (final AdminAddedContactEvent event);
+       void afterAdminAddedContact (final ObservableAdminAddedContactEvent event);
 
        /**
         * Observes events being fired when an administrator has linked a new user
@@ -107,21 +107,21 @@ public interface FinancialsContactWebSessionController extends Serializable {
         * <p>
         * @param event Event being fired
         */
-       void afterAdminLinkedUser (final AdminLinkedUserEvent event);
+       void afterAdminLinkedUser (final ObservableAdminLinkedUserEvent event);
 
        /**
         * Event observer for updated contact data by administrators
         * <p>
         * @param event Updated contact data event
         */
-       void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
+       void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event);
 
        /**
         * Event observer for logged-in user
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final UserLoggedInEvent event);
+       void afterUserLogin (final ObservableUserLoggedInEvent event);
 
        /**
         * Creates an instance from all properties

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
index 6038671b0e2b13407590700654ebaf206fd9cc59..27fe38156b70ce0dd08030f13703e200ba858eb5 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
@@ -32,12 +32,12 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
 import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * A general contact bean (controller)
@@ -97,7 +97,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
        }
 
        @Override
-       public void afterAdminAddedContact (@Observes final AdminAddedContactEvent event) {
+       public void afterAdminAddedContact (@Observes final ObservableAdminAddedContactEvent event) {
                // The event must be valid
                if (null == event) {
                        // Throw NPE
@@ -118,7 +118,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
        }
 
        @Override
-       public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
+       public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -139,7 +139,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
        }
 
        @Override
-       public void afterAdminUpdatedContactDataEvent (@Observes final AdminUpdatedContactEvent event) {
+       public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java
index a95b7d9821c6babb2a96a3ffa0a802f502a512a1..2ad5cae4795a5ceb33eddf0fbdfed81d2c316d2a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An interface for user beans
@@ -49,7 +49,7 @@ public interface FinancialsContactPhoneWebSessionController extends Serializable
         * <p>
         * @param event Event being fired
         */
-       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
+       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
 
        /**
         * Observes events being fired when an administrator has added a new
@@ -57,13 +57,13 @@ public interface FinancialsContactPhoneWebSessionController extends Serializable
         * <p>
         * @param event Event being fired
         */
-       void afterAdminAddedContact (final AdminAddedContactEvent event);
+       void afterAdminAddedContact (final ObservableAdminAddedContactEvent event);
 
        /**
         * Event observer for updated contact data by administrators
         * <p>
         * @param event Updated contact data event
         */
-       void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
+       void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event);
 
 }

diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java
index e1bae1fbc79fcc6e2f3147218c412c20e60f83dc..6983e06f91aa98a5bd2152033330ef42ac3746fb 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java
@@ -33,8 +33,8 @@ import org.mxchange.jcountry.data.Country;
 import org.mxchange.jcountry.data.CountryData;
 import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
 import org.mxchange.jcountry.events.AdminAddedCountryEvent;
-import org.mxchange.jcountry.events.AdminEventCountryAdded;
 import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException;
+import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
 
 /**
  * An administrative country bean
@@ -55,7 +55,7 @@ public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsControll
         */
        @Inject
        @Any
-       private Event<AdminAddedCountryEvent> addedCountryEvent;
+       private Event<ObservableAdminAddedCountryEvent> addedCountryEvent;
 
        /**
         * Abroad dial prefix
@@ -146,7 +146,7 @@ public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsControll
                }
 
                // Fire event
-               this.addedCountryEvent.fire(new AdminEventCountryAdded(updatedCountry));
+               this.addedCountryEvent.fire(new AdminAddedCountryEvent(updatedCountry));
 
                // Clear this bean
                this.clear();

diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java
index c62e2914a5cbde09c8699894bc634aa8b886a8db..4333eaa42bad30399804eae3213adf882103d238 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java
@@ -29,7 +29,7 @@ import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
-import org.mxchange.jcountry.events.AdminAddedCountryEvent;
+import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
 
 /**
  * A country bean
@@ -73,7 +73,7 @@ public class FinancialsCountryWebApplicationBean extends BaseFinancialsControlle
        }
 
        @Override
-       public void afterAdminAddedCountry (@Observes final AdminAddedCountryEvent event) {
+       public void afterAdminAddedCountry (@Observes final ObservableAdminAddedCountryEvent event) {
                // Is all valid?
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java
index cf7a3d7fcb0f4f034adf1558ee6f55b9fbfaacd3..93d4ecd6ced90b2159cf03c2d031645f0d6d3e77 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java
+++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java
@@ -19,7 +19,7 @@ package org.mxchange.jfinancials.beans.country;
 import java.io.Serializable;
 import java.util.List;
 import org.mxchange.jcountry.data.Country;
-import org.mxchange.jcountry.events.AdminAddedCountryEvent;
+import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
 
 /**
  * An interface for country beans
@@ -41,6 +41,6 @@ public interface FinancialsCountryWebApplicationController extends Serializable
         * <p>
         * @param event Event instance
         */
-       void afterAdminAddedCountry (final AdminAddedCountryEvent event);
+       void afterAdminAddedCountry (final ObservableAdminAddedCountryEvent event);
 
 }

diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
index bc7ce44fc077bd0840bb3f4ad7c29727f892dc10..a21ad833af9e4e3840c1a1c2de005eadd85760d3 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
@@ -24,8 +24,8 @@ import javax.enterprise.event.Observes;
 import javax.faces.context.FacesContext;
 import javax.inject.Named;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
 
 /**
  * A session bean for handling localization/internationalization changes. This
@@ -50,7 +50,7 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
        private Locale locale;
 
        @Override
-       public void afterUserLogin (@Observes final UserLoggedInEvent event) {
+       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("LandingLocalizationSessionBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N
 
@@ -77,7 +77,7 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
        }
 
        @Override
-       public void afterUserLogout (@Observes final ObserveableUserLogoutEvent event) {
+       public void afterUserLogout (@Observes final ObservableUserLogoutEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ReportsLocalizationSessionBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N
 

diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
index dccfbc355738edc8573490fb2264eb8da2600102..c92d2d319fb4cd3032f2791d394eb97dd7ef4eed 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
@@ -18,8 +18,8 @@ package org.mxchange.jfinancials.beans.localization;
 
 import java.io.Serializable;
 import java.util.Locale;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
 
 /**
  * An interface for localization change beans
@@ -33,14 +33,14 @@ public interface FinancialsLocalizationSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final UserLoggedInEvent event);
+       void afterUserLogin (final ObservableUserLoggedInEvent event);
 
        /**
         * Event observer for logged-out user
         * <p>
         * @param event Event instance
         */
-       void afterUserLogout (final ObserveableUserLogoutEvent event);
+       void afterUserLogout (final ObservableUserLogoutEvent event);
 
        /**
         * Getter for locale

diff --git a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
index c05a8f1c258bb970d6bfd0bcb3cf8bb9f646186a..3d8d5082c1851d460a2b526ca729e5b6acda28c7 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
@@ -35,10 +35,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jusercore.container.login.LoginContainer;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.login.UserLoginEvent;
-import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent;
 import org.mxchange.jusercore.events.logout.UserLogoutEvent;
-import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
@@ -51,6 +48,9 @@ import org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySes
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * A web bean for user registration
@@ -113,14 +113,14 @@ public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController
         */
        @Inject
        @Any
-       private Event<UserLoggedInEvent> userLoginEvent;
+       private Event<ObservableUserLoggedInEvent> userLoginEvent;
 
        /**
         * Event fired when user has logged out
         */
        @Inject
        @Any
-       private Event<ObserveableUserLogoutEvent> userLogoutEvent;
+       private Event<ObservableUserLogoutEvent> userLogoutEvent;
 
        /**
         * User's password history
@@ -155,7 +155,7 @@ public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController
        }
 
        @Override
-       public void afterUserUpdatedPasswordEvent (@Observes final UpdatedUserPasswordEvent event) {
+       public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) {
                // Check parameter
                if (null == event) {
                        // Throw NPE
@@ -215,7 +215,7 @@ public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController
                        this.setBaseTemplatePathName(USER_BASE_TEMPLATE_NAME); //NOI18N
 
                        // Fire event away. Keep this last before return statement.
-                       this.userLoginEvent.fire(new UserLoginEvent(confirmedUser));
+                       this.userLoginEvent.fire(new UserLoggedInEvent(confirmedUser));
 
                        // Clear this bean
                        this.clear();

diff --git a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java
index 29322a30534464da01d5abd194dc3ae5749c5da7..8089502a657d311b606cb55c57ce7260b52fd2db 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java
@@ -19,9 +19,9 @@ package org.mxchange.jfinancials.beans.login;
 import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Local;
-import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * An interface for registration web controllers
@@ -37,7 +37,7 @@ public interface FinancialsUserLoginWebSessionController extends Serializable {
         * <p>
         * @param event Event being observed
         */
-       void afterUserUpdatedPasswordEvent (final UpdatedUserPasswordEvent event);
+       void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event);
 
        /**
         * Checks whether given clear-text password is in user's password history.

diff --git a/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java
index fe3e3a7adee1f8470462957dd59dbf3b924899e5..49dc0697f191164b4552c97f2a90d686daa848d6 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java
@@ -30,7 +30,6 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcoreee.utils.FacesUtils;
-import org.mxchange.jusercore.events.registration.RegisteredUserEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.exceptions.DataRepeatMismatchException;
 import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException;
@@ -43,6 +42,7 @@ import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionControl
 import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
 import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * A web bean for user registration
@@ -86,7 +86,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
         */
        @Inject
        @Any
-       private Event<UserRegisteredEvent> registeredEvent;
+       private Event<ObservableUserRegisteredEvent> registeredEvent;
 
        /**
         * User controller
@@ -174,7 +174,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
                        assert (registeredUser.getUserId() instanceof Long) : "registeredUser.userId is null after registerUser() was called."; //NOI18N
 
                        // Fire event
-                       this.registeredEvent.fire(new RegisteredUserEvent(registeredUser));
+                       this.registeredEvent.fire(new UserRegisteredEvent(registeredUser));
 
                        // All fine, redirect to proper page
                        return "register_done"; //NOI18N

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
index 38f0c7c27b2c6556f205202657b79ea6811dce6a..737f57991eaf7a34ec2247e74c1250ab3080e5b5 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
@@ -33,13 +33,9 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcoreee.utils.FacesUtils;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent;
 import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
-import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent;
 import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent;
-import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent;
 import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException;
 import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
@@ -57,6 +53,10 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus;
 import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
 import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
+import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent;
 
 /**
  * A user bean (controller)
@@ -77,7 +77,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
         */
        @Inject
        @Any
-       private Event<AdminAddedUserEvent> addedUserEvent;
+       private Event<ObservableAdminAddedUserEvent> addedUserEvent;
 
        /**
         * Regular contact controller
@@ -107,7 +107,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
         */
        @Inject
        @Any
-       private Event<AdminUpdatedUserDataEvent> updatedUserDataEvent;
+       private Event<ObservableAdminUpdatedUserDataEvent> updatedUserDataEvent;
 
        /**
         * General user EJB
@@ -126,7 +126,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
         */
        @Inject
        @Any
-       private Event<AdminLinkedUserEvent> userLinkedEvent;
+       private Event<ObservableAdminLinkedUserEvent> userLinkedEvent;
 
        /**
         * User lock reason
@@ -274,7 +274,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
                                User updatedUser = this.adminUserBean.linkUser(user);
 
                                // Fire event
-                               this.userLinkedEvent.fire(new AdminUserLinkedEvent(updatedUser));
+                               this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser));
 
                                // Remove contact instance
                                this.beanHelper.setContact(null);
@@ -283,7 +283,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
                                User updatedUser = this.adminUserBean.addUser(user);
 
                                // Fire event
-                               this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
+                               this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser));
                        }
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Throw again
@@ -298,7 +298,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
        }
 
        @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
+       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
 
@@ -389,7 +389,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
                User updatedUser = this.userBean.updateUserData(user);
 
                // Fire event
-               this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser));
+               this.updatedUserDataEvent.fire(new AdminUpdatedUserDataEvent(updatedUser));
 
                // Return to user list (for now)
                return "admin_list_user"; //NOI18N

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java
index ec51974c579aac46f6f611fc4d870b2d5bcb6f32..52a0229f5cb360e8ee370c0195112300c2270723 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java
@@ -17,8 +17,8 @@
 package org.mxchange.jfinancials.beans.user;
 
 import java.io.Serializable;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * An interface for user beans
@@ -32,7 +32,7 @@ public interface FinancialsAdminUserWebRequestController extends Serializable {
         * <p>
         * @param event User registration event
         */
-       void afterRegistrationEvent (final UserRegisteredEvent event);
+       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
 
        /**
         * Adds user instance to database by preparing a complete user instance and

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
index db668607345d159a5f5bafba5bc9b4004fcc0c5e..6464bf661b154529c47ea47e06138ddd569559fb 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
@@ -35,14 +35,7 @@ import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
-import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
-import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent;
 import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent;
-import org.mxchange.jusercore.events.user.update.UserUpdatedPersonalDataEvent;
 import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
@@ -55,6 +48,13 @@ import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionControl
 import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
 import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController;
 import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
+import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent;
+import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent;
 
 /**
  * A user bean (controller)
@@ -98,7 +98,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
         */
        @Inject
        @Any
-       private Event<UpdatedUserPersonalDataEvent> updatedPersonalDataEvent;
+       private Event<ObservableUpdatedUserPersonalDataEvent> updatedPersonalDataEvent;
 
        /**
         * Remote user bean
@@ -175,7 +175,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
+       public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterAdminAddedUserEvent: event={0} - CALLED!", event)); //NOI18N
 
@@ -208,7 +208,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterAdminUpdatedUserDataEvent (@Observes final AdminUpdatedUserDataEvent event) {
+       public void afterAdminUpdatedUserDataEvent (@Observes final ObservableAdminUpdatedUserDataEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterAdminUpdatedUserEvent: event={0} - CALLED!", event)); //NOI18N
 
@@ -238,7 +238,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
+       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
 
@@ -289,7 +289,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterUserConfirmedAccount (@Observes final UserConfirmedAccountEvent event) {
+       public void afterUserConfirmedAccount (@Observes final ObservableUserConfirmedAccountEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactWebBean:afterAdminUpdatedContactDataEvent: event={0} - CALLED!", event)); //NOI18N
 
@@ -313,7 +313,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterUserLogin (@Observes final UserLoggedInEvent event) {
+       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N
 
@@ -346,7 +346,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterUserUpdatedPasswordEvent (@Observes final UpdatedUserPasswordEvent event) {
+       public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) {
                // Check parameter
                if (null == event) {
                        // Throw NPE
@@ -367,7 +367,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        }
 
        @Override
-       public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) {
+       public void afterUserUpdatedPersonalData (@Observes final ObservableUpdatedUserPersonalDataEvent event) {
                // Check parameter
                if (null == event) {
                        // Throw NPE
@@ -518,7 +518,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                User updatedUser = this.userBean.updateUserPersonalData(user);
 
                // Fire event
-               this.updatedPersonalDataEvent.fire(new UserUpdatedPersonalDataEvent(updatedUser));
+               this.updatedPersonalDataEvent.fire(new UpdatedUserPersonalDataEvent(updatedUser));
 
                // All fine
                return "contact_data_saved"; //NOI18N

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
index e6933d364ac18615c9cf4f000c21a284cdf9d57f..8218e80790c20ca395491b96ef24acb937a2eb3b 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
@@ -19,17 +19,17 @@ package org.mxchange.jfinancials.beans.user;
 import java.io.Serializable;
 import java.util.List;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
-import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent;
-import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent;
 import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
+import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent;
+import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent;
 
 /**
  * An interface for user beans
@@ -48,21 +48,21 @@ public interface FinancialsUserWebSessionController extends Serializable {
         * <p>
         * @param event Event being fired
         */
-       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
+       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
 
        /**
         * Event observer for updated user data by administrator
         * <p>
         * @param event Event being updated
         */
-       void afterAdminUpdatedUserDataEvent (final AdminUpdatedUserDataEvent event);
+       void afterAdminUpdatedUserDataEvent (final ObservableAdminUpdatedUserDataEvent event);
 
        /**
         * Event observer when user confirmed account.
         * <p>
         * @param event Event being fired
         */
-       void afterUserConfirmedAccount (final UserConfirmedAccountEvent event);
+       void afterUserConfirmedAccount (final ObservableUserConfirmedAccountEvent event);
 
        /**
         * Method being call after user's password has been updated (and history
@@ -70,28 +70,28 @@ public interface FinancialsUserWebSessionController extends Serializable {
         * <p>
         * @param event Event being observed
         */
-       void afterUserUpdatedPasswordEvent (final UpdatedUserPasswordEvent event);
+       void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event);
 
        /**
         * Listens to fired event when user updated personal data
         * <p>
         * @param event Event being fired
         */
-       void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event);
+       void afterUserUpdatedPersonalData (final ObservableUpdatedUserPersonalDataEvent event);
 
        /**
         * Event observer for new user registrations
         * <p>
         * @param event User registration event
         */
-       void afterRegistrationEvent (final UserRegisteredEvent event);
+       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
 
        /**
         * Event observer for logged-in user
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final UserLoggedInEvent event);
+       void afterUserLogin (final ObservableUserLoggedInEvent event);
 
        /**
         * All users

diff --git a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java
index 36b9f634e60c4896ee288c201097b6f160fe559e..5564dc5599706c74243375bab394c18081317690 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java
@@ -29,7 +29,6 @@ import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcoreee.utils.FacesUtils;
 import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent;
-import org.mxchange.jusercore.events.user.password_change.UserUpdatedPasswordEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
@@ -40,6 +39,7 @@ import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
 import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
 import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * A user password (change) bean (controller)
@@ -92,7 +92,7 @@ public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsControll
         */
        @Any
        @Inject
-       private Event<UpdatedUserPasswordEvent> userUpdatedPasswordEvent;
+       private Event<ObservableUpdatedUserPasswordEvent> userUpdatedPasswordEvent;
 
        /**
         * Default constructor
@@ -181,7 +181,7 @@ public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsControll
                        PasswordHistory passwordHistory = this.userBean.updateUserPassword(user, baseUrl);
 
                        // Fire event
-                       this.userUpdatedPasswordEvent.fire(new UserUpdatedPasswordEvent(passwordHistory));
+                       this.userUpdatedPasswordEvent.fire(new UpdatedUserPasswordEvent(passwordHistory));
                } catch (final UserNotFoundException | UserStatusUnconfirmedException | UserStatusLockedException ex) {
                        // Clear bean
                        this.clear();

diff --git a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
index 8a9d4fc26a404907edad0654389f4f9efb4a2fb9..3a93499de4cbbbac2c94d632cfc3c9b6e2fb563f 100644 (file)
--- a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
@@ -32,9 +32,9 @@ import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.number.BaseLongValidator;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * A validator for user ids
@@ -90,7 +90,7 @@ public class FinancialsUserIdValidator extends BaseLongValidator implements Vali
         * <p>
         * @param event User registration event
         */
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
+       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // Trace message
                this.loggerBeanLocal.logTrace(MessageFormat.format("UserIdValidator:afterRegistrationEvent: event={0} - CALLED!", event)); //NOI18N