Please cherry-pick:

- updated references as with observable events, their interface should be
  prefixed "Observable" to indicate an interface

diff --git a/src/java/org/mxchange/jfinancials/beans/mobile/FinancialsAdminMobileWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobile/FinancialsAdminMobileWebRequestBean.java
index 0a9c7d18dfd074070cc3825b086269349070ba49..535dd9572bb2b7a090a732c579e35e602797c7c1 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/mobile/FinancialsAdminMobileWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobile/FinancialsAdminMobileWebRequestBean.java
@@ -31,12 +31,12 @@ import javax.inject.Named;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.mobile.list.FinancialsMobileListWebViewController;
 import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
-import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent;
 import org.mxchange.jphone.events.mobile.deleted.AdminMobileNumberDeletedEvent;
+import org.mxchange.jphone.events.mobile.deleted.ObservableAdminMobileNumberDeletedEvent;
 import org.mxchange.jphone.events.mobile.remove.AdminMobileNumberRemovedFromListEvent;
-import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent;
+import org.mxchange.jphone.events.mobile.remove.ObservableAdminMobileNumberRemovedFromListEvent;
 import org.mxchange.jphone.events.mobile.updated.AdminMobileNumberUpdatedEvent;
-import org.mxchange.jphone.events.mobile.updated.AdminUpdatedMobileNumberEvent;
+import org.mxchange.jphone.events.mobile.updated.ObservableAdminMobileNumberUpdatedEvent;
 import org.mxchange.jphone.model.phonenumbers.mobile.AdminMobileSessionBeanRemote;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber;
@@ -93,14 +93,14 @@ public class FinancialsAdminMobileWebRequestBean extends BaseFinancialsBean impl
         */
        @Inject
        @Any
-       private Event<AdminDeletedMobileNumberEvent> mobileNumberDeletedEvent;
+       private Event<ObservableAdminMobileNumberDeletedEvent> mobileNumberDeletedEvent;
 
        /**
         * Event being fired when an administrator has updated land-line number
         */
        @Inject
        @Any
-       private Event<AdminUpdatedMobileNumberEvent> mobileNumberUpdatedEvent;
+       private Event<ObservableAdminMobileNumberUpdatedEvent> mobileNumberUpdatedEvent;
 
        /**
         * Mobile provider
@@ -113,7 +113,7 @@ public class FinancialsAdminMobileWebRequestBean extends BaseFinancialsBean impl
         */
        @Inject
        @Any
-       private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+       private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
 
        /**
         * Chosen mobile number

diff --git a/src/java/org/mxchange/jfinancials/beans/mobile/list/FinancialsMobileListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/mobile/list/FinancialsMobileListWebViewBean.java
index 3fbbd59fe88b4cf3d5253e54dde6bf32087f89ad..87da192f4735ad31ca439381d79a05649c696dc0 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/mobile/list/FinancialsMobileListWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobile/list/FinancialsMobileListWebViewBean.java
@@ -35,8 +35,8 @@ import org.mxchange.jcontacts.events.contact.update.ObservableUpdatedContactEven
 import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
-import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent;
-import org.mxchange.jphone.events.mobile.updated.AdminUpdatedMobileNumberEvent;
+import org.mxchange.jphone.events.mobile.deleted.ObservableAdminMobileNumberDeletedEvent;
+import org.mxchange.jphone.events.mobile.updated.ObservableAdminMobileNumberUpdatedEvent;
 import org.mxchange.jphone.exceptions.mobile.MobileEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.model.phonenumbers.mobile.MobileSessionBeanRemote;
@@ -153,7 +153,7 @@ public class FinancialsMobileListWebViewBean extends BaseFinancialsBean implemen
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminDeletedMobileNumberEvent (@Observes final AdminDeletedMobileNumberEvent event) {
+       public void afterAdminDeletedMobileNumberEvent (@Observes final ObservableAdminMobileNumberDeletedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
@@ -252,7 +252,7 @@ public class FinancialsMobileListWebViewBean extends BaseFinancialsBean implemen
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminUpdatedMobileNumberEvent (@Observes final AdminUpdatedMobileNumberEvent event) {
+       public void afterAdminUpdatedMobileNumberEvent (@Observes final ObservableAdminMobileNumberUpdatedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java
index 241cf412ceb37e28fef68e2c224415f57439ac25..c48edac96f3688931778bcc4fd77e63780b95705 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java
@@ -28,8 +28,8 @@ import javax.inject.Named;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.mobileprovider.list.FinancialsMobileProviderListWebViewController;
-import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
 import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent;
+import org.mxchange.jphone.events.mobileprovider.added.ObservableAdminMobileProviderAddedEvent;
 import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderAlreadyAddedException;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider;
@@ -66,7 +66,7 @@ public class FinancialsAdminMobileProviderWebRequestBean extends BaseFinancialsB
         */
        @Inject
        @Any
-       private Event<AdminAddedMobileProviderEvent> providerAddedEvent;
+       private Event<ObservableAdminMobileProviderAddedEvent> providerAddedEvent;
 
        /**
         * Country instance ('s dial data)

diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java
index 4b3b054b9ca3bf12a69d176bca5a9c6be7341c4c..7f29a7238590d67501cb21bafe0fa4f4321a6452 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java
@@ -29,7 +29,7 @@ import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
-import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
+import org.mxchange.jphone.events.mobileprovider.added.ObservableAdminMobileProviderAddedEvent;
 import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
@@ -93,7 +93,7 @@ public class FinancialsMobileProviderListWebViewBean extends BaseFinancialsBean
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminAddedMobileProviderEvent (@Observes final AdminAddedMobileProviderEvent event) {
+       public void afterAdminAddedMobileProviderEvent (@Observes final ObservableAdminMobileProviderAddedEvent event) {
                // Is all valid?
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
index 94e0232f595e1a6be2b5318b666bd3ded8af7954..588d1c6d9a0302071c4813b3a7fe8a83c13acd1a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
@@ -32,20 +32,20 @@ import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.phone.list.FinancialsPhoneListWebViewController;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
-import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent;
 import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent;
+import org.mxchange.jphone.events.fax.deleted.ObservableAdminFaxNumberDeletedEvent;
 import org.mxchange.jphone.events.fax.removed.AdminFaxNumberRemovedFromListEvent;
-import org.mxchange.jphone.events.fax.removed.AdminRemoveFaxNumberFromListEvent;
+import org.mxchange.jphone.events.fax.removed.ObservableAdminFaxNumberRemovedFromListEvent;
 import org.mxchange.jphone.events.fax.updated.AdminFaxNumberUpdatedEvent;
-import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent;
+import org.mxchange.jphone.events.fax.updated.ObservableAdminFaxNumberUpdatedEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
-import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent;
 import org.mxchange.jphone.events.landline.deleted.AdminLandLineNumberDeletedEvent;
+import org.mxchange.jphone.events.landline.deleted.ObservableAdminLandLineNumberDeletedEvent;
 import org.mxchange.jphone.events.landline.removed.AdminLandLineNumberRemovedFromListEvent;
-import org.mxchange.jphone.events.landline.removed.AdminRemoveLandLineNumberFromListEvent;
+import org.mxchange.jphone.events.landline.removed.ObservableAdminLandLineNumberRemovedFromListEvent;
 import org.mxchange.jphone.events.landline.updated.AdminLandLineNumberUpdatedEvent;
-import org.mxchange.jphone.events.landline.updated.AdminUpdatedLandLineNumberEvent;
-import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent;
+import org.mxchange.jphone.events.landline.updated.ObservableAdminLandLineNumberUpdatedEvent;
+import org.mxchange.jphone.events.mobile.remove.ObservableAdminMobileNumberRemovedFromListEvent;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
@@ -83,14 +83,14 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         */
        @Inject
        @Any
-       private Event<AdminDeletedFaxNumberEvent> faxNumberDeletedEvent;
+       private Event<ObservableAdminFaxNumberDeletedEvent> faxNumberDeletedEvent;
 
        /**
         * Event being fired when an administrator has updated fax number
         */
        @Inject
        @Any
-       private Event<AdminUpdatedFaxNumberEvent> faxNumberUpdatedEvent;
+       private Event<ObservableAdminFaxNumberUpdatedEvent> faxNumberUpdatedEvent;
 
        /**
         * land-line number
@@ -102,14 +102,14 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         */
        @Inject
        @Any
-       private Event<AdminDeletedLandLineNumberEvent> landLineNumberDeletedEvent;
+       private Event<ObservableAdminLandLineNumberDeletedEvent> landLineNumberDeletedEvent;
 
        /**
         * Event being fired when an administrator has updated fax number
         */
        @Inject
        @Any
-       private Event<AdminUpdatedLandLineNumberEvent> landLineNumberUpdatedEvent;
+       private Event<ObservableAdminLandLineNumberUpdatedEvent> landLineNumberUpdatedEvent;
 
        /**
         * Mobile provider instance
@@ -157,7 +157,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         */
        @Inject
        @Any
-       private Event<AdminRemoveFaxNumberFromListEvent> removeLinkedFaxNumbersEvent;
+       private Event<ObservableAdminFaxNumberRemovedFromListEvent> removeLinkedFaxNumbersEvent;
 
        /**
         * Event being fired when a list of all unsed land-line numbers is being
@@ -165,7 +165,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         */
        @Inject
        @Any
-       private Event<AdminRemoveLandLineNumberFromListEvent> removeLinkedLandLineNumbersEvent;
+       private Event<ObservableAdminLandLineNumberRemovedFromListEvent> removeLinkedLandLineNumbersEvent;
 
        /**
         * Event being fired when a list of all unsed mobile numbers is being
@@ -173,7 +173,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         */
        @Inject
        @Any
-       private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+       private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
 
        /**
         * Default constructor

diff --git a/src/java/org/mxchange/jfinancials/beans/phone/list/FinancialsPhoneListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/phone/list/FinancialsPhoneListWebViewBean.java
index 23160e93a88c73b3dc4dcf5ba2c082412a489e62..b7c8a70e769e0044798d734c53f0d389df093aad 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/phone/list/FinancialsPhoneListWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/phone/list/FinancialsPhoneListWebViewBean.java
@@ -36,10 +36,10 @@ import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEv
 import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
-import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent;
-import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent;
-import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent;
-import org.mxchange.jphone.events.landline.updated.AdminUpdatedLandLineNumberEvent;
+import org.mxchange.jphone.events.fax.deleted.ObservableAdminFaxNumberDeletedEvent;
+import org.mxchange.jphone.events.fax.updated.ObservableAdminFaxNumberUpdatedEvent;
+import org.mxchange.jphone.events.landline.deleted.ObservableAdminLandLineNumberDeletedEvent;
+import org.mxchange.jphone.events.landline.updated.ObservableAdminLandLineNumberUpdatedEvent;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
@@ -146,7 +146,7 @@ public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implement
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminDeletedFaxNumberEvent (@Observes final AdminDeletedFaxNumberEvent event) {
+       public void afterAdminDeletedFaxNumberEvent (@Observes final ObservableAdminFaxNumberDeletedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
@@ -175,7 +175,7 @@ public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implement
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminDeletedLandLineNumberEvent (@Observes final AdminDeletedLandLineNumberEvent event) {
+       public void afterAdminDeletedLandLineNumberEvent (@Observes final ObservableAdminLandLineNumberDeletedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
@@ -315,7 +315,7 @@ public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implement
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminUpdatedFaxNumberEvent (@Observes final AdminUpdatedFaxNumberEvent event) {
+       public void afterAdminUpdatedFaxNumberEvent (@Observes final ObservableAdminFaxNumberUpdatedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
@@ -344,7 +344,7 @@ public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implement
         * <p>
         * @param event Event being fired
         */
-       public void afterAdminUpdatedLandLineNumberEvent (@Observes final AdminUpdatedLandLineNumberEvent event) {
+       public void afterAdminUpdatedLandLineNumberEvent (@Observes final ObservableAdminLandLineNumberUpdatedEvent event) {
                // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE