From: Roland Häder Date: Sun, 10 Sep 2017 19:19:05 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=306a3558f41165ad5055d312f2e49e448743d86e;p=jcontacts-business-core.git Continued: - renamed exceptions BusinessDataBlaException was to generic, it should be BasicCompanyDataBlaException - renamed BranchOfficeUtils -> BranchOffices as this is more common - fixed imports Signed-off-by: Roland Häder --- diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java new file mode 100644 index 0000000..f489c7f --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcontactsbusiness.exceptions.basicdata; + +import java.text.MessageFormat; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; + +/** + * Thrown if the given BusinessBasicData instance is already added + *

+ * @author Roland Häder + */ +public class BasicCompanyDataAlreadyAddedException extends Exception { + + /** + * Serial number + */ + private static final long serialVersionUID = 75_844_851_467L; + + /** + * Constructor with a basic data instance + *

+ * @param businessContact Business contact that is already added + */ + public BasicCompanyDataAlreadyAddedException (final BusinessBasicData businessContact) { + super(MessageFormat.format("Business contact with comanyName={0} already added.", businessContact.getCompanyName())); //NOI18N + } + + /** + * Default constructor, may be used if no contact instance is available + */ + public BasicCompanyDataAlreadyAddedException () { + super("Business contact already added"); //NOI18N + } + +} diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java new file mode 100644 index 0000000..fc7df97 --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcontactsbusiness.exceptions.basicdata; + +import java.text.MessageFormat; + +/** + * An exception thrown when a contact (entity) has not found. + *

+ * @author Roland Häder + */ +public class BasicCompanyDataNotFoundException extends Exception { + + /** + * Serial number + */ + private static final long serialVersionUID = 23_759_801_876_416_568L; + + /** + * Constructor with business contact id + *

+ * @param businessContactId Business contact id + */ + public BasicCompanyDataNotFoundException (final Long businessContactId) { + // Call super constructor with message and cause + super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId)); //NOI18N + } + + /** + * Constructor with business contact id and causing exception + *

+ * @param businessContactId Business contact id + * @param cause Causing exception + */ + public BasicCompanyDataNotFoundException (final Long businessContactId, final Throwable cause) { + // Call super constructor with message and cause + super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId), cause); //NOI18N + } + + /** + * Constructor with email address and causing exception + *

+ * @param emailAddress Email address + * @param cause Causing exception + */ + public BasicCompanyDataNotFoundException (final String emailAddress, final Throwable cause) { + // Call super constructor with message and cause + super(MessageFormat.format("Business contact with email address {0} was not found.", emailAddress), cause); //NOI18N + } + +} diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java deleted file mode 100644 index 6b39838..0000000 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcontactsbusiness.exceptions.basicdata; - -import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; - -/** - * Thrown if the given BusinessBasicData instance is already added - *

- * @author Roland Häder - */ -public class BusinessDataAlreadyAddedException extends Exception { - - /** - * Serial number - */ - private static final long serialVersionUID = 75_844_851_467L; - - /** - * Constructor with a basic data instance - *

- * @param businessContact Business contact that is already added - */ - public BusinessDataAlreadyAddedException (final BusinessBasicData businessContact) { - super(MessageFormat.format("Business contact with comanyName={0} already added.", businessContact.getCompanyName())); //NOI18N - } - - /** - * Default constructor, may be used if no contact instance is available - */ - public BusinessDataAlreadyAddedException () { - super("Business contact already added"); //NOI18N - } - -} diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java deleted file mode 100644 index a0f9977..0000000 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcontactsbusiness.exceptions.basicdata; - -import java.text.MessageFormat; - -/** - * An exception thrown when a contact (entity) has not found. - *

- * @author Roland Häder - */ -public class BusinessDataNotFoundException extends Exception { - - /** - * Serial number - */ - private static final long serialVersionUID = 23_759_801_876_416_568L; - - /** - * Constructor with business contact id - *

- * @param businessContactId Business contact id - */ - public BusinessDataNotFoundException (final Long businessContactId) { - // Call super constructor with message and cause - super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId)); //NOI18N - } - - /** - * Constructor with business contact id and causing exception - *

- * @param businessContactId Business contact id - * @param cause Causing exception - */ - public BusinessDataNotFoundException (final Long businessContactId, final Throwable cause) { - // Call super constructor with message and cause - super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId), cause); //NOI18N - } - - /** - * Constructor with email address and causing exception - *

- * @param emailAddress Email address - * @param cause Causing exception - */ - public BusinessDataNotFoundException (final String emailAddress, final Throwable cause) { - // Call super constructor with message and cause - super(MessageFormat.format("Business contact with email address {0} was not found.", emailAddress), cause); //NOI18N - } - -} diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index cad9f09..dafe24b 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -23,8 +23,8 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java index 479d104..1e7bc64 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java @@ -42,10 +42,10 @@ import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; import org.mxchange.jcontactsbusiness.model.logo.CompanyLogo; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +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; diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 24435f7..7d205a5 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -20,9 +20,9 @@ import java.io.Serializable; import java.util.Calendar; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java deleted file mode 100644 index 9ca468a..0000000 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcontactsbusiness.model.branchoffice; - -import java.io.Serializable; -import java.util.Objects; - -/** - * An utilities class for branch offices - * - * @author Roland Häder - */ -public class BranchOfficeUtils implements Serializable { - - /** - * Serial number - */ - private static final long serialVersionUID = 69_537_867_224_651L; - - /** - * Checks if both branch offices have same address. This method will throw - * an {@code NullPointerException} if one of the instances is null. - *

- * @param branchOffice1 Branch office 1 - * @param branchOffice2 Branch office 2 - *

- * @return Whether both branch office addresses are the same - *

- * @throws NullPointerException If one of the instances is null - */ - public static boolean isSameAddress (final BranchOffice branchOffice1, final BranchOffice branchOffice2) { - // Check that both parameters are not null - if (null == branchOffice1) { - // Throw NPE - throw new NullPointerException("branchOffice1 is null"); //NOI18N - } else if (null == branchOffice2) { - // Throw NPE - throw new NullPointerException("branchOffice2 is null"); //NOI18N - } - - // Default is the same - boolean isSameAddress = true; - - // Compare both addresses - if (!Objects.equals(branchOffice1.getBranchCompany(), branchOffice2.getBranchCompany())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchCountry(), branchOffice2.getBranchCountry())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchCity(), branchOffice2.getBranchCity())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchZipCode(), branchOffice2.getBranchZipCode())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchStreet(), branchOffice2.getBranchStreet())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchHouseNumber(), branchOffice2.getBranchHouseNumber())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchStore(), branchOffice2.getBranchStore())) { - // Not the same - isSameAddress = false; - } else if (!Objects.equals(branchOffice1.getBranchSuiteNumber(), branchOffice2.getBranchSuiteNumber())) { - // Not the same - isSameAddress = false; - } - - // Return flag - return isSameAddress; - } - - /** - * Private default constructor - */ - private BranchOfficeUtils () { - // Utilities don't have instances - } - -} diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java new file mode 100644 index 0000000..3706785 --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2017 Roland Häder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcontactsbusiness.model.branchoffice; + +import java.io.Serializable; +import java.util.Objects; + +/** + * An utilities class for branch offices + * + * @author Roland Häder + */ +public class BranchOffices implements Serializable { + + /** + * Serial number + */ + private static final long serialVersionUID = 69_537_867_224_651L; + + /** + * Checks if both branch offices have same address. This method will throw + * an {@code NullPointerException} if one of the instances is null. + *

+ * @param branchOffice1 Branch office 1 + * @param branchOffice2 Branch office 2 + *

+ * @return Whether both branch office addresses are the same + *

+ * @throws NullPointerException If one of the instances is null + */ + public static boolean isSameAddress (final BranchOffice branchOffice1, final BranchOffice branchOffice2) { + // Check that both parameters are not null + if (null == branchOffice1) { + // Throw NPE + throw new NullPointerException("branchOffice1 is null"); //NOI18N + } else if (null == branchOffice2) { + // Throw NPE + throw new NullPointerException("branchOffice2 is null"); //NOI18N + } + + // Default is the same + boolean isSameAddress = true; + + // Compare both addresses + if (!Objects.equals(branchOffice1.getBranchCompany(), branchOffice2.getBranchCompany())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchCountry(), branchOffice2.getBranchCountry())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchCity(), branchOffice2.getBranchCity())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchZipCode(), branchOffice2.getBranchZipCode())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchStreet(), branchOffice2.getBranchStreet())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchHouseNumber(), branchOffice2.getBranchHouseNumber())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchStore(), branchOffice2.getBranchStore())) { + // Not the same + isSameAddress = false; + } else if (!Objects.equals(branchOffice1.getBranchSuiteNumber(), branchOffice2.getBranchSuiteNumber())) { + // Not the same + isSameAddress = false; + } + + // Return flag + return isSameAddress; + } + + /** + * Private default constructor + */ + private BranchOffices () { + // Utilities don't have instances + } + +} diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java index 7d001c1..ee57cb5 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java @@ -38,12 +38,12 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jcountry.data.CountryData; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +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; diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java index d2bd7da..04eba99 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java @@ -33,8 +33,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.UserContact; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; @@ -45,8 +45,8 @@ import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.jobposition.EmployeePosition; import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java index 4f709f4..87c7a05 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java @@ -18,14 +18,14 @@ package org.mxchange.jcontactsbusiness.model.employee; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.department.Department; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; /** * A POJI for employees diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java index 77b5360..bd44445 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java @@ -31,12 +31,12 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jcountry.data.CountryData; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +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; diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java index e0e1138..03a9b7f 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java @@ -18,9 +18,9 @@ package org.mxchange.jcontactsbusiness.model.headquarters; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /**