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 670415ec0f3e4ace64227a6cf24533c026140f5d..4c9afc99c34ff8af78e6417fa1ba29c93e862a3b 100644 (file)
--- 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 8b87070ba51c1b45db53002f5b706024555d9b2c..9119e1b1f92f530cd87ba0876652cabb8a064672 100644 (file)
--- 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