From: Roland Häder <roland@mxchange.org>
Date: Sun, 22 Jan 2023 06:34:57 +0000 (+0100)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ee4e77359355dc1d464a36370b78ba174e5f3f8;p=jjobs-war.git
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/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java
index 5c5f71e3..bc84afab 100644
--- a/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java
@@ -31,12 +31,12 @@ import javax.inject.Named;
import org.mxchange.jjobs.beans.BaseJobsBean;
import org.mxchange.jjobs.beans.mobile.list.JobsMobileListWebViewController;
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 JobsAdminMobileWebRequestBean extends BaseJobsBean implements JobsA
*/
@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 JobsAdminMobileWebRequestBean extends BaseJobsBean implements JobsA
*/
@Inject
@Any
- private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+ private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
/**
* Chosen mobile number
diff --git a/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java
index 7e30eeaa..73b8974a 100644
--- a/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.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.jjobs.beans.BaseJobsBean;
-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 JobsMobileListWebViewBean extends BaseJobsBean implements JobsMobil
* <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 JobsMobileListWebViewBean extends BaseJobsBean implements JobsMobil
* <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/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
index 353a7a6a..1e7c9716 100644
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
@@ -28,8 +28,8 @@ import javax.inject.Named;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jjobs.beans.BaseJobsBean;
import org.mxchange.jjobs.beans.mobileprovider.list.JobsMobileProviderListWebViewController;
-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 JobsAdminMobileProviderWebRequestBean extends BaseJobsBean implemen
*/
@Inject
@Any
- private Event<AdminAddedMobileProviderEvent> providerAddedEvent;
+ private Event<ObservableAdminMobileProviderAddedEvent> providerAddedEvent;
/**
* Country instance ('s dial data)
diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java
index 6c47ba08..027c9869 100644
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java
@@ -29,7 +29,7 @@ import javax.faces.view.ViewScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.mxchange.jjobs.beans.BaseJobsBean;
-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 JobsMobileProviderListWebViewBean extends BaseJobsBean implements J
* <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/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index eb44638c..a8456e3b 100644
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -32,20 +32,20 @@ import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jjobs.beans.BaseJobsBean;
import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewController;
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 JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd
*/
@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 JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd
*/
@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 JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd
*/
@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 JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd
*/
@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 JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd
*/
@Inject
@Any
- private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
+ private Event<ObservableAdminMobileNumberRemovedFromListEvent> removeLinkedMobileNumbersEvent;
/**
* Default constructor
diff --git a/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java
index 8d78824f..0dbd4e7f 100644
--- a/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.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.jjobs.beans.BaseJobsBean;
-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 JobsPhoneListWebViewBean extends BaseJobsBean implements JobsPhoneL
* <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 JobsPhoneListWebViewBean extends BaseJobsBean implements JobsPhoneL
* <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 JobsPhoneListWebViewBean extends BaseJobsBean implements JobsPhoneL
* <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 JobsPhoneListWebViewBean extends BaseJobsBean implements JobsPhoneL
* <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