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/FinancialsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java
index ed3dc33c59cca71e1a257f8833eddc41e286b858..e613a3919f6376248972b23ecf42a7e13bdbb0de 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean;
@@ -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 FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements AdminBusinessDataSessionBeanRemote {
+@Stateless (name = "adminBasicCompanyData", description = "An administrative statless bean for handling business data (all)")
+public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements AdminBasicCompanyDataSessionBeanRemote {
 
        /**
         * Serial number
@@ -46,7 +44,7 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDataba
         * Administrative EJB
         */
        @EJB
-       private BusinessDataSessionBeanRemote businessDataBean;
+       private BasicCompanyDataSessionBeanRemote businessDataBean;
 
        /**
         * Default constructor

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java
index 3ee18afe50d45f51a1e2f6ea99030368fa4e47f5..690f834082bceb890e5bfc6425f93f6195043903 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean;
 
@@ -31,8 +30,8 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Stateless (name = "businessData", description = "A general statless bean for handling business data (all)")
-public class FinancialsBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements BusinessDataSessionBeanRemote {
+@Stateless (name = "basicCompanyData", description = "A general statless bean for handling business data (all)")
+public class FinancialsBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements BasicCompanyDataSessionBeanRemote {
 
        /**
         * Serial number

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java
index c2f70c5f3b3793dbdda145bc67658446cd5b34ed..df383d1f9d5353284278fe3463df35dea1b474af 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.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.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcountry.model.data.Country;
@@ -132,7 +130,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba
                // 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/FinancialsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java
index 2c4ab7fd2179c86314dc82c4588f2b206f200ff1..fe6647beb710896874509bb4a474a42d56f2fd42 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean;
 
 /**

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java
index e805d9f7f462f98a2f414ca7d08bf5d353634965..9387418e8b73581591cece0958abc178faef39d9 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java
@@ -17,7 +17,6 @@
 package org.mxchange.jcontactsbusiness.model.employee;
 
 import javax.ejb.Stateless;
-import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote;
 import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean;
 
 /**

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java
index 832d87fee01a492d2c53eba75191555bc2824534..f986d5ce500a8c3be93f2f3ee0e7e301fafa4a24 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean;