From 8aabb81066f97ee2f16268463731fb16ce8f639e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 13 Sep 2017 01:14:39 +0200 Subject: [PATCH] Please cherry-pick: - fixed imports, new class names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../basicdata/AddressbookAdminBusinessDataSessionBean.java | 6 +++--- .../model/basicdata/AddressbookBusinessDataSessionBean.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java index 225881c..8ecfe0a 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java @@ -23,7 +23,7 @@ import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; -import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jusercore.model.user.User; @@ -55,7 +55,7 @@ public class AddressbookAdminBusinessDataSessionBean extends BaseAddressbookData } @Override - public BusinessBasicData addCompanyBasicData (final BusinessBasicData basicData) throws BusinessDataAlreadyAddedException { + public BusinessBasicData addCompanyBasicData (final BusinessBasicData basicData) throws BasicCompanyDataAlreadyAddedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addBusinessBasicData: basicData={1} - CALLED!", this.getClass().getSimpleName(), basicData)); //NOI18N @@ -68,7 +68,7 @@ public class AddressbookAdminBusinessDataSessionBean extends BaseAddressbookData throw new IllegalArgumentException(MessageFormat.format("basicData.basicDataId={0} - is not null", basicData.getBasicDataId())); //NOI18N } else if (this.isSameCompanyNameAdded(basicData)) { // Throw exception - throw new BusinessDataAlreadyAddedException(basicData); + throw new BasicCompanyDataAlreadyAddedException(basicData); } // Now add current date diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java index f9f983c..a6882b2 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java @@ -23,7 +23,7 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; -import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataNotFoundException; /** * A stateless session bean for business data @@ -66,7 +66,7 @@ public class AddressbookBusinessDataSessionBean extends BaseAddressbookDatabaseB } @Override - public BusinessBasicData findBasicDataById (final Long basicDataId) throws BusinessDataNotFoundException { + public BusinessBasicData findBasicDataById (final Long basicDataId) throws BasicCompanyDataNotFoundException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: CALLED!", this.getClass().getSimpleName())); //NOI18N @@ -88,7 +88,7 @@ public class AddressbookBusinessDataSessionBean extends BaseAddressbookDatabaseB this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: Found basicData={1}", this.getClass().getSimpleName(), basicData)); //NOI18N } catch (final NoResultException ex) { // No result found - throw new BusinessDataNotFoundException(basicDataId, ex); + throw new BasicCompanyDataNotFoundException(basicDataId, ex); } // Trace message -- 2.39.5