Please cherry-pick:

- cleaned up imports
- fixed EJB names

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
index b1bd1ba95c550c1b0b6bf650e8300e658c3d4bf1..aa1c79ef90f81b288eee4cc4fa7c0afe4b7ec2a3 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java
@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.Objects;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
-import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
@@ -34,8 +32,8 @@ import org.mxchange.jusercore.model.user.User;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Stateless (name = "adminBusinessData", description = "An administrative statless bean for handling business data (all)")
-public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean implements AdminBusinessDataSessionBeanRemote {
+@Stateless (name = "adminBasicCompanyData", description = "An administrative statless bean for handling business data (all)")
+public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean implements AdminBasicCompanyDataSessionBeanRemote {
 
        /**
         * Serial number
@@ -46,7 +44,7 @@ public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean imple
         * Administrative EJB
         */
        @EJB
-       private BusinessDataSessionBeanRemote businessDataBean;
+       private BasicCompanyDataSessionBeanRemote businessDataBean;
 
        /**
         * Default constructor

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
index a0c473d981a842f3ad7048e23ff4ea206ed6b7b8..b5351b08a5dd5acbf5fce1b7a6d3d0ef20c51e8f 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java
@@ -22,7 +22,6 @@ import java.util.Objects;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 
@@ -31,8 +30,8 @@ import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Stateless (name = "businessData", description = "A general statless bean for handling business data (all)")
-public class JobsBusinessDataSessionBean extends BaseJobsDatabaseBean implements BusinessDataSessionBeanRemote {
+@Stateless (name = "basicCompanyData", description = "A general statless bean for handling business data (all)")
+public class JobsBusinessDataSessionBean extends BaseJobsDatabaseBean implements BasicCompanyDataSessionBeanRemote {
 
        /**
         * Serial number

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
index b8be6258a3ed922b3b678d6830c62b5ff68720df..c3f8803003ee6351e38f4501650d5e3cd722b0f0 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
@@ -21,8 +21,6 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
-import org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote;
-import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
@@ -130,7 +128,7 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsDatabaseBean imple
                // Check all single addresses
                for (final BranchOffice bo : branchOffices) {
                        // Is the same address found?
-                       if (BranchOfficeUtils.isSameAddress(bo, branchOffice)) {
+                       if (BranchOffices.isSameAddress(bo, branchOffice)) {
                                // Found one
                                isFound = true;
                                break;

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
index f1ed632f037deed5bd89adfb9d1f3c1e6eefe65a..d454a0bd0474898a864fbe57397d726bc74febca 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java
@@ -20,7 +20,6 @@ import java.text.MessageFormat;
 import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.Query;
-import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 
 /**

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
index 79b4897884d01c54a0ac6a69dc0f821c48dc0074..b324ea244ad7346848a3e8cffa08b1925b926692 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
@@ -17,7 +17,6 @@
 package org.mxchange.jcontactsbusiness.model.employee;
 
 import javax.ejb.Stateless;
-import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
 
 /**

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
index 959056c0713de41db4115624895e2716c52f71ea..72bae60cd17928d18a5a49320d73e65ca93ba7f0 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java
@@ -21,7 +21,6 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;