From ba989205464935dfb5c17cb911bfc8f3b616e59b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 16:42:46 +0200 Subject: [PATCH] Continued: - moved model-related classes (entities, of course) to own 'model' package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../contact/add/AdminAddedContactEvent.java | 2 +- .../add/ObservableAdminAddedContactEvent.java | 2 +- .../contact/created/CreatedContactEvent.java | 2 +- .../ObservableCreatedContactEvent.java | 2 +- .../deleted/AdminDeletedContactEvent.java | 2 +- .../ObservableAdminDeletedContactEvent.java | 2 +- .../update/AdminUpdatedContactEvent.java | 2 +- .../ObservableAdminUpdatedContactEvent.java | 2 +- .../fax/linked/AdminLinkedFaxNumberEvent.java | 4 ++-- .../ObservableAdminLinkedFaxNumberEvent.java | 4 ++-- .../unlinked/AdminUnlinkedFaxNumberEvent.java | 4 ++-- ...ObservableAdminUnlinkedFaxNumberEvent.java | 4 ++-- .../AdminLinkedLandLineNumberEvent.java | 4 ++-- ...ervableAdminLinkedLandLineNumberEvent.java | 4 ++-- .../AdminUnlinkedLandLineNumberEvent.java | 4 ++-- ...vableAdminUnlinkedLandLineNumberEvent.java | 4 ++-- .../linked/AdminLinkedMobileNumberEvent.java | 4 ++-- ...bservableAdminLinkedMobileNumberEvent.java | 4 ++-- .../AdminUnlinkedMobileNumberEvent.java | 4 ++-- ...ervableAdminUnlinkedMobileNumberEvent.java | 4 ++-- .../ContactAlreadyAddedException.java | 2 +- .../{ => model}/contact/Contact.java | 12 +++++------ .../{ => model}/contact/ContactUtils.java | 18 ++++++++--------- .../{ => model}/contact/UserContact.java | 20 +++++++++---------- .../{ => model}/contact/gender/Gender.java | 2 +- .../contact/gender/GenderUtils.java | 2 +- .../contact/title/PersonalTitle.java | 2 +- .../{ => model}/contact/title/TitleUtils.java | 4 +++- 28 files changed, 64 insertions(+), 62 deletions(-) rename src/org/mxchange/jcontacts/{ => model}/contact/Contact.java (94%) rename src/org/mxchange/jcontacts/{ => model}/contact/ContactUtils.java (94%) rename src/org/mxchange/jcontacts/{ => model}/contact/UserContact.java (95%) rename src/org/mxchange/jcontacts/{ => model}/contact/gender/Gender.java (97%) rename src/org/mxchange/jcontacts/{ => model}/contact/gender/GenderUtils.java (98%) rename src/org/mxchange/jcontacts/{ => model}/contact/title/PersonalTitle.java (97%) rename src/org/mxchange/jcontacts/{ => model}/contact/title/TitleUtils.java (96%) diff --git a/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java index 1e1dd70..3ec3481 100644 --- a/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.add; import java.text.MessageFormat; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An event being fired when the administrator has added a new user account diff --git a/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java index 8346b31..feef6eb 100644 --- a/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.add; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An interface for events being fired when an administrator added new contact diff --git a/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java index 29d69e1..7f7fb55 100644 --- a/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jcontacts.events.contact.created; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An interface for observable events being fired when a contact instance has diff --git a/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java index edda265..777b3ae 100644 --- a/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.created; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An interface for observable events being fired when a contact instance has diff --git a/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java index 3bc3cc2..ff2b5e7 100644 --- a/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.deleted; import java.text.MessageFormat; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An event being fired when the administrator has deleted a contact diff --git a/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java index 0427df9..8b09643 100644 --- a/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.deleted; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An interface for events being fired when an administrator deleted a contact. diff --git a/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java index 51e691f..881ff4e 100644 --- a/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.update; import java.text.MessageFormat; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An event being fired when the administrator has updated a new user account diff --git a/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java index 845fae8..87182ee 100644 --- a/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.events.contact.update; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * An interface for events being fired when an administrator updated a new user diff --git a/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java index 2bd28e2..eb71aac 100644 --- a/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.fax.linked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event when a fax number has been linked with a contact diff --git a/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java index 962606d..afc7286 100644 --- a/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.fax.linked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An interface for an event when a fax number has been linked with a contact diff --git a/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java index ff1e769..764f5d3 100644 --- a/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.fax.unlinked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event when a fax number has been unlinked diff --git a/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java index d6c9b99..51082d1 100644 --- a/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.fax.unlinked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An interface for an event when a fax number has been unlinked diff --git a/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java index 89f39f5..01ef3e4 100644 --- a/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.landline.linked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event when a land-line number has been linked with a contact diff --git a/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java index d02597f..c4e04f6 100644 --- a/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.landline.linked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An interface for an event when a land-line number has been linked with a diff --git a/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java index 93efedc..4a46001 100644 --- a/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.landline.unlinked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event when a land-line number has been unlinked diff --git a/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java index 90f2051..bc6cbc7 100644 --- a/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.landline.unlinked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An interface for an event when a land-line number has been unlinked diff --git a/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java index bda30bf..f681f20 100644 --- a/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.mobile.linked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event when a mobile number has been linked with a contact diff --git a/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java index 8ba8813..580b48a 100644 --- a/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.mobile.linked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a mobile number has been linked with a contact diff --git a/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java index 03f09b3..b7a9589 100644 --- a/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java @@ -16,8 +16,8 @@ */ package org.mxchange.jcontacts.events.mobile.unlinked; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event when a mobile number has been unlinked diff --git a/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java index daa64e1..f85862c 100644 --- a/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java @@ -17,8 +17,8 @@ package org.mxchange.jcontacts.events.mobile.unlinked; import java.io.Serializable; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a mobile number has been unlinked diff --git a/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java b/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java index 4ccd3ce..062966a 100644 --- a/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java +++ b/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.exceptions; import java.text.MessageFormat; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; /** * Thrown if the given Contact instance is already added diff --git a/src/org/mxchange/jcontacts/contact/Contact.java b/src/org/mxchange/jcontacts/model/contact/Contact.java similarity index 94% rename from src/org/mxchange/jcontacts/contact/Contact.java rename to src/org/mxchange/jcontacts/model/contact/Contact.java index 89e4113..4eb2f5a 100644 --- a/src/org/mxchange/jcontacts/contact/Contact.java +++ b/src/org/mxchange/jcontacts/model/contact/Contact.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; import java.io.Serializable; import java.util.Calendar; import java.util.Date; -import org.mxchange.jcontacts.contact.title.PersonalTitle; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jcontacts.model.contact.title.PersonalTitle; +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.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * A general contact POJI diff --git a/src/org/mxchange/jcontacts/contact/ContactUtils.java b/src/org/mxchange/jcontacts/model/contact/ContactUtils.java similarity index 94% rename from src/org/mxchange/jcontacts/contact/ContactUtils.java rename to src/org/mxchange/jcontacts/model/contact/ContactUtils.java index 7cc6f12..8397012 100644 --- a/src/org/mxchange/jcontacts/contact/ContactUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/ContactUtils.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; import java.io.Serializable; import java.util.Objects; -import org.mxchange.jcountry.data.Country; -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.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jcountry.model.data.Country; +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.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * Utilities for contacts diff --git a/src/org/mxchange/jcontacts/contact/UserContact.java b/src/org/mxchange/jcontacts/model/contact/UserContact.java similarity index 95% rename from src/org/mxchange/jcontacts/contact/UserContact.java rename to src/org/mxchange/jcontacts/model/contact/UserContact.java index 6a61c8b..7554f46 100644 --- a/src/org/mxchange/jcontacts/contact/UserContact.java +++ b/src/org/mxchange/jcontacts/model/contact/UserContact.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; import java.util.Calendar; import java.util.Date; @@ -38,15 +38,15 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontacts.contact.title.PersonalTitle; -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.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; +import org.mxchange.jcontacts.model.contact.title.PersonalTitle; +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.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; /** * A general contact class which serves as an entity. diff --git a/src/org/mxchange/jcontacts/contact/gender/Gender.java b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java similarity index 97% rename from src/org/mxchange/jcontacts/contact/gender/Gender.java rename to src/org/mxchange/jcontacts/model/contact/gender/Gender.java index b06b94d..3af0329 100644 --- a/src/org/mxchange/jcontacts/contact/gender/Gender.java +++ b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact.gender; +package org.mxchange.jcontacts.model.contact.gender; import java.io.Serializable; diff --git a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java b/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java similarity index 98% rename from src/org/mxchange/jcontacts/contact/gender/GenderUtils.java rename to src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java index 87ec6e8..5156db7 100644 --- a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact.gender; +package org.mxchange.jcontacts.model.contact.gender; import java.io.Serializable; import java.text.MessageFormat; diff --git a/src/org/mxchange/jcontacts/contact/title/PersonalTitle.java b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java similarity index 97% rename from src/org/mxchange/jcontacts/contact/title/PersonalTitle.java rename to src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java index 8a88902..ee8c343 100644 --- a/src/org/mxchange/jcontacts/contact/title/PersonalTitle.java +++ b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact.title; +package org.mxchange.jcontacts.model.contact.title; import java.io.Serializable; diff --git a/src/org/mxchange/jcontacts/contact/title/TitleUtils.java b/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java similarity index 96% rename from src/org/mxchange/jcontacts/contact/title/TitleUtils.java rename to src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java index 492f5ef..60b1f56 100644 --- a/src/org/mxchange/jcontacts/contact/title/TitleUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact.title; +package org.mxchange.jcontacts.model.contact.title; import java.io.Serializable; import java.text.MessageFormat; @@ -42,7 +42,9 @@ public class TitleUtils implements Serializable { * All available personal titles as a list *

* @return Selectable personal titles + * @deprecated Arrays.asList() is there */ + @Deprecated public static List allPersonalTitlesAsList () { // Init list List list = new LinkedList<>(); -- 2.39.2