X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fbusiness%2Fbasicdata%2FJobsBusinessDataWebRequestBean.java;h=a7b0c9f00c60e74874e5296fa976cbdf65d38874;hb=564dd9b71a13ae0127b3648ba8b0492b19f16631;hp=77f4a36d61dfec2e888371d0ba369dd0d5eba1bd;hpb=e6f89a9135105a78e256b86f2c33a36eeab4f86c;p=jjobs-war.git diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java index 77f4a36d..a7b0c9f0 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java @@ -28,11 +28,11 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent; -import org.mxchange.jcountry.data.Country; +import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; @@ -142,12 +142,12 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement } else if (event.getBasicData() == null) { // Throw NPE again throw new NullPointerException("event.basicData is null"); - } else if (event.getBasicData().getCompanyDataId() == null) { + } else if (event.getBasicData().getBasicDataId() == null) { // Throw NPE again - throw new NullPointerException("event.basicData.companyDataId is null"); - } else if (event.getBasicData().getCompanyDataId() < 1) { + throw new NullPointerException("event.basicData.basicDataId is null"); + } else if (event.getBasicData().getBasicDataId() < 1) { // Throw IAE - throw new IllegalArgumentException(MessageFormat.format("event.basicData.companyDataId={0} is invalid", event.getBasicData().getCompanyDataId())); + throw new IllegalArgumentException(MessageFormat.format("event.basicData.basicDataId={0} is invalid", event.getBasicData().getBasicDataId())); } else if (event.getBasicData().getCompanyName() == null) { // Throw NPE again throw new NullPointerException("event.basicData.companyName is null"); @@ -157,7 +157,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement } // Add it to list - this.basicDataCache.put(event.getBasicData().getCompanyDataId(), event.getBasicData()); + this.basicDataCache.put(event.getBasicData().getBasicDataId(), event.getBasicData()); } /** @@ -364,7 +364,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement final BusinessBasicData next = iterator.next(); // Add it to cache - this.basicDataCache.put(next.getCompanyDataId(), next); + this.basicDataCache.put(next.getBasicDataId(), next); } } }