From dee04814d8f638d9255fc313770eea783873429d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 10 Jun 2020 20:21:14 +0200 Subject: [PATCH] Don't cherry-pick: - fixed bugs of previous cherry-picking season ... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/project.properties | 4 ---- nbproject/project.xml | 15 +++------------ .../beans/contact/JobsContactWebRequestBean.java | 7 ------- ...ean.java => JobsUserActionWebRequestBean.java} | 4 ++-- .../basicdata/JobsBasicCompanyDataConverter.java | 2 +- .../branchoffice/JobsBranchOfficeConverter.java | 2 +- .../company_employee/JobsEmployeeConverter.java | 2 +- .../department/JobsDepartmentConverter.java | 2 +- .../headquarter/JobsHeadquarterConverter.java | 2 +- .../converter/contact/JobsContactConverter.java | 2 +- .../converter/country/JobsCountryConverter.java | 2 +- .../converter/fax/JobsFaxNumberConverter.java | 2 +- .../landline/JobsLandLineNumberConverter.java | 2 +- .../mobile/JobsMobileNumberConverter.java | 2 +- .../JobsMobileProviderConverter.java | 2 +- .../jjobs/converter/user/JobsUserConverter.java | 2 +- 16 files changed, 17 insertions(+), 37 deletions(-) rename src/java/org/mxchange/jjobs/beans/user/action/{JobssUserActionWebRequestBean.java => JobsUserActionWebRequestBean.java} (97%) diff --git a/nbproject/project.properties b/nbproject/project.properties index bdb0bd79..dab8378d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -72,8 +72,6 @@ javac.classpath=\ ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-business-lib.jar}:\ - ${file.reference.jcustomer-core.jar}:\ - ${file.reference.jcustomer-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jphone-lib.jar}:\ ${file.reference.juser-core.jar}:\ @@ -122,8 +120,6 @@ javadoc.reference.jcontacts-lib.jar=https://docs.mxchange.org/javadoc/jcontacts- javadoc.reference.jcoreee.jar=https://docs.mxchange.org/javadoc/jcoreee/ javadoc.reference.jcountry-core.jar=https://docs.mxchange.org/javadoc/jcountry-core/ javadoc.reference.jcountry-lib.jar=https://docs.mxchange.org/javadoc/jcountry-lib/ -javadoc.reference.jcustomer-core.jar=https://docs.mxchange.org/javadoc/jcustomer-core/ -javadoc.reference.jcustomer-lib.jar=https://docs.mxchange.org/javadoc/jcustomer-lib/ javadoc.reference.jphone-core.jar=https://docs.mxchange.org/javadoc/jphone-core/ javadoc.reference.jphone-lib.jar=https://docs.mxchange.org/javadoc/jphone-lib/ javadoc.reference.juser-activity-core.jar=https://docs.mxchange.org/javadoc/juser-activity-core/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 596e47ec..46cb1053 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -27,12 +27,6 @@ ${file.reference.jcontacts-business-lib.jar} - - ${file.reference.jcustomer-core.jar} - - - ${file.reference.jcustomer-lib.jar} - ${file.reference.jphone-core.jar} @@ -49,16 +43,13 @@ ${file.reference.juser-activity-core.jar} - ${file.reference.juser-login-core.jar} - - - ${file.reference.juser-login-lib.jar} + ${file.reference.juser-activity-lib.jar} - ${file.reference.juser-activity-lib.jar} + ${file.reference.juser-login-core.jar} - ${file.reference.jcontacts-business-lib.jar} + ${file.reference.juser-login-lib.jar} ${reference.jjobs-core.jar} diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java index 248a06b6..85e5bd1b 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java @@ -105,13 +105,6 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta @Inject private Event contactUpdatedEvent; - /** - * Event being fired when a user has updated his contact data - */ - @Any - @Inject - private Event contactUpdatedEvent; - /** * Country instance */ diff --git a/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java index faace205..3b60d240 100644 --- a/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java @@ -44,7 +44,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("userActionController") @RequestScoped -public class JobssUserActionWebRequestBean extends BaseJobsBean implements JobsUserActionWebRequestController { +public class JobsUserActionWebRequestBean extends BaseJobsBean implements JobsUserActionWebRequestController { /** * Serial number @@ -92,7 +92,7 @@ public class JobssUserActionWebRequestBean extends BaseJobsBean implements JobsU /** * Default constructor */ - public JobssUserActionWebRequestBean () { + public JobsUserActionWebRequestBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java index 304d9b47..09ebf9f6 100644 --- a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java @@ -54,7 +54,7 @@ public class JobsBasicCompanyDataConverter implements Converter { // Is the instance there? if (null == BASIC_DATA_LIST_CONTROLLER) { // Get bean from CDI directly - BASIC_DATA_LIST_CONTROLLER = CDI.current().select(JobssBasicDataListWebViewBean.class).get(); + BASIC_DATA_LIST_CONTROLLER = CDI.current().select(JobsBasicDataListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java index 6aa69961..25f56b6c 100644 --- a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java @@ -54,7 +54,7 @@ public class JobsBranchOfficeConverter implements Converter { // Is the instance there? if (null == BRANCH_OFFICE_LIST_CONTROLLER) { // Get bean from CDI directly - BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobssBranchOfficeListWebViewBean.class).get(); + BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java index 4fb4f03d..6f39ab5d 100644 --- a/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java @@ -54,7 +54,7 @@ public class JobsEmployeeConverter implements Converter { // Is the instance there? if (null == EMPLOYEE_LIST_CONTROLLER) { // Get bean from CDI directly - EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobssEmployeeListWebViewBean.class).get(); + EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/business/department/JobsDepartmentConverter.java b/src/java/org/mxchange/jjobs/converter/business/department/JobsDepartmentConverter.java index 7b72dd59..7af9ee43 100644 --- a/src/java/org/mxchange/jjobs/converter/business/department/JobsDepartmentConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/department/JobsDepartmentConverter.java @@ -54,7 +54,7 @@ public class JobsDepartmentConverter implements Converter { // Is the instance there? if (null == DEPARTMENT_LIST_CONTROLLER) { // Get bean from CDI directly - DEPARTMENT_LIST_CONTROLLER = CDI.current().select(JobssDepartmentListWebViewBean.class).get(); + DEPARTMENT_LIST_CONTROLLER = CDI.current().select(JobsDepartmentListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/business/headquarter/JobsHeadquarterConverter.java b/src/java/org/mxchange/jjobs/converter/business/headquarter/JobsHeadquarterConverter.java index 392ddd67..20de7a51 100644 --- a/src/java/org/mxchange/jjobs/converter/business/headquarter/JobsHeadquarterConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/headquarter/JobsHeadquarterConverter.java @@ -54,7 +54,7 @@ public class JobsHeadquarterConverter implements Converter { // Is the instance there? if (null == HEADQUARTER_LIST_CONTROLLER) { // Set it now - HEADQUARTER_LIST_CONTROLLER = CDI.current().select(JobssHeadquarterListWebViewBean.class).get(); + HEADQUARTER_LIST_CONTROLLER = CDI.current().select(JobsHeadquarterListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java b/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java index 1dc91db5..647654a1 100644 --- a/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java +++ b/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java @@ -54,7 +54,7 @@ public class JobsContactConverter implements Converter { // Is the instance there? if (null == CONTACT_LIST_CONTROLLER) { // Get bean from CDI directly - CONTACT_LIST_CONTROLLER = CDI.current().select(JobssContactListWebViewBean.class).get(); + CONTACT_LIST_CONTROLLER = CDI.current().select(JobsContactListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java index 283367fe..6507d87c 100644 --- a/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java +++ b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java @@ -54,7 +54,7 @@ public class JobsCountryConverter implements Converter { // Is the instance there? if (null == COUNTRY_LIST_CONTROLLER) { // Get bean from CDI directly - COUNTRY_LIST_CONTROLLER = CDI.current().select(JobssCountryListWebViewBean.class).get(); + COUNTRY_LIST_CONTROLLER = CDI.current().select(JobsCountryListWebViewBean.class).get(); } // Try this better diff --git a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java index c37cf3fd..a3ce26bb 100644 --- a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java @@ -54,7 +54,7 @@ public class JobsFaxNumberConverter implements Converter { // Is the instance there? if (null == PHONE_LIST_CONTROLLER) { // Get bean from CDI directly - PHONE_LIST_CONTROLLER = CDI.current().select(JobssPhoneListWebViewBean.class).get(); + PHONE_LIST_CONTROLLER = CDI.current().select(JobsPhoneListWebViewBean.class).get(); } try { diff --git a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java index 8c5a5777..534a6da6 100644 --- a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java @@ -54,7 +54,7 @@ public class JobsLandLineNumberConverter implements Converter { // Is the instance there? if (null == MOBILE_PROVIDER_LIST_CONTROLLER) { // Get bean from CDI directly - MOBILE_PROVIDER_LIST_CONTROLLER = CDI.current().select(JobssMobileProviderListWebViewBean.class).get(); + MOBILE_PROVIDER_LIST_CONTROLLER = CDI.current().select(JobsMobileProviderListWebViewBean.class).get(); } // Try this better diff --git a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java index c1589801..b55a40d0 100644 --- a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java +++ b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java @@ -57,7 +57,7 @@ public class JobsUserConverter implements Converter { // Is the instance there? if (null == USER_LIST_CONTROLLER) { // Get bean from CDI directly - USER_LIST_CONTROLLER = CDI.current().select(JobssUserListWebViewBean.class).get(); + USER_LIST_CONTROLLER = CDI.current().select(JobsUserListWebViewBean.class).get(); } try { -- 2.39.2