From cfc9a43dfa7ec4e0d9c34bb69b034692ef324b25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 18 Oct 2017 01:36:09 +0200 Subject: [PATCH] Please cherry-pick: - renamed more from Company to Business (jcontacts-business-core was the name of the project anyway) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/conf/persistence.xml | 12 ++++++------ .../database/BaseFinancialsDatabaseBean.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml index 670415e..4c9afc9 100644 --- a/src/conf/persistence.xml +++ b/src/conf/persistence.xml @@ -3,13 +3,13 @@ jdbc/jfinancials org.mxchange.jcontacts.model.contact.UserContact - org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData - org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice - org.mxchange.jcontactsbusiness.model.department.CompanyDepartment - org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee - org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData + org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData + org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice + org.mxchange.jcontactsbusiness.model.department.BusinessDepartment + org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee + org.mxchange.jcontactsbusiness.model.headquarters.BusinessHeadquartersData org.mxchange.jcontactsbusiness.model.jobposition.EmployeePosition - org.mxchange.jcontactsbusiness.model.logo.CompanyLogo + org.mxchange.jcontactsbusiness.model.logo.BusinessLogo org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime org.mxchange.jcountry.model.data.CountryData org.mxchange.jfinancials.model.income.FinancialIncome diff --git a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java index 8b87070..9119e1b 100644 --- a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java +++ b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java @@ -34,7 +34,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice; import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; -import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; +import org.mxchange.jcontactsbusiness.model.headquarters.BusinessHeadquartersData; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcoreee.database.BaseDatabaseBean; @@ -290,7 +290,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { } // Try to find it (should be there) - final HeadquartersData managedHeadquarters = this.getEntityManager().find(CompanyHeadquartersData.class, headquarters.getHeadquartersId()); + final HeadquartersData managedHeadquarters = this.getEntityManager().find(BusinessHeadquartersData.class, headquarters.getHeadquartersId()); // Should be there assert (managedHeadquarters instanceof BasicData) : "managedHeadquarters is null"; //NOI18N -- 2.39.5