renamed to better names

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

diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
index 688f6914baf0f49da0020e4ef9cf33a1f05d30b1..4fd8efafd9d485da3dbb3f7d9557e0e374794126 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java
@@ -39,14 +39,14 @@ import org.mxchange.addressbook.beans.BaseAddressbookController;
 import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
 import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent;
-import org.mxchange.jaddressbookcore.events.addressbook.LoadedAddressbookEvent;
 import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException;
 import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
 import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jaddressbookcore.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
 
 /**
  * An address book bean (controller)
@@ -102,7 +102,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme
         */
        @Inject
        @Any
-       private Event<AddressbookLoadedEvent> loadedEvent;
+       private Event<ObservableAddressbookLoadedEvent> loadedEvent;
 
        /**
         * Login controller
@@ -174,7 +174,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme
        }
 
        @Override
-       public void afterAddressbookLoadedEvent (@Observes final AddressbookLoadedEvent event) {
+       public void afterAddressbookLoadedEvent (@Observes final ObservableAddressbookLoadedEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -207,7 +207,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme
        }
 
        @Override
-       public void afterLoginEvent (@Observes final UserLoggedInEvent event) {
+       public void afterLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // Is the user logged in?
                if (null == event) {
                        // Is null
@@ -439,7 +439,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme
                        Addressbook a = this.addressbookBean.getAddressbookById(this.getAddressbookId());
 
                        // Fire event here
-                       this.loadedEvent.fire(new LoadedAddressbookEvent(a));
+                       this.loadedEvent.fire(new AddressbookLoadedEvent(a));
 
                        // Found it
                        isFound = true;

diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java
index 8b71fec2c84f042d21ba1c751744bc4b52588e35..43d84c30ce1f0bec70c888b955b925eb5b583071 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java
@@ -19,11 +19,11 @@ package org.mxchange.addressbook.beans.addressbook;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
-import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent;
 import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jaddressbookcore.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
 
 /**
  * An interface for address book beans
@@ -145,7 +145,7 @@ public interface AddressbookWebSessionController extends Serializable {
         * <p>
         * @param event Event with address book instance
         */
-       void afterAddressbookLoadedEvent (final AddressbookLoadedEvent event);
+       void afterAddressbookLoadedEvent (final ObservableAddressbookLoadedEvent event);
 
        /**
         * Count all shared address books by given user id
@@ -162,7 +162,7 @@ public interface AddressbookWebSessionController extends Serializable {
         * <p>
         * @param event
         */
-       void afterLoginEvent (final UserLoggedInEvent event);
+       void afterLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Checks if the user is logged in and if so if it matches the current

diff --git a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java
index 8663656850512568e72faff0c1ce7c162ea1846f..d7cb4792051432468e08869f5671b9825f93f51e 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java
@@ -33,13 +33,13 @@ import org.mxchange.addressbook.beans.BaseAddressbookController;
 import org.mxchange.addressbook.beans.helper.AddressbookWebRequestController;
 import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 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;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
+import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
 
 /**
  * A web request bean for confirmation link handling
@@ -82,7 +82,7 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo
         */
        @Inject
        @Any
-       private Event<UserConfirmedAccountEvent> userConfirmedEvent;
+       private Event<ObservableUserConfirmedAccountEvent> userConfirmedEvent;
 
        /**
         * Default constructor
@@ -203,7 +203,7 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo
                }
 
                // 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/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
index 4e4ac598ee19484c56b842a3aa9c6bcbd626540a..62482450e9e767a78f66aab2a85bb2eab712be46 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
@@ -39,8 +39,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.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.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An administrative user bean (controller)
@@ -72,7 +72,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
         */
        @Inject
        @Any
-       private Event<AdminAddedContactEvent> addedContactEvent;
+       private Event<ObservableAdminAddedContactEvent> addedContactEvent;
 
        /**
         * Administrative contact EJB
@@ -236,7 +236,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
         */
        @Inject
        @Any
-       private Event<AdminUpdatedContactEvent> updatedContactEvent;
+       private Event<ObservableAdminUpdatedContactEvent> updatedContactEvent;
 
        /**
         * ZIP code
@@ -302,7 +302,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                }
 
                // 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 AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                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 AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                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/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
index 62b02388a04f2ce502880b1562b645e5e88765aa..5b412444a5467e4d95bb683b70bf4e98bf754269 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
@@ -40,8 +40,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;
@@ -51,13 +49,15 @@ 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.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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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 AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @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/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
index 015ad2c3bf147ce558662a622623ad5a985cf9cf..248d9d74bb9cbd864b5b15b205927f64329c6505 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.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 AddressbookContactWebSessionController 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 AddressbookContactWebSessionController 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 AddressbookContactWebSessionController 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 AddressbookContactWebSessionController 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/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java
index 294f88778c03c21a61a3355abb980045942f1bc6..5357e3d6bf035a00a455b3823c832c311dd223ad 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java
@@ -34,10 +34,10 @@ import org.mxchange.addressbook.beans.BaseAddressbookController;
 import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController;
 import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController;
 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.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 AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro
        }
 
        @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 AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro
        }
 
        @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 AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro
        }
 
        @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/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java
index 781bd4c2de562e50a95e1213a6e9cbfb1e54dc39..160826d59b7b5ce173233ecca8832e5d54b21d1b 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.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 AddressbookContactPhoneWebSessionController extends Serializabl
         * <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 AddressbookContactPhoneWebSessionController extends Serializabl
         * <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/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java
index 35f9e315b3625196d3b53dfdd73976338378e7a1..28991e3aeed32628d7f7bef305fe65f4ffd5e240 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.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 AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro
         */
        @Inject
        @Any
-       private Event<AdminAddedCountryEvent> addedCountryEvent;
+       private Event<ObservableAdminAddedCountryEvent> addedCountryEvent;
 
        /**
         * Abroad dial prefix
@@ -146,7 +146,7 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro
                }
 
                // 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/addressbook/beans/country/AddressbookCountryWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java
index 7e890d2afdab10f2396a412dafe45928719b52cf..69bfb3e80201ce1bf38f7b6e4ccbc21f91ac9b79 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java
+++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java
@@ -29,7 +29,7 @@ import javax.naming.NamingException;
 import org.mxchange.addressbook.beans.BaseAddressbookController;
 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 AddressbookCountryWebApplicationBean extends BaseAddressbookControl
        }
 
        @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/addressbook/beans/country/AddressbookCountryWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java
index 16d43f90d7c902b67c4559f4d07f8dc08fdcf0c3..a6eaaf17bb224d08516fcb1689ad48761acafb41 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java
+++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java
@@ -19,7 +19,7 @@ package org.mxchange.addressbook.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 AddressbookCountryWebApplicationController extends Serializable
         * <p>
         * @param event Event instance
         */
-       void afterAdminAddedCountry (final AdminAddedCountryEvent event);
+       void afterAdminAddedCountry (final ObservableAdminAddedCountryEvent event);
 
 }

diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
index 5db9cef17f06de87c57ecd12a314cd421495bb51..6a448560a76fdb8cc9b12b984932eed1933ca183 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
@@ -24,8 +24,8 @@ import javax.enterprise.event.Observes;
 import javax.faces.context.FacesContext;
 import javax.inject.Named;
 import org.mxchange.addressbook.beans.BaseAddressbookController;
-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 AddressbookLocalizationSessionBean extends BaseAddressbookControlle
        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 AddressbookLocalizationSessionBean extends BaseAddressbookControlle
        }
 
        @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/addressbook/beans/localization/AddressbookLocalizationSessionController.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
index e0d2b609a8dae1309a590ee8a2918452cd29df9e..ee3ae05b42a768cf23d34e6278792dce089380c5 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
@@ -18,8 +18,8 @@ package org.mxchange.addressbook.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 AddressbookLocalizationSessionController 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/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
index f0ea1b4ad0f7a4300a0e7f480a6339319d805972..afcf854f7da1b8e3fad50287c6d0bde5a6fe0ebd 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
@@ -36,10 +36,7 @@ import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 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.PasswordHistory;
 import org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
+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 AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
         */
        @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 AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
        }
 
        @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 AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
                        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/addressbook/beans/login/AddressbookUserLoginWebSessionController.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
index c5da9603358843d302bf7bf31ab06cff25c0979f..7e7c74c2784b935aa27b41115f04a930e7250a77 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
@@ -19,9 +19,9 @@ package org.mxchange.addressbook.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 AddressbookUserLoginWebSessionController 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/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
index 88b302ef87017d2c15b8f238e18b7d0818d8c1d7..eadd0df1cddd39d0d683f6f4a673eb15b5fd2b02 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
@@ -34,7 +34,6 @@ import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 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.jusercore.model.register.UserRegistrationSessionBeanRemote;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * A web bean for user registration
@@ -86,7 +86,7 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro
         */
        @Inject
        @Any
-       private Event<UserRegisteredEvent> registeredEvent;
+       private Event<ObservableUserRegisteredEvent> registeredEvent;
 
        /**
         * User controller
@@ -174,7 +174,7 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro
                        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/addressbook/beans/shares/AddressbookSharesWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java
index 8db16f9429f88cf7bec253bd4e3850dc7ae58c6f..ea23f50edb602058601c7f673a92b1dba8e9bf0c 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java
@@ -34,15 +34,15 @@ import javax.naming.NamingException;
 import org.mxchange.addressbook.beans.BaseAddressbookController;
 import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 import org.mxchange.addressbook.model.shared.SharedAddressbooksSessionBeanRemote;
-import org.mxchange.jaddressbookcore.events.sharing.AddressbookSharingEvent;
 import org.mxchange.jaddressbookcore.events.sharing.StartedAddressbookSharingEvent;
 import org.mxchange.jaddressbookcore.events.sharing.type.SharingType;
 import org.mxchange.jaddressbookcore.exceptions.UserAlreadySharingAddressbookException;
 import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
+import org.mxchange.jaddressbookcore.events.sharing.ObservableAddressbookSharingEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
 
 /**
  * A bean for sharing address books with other users
@@ -94,7 +94,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i
         */
        @Inject
        @Any
-       private Event<AddressbookSharingEvent> sharingEvent;
+       private Event<ObservableAddressbookSharingEvent> sharingEvent;
 
        /**
         * Default constructor
@@ -114,7 +114,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i
        }
 
        @Override
-       public void afterAdressbookShareEnded (@Observes final AddressbookSharingEvent event) {
+       public void afterAdressbookShareEnded (@Observes final ObservableAddressbookSharingEvent event) {
                // Validate parameter
                if (null == event) {
                        // Throw NPE
@@ -135,7 +135,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i
        }
 
        @Override
-       public void afterAdressbookShareStarted (@Observes final AddressbookSharingEvent event) {
+       public void afterAdressbookShareStarted (@Observes final ObservableAddressbookSharingEvent event) {
                // Validate parameter
                if (null == event) {
                        // Throw NPE
@@ -156,7 +156,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i
        }
 
        @Override
-       public void afterLoginEvent (@Observes final UserLoggedInEvent event) {
+       public void afterLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // Is the user logged in?
                if (null == event) {
                        // Is null
@@ -297,7 +297,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i
         * <p>
         * @param event Event to validate
         */
-       private void validateEvent (final AddressbookSharingEvent event) {
+       private void validateEvent (final ObservableAddressbookSharingEvent event) {
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N

diff --git a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java
index 066dc2ec63d6947ea23b5f5089832292fe1e1dec..f3dd50487b72939c18acdf0908611380ef11b796 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java
@@ -18,11 +18,11 @@ package org.mxchange.addressbook.beans.shares;
 
 import java.io.Serializable;
 import java.util.List;
-import org.mxchange.jaddressbookcore.events.sharing.AddressbookSharingEvent;
 import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jaddressbookcore.events.sharing.ObservableAddressbookSharingEvent;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
 
 /**
  * Controller interface sharing address books
@@ -36,14 +36,14 @@ public interface AddressbookSharesWebSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterAdressbookShareEnded (final AddressbookSharingEvent event);
+       void afterAdressbookShareEnded (final ObservableAddressbookSharingEvent event);
 
        /**
         * Observer method for started sharing events
         * <p>
         * @param event Event instance
         */
-       void afterAdressbookShareStarted (final AddressbookSharingEvent event);
+       void afterAdressbookShareStarted (final ObservableAddressbookSharingEvent event);
 
        /**
         * This method is called when a user has successfully logged in his/her
@@ -51,7 +51,7 @@ public interface AddressbookSharesWebSessionController extends Serializable {
         * <p>
         * @param event
         */
-       void afterLoginEvent (final UserLoggedInEvent event);
+       void afterLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Returns a list of all address books the user is sharing with others.

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
index baa40fa43baac3f95e047a02c861bbdc122ad799..4dd5355ff11a8e32d561465573bdae434efb080d 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
@@ -36,13 +36,9 @@ import org.mxchange.addressbook.beans.helper.AddressbookWebRequestController;
 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.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
+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 AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
         */
        @Inject
        @Any
-       private Event<AdminAddedUserEvent> addedUserEvent;
+       private Event<ObservableAdminAddedUserEvent> addedUserEvent;
 
        /**
         * Regular contact controller
@@ -107,7 +107,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
         */
        @Inject
        @Any
-       private Event<AdminUpdatedUserDataEvent> updatedUserDataEvent;
+       private Event<ObservableAdminUpdatedUserDataEvent> updatedUserDataEvent;
 
        /**
         * General user EJB
@@ -126,7 +126,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
         */
        @Inject
        @Any
-       private Event<AdminLinkedUserEvent> userLinkedEvent;
+       private Event<ObservableAdminLinkedUserEvent> userLinkedEvent;
 
        /**
         * User lock reason
@@ -274,7 +274,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
                                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 AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
                                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 AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
        }
 
        @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 AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
                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/addressbook/beans/user/AddressbookAdminUserWebRequestController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
index 10dad2edc93a4c3ab8ad4fa6611c1ec0b99e55f2..3ed61f22a50088f5c4a06ecd53c85e2218442532 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
@@ -17,8 +17,8 @@
 package org.mxchange.addressbook.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 AddressbookAdminUserWebRequestController 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/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
index e872c23e6482562b5134e33aac2b6dbe33891545..7f779a4dacef422e0f95a85f16bf8ae444bfd897 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
@@ -39,14 +39,7 @@ import org.mxchange.addressbook.beans.localization.AddressbookLocalizationSessio
 import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 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.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.UserUtils;
 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;
 
 /**
  * A user bean (controller)
@@ -98,7 +98,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp
         */
        @Inject
        @Any
-       private Event<UpdatedUserPersonalDataEvent> updatedPersonalDataEvent;
+       private Event<ObservableUpdatedUserPersonalDataEvent> updatedPersonalDataEvent;
 
        /**
         * Remote user bean
@@ -175,7 +175,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @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 AddressbookUserWebSessionBean extends BaseAddressbookController imp
                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/addressbook/beans/user/AddressbookUserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
index 56431b5b92ed388446b673c399a31456ae803be1..fed63f012613f5eb276e930df70e54812478f781 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
@@ -19,17 +19,17 @@ package org.mxchange.addressbook.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 AddressbookUserWebSessionController 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 AddressbookUserWebSessionController 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/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java
index 27b4becf1d5d8bd7ac6859c652d70dfaf170a258..4463dbba7dca7d3a5ffc206a89fa2531f9e362f5 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java
@@ -31,7 +31,6 @@ import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplication
 import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 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.User;
 import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * A user password (change) bean (controller)
@@ -92,7 +92,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro
         */
        @Any
        @Inject
-       private Event<UpdatedUserPasswordEvent> userUpdatedPasswordEvent;
+       private Event<ObservableUpdatedUserPasswordEvent> userUpdatedPasswordEvent;
 
        /**
         * Default constructor
@@ -181,7 +181,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro
                        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/addressbook/validator/user/AddressbookUserIdValidator.java b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
index 5530222dedb5d54448b3d8000b087cc466af625f..8681557942b1f89defd02d454c96fc50c4477d4f 100644 (file)
--- a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.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 AddressbookUserIdValidator extends BaseLongValidator implements Val
         * <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