From 5f873815f09f2e8ed6363b3b914de6611a19607a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 19:26:14 +0200 Subject: [PATCH] renamed headQuartersData to companyHeadQuartersData as all others have 'company' as prefix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../basicdata/BusinessBasicData.java | 4 ++-- .../basicdata/CompanyBasicData.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java index 0485562..399b178 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java @@ -95,14 +95,14 @@ public interface BusinessBasicData extends Serializable { *

* @return Headquarters data */ - HeadQuartersData getHeadQuartersData (); + HeadQuartersData getCompanyHeadQuartersData (); /** * Setter for headquarters data *

* @param headQuartersData Headquarters data */ - void setHeadQuartersData (final HeadQuartersData headQuartersData); + void setCompanyHeadQuartersData (final HeadQuartersData headQuartersData); /** * Getter for user owner instance diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java index d821571..a5ebc01 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java @@ -172,7 +172,7 @@ public class CompanyBasicData implements BusinessBasicData { */ @JoinColumn (name = "company_headquarters_data_id") @OneToOne (targetEntity = CompanyHeadQuartersData.class, cascade = CascadeType.ALL) - private HeadQuartersData headQuartersData; + private HeadQuartersData companyHeadQuartersData; @Override public boolean equals (final Object object) { @@ -188,7 +188,7 @@ public class CompanyBasicData implements BusinessBasicData { return false; } else if (!Objects.equals(this.getCompanyName(), other.getCompanyName())) { return false; - } else if (!Objects.equals(this.getHeadQuartersData(), other.getHeadQuartersData())) { + } else if (!Objects.equals(this.getCompanyHeadQuartersData(), other.getCompanyHeadQuartersData())) { return false; } else if (!Objects.equals(this.getCompanyContactEmployee(), other.getCompanyContactEmployee())) { return false; @@ -344,13 +344,13 @@ public class CompanyBasicData implements BusinessBasicData { } @Override - public HeadQuartersData getHeadQuartersData () { - return this.headQuartersData; + public HeadQuartersData getCompanyHeadQuartersData () { + return this.companyHeadQuartersData; } @Override - public void setHeadQuartersData (final HeadQuartersData headQuartersData) { - this.headQuartersData = headQuartersData; + public void setCompanyHeadQuartersData (final HeadQuartersData companyHeadQuartersData) { + this.companyHeadQuartersData = companyHeadQuartersData; } @Override @@ -359,7 +359,7 @@ public class CompanyBasicData implements BusinessBasicData { hash = 37 * hash + Objects.hashCode(this.getBusinessDataId()); hash = 37 * hash + Objects.hashCode(this.getCompanyName()); - hash = 37 * hash + Objects.hashCode(this.getHeadQuartersData()); + hash = 37 * hash + Objects.hashCode(this.getCompanyHeadQuartersData()); hash = 37 * hash + Objects.hashCode(this.getCompanyContactEmployee()); hash = 37 * hash + Objects.hashCode(this.getCompanyFounder()); -- 2.39.5