Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / converter / business / basicdata / JobsBusinessContactConverter.java

diff --git a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
index a35c4594ce3c8c7ba4b4e1191055acecac963660..2feff0fa720355e3246e7ceb5ef4c03dbd69bb50 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
@@ -24,8 +24,13 @@ import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
+<<<<<<< HEAD:src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
 import org.mxchange.jjobs.beans.business.basicdata.JobsBasicDataWebRequestBean;
 import org.mxchange.jjobs.beans.business.basicdata.JobsBasicDataWebRequestController;
+=======
+import org.mxchange.jjobs.beans.business.basicdata.list.JobsBasicDataListWebViewBean;
+import org.mxchange.jjobs.beans.business.basicdata.list.JobsBasicDataListWebViewController;
+>>>>>>> 11ccdf2a4... Please cherry-pick::src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java
 
 /**
  * Converter for basic company data id <-> valid basic company data instance
@@ -38,14 +43,22 @@ public class JobsBasicCompanyDataConverter implements Converter<BasicData> {
        /**
         * Basic company data backing bean
         */
+<<<<<<< HEAD:src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
        private static JobsBasicDataWebRequestController BASIC_DATA_CONTROLLER;
+=======
+       private static JobsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER;
+>>>>>>> 11ccdf2a4... Please cherry-pick::src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java
 
        @Override
        public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
-               if (null == BASIC_DATA_CONTROLLER) {
+               if (null == BASIC_DATA_LIST_CONTROLLER) {
                        // Get bean from CDI directly
+<<<<<<< HEAD:src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
                        BASIC_DATA_CONTROLLER = CDI.current().select(JobsBasicDataWebRequestBean.class).get();
+=======
+                       BASIC_DATA_LIST_CONTROLLER = CDI.current().select(JobsBasicDataListWebViewBean.class).get();
+>>>>>>> 11ccdf2a4... Please cherry-pick::src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBasicCompanyDataConverter.java
                }
 
                // Is the value null or empty?
@@ -65,7 +78,7 @@ public class JobsBasicCompanyDataConverter implements Converter<BasicData> {
                        final Long basicDataId = Long.valueOf(submittedValue);
 
                        // Try to get user instance from it
-                       basicData = BASIC_DATA_CONTROLLER.findBasicDataById(basicDataId);
+                       basicData = BASIC_DATA_LIST_CONTROLLER.findBasicDataById(basicDataId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);