Continued:

- renamed headquartersPhoneNumber to headquartersLandLineNumber as common on
  many other places, too

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

diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
index 663ce23d0392697658ca3e45bf7b4a4fb383955b..ba12af35d92a779ab73083cbdbe48f4b0491d0c7 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquarters.java
@@ -115,18 +115,18 @@ public class BusinessHeadquarters implements Headquarters {
        private Long headquartersId;
 
        /**
-        * Opening times for this branch office
+        * Headquarters' land-line number
         */
-       @JoinTable (name = "headquarters_opening_times", joinColumns = @JoinColumn (name = "headquarters_opening_id", referencedColumnName = "branch_id"), inverseJoinColumns = @JoinColumn (name = "opening_headquarters_id", referencedColumnName = "opening_times_id"))
-       @ManyToMany (targetEntity = BusinessOpeningTime.class, cascade = CascadeType.ALL)
-       private List<OpeningTime> headquartersOpeningTimes;
+       @JoinColumn (name = "headquarters_landline_number_id")
+       @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL)
+       private DialableLandLineNumber headquartersLandLineNumber;
 
        /**
-        * Headquarters' phone number
+        * Opening times for this branch office
         */
-       @JoinColumn (name = "headquarters_phone_number_id")
-       @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL)
-       private DialableLandLineNumber headquartersPhoneNumber;
+       @JoinTable (name = "headquarters_opening_times", joinColumns =@JoinColumn (name = "headquarters_opening_id", referencedColumnName = "branch_id"), inverseJoinColumns = @JoinColumn (name = "opening_headquarters_id", referencedColumnName = "opening_times_id"))
+       @ManyToMany (targetEntity = BusinessOpeningTime.class, cascade = CascadeType.ALL)
+       private List<OpeningTime> headquartersOpeningTimes;
 
        /**
         * Headquarters' store number (multi-store building only)
@@ -265,25 +265,25 @@ public class BusinessHeadquarters implements Headquarters {
        }
 
        @Override
-       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
-       public List<OpeningTime> getHeadquartersOpeningTimes () {
-               return this.headquartersOpeningTimes;
+       public DialableLandLineNumber getHeadquartersLandLineNumber () {
+               return this.headquartersLandLineNumber;
        }
 
        @Override
-       @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
-       public void setHeadquartersOpeningTimes (final List<OpeningTime> headquartersOpeningTimes) {
-               this.headquartersOpeningTimes = headquartersOpeningTimes;
+       public void setHeadquartersLandLineNumber (final DialableLandLineNumber headquartersLandLineNumber) {
+               this.headquartersLandLineNumber = headquartersLandLineNumber;
        }
 
        @Override
-       public DialableLandLineNumber getHeadquartersPhoneNumber () {
-               return this.headquartersPhoneNumber;
+       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+       public List<OpeningTime> getHeadquartersOpeningTimes () {
+               return this.headquartersOpeningTimes;
        }
 
        @Override
-       public void setHeadquartersPhoneNumber (final DialableLandLineNumber headquartersPhoneNumber) {
-               this.headquartersPhoneNumber = headquartersPhoneNumber;
+       @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
+       public void setHeadquartersOpeningTimes (final List<OpeningTime> headquartersOpeningTimes) {
+               this.headquartersOpeningTimes = headquartersOpeningTimes;
        }
 
        @Override

diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java
index 6e14f3d02d4270fe3b53c40a8015393d0f698f92..117819845bdcfaf318dca8ec8994bfee77c2ffdc 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/Headquarters.java
@@ -146,18 +146,18 @@ public interface Headquarters extends Serializable {
        void setHeadquartersZipCode (final Integer headquartersZipCode);
 
        /**
-        * Getter for headquarters' phone number
+        * Getter for headquarters' land-line number
         * <p>
-        * @return Headquarters' phone number
+        * @return Headquarters' land-line number
         */
-       DialableLandLineNumber getHeadquartersPhoneNumber ();
+       DialableLandLineNumber getHeadquartersLandLineNumber ();
 
        /**
-        * Setter for headquarters' phone number
+        * Setter for headquarters' land-line number
         * <p>
-        * @param headquartersPhoneNumber Headquarters' phone number
+        * @param headquartersLandLineNumber Headquarters' land-line number
         */
-       void setHeadquartersPhoneNumber (final DialableLandLineNumber headquartersPhoneNumber);
+       void setHeadquartersLandLineNumber (final DialableLandLineNumber headquartersLandLineNumber);
 
        /**
         * Getter for headquarters' fax number
@@ -234,4 +234,5 @@ public interface Headquarters extends Serializable {
 
        @Override
        int hashCode ();
+
 }