Please cherry-pick:

- event classes/interfaces have been renamed as they are not just for
  bean helpers

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

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
index 1e99aac9609f2c6b842aa439b399c1adadee8a9e..caf7e6de0ba44d65b90cc09a6a377e36d70fc6e4 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java
@@ -39,7 +39,7 @@ import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.helper.created.ObservableHelperCreatedContactEvent;
+import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
@@ -315,9 +315,9 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedContactEvent (@Observes final ObservableHelperCreatedContactEvent event) {
+       public void afterCreatedContactEvent (@Observes final ObservableCreatedContactEvent event) {
                // Log message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminContactController::afterHelperCreatedContactEvent(): contact={0} - CALLED!", contact)); //NOI18N
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminContactController::afterCreatedContactEvent(): contact={0} - CALLED!", contact)); //NOI18N
 
                // The event instance must be valid
                if (null == event) {
@@ -380,7 +380,7 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll
                }
 
                // Log message
-               //* NOISY-DEBUG: */ System.out.println("AdminContactController::afterHelperCreatedContactEvent(): EXIT!"); //NOI18N
+               //* NOISY-DEBUG: */ System.out.println("AdminContactController::afterCreatedContactEvent(): EXIT!"); //NOI18N
        }
 
        @Override

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
index ebded58c48036c1e37c66530ede66a779a9092db..2869e4d0277ba46a5ae6b82816661b9b6f304d26 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
@@ -31,7 +31,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.helper.created.ObservableHelperCreatedContactEvent;
+import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 import org.mxchange.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent;
@@ -50,7 +50,8 @@ import org.mxchange.jcountry.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController;
 import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
-import org.mxchange.jphone.events.mobile.created.ObservableHelperCreatedMobileNumberEvent;
+import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
+import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException;
 import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
@@ -61,8 +62,7 @@ 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.ObservableAdminAddedUserEvent;
-import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
-import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
+import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
 
 /**
  * An administrative contact phone controller (bean)
@@ -295,9 +295,9 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedContactEvent (@Observes final ObservableHelperCreatedContactEvent event) {
+       public void afterCreatedContactEvent (@Observes final ObservableCreatedContactEvent event) {
                // Log message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminContactController::afterHelperCreatedContactEvent(): contact={0} - CALLED!", contact)); //NOI18N
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminContactController::afterCreatedContactEvent(): contact={0} - CALLED!", contact)); //NOI18N
 
                // The event instance must be valid
                if (null == event) {
@@ -324,7 +324,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
+       public void afterCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -358,7 +358,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
+       public void afterCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -392,7 +392,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedMobileNumberEvent (@Observes final ObservableHelperCreatedMobileNumberEvent event) {
+       public void afterCreatedMobileNumberEvent (@Observes final ObservableCreatedMobileNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
index b6f940c0ceee9d6ac8a8e5404296f340639d5b9d..7b0aab6389b5a114f5f40e3a8eb940e769d6f11a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
@@ -35,7 +35,6 @@ import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobi
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
 import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController;
-import org.mxchange.jphone.events.mobile.created.ObservableHelperCreatedMobileNumberEvent;
 import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
@@ -43,6 +42,7 @@ import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
+import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
 
 /**
  * A general contact bean (controller)
@@ -269,7 +269,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
+       public void afterCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -295,7 +295,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
+       public void afterCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -321,7 +321,7 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedMobileNumberEvent (@Observes final ObservableHelperCreatedMobileNumberEvent event) {
+       public void afterCreatedMobileNumberEvent (@Observes final ObservableCreatedMobileNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
index 4eb13abd227d32baca2c8304171d64c7d7a55e25..efb8c6d2415c5c113a71dda50c9a0ffb1da93ade 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
@@ -23,25 +23,25 @@ import javax.enterprise.inject.Any;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.contact.helper.created.HelperCreatedContactEvent;
-import org.mxchange.jcontacts.events.contact.helper.created.ObservableHelperCreatedContactEvent;
+import org.mxchange.jcontacts.events.contact.created.CreatedContactEvent;
+import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController;
 import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
 import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
 import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent;
+import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent;
-import org.mxchange.jphone.events.mobile.created.HelperCreatedMobileNumberEvent;
-import org.mxchange.jphone.events.mobile.created.ObservableHelperCreatedMobileNumberEvent;
+import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
+import org.mxchange.jphone.events.mobile.created.CreatedMobileNumberEvent;
 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.created.CreatedUserEvent;
-import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
-import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
-import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
+import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
 
 /**
  * A general helper for beans
@@ -90,7 +90,7 @@ public class FinancialsWebRequestHelperBean extends BaseFinancialsController imp
         */
        @Any
        @Inject
-       private Event<ObservableHelperCreatedContactEvent> contactCreatedEvent;
+       private Event<ObservableCreatedContactEvent> contactCreatedEvent;
 
        /**
         * Fax number
@@ -126,7 +126,7 @@ public class FinancialsWebRequestHelperBean extends BaseFinancialsController imp
         */
        @Any
        @Inject
-       private Event<ObservableHelperCreatedMobileNumberEvent> mobileNumberCreatedEvent;
+       private Event<ObservableCreatedMobileNumberEvent> mobileNumberCreatedEvent;
 
        /**
         * User instance
@@ -304,7 +304,7 @@ public class FinancialsWebRequestHelperBean extends BaseFinancialsController imp
                this.setPhoneInstances(this.getContact());
 
                // Set all fields: user
-               this.contactCreatedEvent.fire(new HelperCreatedContactEvent(this.getContact()));
+               this.contactCreatedEvent.fire(new CreatedContactEvent(this.getContact()));
        }
 
        /**
@@ -424,7 +424,7 @@ public class FinancialsWebRequestHelperBean extends BaseFinancialsController imp
                }
 
                // Fire event
-               this.mobileNumberCreatedEvent.fire(new HelperCreatedMobileNumberEvent(this.getMobileNumber()));
+               this.mobileNumberCreatedEvent.fire(new CreatedMobileNumberEvent(this.getMobileNumber()));
        }
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
index 42ca1e3c433732c4e9a79ea3ac9d1381447a0903..046866973b35cbb88b41944ed7b674ba1088c6c2 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
@@ -40,7 +40,6 @@ import org.mxchange.jphone.events.fax.removed.AdminFaxNumberRemovedFromListEvent
 import org.mxchange.jphone.events.fax.removed.AdminRemoveFaxNumberFromListEvent;
 import org.mxchange.jphone.events.fax.updated.AdminFaxNumberUpdatedEvent;
 import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent;
-import org.mxchange.jphone.events.mobile.created.ObservableHelperCreatedMobileNumberEvent;
 import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent;
 import org.mxchange.jphone.events.landline.deleted.AdminLandLineNumberDeletedEvent;
 import org.mxchange.jphone.events.landline.removed.AdminLandLineNumberRemovedFromListEvent;
@@ -63,6 +62,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
+import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
 
 /**
  * Administrative bean (controller) for phone numbers
@@ -232,7 +232,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
+       public void afterCreatedFaxNumberEvent (@Observes final ObservableCreatedFaxNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -266,7 +266,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
+       public void afterCreatedLandLineNumberEvent (@Observes final ObservableCreatedLandLineNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE
@@ -300,7 +300,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController
         * <p>
         * @param event Event being fired
         */
-       public void afterHelperCreatedMobileNumberEvent (@Observes final ObservableHelperCreatedMobileNumberEvent event) {
+       public void afterCreatedMobileNumberEvent (@Observes final ObservableCreatedMobileNumberEvent event) {
                // The event instance must be valid
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
index 1ba7832d6238e8adbc3169c407a2e2cad9fabbcc..1104a35b3aef745dc881af3548c6a2b073af4ec1 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
@@ -39,6 +39,7 @@ import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperControlle
 import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
 import org.mxchange.jusercore.events.user.delete.AdminDeletedUserEvent;
 import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent;
 import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
@@ -65,7 +66,6 @@ import org.mxchange.juserlogincore.container.login.UserLoginContainer;
 import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent;
 import org.mxchange.juserlogincore.exceptions.UserPasswordRepeatMismatchException;
 import org.mxchange.juserlogincore.login.UserLoginUtils;
-import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
 
 /**
  * A user bean (controller)
@@ -332,7 +332,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
         * <p>
         * @param event User created event
         */
-       public void afterHelperCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
+       public void afterCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
                // Is the instance valid?
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
index 4b9da1b376f503e3d5d81bc80549fc5d798c1290..8afe8e573b2f0c0558944e47ffe4ec364c909013 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
@@ -338,7 +338,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
         * <p>
         * @param event User created event
         */
-       public void afterHelperCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
+       public void afterCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
                // Is the instance valid?
                if (null == event) {
                        // Throw NPE