From 42d27fab9a65212c1a9882c0195bcc0704c04dbb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 15:58:45 +0200 Subject: [PATCH] Please cherry-pick: - cleaned up imports - fixed EJB names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/basicdata/JobsAdminBusinessDataSessionBean.java | 8 +++----- .../model/basicdata/JobsBusinessDataSessionBean.java | 5 ++--- .../branchoffice/JobsAdminBranchOfficeSessionBean.java | 4 +--- .../model/branchoffice/JobsBranchOfficeSessionBean.java | 1 - .../employee/JobsAdminCompanyEmployeeSessionBean.java | 1 - .../model/employee/JobsCompanyEmployeeSessionBean.java | 1 - 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java index b1bd1ba..aa1c79e 100644 --- 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; *

* @author Roland Häder */ -@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 a0c473d..b5351b0 100644 --- 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; *

* @author Roland Häder */ -@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 b8be625..c3f8803 100644 --- 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 f1ed632..d454a0b 100644 --- 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 79b4897..b324ea2 100644 --- 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 959056c..72bae60 100644 --- 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; -- 2.39.5