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/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java
index 31c9cec0d720150832d911062b1e66ec2100f8b5..c2e01b17b5efd83a04c95e70922a140051bb286f 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java
@@ -31,12 +31,12 @@ import javax.inject.Named;
 import org.mxchange.addressbook.beans.BaseAddressbookBean;
 import org.mxchange.addressbook.beans.mobile.list.AddressbookMobileListWebViewController;
 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 AddressbookAdminMobileWebRequestBean extends BaseAddressbookBean im
         */
        @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 AddressbookAdminMobileWebRequestBean extends BaseAddressbookBean im
         */
        @Inject
        @Any
-       private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+       private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
 
        /**
         * Chosen mobile number

diff --git a/src/java/org/mxchange/addressbook/beans/mobile/list/AddressbookMobileListWebViewBean.java b/src/java/org/mxchange/addressbook/beans/mobile/list/AddressbookMobileListWebViewBean.java
index 972ef5b6a8c240ca3ff69b5aefc9663a5debb4e3..ea48b876ab780e1ab023d590c14af6420ecc4b77 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/mobile/list/AddressbookMobileListWebViewBean.java
+++ b/src/java/org/mxchange/addressbook/beans/mobile/list/AddressbookMobileListWebViewBean.java
@@ -35,8 +35,8 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac
 import org.mxchange.jcontacts.events.contact.update.ObservableUpdatedContactEvent;
 import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent;
 import org.mxchange.jcontacts.model.contact.Contact;
-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 AddressbookMobileListWebViewBean extends BaseAddressbookBean implem
         * <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 AddressbookMobileListWebViewBean extends BaseAddressbookBean implem
         * <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/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
index 34864ad222c789c5ea792bc0c762743fea5c4693..ea4f7736504bed80684cea4cb8e62a453a09dd15 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
@@ -28,8 +28,8 @@ import javax.inject.Named;
 import org.mxchange.addressbook.beans.BaseAddressbookBean;
 import org.mxchange.addressbook.beans.mobileprovider.list.AddressbookMobileProviderListWebViewController;
 import org.mxchange.jcountry.model.data.Country;
-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 AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo
         */
        @Inject
        @Any
-       private Event<AdminAddedMobileProviderEvent> providerAddedEvent;
+       private Event<ObservableAdminMobileProviderAddedEvent> providerAddedEvent;
 
        /**
         * Country instance ('s dial data)

diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/list/AddressbookMobileProviderListWebViewBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/list/AddressbookMobileProviderListWebViewBean.java
index b2655bdef66234dddedfe2e22e3396f8dd0cecd4..b3426ceca90f654562ab7682e1f1bb7b7b3f2e5e 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/mobileprovider/list/AddressbookMobileProviderListWebViewBean.java
+++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/list/AddressbookMobileProviderListWebViewBean.java
@@ -29,7 +29,7 @@ import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.addressbook.beans.BaseAddressbookBean;
-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 AddressbookMobileProviderListWebViewBean extends BaseAddressbookBea
         * <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/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java
index ae4499d3bae04979dc1de14f6a03d106a014fa50..7a21b58689de6f1e7bf8100a7fcc7170799f14bb 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java
@@ -32,20 +32,20 @@ import org.mxchange.addressbook.beans.BaseAddressbookBean;
 import org.mxchange.addressbook.beans.phone.list.AddressbookPhoneListWebViewController;
 import org.mxchange.jcountry.model.data.Country;
 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;
@@ -88,14 +88,14 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp
         */
        @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
@@ -107,14 +107,14 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp
         */
        @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
@@ -162,7 +162,7 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp
         */
        @Inject
        @Any
-       private Event<AdminRemoveFaxNumberFromListEvent> removeLinkedFaxNumbersEvent;
+       private Event<ObservableAdminFaxNumberRemovedFromListEvent> removeLinkedFaxNumbersEvent;
 
        /**
         * Event being fired when a list of all unsed land-line numbers is being
@@ -170,7 +170,7 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp
         */
        @Inject
        @Any
-       private Event<AdminRemoveLandLineNumberFromListEvent> removeLinkedLandLineNumbersEvent;
+       private Event<ObservableAdminLandLineNumberRemovedFromListEvent> removeLinkedLandLineNumbersEvent;
 
        /**
         * Event being fired when a list of all unsed mobile numbers is being
@@ -178,7 +178,7 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp
         */
        @Inject
        @Any
-       private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+       private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
 
        /**
         * Default constructor

diff --git a/src/java/org/mxchange/addressbook/beans/phone/list/AddressbookPhoneListWebViewBean.java b/src/java/org/mxchange/addressbook/beans/phone/list/AddressbookPhoneListWebViewBean.java
index 0094d5fd93741dcbf2ef411795c86dc5fe32f419..1db247db60bf45d1e97701eb920f49e8cfb8e871 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/phone/list/AddressbookPhoneListWebViewBean.java
+++ b/src/java/org/mxchange/addressbook/beans/phone/list/AddressbookPhoneListWebViewBean.java
@@ -36,10 +36,10 @@ import org.mxchange.jcontacts.events.contact.update.ObservableUpdatedContactEven
 import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.model.contact.Contact;
-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 AddressbookPhoneListWebViewBean extends BaseAddressbookBean impleme
         * <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 AddressbookPhoneListWebViewBean extends BaseAddressbookBean impleme
         * <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 AddressbookPhoneListWebViewBean extends BaseAddressbookBean impleme
         * <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 AddressbookPhoneListWebViewBean extends BaseAddressbookBean impleme
         * <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