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 60be98df4895fd4aa87ffefacc355ce1700ee21c..a4c0ea1d66a66312d35101d3525fb7a207ffc13a 100644 (file)
--- a/src/conf/persistence.xml
+++ b/src/conf/persistence.xml
@@ -10,9 +10,9 @@
     <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.CompanyHeadquartersData</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.jphone.model.phonenumbers.fax.FaxNumber</class>

diff --git a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
index 0a4fa963dd5e337f3b432414c17fdd052ea5ca94..bf329a7a45171d0f31b5905dc03e2ff68c0b5245 100644 (file)
--- a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
+++ b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.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;
@@ -497,7 +497,7 @@ public abstract class BaseAddressbookDatabaseBean 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