From: Roland Häder <roland@mxchange.org>
Date: Tue, 17 Oct 2017 23:36:09 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cfc9a43dfa7ec4e0d9c34bb69b034692ef324b25;p=jfinancials-ejb.git

Please cherry-pick:
- renamed more from Company to Business (jcontacts-business-core was the name
  of the project anyway)

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

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 @@
   <persistence-unit name="jfinancials-ejbPU" transaction-type="JTA">
     <jta-data-source>jdbc/jfinancials</jta-data-source>
     <class>org.mxchange.jcontacts.model.contact.UserContact</class>
-    <class>org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData</class>
-    <class>org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice</class>
-    <class>org.mxchange.jcontactsbusiness.model.department.CompanyDepartment</class>
-    <class>org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee</class>
-    <class>org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData</class>
+    <class>org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData</class>
+    <class>org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice</class>
+    <class>org.mxchange.jcontactsbusiness.model.department.BusinessDepartment</class>
+    <class>org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee</class>
+    <class>org.mxchange.jcontactsbusiness.model.headquarters.BusinessHeadquartersData</class>
     <class>org.mxchange.jcontactsbusiness.model.jobposition.EmployeePosition</class>
-    <class>org.mxchange.jcontactsbusiness.model.logo.CompanyLogo</class>
+    <class>org.mxchange.jcontactsbusiness.model.logo.BusinessLogo</class>
     <class>org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime</class>
     <class>org.mxchange.jcountry.model.data.CountryData</class>
     <class>org.mxchange.jfinancials.model.income.FinancialIncome</class>
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