From b9583d498ece64c9dc47a343eb8192f0b435a950 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Jan 2023 07:34:57 +0100 Subject: [PATCH] Please cherry-pick: - updated references as with observable events, their interface should be prefixed "Observable" to indicate an interface --- .../AddressbookAdminMobileWebRequestBean.java | 12 ++++---- .../AddressbookMobileListWebViewBean.java | 8 +++--- ...bookAdminMobileProviderWebRequestBean.java | 4 +-- ...ressbookMobileProviderListWebViewBean.java | 4 +-- .../AddressbookAdminPhoneWebRequestBean.java | 28 +++++++++---------- .../list/AddressbookPhoneListWebViewBean.java | 16 +++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobile/AddressbookAdminMobileWebRequestBean.java index 31c9cec0..c2e01b17 100644 --- 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 mobileNumberDeletedEvent; + private Event mobileNumberDeletedEvent; /** * Event being fired when an administrator has updated land-line number */ @Inject @Any - private Event mobileNumberUpdatedEvent; + private Event mobileNumberUpdatedEvent; /** * Mobile provider @@ -113,7 +113,7 @@ public class AddressbookAdminMobileWebRequestBean extends BaseAddressbookBean im */ @Inject @Any - private Event removeLinkedMobileNumbersEvent; + private Event 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 972ef5b6..ea48b876 100644 --- 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 *

* @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 *

* @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 34864ad2..ea4f7736 100644 --- 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 providerAddedEvent; + private Event 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 b2655bde..b3426cec 100644 --- 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 *

* @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 ae4499d3..7a21b586 100644 --- 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 faxNumberDeletedEvent; + private Event faxNumberDeletedEvent; /** * Event being fired when an administrator has updated fax number */ @Inject @Any - private Event faxNumberUpdatedEvent; + private Event faxNumberUpdatedEvent; /** * land-line number @@ -107,14 +107,14 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp */ @Inject @Any - private Event landLineNumberDeletedEvent; + private Event landLineNumberDeletedEvent; /** * Event being fired when an administrator has updated fax number */ @Inject @Any - private Event landLineNumberUpdatedEvent; + private Event landLineNumberUpdatedEvent; /** * Mobile provider instance @@ -162,7 +162,7 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookBean imp */ @Inject @Any - private Event removeLinkedFaxNumbersEvent; + private Event 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 removeLinkedLandLineNumbersEvent; + private Event 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 removeLinkedMobileNumbersEvent; + private Event 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 0094d5fd..1db247db 100644 --- 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 *

* @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 *

* @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 *

* @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 *

* @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 -- 2.39.5