From e882c2f5621e99e119e896aa78fed22e609e82f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 1 Nov 2017 21:58:38 +0100
Subject: [PATCH] Continued: - had to rename Headquarters again, to Headquarter
to make room for a tools class, it is common to name them <Entity>s and
Headquarterss is not correct
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
.../HeadquartersAlreadyAddedException.java | 6 +--
.../model/basicdata/BasicData.java | 10 ++---
.../model/basicdata/BusinessBasicData.java | 8 ++--
.../model/department/BusinessDepartment.java | 8 ++--
.../model/department/Department.java | 6 +--
.../model/employee/BusinessEmployee.java | 8 ++--
.../model/employee/Employable.java | 6 +--
.../headquarters/BusinessHeadquarters.java | 20 ++++-----
.../{Headquarters.java => Headquarter.java} | 42 +++++++++----------
9 files changed, 57 insertions(+), 57 deletions(-)
rename src/org/mxchange/jcontactsbusiness/model/headquarters/{Headquarters.java => Headquarter.java} (83%)
diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/headquarters/HeadquartersAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/headquarters/HeadquartersAlreadyAddedException.java
index d92a414..25a5470 100644
--- a/src/org/mxchange/jcontactsbusiness/exceptions/headquarters/HeadquartersAlreadyAddedException.java
+++ b/src/org/mxchange/jcontactsbusiness/exceptions/headquarters/HeadquartersAlreadyAddedException.java
@@ -17,7 +17,7 @@
package org.mxchange.jcontactsbusiness.exceptions.headquarters;
import java.text.MessageFormat;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* An exception thrown when a headquarters (entity) was already added.
@@ -34,9 +34,9 @@ public class HeadquartersAlreadyAddedException extends Exception {
/**
* Constructor with a headquarters instance
* <p>
- * @param headquarters Headquarters that is already found
+ * @param headquarters Headquarter that is already found
*/
- public HeadquartersAlreadyAddedException (final Headquarters headquarters) {
+ public HeadquartersAlreadyAddedException (final Headquarter headquarters) {
super(MessageFormat.format("Headquarters office with headquartersStreet={0},headquartersHouseNumber={1},headquartersZipCode={2},headquartersCity={3} already created.", headquarters.getHeadquartersStreet(), headquarters.getHeadquartersHouseNumber(), headquarters.getHeadquartersZipCode(), headquarters.getHeadquartersCity()));
}
diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java
index 1a129dd..ff170c6 100644
--- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java
@@ -25,7 +25,7 @@ import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jcontactsbusiness.model.logo.Logo;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJI for business contact classes
@@ -93,16 +93,16 @@ public interface BasicData extends Serializable {
/**
* Getter for headquarters data
* <p>
- * @return Headquarters data
+ * @return Headquarter data
*/
- Headquarters getCompanyHeadQuartersData ();
+ Headquarter getCompanyHeadQuartersData ();
/**
* Setter for headquarters data
* <p>
- * @param headQuartersData Headquarters data
+ * @param headQuartersData Headquarter data
*/
- void setCompanyHeadQuartersData (final Headquarters headQuartersData);
+ void setCompanyHeadQuartersData (final Headquarter headQuartersData);
/**
* Getter for user owner instance
diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
index 5cf2bb1..d532bfc 100644
--- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
@@ -47,7 +47,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber;
import org.mxchange.jusercore.model.user.LoginUser;
import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJO for business basic data
@@ -132,7 +132,7 @@ public class BusinessBasicData implements BasicData {
*/
@JoinColumn (name = "company_headquarters_data_id")
@OneToOne (targetEntity = BusinessHeadquarters.class, cascade = CascadeType.ALL)
- private Headquarters companyHeadQuartersData;
+ private Headquarter companyHeadQuartersData;
/**
* Company's main phone number: +ccxxxxxxxxxx
@@ -309,12 +309,12 @@ public class BusinessBasicData implements BasicData {
}
@Override
- public Headquarters getCompanyHeadQuartersData () {
+ public Headquarter getCompanyHeadQuartersData () {
return this.companyHeadQuartersData;
}
@Override
- public void setCompanyHeadQuartersData (final Headquarters companyHeadQuartersData) {
+ public void setCompanyHeadQuartersData (final Headquarter companyHeadQuartersData) {
this.companyHeadQuartersData = companyHeadQuartersData;
}
diff --git a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java
index 582b922..df247c5 100644
--- a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java
+++ b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java
@@ -43,7 +43,7 @@ import org.mxchange.jusercore.model.user.LoginUser;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jcontactsbusiness.model.employee.Employable;
import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJO for company departments
@@ -93,7 +93,7 @@ public class BusinessDepartment implements Department {
*/
@JoinColumn (name = "department_headquarters_id")
@OneToOne (targetEntity = BusinessHeadquarters.class, cascade = CascadeType.REFRESH)
- private Headquarters departmentHeadquarters;
+ private Headquarter departmentHeadquarters;
/**
* Department i18n key
@@ -211,12 +211,12 @@ public class BusinessDepartment implements Department {
}
@Override
- public Headquarters getDepartmentHeadquarters () {
+ public Headquarter getDepartmentHeadquarters () {
return this.departmentHeadquarters;
}
@Override
- public void setDepartmentHeadquarters (final Headquarters departmentHeadquarters) {
+ public void setDepartmentHeadquarters (final Headquarter departmentHeadquarters) {
this.departmentHeadquarters = departmentHeadquarters;
}
diff --git a/src/org/mxchange/jcontactsbusiness/model/department/Department.java b/src/org/mxchange/jcontactsbusiness/model/department/Department.java
index d349513..36ecead 100644
--- a/src/org/mxchange/jcontactsbusiness/model/department/Department.java
+++ b/src/org/mxchange/jcontactsbusiness/model/department/Department.java
@@ -22,7 +22,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jcontactsbusiness.model.employee.Employable;
import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJI for company departments
@@ -50,14 +50,14 @@ public interface Department extends Serializable {
* <p>
* @return Connection to company headquarters
*/
- Headquarters getDepartmentHeadquarters ();
+ Headquarter getDepartmentHeadquarters ();
/**
* Setter for connection to company headquarters
* <p>
* @param departmentHeadquarters Connection to company headquarters
*/
- void setDepartmentHeadquarters (final Headquarters departmentHeadquarters);
+ void setDepartmentHeadquarters (final Headquarter departmentHeadquarters);
/**
* Getter for connection to company branch office
diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java
index 5fbcb64..2e5c606 100644
--- a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java
+++ b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java
@@ -48,7 +48,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber;
import org.mxchange.jusercore.model.user.LoginUser;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJO for company employees (including CEO)
@@ -112,7 +112,7 @@ public class BusinessEmployee implements Employable {
*/
@JoinColumn (name = "employee_headquarters_id")
@OneToOne (targetEntity = BusinessHeadquarters.class, cascade = CascadeType.REFRESH)
- private Headquarters employeeHeadquarter;
+ private Headquarter employeeHeadquarter;
/**
* Id number
@@ -263,12 +263,12 @@ public class BusinessEmployee implements Employable {
}
@Override
- public Headquarters getEmployeeHeadquarter () {
+ public Headquarter getEmployeeHeadquarter () {
return this.employeeHeadquarter;
}
@Override
- public void setEmployeeHeadquarter (final Headquarters employeeHeadquarter) {
+ public void setEmployeeHeadquarter (final Headquarter employeeHeadquarter) {
this.employeeHeadquarter = employeeHeadquarter;
}
diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java
index c724c02..4063171 100644
--- a/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java
+++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java
@@ -25,7 +25,7 @@ import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition;
import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.Headquarters;
+import org.mxchange.jcontactsbusiness.model.headquarters.Headquarter;
/**
* A POJI for employees
@@ -81,14 +81,14 @@ public interface Employable extends Serializable {
* <p>
* @return Employable's head quarters
*/
- Headquarters getEmployeeHeadquarter ();
+ Headquarter getEmployeeHeadquarter ();
/**
* Getter for employee's head quarters
* <p>
* @param employeeHeadquarter Employable's head quarters
*/
- void setEmployeeHeadquarter (final Headquarters employeeHeadquarter);
+ void setEmployeeHeadquarter (final Headquarter employeeHeadquarter);
/**
* Getter for employee's email address
diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
index ba12af3..9fe7e36 100644
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
@@ -55,7 +55,7 @@ import org.mxchange.jusercore.model.user.User;
@Entity (name = "company_headquarters")
@Table (name = "company_headquarters")
@SuppressWarnings ("PersistenceUnitPresent")
-public class BusinessHeadquarters implements Headquarters {
+public class BusinessHeadquarters implements Headquarter {
/**
* Serial number
@@ -64,7 +64,7 @@ public class BusinessHeadquarters implements Headquarters {
private static final long serialVersionUID = 385_752_948_781_761L;
/**
- * Headquarters' city name
+ * Headquarter' city name
*/
@Basic (optional = false)
@Column (name = "headquarters_city", length = 100, nullable = false)
@@ -93,14 +93,14 @@ public class BusinessHeadquarters implements Headquarters {
private Date headquartersCreated;
/**
- * Headquarters' fax number
+ * Headquarter' fax number
*/
@JoinColumn (name = "headquarters_fax_number_id")
@OneToOne (targetEntity = FaxNumber.class, cascade = CascadeType.ALL)
private DialableFaxNumber headquartersFaxNumber;
/**
- * Headquarters' house number
+ * Headquarter' house number
*/
@Basic (optional = false)
@Column (name = "headquarters_house_number", length = 4, nullable = false)
@@ -115,7 +115,7 @@ public class BusinessHeadquarters implements Headquarters {
private Long headquartersId;
/**
- * Headquarters' land-line number
+ * Headquarter' land-line number
*/
@JoinColumn (name = "headquarters_landline_number_id")
@OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL)
@@ -129,20 +129,20 @@ public class BusinessHeadquarters implements Headquarters {
private List<OpeningTime> headquartersOpeningTimes;
/**
- * Headquarters' store number (multi-store building only)
+ * Headquarter' store number (multi-store building only)
*/
@Column (name = "headquarters_store", length = 3)
private Short headquartersStore;
/**
- * Headquarters' street name
+ * Headquarter' street name
*/
@Basic (optional = false)
@Column (name = "headquarters_street", length = 100, nullable = false)
private String headquartersStreet;
/**
- * Headquarters' suite number
+ * Headquarter' suite number
*/
@Column (name = "headquarters_suite_number", length = 4)
private Short headquartersSuiteNumber;
@@ -155,7 +155,7 @@ public class BusinessHeadquarters implements Headquarters {
private User headquartersUserOwner;
/**
- * Headquarters' ZIP code
+ * Headquarter' ZIP code
*/
@Basic (optional = false)
@Column (name = "headquarters_zip_code", length = 6, nullable = false)
@@ -169,7 +169,7 @@ public class BusinessHeadquarters implements Headquarters {
return false;
}
- final Headquarters other = (Headquarters) object;
+ final Headquarter other = (Headquarter) object;
if (!Objects.equals(this.getHeadquartersId(), other.getHeadquartersId())) {
return false;
diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarter.java
similarity index 83%
rename from src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java
rename to src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarter.java
index 1178198..ee834a1 100644
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarter.java
@@ -31,145 +31,145 @@ import org.mxchange.jusercore.model.user.User;
* <p>
* @author Roland Häder<roland@mxchange.org>
*/
-public interface Headquarters extends Serializable {
+public interface Headquarter extends Serializable {
/**
* Getter for headquarters' city name
* <p>
- * @return Headquarters' city name
+ * @return Headquarter' city name
*/
String getHeadquartersCity ();
/**
* Setter for headquarters' city name
* <p>
- * @param headquartersCity Headquarters' city name
+ * @param headquartersCity Headquarter' city name
*/
void setHeadquartersCity (final String headquartersCity);
/**
* Getter for headquarters' country code
* <p>
- * @return Headquarters' country code
+ * @return Headquarter' country code
*/
Country getHeadquartersCountry ();
/**
* Setter for headquarters' country code
* <p>
- * @param headquartersCountryCode Headquarters' country code
+ * @param headquartersCountryCode Headquarter' country code
*/
void setHeadquartersCountry (final Country headquartersCountryCode);
/**
* Getter for headquarters' house number
* <p>
- * @return Headquarters' house number
+ * @return Headquarter' house number
*/
Short getHeadquartersHouseNumber ();
/**
* Setter for headquarters' house number
* <p>
- * @param headquartersHouseNumber Headquarters' house number
+ * @param headquartersHouseNumber Headquarter' house number
*/
void setHeadquartersHouseNumber (final Short headquartersHouseNumber);
/**
* Getter for headquarters' id number
* <p>
- * @return Headquarters' id number
+ * @return Headquarter' id number
*/
Long getHeadquartersId ();
/**
* Setter for headquarters' id number
* <p>
- * @param headquartersId Headquarters' id number
+ * @param headquartersId Headquarter' id number
*/
void setHeadquartersId (final Long headquartersId);
/**
* Getter for headquarters' store number
* <p>
- * @return Headquarters' store number
+ * @return Headquarter' store number
*/
Short getHeadquartersStore ();
/**
* Setter for headquarters' store number
* <p>
- * @param headquartersStore Headquarters' store number
+ * @param headquartersStore Headquarter' store number
*/
void setHeadquartersStore (final Short headquartersStore);
/**
* Getter for headquarters' street name
* <p>
- * @return Headquarters' street name
+ * @return Headquarter' street name
*/
String getHeadquartersStreet ();
/**
* Setter for headquarters' street name
* <p>
- * @param headquartersStreet Headquarters' street name
+ * @param headquartersStreet Headquarter' street name
*/
void setHeadquartersStreet (final String headquartersStreet);
/**
* Getter for headquarters' suite number
* <p>
- * @return Headquarters' suite number
+ * @return Headquarter' suite number
*/
Short getHeadquartersSuiteNumber ();
/**
* Setter for headquarters' suite number
* <p>
- * @param headquartersSuiteNumber Headquarters' suite number
+ * @param headquartersSuiteNumber Headquarter' suite number
*/
void setHeadquartersSuiteNumber (final Short headquartersSuiteNumber);
/**
* Getter for headquarters' ZIP code
* <p>
- * @return Headquarters' ZIP code
+ * @return Headquarter' ZIP code
*/
Integer getHeadquartersZipCode ();
/**
* Setter for headquarters' ZIP code
* <p>
- * @param headquartersZipCode Headquarters' ZIP code
+ * @param headquartersZipCode Headquarter' ZIP code
*/
void setHeadquartersZipCode (final Integer headquartersZipCode);
/**
* Getter for headquarters' land-line number
* <p>
- * @return Headquarters' land-line number
+ * @return Headquarter' land-line number
*/
DialableLandLineNumber getHeadquartersLandLineNumber ();
/**
* Setter for headquarters' land-line number
* <p>
- * @param headquartersLandLineNumber Headquarters' land-line number
+ * @param headquartersLandLineNumber Headquarter' land-line number
*/
void setHeadquartersLandLineNumber (final DialableLandLineNumber headquartersLandLineNumber);
/**
* Getter for headquarters' fax number
* <p>
- * @return Headquarters' fax number
+ * @return Headquarter' fax number
*/
DialableFaxNumber getHeadquartersFaxNumber ();
/**
* Setter for headquarters' fax number
* <p>
- * @param headquartersFaxNumber Headquarters' fax number
+ * @param headquartersFaxNumber Headquarter' fax number
*/
void setHeadquartersFaxNumber (final DialableFaxNumber headquartersFaxNumber);
--
2.39.5