From d5fda2ab63061743d025611b5751a8346e11c698 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Apr 2017 00:48:49 +0200 Subject: [PATCH] renamed to better names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../JobsAddressbookWebSessionBean.java | 12 ++--- .../JobsAddressbookWebSessionController.java | 8 +-- .../JobsConfirmationLinkWebRequestBean.java | 6 +-- .../JobsAdminContactWebRequestBean.java | 22 ++++---- .../JobsAdminContactWebRequestController.java | 4 +- .../contact/JobsContactWebSessionBean.java | 44 ++++++++-------- .../JobsContactWebSessionController.java | 44 ++++++++-------- .../JobsAdminContactPhoneWebRequestBean.java | 48 ++++++++--------- ...AdminContactPhoneWebRequestController.java | 12 ++--- .../phone/JobsContactPhoneWebSessionBean.java | 24 ++++----- .../JobsContactPhoneWebSessionController.java | 24 ++++----- .../JobsAdminCountryWebRequestBean.java | 6 +-- .../JobsCountryWebApplicationBean.java | 4 +- .../JobsCountryWebApplicationController.java | 4 +- .../JobsLocalizationSessionBean.java | 8 +-- .../JobsLocalizationSessionController.java | 8 +-- .../login/JobsUserLoginWebSessionBean.java | 16 +++--- .../JobsUserLoginWebSessionController.java | 4 +- .../phone/JobsPhoneWebApplicationBean.java | 24 ++++----- .../JobsPhoneWebApplicationController.java | 24 ++++----- .../JobsUserRegisterWebSessionBean.java | 6 +-- .../JobsResendLinkWebSessionBean.java | 6 +-- .../user/JobsAdminUserWebRequestBean.java | 40 +++++++------- .../JobsAdminUserWebRequestController.java | 4 +- .../beans/user/JobsUserWebSessionBean.java | 48 ++++++++--------- .../user/JobsUserWebSessionController.java | 44 ++++++++-------- .../JobsUserActivityWebApplicationBean.java | 52 +++++++++---------- ...sUserActivityWebApplicationController.java | 52 +++++++++---------- .../JobsUserPasswordWebRequestBean.java | 6 +-- .../validator/user/JobsUserIdValidator.java | 4 +- 30 files changed, 304 insertions(+), 304 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java index 81bd02d2..cd9fb585 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java @@ -35,7 +35,6 @@ import javax.naming.InitialContext; import javax.naming.NamingException; 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; @@ -43,8 +42,9 @@ import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook; import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; -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) @@ -95,7 +95,7 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements */ @Inject @Any - private Event loadedEvent; + private Event loadedEvent; /** * Login controller @@ -164,7 +164,7 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements } @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 @@ -197,7 +197,7 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements } @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 @@ -401,7 +401,7 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements 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/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java index 3d716c56..94666b90 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java @@ -19,11 +19,11 @@ package org.mxchange.jjobs.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 JobsAddressbookWebSessionController extends Serializable { *

* @param event Event with address book instance */ - void afterAddressbookLoadedEvent (final AddressbookLoadedEvent event); + void afterAddressbookLoadedEvent (final ObservableAddressbookLoadedEvent event); /** * This method is called when a user has successfully logged in his/her @@ -153,7 +153,7 @@ public interface JobsAddressbookWebSessionController extends Serializable { *

* @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/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java index 31e1f9bf..d49aae87 100644 --- a/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java @@ -33,13 +33,13 @@ import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; -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 @@ -76,7 +76,7 @@ public class JobsConfirmationLinkWebRequestBean extends BaseJobsController imple */ @Inject @Any - private Event userConfirmedEvent; + private Event userConfirmedEvent; /** * User controller @@ -203,7 +203,7 @@ public class JobsConfirmationLinkWebRequestBean extends BaseJobsController imple } // 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/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 1293d20d..b4c59825 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -37,10 +37,7 @@ 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.deleted.AdminContactDeletedEvent; import org.mxchange.jcontacts.events.contact.deleted.AdminDeletedContactEvent; -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; @@ -51,7 +48,10 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; -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.deleted.ObservableAdminDeletedContactEvent; +import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; /** * An administrative user controller (bean) @@ -72,7 +72,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ @Inject @Any - private Event addedContactEvent; + private Event addedContactEvent; /** * Administrative contact EJB @@ -126,7 +126,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ @Inject @Any - private Event deletedContactEvent; + private Event deletedContactEvent; /** * Email address @@ -243,7 +243,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ @Inject @Any - private Event updatedContactEvent; + private Event updatedContactEvent; /** * ZIP code @@ -312,7 +312,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement } // Fire event - this.addedContactEvent.fire(new AdminContactAddedEvent(updatedContact)); + this.addedContactEvent.fire(new AdminAddedContactEvent(updatedContact)); // Clear this bean this.clear(); @@ -322,7 +322,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement } @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 @@ -426,7 +426,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement this.adminContactBean.deleteContactData(contact); // Fire event - this.deletedContactEvent.fire(new AdminContactDeletedEvent(contact)); + this.deletedContactEvent.fire(new AdminDeletedContactEvent(contact)); // All fine return "admin_list_contact"; //NOI18N @@ -456,7 +456,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java index ccfcba28..1bc2438a 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java @@ -24,7 +24,7 @@ import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; +import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; /** * An administrative interface for user beans @@ -55,7 +55,7 @@ public interface JobsAdminContactWebRequestController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedUserEvent (final AdminAddedUserEvent event); + void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event); /** * Creates an instance from contact data diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index 8fc2f45f..7f6a66a9 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java @@ -37,12 +37,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.deleted.AdminDeletedContactEvent; -import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; -import org.mxchange.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcountry.data.Country; import org.mxchange.jjobs.beans.BaseJobsController; @@ -56,12 +50,18 @@ 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.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.deleted.ObservableAdminDeletedContactEvent; +import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; +import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; /** * A general contact controller (bean) @@ -256,7 +256,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminAddedContactEvent (@Observes final AdminAddedContactEvent event) { + public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) { // The event must be valid if (null == event) { // Throw NPE @@ -283,7 +283,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @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 @@ -304,7 +304,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminDeletedContactEvent (@Observes final AdminDeletedContactEvent event) { + public void afterAdminDeletedContactEvent (@Observes final ObservableAdminDeletedContactEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -329,7 +329,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminLinkedUserEvent (@Observes final AdminLinkedUserEvent event) { + public void afterAdminLinkedUserEvent (@Observes final ObservableAdminLinkedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -356,7 +356,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminUnlinkedFaxContactDataEvent (@Observes final AdminUnlinkedFaxNumberEvent event) { + public void afterAdminUnlinkedFaxContactDataEvent (@Observes final ObservableAdminUnlinkedFaxNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -380,7 +380,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminUnlinkedLandLineContactDataEvent (@Observes final AdminUnlinkedLandLineNumberEvent event) { + public void afterAdminUnlinkedLandLineContactDataEvent (@Observes final ObservableAdminUnlinkedLandLineNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -404,7 +404,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterAdminUnlinkedMobileContactDataEvent (@Observes final AdminUnlinkedMobileNumberEvent event) { + public void afterAdminUnlinkedMobileContactDataEvent (@Observes final ObservableAdminUnlinkedMobileNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -428,7 +428,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @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 @@ -452,7 +452,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterUserConfirmedAccountEventEvent (@Observes final UserConfirmedAccountEvent event) { + public void afterUserConfirmedAccountEventEvent (@Observes final ObservableUserConfirmedAccountEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -473,7 +473,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterUserLoginEvent (@Observes final UserLoggedInEvent event) { + public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -494,7 +494,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @Override - public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java index 78b565fc..4257510d 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java @@ -22,21 +22,21 @@ 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.deleted.AdminDeletedContactEvent; -import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; -import org.mxchange.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent; 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.deleted.ObservableAdminDeletedContactEvent; +import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; +import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; /** * An interface for user beans @@ -58,42 +58,42 @@ public interface JobsContactWebSessionController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedUserEvent (final AdminAddedUserEvent event); + void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event); /** * Event observer for deleted contact instance by administrator *

* @param event Event being fired */ - void afterAdminDeletedContactEvent (final AdminDeletedContactEvent event); + void afterAdminDeletedContactEvent (final ObservableAdminDeletedContactEvent event); /** * Event observer for unlinked fax contact by administrators *

* @param event Unlinked fax contact event */ - void afterAdminUnlinkedFaxContactDataEvent (final AdminUnlinkedFaxNumberEvent event); + void afterAdminUnlinkedFaxContactDataEvent (final ObservableAdminUnlinkedFaxNumberEvent event); /** * Event observer for unlinked land-line contact by administrators *

* @param event Unlinked land-line contact event */ - void afterAdminUnlinkedLandLineContactDataEvent (final AdminUnlinkedLandLineNumberEvent event); + void afterAdminUnlinkedLandLineContactDataEvent (final ObservableAdminUnlinkedLandLineNumberEvent event); /** * Event observer for unlinked mobile contact by administrators *

* @param event Unlinked mobile contact event */ - void afterAdminUnlinkedMobileContactDataEvent (final AdminUnlinkedMobileNumberEvent event); + void afterAdminUnlinkedMobileContactDataEvent (final ObservableAdminUnlinkedMobileNumberEvent event); /** * Event observer when user confirmed account. *

* @param event Event being fired */ - void afterUserConfirmedAccountEventEvent (final UserConfirmedAccountEvent event); + void afterUserConfirmedAccountEventEvent (final ObservableUserConfirmedAccountEvent event); /** * Event observer when a list with unused mobile numbers is being created @@ -126,7 +126,7 @@ public interface JobsContactWebSessionController extends Serializable { *

* @param event User registration event */ - void afterUserRegistrationEvent (final UserRegisteredEvent event); + void afterUserRegistrationEvent (final ObservableUserRegisteredEvent event); /** * Observes events being fired when an administrator has added a new @@ -134,7 +134,7 @@ public interface JobsContactWebSessionController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedContactEvent (final AdminAddedContactEvent event); + void afterAdminAddedContactEvent (final ObservableAdminAddedContactEvent event); /** * Observes events being fired when an administrator has linked a new user @@ -142,21 +142,21 @@ public interface JobsContactWebSessionController extends Serializable { *

* @param event Event being fired */ - void afterAdminLinkedUserEvent (final AdminLinkedUserEvent event); + void afterAdminLinkedUserEvent (final ObservableAdminLinkedUserEvent event); /** * Event observer for updated contact data by administrators *

* @param event Updated contact data event */ - void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event); + void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event); /** * Event observer for logged-in user *

* @param event Event instance */ - void afterUserLoginEvent (final UserLoggedInEvent event); + void afterUserLoginEvent (final ObservableUserLoggedInEvent event); /** * Creates an instance from all properties diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index f693fe9f..b54c6728 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -28,19 +28,11 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; 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.jcontacts.events.fax.linked.AdminFaxNumberLinkedEvent; import org.mxchange.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.fax.unlinked.AdminFaxNumberUnlinkedEvent; import org.mxchange.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.linked.AdminLandLineNumberLinkedEvent; import org.mxchange.jcontacts.events.landline.linked.AdminLinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.landline.unlinked.AdminLandLineNumberUnlinkedEvent; import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent; import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent; -import org.mxchange.jcontacts.events.mobile.linked.AdminMobileNumberLinkedEvent; -import org.mxchange.jcontacts.events.mobile.unlinked.AdminMobileNumberUnlinkedEvent; import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jcountry.data.Country; @@ -56,7 +48,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.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; +import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; +import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; /** * An administrative contact phone controller (bean) @@ -82,21 +82,21 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl */ @Inject @Any - private Event adminLinkedFaxNumberEvent; + private Event adminLinkedFaxNumberEvent; /** * Event being fired when a land-line number has been linked */ @Inject @Any - private Event adminLinkedLandLineNumberEvent; + private Event adminLinkedLandLineNumberEvent; /** * Event being fired when a mobile number has been linked */ @Inject @Any - private Event adminLinkedMobileNumberEvent; + private Event adminLinkedMobileNumberEvent; /** * Administrative EJB for phone number @@ -120,21 +120,21 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl */ @Inject @Any - private Event faxNumberUnlinkedEvent; + private Event faxNumberUnlinkedEvent; /** * Event being fired when a land-line number has been unlinked */ @Inject @Any - private Event landLineNumberUnlinkedEvent; + private Event landLineNumberUnlinkedEvent; /** * Event being fired when admin unlinks mobile from contact */ @Inject @Any - private Event mobileNumberUnlinkedEvent; + private Event mobileNumberUnlinkedEvent; /** * Default constructor @@ -157,7 +157,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } @Override - public void afterAdminAddedContactEvent (@Observes final AdminAddedContactEvent event) { + public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) { // The event must be valid if (null == event) { // Throw NPE @@ -178,7 +178,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } @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 @@ -199,7 +199,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } @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 @@ -275,7 +275,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.adminLinkedFaxNumberEvent.fire(new AdminFaxNumberLinkedEvent(updatedContact, faxNumber)); + this.adminLinkedFaxNumberEvent.fire(new AdminLinkedFaxNumberEvent(updatedContact, faxNumber)); // Return to contact profile return "admin_show_contact"; //NOI18N @@ -337,7 +337,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.adminLinkedLandLineNumberEvent.fire(new AdminLandLineNumberLinkedEvent(updatedContact, landLineNumber)); + this.adminLinkedLandLineNumberEvent.fire(new AdminLinkedLandLineNumberEvent(updatedContact, landLineNumber)); // Return to contact profile return "admin_show_contact"; //NOI18N @@ -395,7 +395,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.adminLinkedMobileNumberEvent.fire(new AdminMobileNumberLinkedEvent(updatedContact, mobileNumber)); + this.adminLinkedMobileNumberEvent.fire(new AdminLinkedMobileNumberEvent(updatedContact, mobileNumber)); // Return to contact profile return "admin_show_contact"; //NOI18N @@ -443,7 +443,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.faxNumberUnlinkedEvent.fire(new AdminFaxNumberUnlinkedEvent(updatedContact, this.beanHelper.getFaxNumber())); + this.faxNumberUnlinkedEvent.fire(new AdminUnlinkedFaxNumberEvent(updatedContact, this.beanHelper.getFaxNumber())); // All fine here return "admin_show_contact"; //NOI18N @@ -491,7 +491,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.landLineNumberUnlinkedEvent.fire(new AdminLandLineNumberUnlinkedEvent(updatedContact, this.beanHelper.getLandLineNumber())); + this.landLineNumberUnlinkedEvent.fire(new AdminUnlinkedLandLineNumberEvent(updatedContact, this.beanHelper.getLandLineNumber())); // All fine here return "admin_show_contact"; //NOI18N @@ -548,7 +548,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } // Fire event - this.mobileNumberUnlinkedEvent.fire(new AdminMobileNumberUnlinkedEvent(updatedContact, this.beanHelper.getMobileNumber())); + this.mobileNumberUnlinkedEvent.fire(new AdminUnlinkedMobileNumberEvent(updatedContact, this.beanHelper.getMobileNumber())); // All fine here return "admin_show_contact"; //NOI18N diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java index a9caa56f..d35718bf 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java @@ -20,9 +20,9 @@ package org.mxchange.jjobs.beans.contact.phone; import java.io.Serializable; 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 @@ -58,7 +58,7 @@ public interface JobsAdminContactPhoneWebRequestController extends Serializable *

* @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 @@ -66,14 +66,14 @@ public interface JobsAdminContactPhoneWebRequestController extends Serializable *

* @param event Event being fired */ - void afterAdminAddedContactEvent (final AdminAddedContactEvent event); + void afterAdminAddedContactEvent (final ObservableAdminAddedContactEvent event); /** * Event observer for updated contact data by administrators *

* @param event Updated contact data event */ - void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event); + void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event); /** * Links given contact instance with setted fax number or entered data. If diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java index 6936fd78..73a31688 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java @@ -27,11 +27,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; 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.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController; @@ -39,7 +34,12 @@ import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -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; +import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; /** * An administrative contact phone controller (bean) @@ -83,7 +83,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @Override - public void afterAdminAddedContactEvent (@Observes final AdminAddedContactEvent event) { + public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) { // The event must be valid if (null == event) { // Throw NPE @@ -104,7 +104,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @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 @@ -125,7 +125,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @Override - public void afterAdminUnlinkedFaxContactDataEvent (@Observes final AdminUnlinkedFaxNumberEvent event) { + public void afterAdminUnlinkedFaxContactDataEvent (@Observes final ObservableAdminUnlinkedFaxNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -149,7 +149,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @Override - public void afterAdminUnlinkedLandLineContactDataEvent (@Observes final AdminUnlinkedLandLineNumberEvent event) { + public void afterAdminUnlinkedLandLineContactDataEvent (@Observes final ObservableAdminUnlinkedLandLineNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -173,7 +173,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @Override - public void afterAdminUnlinkedMobileContactDataEvent (@Observes final AdminUnlinkedMobileNumberEvent event) { + public void afterAdminUnlinkedMobileContactDataEvent (@Observes final ObservableAdminUnlinkedMobileNumberEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -197,7 +197,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement } @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/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java index 5bb0d3cd..85f1d255 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java @@ -20,12 +20,12 @@ 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.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; -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; +import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; /** * An interface for user beans @@ -61,7 +61,7 @@ public interface JobsContactPhoneWebSessionController extends Serializable { *

* @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 @@ -69,34 +69,34 @@ public interface JobsContactPhoneWebSessionController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedContactEvent (final AdminAddedContactEvent event); + void afterAdminAddedContactEvent (final ObservableAdminAddedContactEvent event); /** * Event observer for updated contact data by administrators *

* @param event Updated contact data event */ - void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event); + void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event); /** * Event observer for unlinked fax contact by administrators *

* @param event Unlinked fax contact event */ - void afterAdminUnlinkedFaxContactDataEvent (final AdminUnlinkedFaxNumberEvent event); + void afterAdminUnlinkedFaxContactDataEvent (final ObservableAdminUnlinkedFaxNumberEvent event); /** * Event observer for unlinked land-line contact by administrators *

* @param event Unlinked land-line contact event */ - void afterAdminUnlinkedLandLineContactDataEvent (final AdminUnlinkedLandLineNumberEvent event); + void afterAdminUnlinkedLandLineContactDataEvent (final ObservableAdminUnlinkedLandLineNumberEvent event); /** * Event observer for unlinked mobile contact by administrators *

* @param event Unlinked mobile contact event */ - void afterAdminUnlinkedMobileContactDataEvent (final AdminUnlinkedMobileNumberEvent event); + void afterAdminUnlinkedMobileContactDataEvent (final ObservableAdminUnlinkedMobileNumberEvent event); } diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java index 8e63c682..5905c9dd 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java @@ -32,9 +32,9 @@ 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.jjobs.beans.BaseJobsController; +import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; /** * An administrative country bean @@ -55,7 +55,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement */ @Inject @Any - private Event addedCountryEvent; + private Event addedCountryEvent; /** * Abroad dial prefix @@ -146,7 +146,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement } // 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/jjobs/beans/country/JobsCountryWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java index 60519c8a..b4ba3e29 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java @@ -28,8 +28,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountrySingletonBeanRemote; -import org.mxchange.jcountry.events.AdminAddedCountryEvent; import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; /** * A country bean @@ -73,7 +73,7 @@ public class JobsCountryWebApplicationBean extends BaseJobsController implements } @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/jjobs/beans/country/JobsCountryWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java index 42a10db1..948dd681 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.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 JobsCountryWebApplicationController extends Serializable { *

* @param event Event instance */ - void afterAdminAddedCountry (final AdminAddedCountryEvent event); + void afterAdminAddedCountry (final ObservableAdminAddedCountryEvent event); } diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java index 3ecd190c..f95bf02a 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java @@ -24,8 +24,8 @@ import javax.enterprise.event.Observes; import javax.faces.context.FacesContext; import javax.inject.Named; import org.mxchange.jjobs.beans.BaseJobsController; -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 JobsLocalizationSessionBean extends BaseJobsController implements J private Locale locale; @Override - public void afterUserLoginEvent (@Observes final UserLoggedInEvent event) { + public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -74,7 +74,7 @@ public class JobsLocalizationSessionBean extends BaseJobsController implements J } @Override - public void afterUserLogoutEvent (@Observes final ObserveableUserLogoutEvent event) { + public void afterUserLogoutEvent (@Observes final ObservableUserLogoutEvent event) { // event should not be null if (null == event) { // Throw NPE diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java index 02867a65..6aed0a7a 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java @@ -18,8 +18,8 @@ package org.mxchange.jjobs.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 JobsLocalizationSessionController extends Serializable { *

* @param event Event instance */ - void afterUserLoginEvent (final UserLoggedInEvent event); + void afterUserLoginEvent (final ObservableUserLoggedInEvent event); /** * Event observer for logged-out user *

* @param event Event instance */ - void afterUserLogoutEvent (final ObserveableUserLogoutEvent event); + void afterUserLogoutEvent (final ObservableUserLogoutEvent event); /** * Getter for locale diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 8195e3e6..fe8adc93 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -36,10 +36,7 @@ import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; 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 @@ -102,7 +102,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J */ @Inject @Any - private Event loginEvent; + private Event loginEvent; /** * User controller @@ -120,14 +120,14 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J */ @Inject @Any - private Event userLoginEvent; + private Event userLoginEvent; /** * Event fired when user has logged out */ @Inject @Any - private Event userLogoutEvent; + private Event userLogoutEvent; /** * User's password history @@ -162,7 +162,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J } @Override - public void afterUserUpdatedPasswordEvent (@Observes final UpdatedUserPasswordEvent event) { + public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) { // Check parameter if (null == event) { // Throw NPE @@ -222,7 +222,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J 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/jjobs/beans/login/JobsUserLoginWebSessionController.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java index 059a2799..cc44c958 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java @@ -19,9 +19,9 @@ package org.mxchange.jjobs.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 JobsUserLoginWebSessionController extends Serializable { *

* @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/jjobs/beans/phone/JobsPhoneWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java index 3ddde188..258f3826 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java @@ -29,11 +29,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; 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.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.linked.AdminLinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent; @@ -45,7 +40,12 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; -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; +import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; /** * Regular controller (bean) for phone numbers @@ -104,7 +104,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @Override - public void afterAdminAddedContactEvent (@Observes final AdminAddedContactEvent event) { + public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) { // The event must be valid if (null == event) { // Throw NPE @@ -128,7 +128,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @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 @@ -224,7 +224,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @Override - public void afterAdminLinkedFaxNumberEvent (@Observes final AdminLinkedFaxNumberEvent event) { + public void afterAdminLinkedFaxNumberEvent (@Observes final ObservableAdminLinkedFaxNumberEvent event) { // Is the event fine? if (event == null) { // Throw NPE @@ -266,7 +266,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @Override - public void afterAdminLinkedLandLineNumberEvent (@Observes final AdminLinkedLandLineNumberEvent event) { + public void afterAdminLinkedLandLineNumberEvent (@Observes final ObservableAdminLinkedLandLineNumberEvent event) { // Is the event fine? if (event == null) { // Throw NPE @@ -308,7 +308,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @Override - public void afterAdminLinkedMobileNumberEvent (@Observes final AdminLinkedMobileNumberEvent event) { + public void afterAdminLinkedMobileNumberEvent (@Observes final ObservableAdminLinkedMobileNumberEvent event) { // Is the event fine? if (event == null) { // Throw NPE @@ -350,7 +350,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } @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/jjobs/beans/phone/JobsPhoneWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java index 2123b7a1..67e9a43b 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java @@ -19,11 +19,6 @@ package org.mxchange.jjobs.beans.phone; import java.io.Serializable; import java.util.List; import javax.ejb.Local; -import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; -import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; -import org.mxchange.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent; -import org.mxchange.jcontacts.events.landline.linked.AdminLinkedLandLineNumberEvent; -import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent; import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent; @@ -33,7 +28,12 @@ import org.mxchange.jphone.events.mobile.updated.AdminUpdatedMobileNumberEvent; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -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; +import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent; +import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; +import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; /** * An interface for a request web controller (bean) for administrative phone @@ -49,7 +49,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @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,7 +57,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedContactEvent (final AdminAddedContactEvent event); + void afterAdminAddedContactEvent (final ObservableAdminAddedContactEvent event); /** * Observes events being fired when an administrator has deleted a fax @@ -89,7 +89,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @param event Event being fired */ - void afterAdminLinkedFaxNumberEvent (final AdminLinkedFaxNumberEvent event); + void afterAdminLinkedFaxNumberEvent (final ObservableAdminLinkedFaxNumberEvent event); /** * Observes events being fired when an administrator has a linked a @@ -97,7 +97,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @param event Event being fired */ - void afterAdminLinkedLandLineNumberEvent (final AdminLinkedLandLineNumberEvent event); + void afterAdminLinkedLandLineNumberEvent (final ObservableAdminLinkedLandLineNumberEvent event); /** * Observes events being fired when an administrator has a linked a mobile @@ -105,7 +105,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @param event Event being fired */ - void afterAdminLinkedMobileNumberEvent (final AdminLinkedMobileNumberEvent event); + void afterAdminLinkedMobileNumberEvent (final ObservableAdminLinkedMobileNumberEvent event); /** * Observes events being fired when an administrator has updated a fax @@ -136,7 +136,7 @@ public interface JobsPhoneWebApplicationController extends Serializable { *

* @param event Updated contact data event */ - void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event); + void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event); /** * Returns a list of all mobile numbers. For performance reasons, the diff --git a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java index d863c41b..82e29446 100644 --- a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java @@ -34,7 +34,6 @@ import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.user.JobsAdminUserWebRequestController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; -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 JobsUserRegisterWebSessionBean extends BaseJobsController implement */ @Inject @Any - private Event registeredEvent; + private Event registeredEvent; /** * User controller @@ -200,7 +200,7 @@ public class JobsUserRegisterWebSessionBean extends BaseJobsController implement 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 "user_register_done"; //NOI18N diff --git a/src/java/org/mxchange/jjobs/beans/resendlink/JobsResendLinkWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/resendlink/JobsResendLinkWebSessionBean.java index d5ac92d3..d06de530 100644 --- a/src/java/org/mxchange/jjobs/beans/resendlink/JobsResendLinkWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/resendlink/JobsResendLinkWebSessionBean.java @@ -29,7 +29,6 @@ import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; -import org.mxchange.jusercore.events.resendlink.ResendLinkUserAccountEvent; import org.mxchange.jusercore.events.resendlink.UserResendLinkAccountEvent; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -37,6 +36,7 @@ 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.status.UserAccountStatus; +import org.mxchange.jusercore.events.resendlink.ObservableUserResendLinkAccountEvent; /** * A web session bean for resending confirmation link @@ -79,7 +79,7 @@ public class JobsResendLinkWebSessionBean extends BaseJobsController implements */ @Inject @Any - private Event userResendLinkEvent; + private Event userResendLinkEvent; /** * Default constructor @@ -158,7 +158,7 @@ public class JobsResendLinkWebSessionBean extends BaseJobsController implements } // Fire event - this.userResendLinkEvent.fire(new ResendLinkUserAccountEvent(user)); + this.userResendLinkEvent.fire(new UserResendLinkAccountEvent(user)); // Clear this bean this.clear(); diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 345ff110..99b8fe5f 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -37,19 +37,12 @@ import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; 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.delete.AdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.delete.AdminUserDeletedEvent; import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; -import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent; import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminUserLockedEvent; import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUserUnlockedEvent; 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; @@ -64,6 +57,13 @@ 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.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; /** * A user controller (bean) @@ -84,7 +84,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event addedUserEvent; + private Event addedUserEvent; /** * Regular contact controller @@ -114,7 +114,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event deleteUserEvent; + private Event deleteUserEvent; /** * Localization controller @@ -127,7 +127,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event updatedUserDataEvent; + private Event updatedUserDataEvent; /** * General user EJB @@ -151,7 +151,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event userLinkedEvent; + private Event userLinkedEvent; /** * User lock reason @@ -163,7 +163,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event userLockedEvent; + private Event userLockedEvent; /** * Flag whether user must change password after login @@ -190,7 +190,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J */ @Inject @Any - private Event userUnlockedEvent; + private Event userUnlockedEvent; /** * Default constructor @@ -312,7 +312,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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); @@ -321,7 +321,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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 @@ -339,7 +339,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } @Override - public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -390,7 +390,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Fire event - this.deleteUserEvent.fire(new AdminUserDeletedEvent(user, this.getUserDeleteReason())); + this.deleteUserEvent.fire(new AdminDeletedUserEvent(user, this.getUserDeleteReason())); // Redirect return "admin_list_user"; //NOI18N @@ -465,7 +465,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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 @@ -572,7 +572,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Fire event - this.userLockedEvent.fire(new AdminUserLockedEvent(updatedUser)); + this.userLockedEvent.fire(new AdminLockedUserEvent(updatedUser)); // Clear bean this.clear(); @@ -616,7 +616,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } // Fire event - this.userUnlockedEvent.fire(new AdminUserUnlockedEvent(updatedUser)); + this.userUnlockedEvent.fire(new AdminUnlockedUserEvent(updatedUser)); // Clear bean this.clear(); diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index ac85a7ec..38a3ab94 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -17,8 +17,8 @@ package org.mxchange.jjobs.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 JobsAdminUserWebRequestController extends Serializable { *

* @param event User registration event */ - void afterUserRegistrationEvent (final UserRegisteredEvent event); + void afterUserRegistrationEvent (final ObservableUserRegisteredEvent event); /** * Adds user instance to database by preparing a complete user instance and diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java index 22c4f2a6..51bbe13c 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java @@ -38,18 +38,7 @@ import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; -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.delete.AdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -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; @@ -58,6 +47,17 @@ 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.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; +import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent; /** * A user controller (bean) @@ -96,7 +96,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs */ @Inject @Any - private Event updatedPersonalDataEvent; + private Event updatedPersonalDataEvent; /** * Remote user bean @@ -170,7 +170,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @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 @@ -197,7 +197,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterAdminDeletedUserEvent (final AdminDeletedUserEvent event) { + public void afterAdminDeletedUserEvent (final ObservableAdminDeletedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -221,7 +221,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterAdminLinkedUserEvent (@Observes final AdminLinkedUserEvent event) { + public void afterAdminLinkedUserEvent (@Observes final ObservableAdminLinkedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -248,7 +248,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterAdminLockedUserEvent (@Observes final AdminLockedUserEvent event) { + public void afterAdminLockedUserEvent (@Observes final ObservableAdminLockedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -269,7 +269,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterAdminUnlockedUserEvent (@Observes final AdminUnlockedUserEvent event) { + public void afterAdminUnlockedUserEvent (@Observes final ObservableAdminUnlockedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -290,7 +290,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterAdminUpdatedUserDataEvent (@Observes final AdminUpdatedUserDataEvent event) { + public void afterAdminUpdatedUserDataEvent (@Observes final ObservableAdminUpdatedUserDataEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -314,7 +314,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterUserConfirmedAccountEvent (@Observes final UserConfirmedAccountEvent event) { + public void afterUserConfirmedAccountEvent (@Observes final ObservableUserConfirmedAccountEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -335,7 +335,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterUserLoginEvent (@Observes final UserLoggedInEvent event) { + public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -365,7 +365,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -407,7 +407,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterUserUpdatedPasswordEvent (@Observes final UpdatedUserPasswordEvent event) { + public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) { // Check parameter if (null == event) { // Throw NPE @@ -428,7 +428,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs } @Override - public void afterUserUpdatedPersonalDataEvent (@Observes final UpdatedUserPersonalDataEvent event) { + public void afterUserUpdatedPersonalDataEvent (@Observes final ObservableUpdatedUserPersonalDataEvent event) { // Check parameter if (null == event) { // Throw NPE @@ -564,7 +564,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs User updatedUser = this.userBean.updateUserPersonalData(user); // Fire event - this.updatedPersonalDataEvent.fire(new UserUpdatedPersonalDataEvent(updatedUser)); + this.updatedPersonalDataEvent.fire(new UpdatedUserPersonalDataEvent(updatedUser)); // All fine return "user_contact_data_saved"; //NOI18N diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java index 9bf777bb..cfa5baaf 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java @@ -19,21 +19,21 @@ package org.mxchange.jjobs.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.delete.AdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -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.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; +import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent; /** * An interface for user beans @@ -52,49 +52,49 @@ public interface JobsUserWebSessionController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedUserEvent (final AdminAddedUserEvent event); + void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event); /** * Event observer for deleted user accounts (by administrator) *

* @param event Event being fired */ - void afterAdminDeletedUserEvent (final AdminDeletedUserEvent event); + void afterAdminDeletedUserEvent (final ObservableAdminDeletedUserEvent event); /** * Event observer for linked users with existing contact data *

* @param event Event being fired */ - void afterAdminLinkedUserEvent (final AdminLinkedUserEvent event); + void afterAdminLinkedUserEvent (final ObservableAdminLinkedUserEvent event); /** * Event observer for locked users *

* @param event Event being fired */ - void afterAdminLockedUserEvent (final AdminLockedUserEvent event); + void afterAdminLockedUserEvent (final ObservableAdminLockedUserEvent event); /** * Event observer for unlocked users *

* @param event Event being fired */ - void afterAdminUnlockedUserEvent (final AdminUnlockedUserEvent event); + void afterAdminUnlockedUserEvent (final ObservableAdminUnlockedUserEvent event); /** * Event observer for updated user data by administrator *

* @param event Event being updated */ - void afterAdminUpdatedUserDataEvent (final AdminUpdatedUserDataEvent event); + void afterAdminUpdatedUserDataEvent (final ObservableAdminUpdatedUserDataEvent event); /** * Event observer when user confirmed account. *

* @param event Event being fired */ - void afterUserConfirmedAccountEvent (final UserConfirmedAccountEvent event); + void afterUserConfirmedAccountEvent (final ObservableUserConfirmedAccountEvent event); /** * Method being call after user's password has been updated (and history @@ -102,28 +102,28 @@ public interface JobsUserWebSessionController extends Serializable { *

* @param event Event being observed */ - void afterUserUpdatedPasswordEvent (final UpdatedUserPasswordEvent event); + void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event); /** * Listens to fired event when user updated personal data *

* @param event Event being fired */ - void afterUserUpdatedPersonalDataEvent (final UpdatedUserPersonalDataEvent event); + void afterUserUpdatedPersonalDataEvent (final ObservableUpdatedUserPersonalDataEvent event); /** * Event observer for new user registrations *

* @param event User registration event */ - void afterUserRegistrationEvent (final UserRegisteredEvent event); + void afterUserRegistrationEvent (final ObservableUserRegisteredEvent event); /** * Event observer for logged-in user *

* @param event Event instance */ - void afterUserLoginEvent (final UserLoggedInEvent event); + void afterUserLoginEvent (final ObservableUserLoggedInEvent event); /** * All users diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java index 8f9e66f7..0ff70e10 100644 --- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java @@ -34,24 +34,24 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController; -import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent; -import org.mxchange.jusercore.events.registration.UserRegisteredEvent; -import org.mxchange.jusercore.events.resendlink.UserResendLinkAccountEvent; -import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; -import org.mxchange.jusercore.events.user.delete.AdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; -import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.activity.LogableUserActivity; import org.mxchange.jusercore.model.user.activity.UserActivityLog; import org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote; import org.mxchange.jusercore.model.user.activity.comparator.UserActivityLogTimestampComparator; +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.resendlink.ObservableUserResendLinkAccountEvent; +import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; +import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent; +import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; +import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent; /** * A controller (bean) for user activity log @@ -171,7 +171,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @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 @@ -192,7 +192,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterAdminDeletedUserEvent (@Observes final AdminDeletedUserEvent event) { + public void afterAdminDeletedUserEvent (@Observes final ObservableAdminDeletedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -213,7 +213,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterAdminLinkedUserEvent (@Observes final AdminLinkedUserEvent event) { + public void afterAdminLinkedUserEvent (@Observes final ObservableAdminLinkedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -234,7 +234,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterAdminLockedUserEvent (@Observes final AdminLockedUserEvent event) { + public void afterAdminLockedUserEvent (@Observes final ObservableAdminLockedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -255,7 +255,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterAdminUnlockedUserEvent (@Observes final AdminUnlockedUserEvent event) { + public void afterAdminUnlockedUserEvent (@Observes final ObservableAdminUnlockedUserEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -276,7 +276,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterAdminUpdatedUserDataEvent (@Observes final AdminUpdatedUserDataEvent event) { + public void afterAdminUpdatedUserDataEvent (@Observes final ObservableAdminUpdatedUserDataEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -297,7 +297,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserConfirmedAccountEvent (@Observes final UserConfirmedAccountEvent event) { + public void afterUserConfirmedAccountEvent (@Observes final ObservableUserConfirmedAccountEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -318,7 +318,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserLoginEvent (@Observes final UserLoggedInEvent event) { + public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -339,7 +339,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserLogoutEvent (@Observes final ObserveableUserLogoutEvent event) { + public void afterUserLogoutEvent (@Observes final ObservableUserLogoutEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -360,7 +360,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -381,7 +381,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserResendConfirmationLinkEvent (@Observes final UserResendLinkAccountEvent event) { + public void afterUserResendConfirmationLinkEvent (@Observes final ObservableUserResendLinkAccountEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -402,7 +402,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserUpdatedPasswordEvent (@Observes final UpdatedUserPasswordEvent event) { + public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) { // Check parameter if (null == event) { // Throw NPE @@ -423,7 +423,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple } @Override - public void afterUserUpdatedPersonalDataEvent (@Observes final UpdatedUserPersonalDataEvent event) { + public void afterUserUpdatedPersonalDataEvent (@Observes final ObservableUpdatedUserPersonalDataEvent event) { // Check parameter if (null == event) { // Throw NPE diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java index bdb7a650..831d92cf 100644 --- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationController.java @@ -19,21 +19,21 @@ package org.mxchange.jjobs.beans.user.activity; import java.io.Serializable; import java.util.List; import javax.ejb.Local; -import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent; -import org.mxchange.jusercore.events.registration.UserRegisteredEvent; -import org.mxchange.jusercore.events.resendlink.UserResendLinkAccountEvent; -import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; -import org.mxchange.jusercore.events.user.delete.AdminDeletedUserEvent; -import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; -import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent; -import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; -import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; -import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; -import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.activity.LogableUserActivity; +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.resendlink.ObservableUserResendLinkAccountEvent; +import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; +import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent; +import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; +import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; +import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent; +import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; +import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent; +import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent; /** * A controller (bean) interface for user activity log @@ -48,56 +48,56 @@ public interface JobsUserActivityWebApplicationController extends Serializable { *

* @param event Event being fired */ - void afterAdminAddedUserEvent (final AdminAddedUserEvent event); + void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event); /** * Event observer for deleted user accounts (by administrator) *

* @param event Event being fired */ - void afterAdminDeletedUserEvent (final AdminDeletedUserEvent event); + void afterAdminDeletedUserEvent (final ObservableAdminDeletedUserEvent event); /** * Event observer for linked users with existing contact data *

* @param event Event being fired */ - void afterAdminLinkedUserEvent (final AdminLinkedUserEvent event); + void afterAdminLinkedUserEvent (final ObservableAdminLinkedUserEvent event); /** * Event observer for locked users *

* @param event Event being fired */ - void afterAdminLockedUserEvent (final AdminLockedUserEvent event); + void afterAdminLockedUserEvent (final ObservableAdminLockedUserEvent event); /** * Event observer for unlocked users *

* @param event Event being fired */ - void afterAdminUnlockedUserEvent (final AdminUnlockedUserEvent event); + void afterAdminUnlockedUserEvent (final ObservableAdminUnlockedUserEvent event); /** * Event observer for updated user data by administrator *

* @param event Event being updated */ - void afterAdminUpdatedUserDataEvent (final AdminUpdatedUserDataEvent event); + void afterAdminUpdatedUserDataEvent (final ObservableAdminUpdatedUserDataEvent event); /** * Event observer when user confirmed account. *

* @param event Event being fired */ - void afterUserConfirmedAccountEvent (final UserConfirmedAccountEvent event); + void afterUserConfirmedAccountEvent (final ObservableUserConfirmedAccountEvent event); /** * Event observer for logged-out user *

* @param event Event instance */ - void afterUserLogoutEvent (final ObserveableUserLogoutEvent event); + void afterUserLogoutEvent (final ObservableUserLogoutEvent event); /** * Method being call after user's password has been updated (and history @@ -105,35 +105,35 @@ public interface JobsUserActivityWebApplicationController extends Serializable { *

* @param event Event being observed */ - void afterUserUpdatedPasswordEvent (final UpdatedUserPasswordEvent event); + void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event); /** * Listens to fired event when user updated personal data *

* @param event Event being fired */ - void afterUserUpdatedPersonalDataEvent (final UpdatedUserPersonalDataEvent event); + void afterUserUpdatedPersonalDataEvent (final ObservableUpdatedUserPersonalDataEvent event); /** * Event observer for new user registrations *

* @param event Event being fired */ - void afterUserRegistrationEvent (final UserRegisteredEvent event); + void afterUserRegistrationEvent (final ObservableUserRegisteredEvent event); /** * Event observer for logged-in user *

* @param event Event being fired */ - void afterUserLoginEvent (final UserLoggedInEvent event); + void afterUserLoginEvent (final ObservableUserLoggedInEvent event); /** * Event observer for users resending their confirmation link *

* @param event Event being fired */ - void afterUserResendConfirmationLinkEvent (final UserResendLinkAccountEvent event); + void afterUserResendConfirmationLinkEvent (final ObservableUserResendLinkAccountEvent event); /** * Adds user activity entry with given type diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java index e9a4ba45..b82eb125 100644 --- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java @@ -31,7 +31,6 @@ import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; 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.UserStatusLockedException; import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; @@ -39,6 +38,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) controller (bean) @@ -86,7 +86,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement */ @Any @Inject - private Event userUpdatedPasswordEvent; + private Event userUpdatedPasswordEvent; /** * Default constructor @@ -187,7 +187,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement 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.userLoginController.setUserCurrentPassword(null); diff --git a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java index 1ee29c43..9f059bf8 100644 --- a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java +++ b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.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 JobsUserIdValidator extends BaseLongValidator implements Validator *

* @param event User registration event */ - public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) { + public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // Trace message this.loggerBeanLocal.logTrace(MessageFormat.format("UserIdValidator:afterUserRegistrationEvent: event={0} - CALLED!", event)); //NOI18N -- 2.39.5