]> git.mxchange.org Git - jjobs-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Wed, 10 Jun 2020 18:21:14 +0000 (20:21 +0200)
committerRoland Häder <roland@mxchange.org>
Wed, 10 Jun 2020 18:21:14 +0000 (20:21 +0200)
- fixed bugs of previous cherry-picking season ...

Signed-off-by: Roland Häder <roland@mxchange.org>
17 files changed:
nbproject/project.properties
nbproject/project.xml
src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java [new file with mode: 0644]
src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java [deleted file]
src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java
src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java
src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java
src/java/org/mxchange/jjobs/converter/business/department/JobsDepartmentConverter.java
src/java/org/mxchange/jjobs/converter/business/headquarter/JobsHeadquarterConverter.java
src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java
src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java
src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java
src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java
src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java
src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java

index bdb0bd792f739c8273bc689cc98938af24912728..dab8378dfac41dd7a0939d0e70bd900ff41942d3 100644 (file)
@@ -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/
index 596e47ec9a3334ea47dc4818be1d455bd3260b75..46cb1053f5e18a617a6cb1a3cbf65aba57a967de 100644 (file)
                 <library dirs="200">
                     <file>${file.reference.jcontacts-business-lib.jar}</file>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.jcustomer-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcustomer-lib.jar}</file>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.jphone-core.jar}</file>
                 </library>
                     <file>${file.reference.juser-activity-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.juser-login-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-login-lib.jar}</file>
+                    <file>${file.reference.juser-activity-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.juser-activity-lib.jar}</file>
+                    <file>${file.reference.juser-login-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-business-lib.jar}</file>
+                    <file>${file.reference.juser-login-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${reference.jjobs-core.jar}</file>
index 248a06b6cd6e1d8202395d6c98c1791e41f3f2f5..85e5bd1b5c1fec9fdeb11e0d3997eaee64a5eb48 100644 (file)
@@ -105,13 +105,6 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta
        @Inject
        private Event<ObservableUpdatedContactEvent> contactUpdatedEvent;
 
-       /**
-        * Event being fired when a user has updated his contact data
-        */
-       @Any
-       @Inject
-       private Event<ObservableUpdatedContactEvent> contactUpdatedEvent;
-
        /**
         * Country instance
         */
diff --git a/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestBean.java
new file mode 100644 (file)
index 0000000..3b60d24
--- /dev/null
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2016 - 2020 Free Software Foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.beans.user.action;
+
+import java.text.MessageFormat;
+import javax.ejb.EJB;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+import javax.faces.FacesException;
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.mxchange.jcontacts.model.contact.Contact;
+import org.mxchange.jjobs.beans.BaseJobsBean;
+import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController;
+import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController;
+import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController;
+import org.mxchange.jusercore.events.user.update.post.ObservablePostUserPersonalDataUpdatedEvent;
+import org.mxchange.jusercore.events.user.update.post.PostUserPersonalDataUpdatedEvent;
+import org.mxchange.jusercore.events.user.update.pre.ObservablePreUserPersonalDataUpdatedEvent;
+import org.mxchange.jusercore.events.user.update.pre.PreUserPersonalDataUpdatedEvent;
+import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
+import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException;
+
+/**
+ * A user action bean (controller)
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Named ("userActionController")
+@RequestScoped
+public class JobsUserActionWebRequestBean extends BaseJobsBean implements JobsUserActionWebRequestController {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 542_145_347_920L;
+
+       /**
+        * General contact controller
+        */
+       @Inject
+       private JobsContactWebRequestController contactController;
+
+       /**
+        * Features controller
+        */
+       @Inject
+       private JobsFeaturesWebApplicationController featureController;
+
+       /**
+        * Event being fired when user updated personal data
+        */
+       @Inject
+       @Any
+       private Event<ObservablePostUserPersonalDataUpdatedEvent> postUpdatedPersonalDataEvent;
+
+       /**
+        * Event being fired when user updated personal data
+        */
+       @Inject
+       @Any
+       private Event<ObservablePreUserPersonalDataUpdatedEvent> preUpdatedPersonalDataEvent;
+
+       /**
+        * Remote user bean
+        */
+       @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote")
+       private UserSessionBeanRemote userBean;
+
+       /**
+        * Login controller (bean)
+        */
+       @Inject
+       private JobsUserLoginWebSessionController userLoginController;
+
+       /**
+        * Default constructor
+        */
+       public JobsUserActionWebRequestBean () {
+               // Call super constructor
+               super();
+       }
+
+       @Override
+       public String doChangePersonalData () {
+               // This method shall only be called if the user is logged-in
+               if (!this.userLoginController.isUserLoggedIn()) {
+                       // Not logged-in
+                       throw new IllegalStateException("User is not logged-in"); //NOI18N
+               } else if (!this.contactController.isRequiredChangePersonalDataSet()) {
+                       // Not all required fields are set
+                       throw new FacesException("Not all required fields are set."); //NOI18N
+               } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
+                       // Password not matching
+                       throw new FacesException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
+               } else if (!this.featureController.isFeatureEnabled("change_user_personal_data")) { //NOI18N
+                       // Editing is not allowed
+                       throw new IllegalStateException("User tried to edit personal data."); //NOI18N
+               }
+
+               // Get user instance
+               final User user = this.userLoginController.getLoggedInUser();
+
+               // Fire pre-update event
+               this.preUpdatedPersonalDataEvent.fire(new PreUserPersonalDataUpdatedEvent(user));
+
+               // It should be there, so run some tests on it
+               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null"; //NOI18N
+               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null"; //NOI18N
+               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
+               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
+
+               // Send it to the EJB
+               final User updatedUser = this.userBean.updateUserPersonalData(user);
+
+               // Fire post-update event
+               this.postUpdatedPersonalDataEvent.fire(new PostUserPersonalDataUpdatedEvent(updatedUser));
+
+               // All fine
+               return "user_contact_data_saved"; //NOI18N
+       }
+
+}
diff --git a/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java
deleted file mode 100644 (file)
index faace20..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2016 - 2020 Free Software Foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jjobs.beans.user.action;
-
-import java.text.MessageFormat;
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.faces.FacesException;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.mxchange.jcontacts.model.contact.Contact;
-import org.mxchange.jjobs.beans.BaseJobsBean;
-import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController;
-import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController;
-import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController;
-import org.mxchange.jusercore.events.user.update.post.ObservablePostUserPersonalDataUpdatedEvent;
-import org.mxchange.jusercore.events.user.update.post.PostUserPersonalDataUpdatedEvent;
-import org.mxchange.jusercore.events.user.update.pre.ObservablePreUserPersonalDataUpdatedEvent;
-import org.mxchange.jusercore.events.user.update.pre.PreUserPersonalDataUpdatedEvent;
-import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
-import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException;
-
-/**
- * A user action bean (controller)
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-@Named ("userActionController")
-@RequestScoped
-public class JobssUserActionWebRequestBean extends BaseJobsBean implements JobsUserActionWebRequestController {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 542_145_347_920L;
-
-       /**
-        * General contact controller
-        */
-       @Inject
-       private JobsContactWebRequestController contactController;
-
-       /**
-        * Features controller
-        */
-       @Inject
-       private JobsFeaturesWebApplicationController featureController;
-
-       /**
-        * Event being fired when user updated personal data
-        */
-       @Inject
-       @Any
-       private Event<ObservablePostUserPersonalDataUpdatedEvent> postUpdatedPersonalDataEvent;
-
-       /**
-        * Event being fired when user updated personal data
-        */
-       @Inject
-       @Any
-       private Event<ObservablePreUserPersonalDataUpdatedEvent> preUpdatedPersonalDataEvent;
-
-       /**
-        * Remote user bean
-        */
-       @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote")
-       private UserSessionBeanRemote userBean;
-
-       /**
-        * Login controller (bean)
-        */
-       @Inject
-       private JobsUserLoginWebSessionController userLoginController;
-
-       /**
-        * Default constructor
-        */
-       public JobssUserActionWebRequestBean () {
-               // Call super constructor
-               super();
-       }
-
-       @Override
-       public String doChangePersonalData () {
-               // This method shall only be called if the user is logged-in
-               if (!this.userLoginController.isUserLoggedIn()) {
-                       // Not logged-in
-                       throw new IllegalStateException("User is not logged-in"); //NOI18N
-               } else if (!this.contactController.isRequiredChangePersonalDataSet()) {
-                       // Not all required fields are set
-                       throw new FacesException("Not all required fields are set."); //NOI18N
-               } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
-                       // Password not matching
-                       throw new FacesException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
-               } else if (!this.featureController.isFeatureEnabled("change_user_personal_data")) { //NOI18N
-                       // Editing is not allowed
-                       throw new IllegalStateException("User tried to edit personal data."); //NOI18N
-               }
-
-               // Get user instance
-               final User user = this.userLoginController.getLoggedInUser();
-
-               // Fire pre-update event
-               this.preUpdatedPersonalDataEvent.fire(new PreUserPersonalDataUpdatedEvent(user));
-
-               // It should be there, so run some tests on it
-               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null"; //NOI18N
-               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null"; //NOI18N
-               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
-               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
-               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
-               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
-
-               // Send it to the EJB
-               final User updatedUser = this.userBean.updateUserPersonalData(user);
-
-               // Fire post-update event
-               this.postUpdatedPersonalDataEvent.fire(new PostUserPersonalDataUpdatedEvent(updatedUser));
-
-               // All fine
-               return "user_contact_data_saved"; //NOI18N
-       }
-
-}
index 304d9b476d754f97fa87156ec80712bb35c058a5..09ebf9f60bca3f6887ee5fc6c5917826d4f7bc51 100644 (file)
@@ -54,7 +54,7 @@ public class JobsBasicCompanyDataConverter implements Converter<BasicData> {
                // 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 {
index 6aa69961365fe67180cda35a525c33bab1664788..25f56b6c261ab5508bceff91964711d8caa1db60 100644 (file)
@@ -54,7 +54,7 @@ public class JobsBranchOfficeConverter implements Converter<BranchOffice> {
                // 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 {
index 4fb4f03d7d5001de327c9adaf5f79fa11b5b2d09..6f39ab5d5fbf60acce905192a04ac5cfb7a78050 100644 (file)
@@ -54,7 +54,7 @@ public class JobsEmployeeConverter implements Converter<Employable> {
                // 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 {
index 7b72dd5984e820f0667d26bc2d12dc2471a3d81b..7af9ee4395d8af3b21d24c75922d8173b3a4f176 100644 (file)
@@ -54,7 +54,7 @@ public class JobsDepartmentConverter implements Converter<Department> {
                // 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 {
index 392ddd67af549cbb25c546a1ba0cef3ee4fe2a04..20de7a510b72de5e3e75bb8e33c7201e19bfdf61 100644 (file)
@@ -54,7 +54,7 @@ public class JobsHeadquarterConverter implements Converter<Headquarter> {
                // 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 {
index 1dc91db52a159ce363cc6caac37e9fd58686df2f..647654a103c47bee5ff5a08bf8a9f21b42819bc5 100644 (file)
@@ -54,7 +54,7 @@ public class JobsContactConverter implements Converter<Contact> {
                // 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 {
index 283367fe0d24872e52284054feae52e24d1d6f38..6507d87cb3e924a675845ccb0d2e130b9d8b893c 100644 (file)
@@ -54,7 +54,7 @@ public class JobsCountryConverter implements Converter<Country> {
                // 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
index c37cf3fd3223d4259b7cc0a256d513bc36c7369a..a3ce26bb3d02bebdb0416149a549a42b5ec8cd0f 100644 (file)
@@ -54,7 +54,7 @@ public class JobsFaxNumberConverter implements Converter<DialableFaxNumber> {
                // 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 {
index 8c5a57770aae57d85782831a1b38eb6b62093f2f..534a6da655a8694971ca7bcb57529e739827870e 100644 (file)
@@ -54,7 +54,7 @@ public class JobsLandLineNumberConverter implements Converter<DialableLandLineNu
                // 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 {
index b31921fffb10d4da2bc782a57ab16c0608a1c56c..e20bc2ff7906c661d697ee88fb4525256fa9db3a 100644 (file)
@@ -54,7 +54,7 @@ public class JobsMobileNumberConverter implements Converter<DialableMobileNumber
                // Is the instance there?
                if (null == MOBILE_LIST_CONTROLLER) {
                        // Get bean from CDI directly
-                       MOBILE_LIST_CONTROLLER = CDI.current().select(JobssMobileListWebViewBean.class).get();
+                       MOBILE_LIST_CONTROLLER = CDI.current().select(JobsMobileListWebViewBean.class).get();
                }
 
                try {
index 9cb07ae99140f6f792fa6e6018dc5487b418e127..de07ebbbea510c490727195494752bcf1122bf3e 100644 (file)
@@ -54,7 +54,7 @@ public class JobsMobileProviderConverter implements Converter<MobileProvider> {
                // 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
index c158980187f581dd6fc0b9e362dd1cec6bd0d671..b55a40d0ad884b4ad7788889a541fa07b25c5681 100644 (file)
@@ -57,7 +57,7 @@ public class JobsUserConverter implements Converter<User> {
                // 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 {