X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fcountry%2FJobsAdminCountryWebRequestBean.java;h=9dcd1fed493185dc75fc6292a2ec68f79e399680;hb=f388623f8643b99d43a20d3ca6bfd1424d90abf5;hp=4c5c440be7d5ee68ca234d4623979ae25c056398;hpb=71af705cba00ac4cb88971049f9abe1e2c9f33e9;p=jjobs-war.git diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java index 4c5c440b..9dcd1fed 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java @@ -26,9 +26,9 @@ import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jcountry.data.CountryData; -import org.mxchange.jcountry.data.CountrySingletonBeanRemote; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; import org.mxchange.jcountry.events.AdminAddedCountryEvent; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; @@ -63,7 +63,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement /** * Remote country EJB */ - @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote") private CountrySingletonBeanRemote countryBean; /** @@ -115,7 +115,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement */ public String addCountry () { // Create new country object - Country country = new CountryData(); + final Country country = new CountryData(); // Add all data country.setCountryAbroadDialPrefix(this.getCountryAbroadDialPrefix()); @@ -132,7 +132,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement } // Init variable - Country updatedCountry = null; + final Country updatedCountry; try { // Send country to bean @@ -288,15 +288,15 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement boolean isAdded = false; // Now get whole ist - List countries = this.countryController.allCountries(); + final List countries = this.countryController.allCountries(); // Get iterator from it - Iterator iterator = countries.iterator(); + final Iterator iterator = countries.iterator(); // Check whole list while (iterator.hasNext()) { // Get next country - Country next = iterator.next(); + final Country next = iterator.next(); // Is country code or i18n the same? if ((Objects.equals(country.getCountryCode(), next.getCountryCode())) || (Objects.equals(country.getCountryI18nKey(), next.getCountryI18nKey()))) {