From ae9626e73146846f5bba194f2316ac9d41aae43f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 16:44:09 +0200 Subject: [PATCH] Continued: - moved model-related classes/interfaces to own 'model' package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jphone/events/fax/created/CreatedFaxNumberEvent.java | 2 +- .../fax/created/ObservableCreatedFaxNumberEvent.java | 2 +- .../events/fax/deleted/AdminDeletedFaxNumberEvent.java | 2 +- .../events/fax/deleted/AdminFaxNumberDeletedEvent.java | 2 +- .../fax/removed/AdminFaxNumberRemovedFromListEvent.java | 2 +- .../fax/removed/AdminRemoveFaxNumberFromListEvent.java | 2 +- .../events/fax/updated/AdminFaxNumberUpdatedEvent.java | 2 +- .../events/fax/updated/AdminUpdatedFaxNumberEvent.java | 2 +- .../landline/created/CreatedLandLineNumberEvent.java | 2 +- .../created/ObservableCreatedLandLineNumberEvent.java | 2 +- .../landline/deleted/AdminDeletedLandLineNumberEvent.java | 2 +- .../landline/deleted/AdminLandLineNumberDeletedEvent.java | 2 +- .../removed/AdminLandLineNumberRemovedFromListEvent.java | 2 +- .../removed/AdminRemoveLandLineNumberFromListEvent.java | 2 +- .../landline/updated/AdminLandLineNumberUpdatedEvent.java | 2 +- .../landline/updated/AdminUpdatedLandLineNumberEvent.java | 2 +- .../events/mobile/created/CreatedMobileNumberEvent.java | 2 +- .../created/ObservableCreatedMobileNumberEvent.java | 2 +- .../mobile/deleted/AdminDeletedMobileNumberEvent.java | 2 +- .../mobile/deleted/AdminMobileNumberDeletedEvent.java | 2 +- .../remove/AdminMobileNumberRemovedFromListEvent.java | 2 +- .../remove/AdminRemoveMobileNumberFromListEvent.java | 2 +- .../mobile/updated/AdminMobileNumberUpdatedEvent.java | 2 +- .../mobile/updated/AdminUpdatedMobileNumberEvent.java | 2 +- .../added/AdminAddedMobileProviderEvent.java | 3 ++- .../added/AdminMobileProviderAddedEvent.java | 2 +- .../exceptions/MobileProviderAlreadyAddedException.java | 2 +- .../exceptions/PhoneNumberAlreadyLinkedException.java | 6 +++--- .../jphone/exceptions/PhoneNumberNotLinkedException.java | 6 +++--- .../jphone/{ => model}/phonenumbers/DialableNumber.java | 4 ++-- .../{ => model}/phonenumbers/fax/DialableFaxNumber.java | 4 ++-- .../jphone/{ => model}/phonenumbers/fax/FaxNumber.java | 6 +++--- .../jphone/{ => model}/phonenumbers/fax/FaxNumbers.java | 2 +- .../phonenumbers/landline/DialableLandLineNumber.java | 4 ++-- .../{ => model}/phonenumbers/landline/LandLineNumber.java | 6 +++--- .../phonenumbers/landline/LandLineNumbers.java | 2 +- .../phonenumbers/mobile/DialableMobileNumber.java | 6 +++--- .../{ => model}/phonenumbers/mobile/MobileNumber.java | 8 ++++---- .../{ => model}/phonenumbers/mobile/MobileNumbers.java | 2 +- .../phonenumbers/mobileprovider/CellphoneProvider.java | 6 +++--- .../phonenumbers/mobileprovider/MobileProvider.java | 4 ++-- .../phonenumbers/mobileprovider/MobileProviders.java | 2 +- src/org/mxchange/jphone/utils/PhoneUtils.java | 6 +++--- 43 files changed, 65 insertions(+), 64 deletions(-) rename src/org/mxchange/jphone/{ => model}/phonenumbers/DialableNumber.java (96%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/fax/DialableFaxNumber.java (89%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/fax/FaxNumber.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/fax/FaxNumbers.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/landline/DialableLandLineNumber.java (88%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/landline/LandLineNumber.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/landline/LandLineNumbers.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobile/DialableMobileNumber.java (86%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobile/MobileNumber.java (96%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobile/MobileNumbers.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/CellphoneProvider.java (97%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/MobileProvider.java (96%) rename src/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/MobileProviders.java (97%) diff --git a/src/org/mxchange/jphone/events/fax/created/CreatedFaxNumberEvent.java b/src/org/mxchange/jphone/events/fax/created/CreatedFaxNumberEvent.java index cfa093c..351d95e 100644 --- a/src/org/mxchange/jphone/events/fax/created/CreatedFaxNumberEvent.java +++ b/src/org/mxchange/jphone/events/fax/created/CreatedFaxNumberEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.fax.created; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event being fired when a fax number instance has been successfully diff --git a/src/org/mxchange/jphone/events/fax/created/ObservableCreatedFaxNumberEvent.java b/src/org/mxchange/jphone/events/fax/created/ObservableCreatedFaxNumberEvent.java index dff42a0..4e22408 100644 --- a/src/org/mxchange/jphone/events/fax/created/ObservableCreatedFaxNumberEvent.java +++ b/src/org/mxchange/jphone/events/fax/created/ObservableCreatedFaxNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.fax.created; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event being fired when a fax number instance has been successfully diff --git a/src/org/mxchange/jphone/events/fax/deleted/AdminDeletedFaxNumberEvent.java b/src/org/mxchange/jphone/events/fax/deleted/AdminDeletedFaxNumberEvent.java index 128641f..08935d8 100644 --- a/src/org/mxchange/jphone/events/fax/deleted/AdminDeletedFaxNumberEvent.java +++ b/src/org/mxchange/jphone/events/fax/deleted/AdminDeletedFaxNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.fax.deleted; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An interface for an event when a fax number has been deleted diff --git a/src/org/mxchange/jphone/events/fax/deleted/AdminFaxNumberDeletedEvent.java b/src/org/mxchange/jphone/events/fax/deleted/AdminFaxNumberDeletedEvent.java index 085e6af..f48b517 100644 --- a/src/org/mxchange/jphone/events/fax/deleted/AdminFaxNumberDeletedEvent.java +++ b/src/org/mxchange/jphone/events/fax/deleted/AdminFaxNumberDeletedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.fax.deleted; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event when a land-line number has been deleted diff --git a/src/org/mxchange/jphone/events/fax/removed/AdminFaxNumberRemovedFromListEvent.java b/src/org/mxchange/jphone/events/fax/removed/AdminFaxNumberRemovedFromListEvent.java index d3862b6..882f10d 100644 --- a/src/org/mxchange/jphone/events/fax/removed/AdminFaxNumberRemovedFromListEvent.java +++ b/src/org/mxchange/jphone/events/fax/removed/AdminFaxNumberRemovedFromListEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.fax.removed; import java.util.List; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event when a mobile number list needs been cleared diff --git a/src/org/mxchange/jphone/events/fax/removed/AdminRemoveFaxNumberFromListEvent.java b/src/org/mxchange/jphone/events/fax/removed/AdminRemoveFaxNumberFromListEvent.java index 4eebc28..3742ed0 100644 --- a/src/org/mxchange/jphone/events/fax/removed/AdminRemoveFaxNumberFromListEvent.java +++ b/src/org/mxchange/jphone/events/fax/removed/AdminRemoveFaxNumberFromListEvent.java @@ -18,7 +18,7 @@ package org.mxchange.jphone.events.fax.removed; import java.io.Serializable; import java.util.List; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An interface for an event when a list needs to be cleared from fax diff --git a/src/org/mxchange/jphone/events/fax/updated/AdminFaxNumberUpdatedEvent.java b/src/org/mxchange/jphone/events/fax/updated/AdminFaxNumberUpdatedEvent.java index 436c67a..84379b8 100644 --- a/src/org/mxchange/jphone/events/fax/updated/AdminFaxNumberUpdatedEvent.java +++ b/src/org/mxchange/jphone/events/fax/updated/AdminFaxNumberUpdatedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.fax.updated; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An event when a fax number has been updated diff --git a/src/org/mxchange/jphone/events/fax/updated/AdminUpdatedFaxNumberEvent.java b/src/org/mxchange/jphone/events/fax/updated/AdminUpdatedFaxNumberEvent.java index 940f575..b31a291 100644 --- a/src/org/mxchange/jphone/events/fax/updated/AdminUpdatedFaxNumberEvent.java +++ b/src/org/mxchange/jphone/events/fax/updated/AdminUpdatedFaxNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.fax.updated; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; /** * An interface for an event when a fax number has been updated diff --git a/src/org/mxchange/jphone/events/landline/created/CreatedLandLineNumberEvent.java b/src/org/mxchange/jphone/events/landline/created/CreatedLandLineNumberEvent.java index 981e43f..73809e0 100644 --- a/src/org/mxchange/jphone/events/landline/created/CreatedLandLineNumberEvent.java +++ b/src/org/mxchange/jphone/events/landline/created/CreatedLandLineNumberEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.landline.created; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event being fired when a land-line number instance has been successfully diff --git a/src/org/mxchange/jphone/events/landline/created/ObservableCreatedLandLineNumberEvent.java b/src/org/mxchange/jphone/events/landline/created/ObservableCreatedLandLineNumberEvent.java index 70f9d20..1fa6cb1 100644 --- a/src/org/mxchange/jphone/events/landline/created/ObservableCreatedLandLineNumberEvent.java +++ b/src/org/mxchange/jphone/events/landline/created/ObservableCreatedLandLineNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.landline.created; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event being fired when a land-line number instance has been successfully diff --git a/src/org/mxchange/jphone/events/landline/deleted/AdminDeletedLandLineNumberEvent.java b/src/org/mxchange/jphone/events/landline/deleted/AdminDeletedLandLineNumberEvent.java index a0848d5..bf46e23 100644 --- a/src/org/mxchange/jphone/events/landline/deleted/AdminDeletedLandLineNumberEvent.java +++ b/src/org/mxchange/jphone/events/landline/deleted/AdminDeletedLandLineNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.landline.deleted; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An interface for an event when a land-line number has been deleted diff --git a/src/org/mxchange/jphone/events/landline/deleted/AdminLandLineNumberDeletedEvent.java b/src/org/mxchange/jphone/events/landline/deleted/AdminLandLineNumberDeletedEvent.java index 3d80354..0e39428 100644 --- a/src/org/mxchange/jphone/events/landline/deleted/AdminLandLineNumberDeletedEvent.java +++ b/src/org/mxchange/jphone/events/landline/deleted/AdminLandLineNumberDeletedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.landline.deleted; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event when a land-line number has been deleted diff --git a/src/org/mxchange/jphone/events/landline/removed/AdminLandLineNumberRemovedFromListEvent.java b/src/org/mxchange/jphone/events/landline/removed/AdminLandLineNumberRemovedFromListEvent.java index fab1989..a1d1795 100644 --- a/src/org/mxchange/jphone/events/landline/removed/AdminLandLineNumberRemovedFromListEvent.java +++ b/src/org/mxchange/jphone/events/landline/removed/AdminLandLineNumberRemovedFromListEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.landline.removed; import java.util.List; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event when a mobile number list needs been cleared diff --git a/src/org/mxchange/jphone/events/landline/removed/AdminRemoveLandLineNumberFromListEvent.java b/src/org/mxchange/jphone/events/landline/removed/AdminRemoveLandLineNumberFromListEvent.java index aa342c6..123a021 100644 --- a/src/org/mxchange/jphone/events/landline/removed/AdminRemoveLandLineNumberFromListEvent.java +++ b/src/org/mxchange/jphone/events/landline/removed/AdminRemoveLandLineNumberFromListEvent.java @@ -18,7 +18,7 @@ package org.mxchange.jphone.events.landline.removed; import java.io.Serializable; import java.util.List; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An interface for an event when a list needs to be cleared from land-line diff --git a/src/org/mxchange/jphone/events/landline/updated/AdminLandLineNumberUpdatedEvent.java b/src/org/mxchange/jphone/events/landline/updated/AdminLandLineNumberUpdatedEvent.java index 152eb65..ec76cef 100644 --- a/src/org/mxchange/jphone/events/landline/updated/AdminLandLineNumberUpdatedEvent.java +++ b/src/org/mxchange/jphone/events/landline/updated/AdminLandLineNumberUpdatedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.landline.updated; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An event when a mobile number has been updated diff --git a/src/org/mxchange/jphone/events/landline/updated/AdminUpdatedLandLineNumberEvent.java b/src/org/mxchange/jphone/events/landline/updated/AdminUpdatedLandLineNumberEvent.java index a6e68c9..596273d 100644 --- a/src/org/mxchange/jphone/events/landline/updated/AdminUpdatedLandLineNumberEvent.java +++ b/src/org/mxchange/jphone/events/landline/updated/AdminUpdatedLandLineNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.landline.updated; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * An interface for an event when a land-line number has been updated diff --git a/src/org/mxchange/jphone/events/mobile/created/CreatedMobileNumberEvent.java b/src/org/mxchange/jphone/events/mobile/created/CreatedMobileNumberEvent.java index bd28112..6100407 100644 --- a/src/org/mxchange/jphone/events/mobile/created/CreatedMobileNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/created/CreatedMobileNumberEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.mobile.created; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event being fired when a mobile number instance has been successfully diff --git a/src/org/mxchange/jphone/events/mobile/created/ObservableCreatedMobileNumberEvent.java b/src/org/mxchange/jphone/events/mobile/created/ObservableCreatedMobileNumberEvent.java index f72c9fe..9b56e6f 100644 --- a/src/org/mxchange/jphone/events/mobile/created/ObservableCreatedMobileNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/created/ObservableCreatedMobileNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.mobile.created; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event being fired when a mobile number instance has been successfully diff --git a/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java b/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java index 85d0218..f3d4f7c 100644 --- a/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.mobile.deleted; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a mobile number has been deleted diff --git a/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java b/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java index f74ed6c..75196c3 100644 --- a/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java +++ b/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.mobile.deleted; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event when a mobile number has been deleted diff --git a/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java b/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java index 1ba5d45..51ac32a 100644 --- a/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java +++ b/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.mobile.remove; import java.util.List; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event when a mobile number list needs been cleared diff --git a/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java b/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java index 25ec85e..9ef0c0c 100644 --- a/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java +++ b/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java @@ -18,7 +18,7 @@ package org.mxchange.jphone.events.mobile.remove; import java.io.Serializable; import java.util.List; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a list needs to be cleared from mobile diff --git a/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java b/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java index dd75f83..72e05e7 100644 --- a/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java +++ b/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.mobile.updated; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An event when a mobile number has been updated diff --git a/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java b/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java index 3e2b32a..5572fcd 100644 --- a/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.mobile.updated; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a mobile number has been updated diff --git a/src/org/mxchange/jphone/events/mobileprovider/added/AdminAddedMobileProviderEvent.java b/src/org/mxchange/jphone/events/mobileprovider/added/AdminAddedMobileProviderEvent.java index f5d3817..0345584 100644 --- a/src/org/mxchange/jphone/events/mobileprovider/added/AdminAddedMobileProviderEvent.java +++ b/src/org/mxchange/jphone/events/mobileprovider/added/AdminAddedMobileProviderEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.events.mobileprovider.added; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * An interface for an event when a new mobile provider has been added. @@ -32,4 +32,5 @@ public interface AdminAddedMobileProviderEvent extends Serializable { * @return Added mobile provider */ MobileProvider getAddedMobileProvider (); + } diff --git a/src/org/mxchange/jphone/events/mobileprovider/added/AdminMobileProviderAddedEvent.java b/src/org/mxchange/jphone/events/mobileprovider/added/AdminMobileProviderAddedEvent.java index 3c47694..5a82602 100644 --- a/src/org/mxchange/jphone/events/mobileprovider/added/AdminMobileProviderAddedEvent.java +++ b/src/org/mxchange/jphone/events/mobileprovider/added/AdminMobileProviderAddedEvent.java @@ -16,7 +16,7 @@ */ package org.mxchange.jphone.events.mobileprovider.added; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * An event when a new mobile provider has been added diff --git a/src/org/mxchange/jphone/exceptions/MobileProviderAlreadyAddedException.java b/src/org/mxchange/jphone/exceptions/MobileProviderAlreadyAddedException.java index 2e5bedf..18477fd 100644 --- a/src/org/mxchange/jphone/exceptions/MobileProviderAlreadyAddedException.java +++ b/src/org/mxchange/jphone/exceptions/MobileProviderAlreadyAddedException.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.exceptions; import java.text.MessageFormat; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * An exception thrown when the mobile provider is already added. This should be diff --git a/src/org/mxchange/jphone/exceptions/PhoneNumberAlreadyLinkedException.java b/src/org/mxchange/jphone/exceptions/PhoneNumberAlreadyLinkedException.java index 3311e1f..2b2f278 100644 --- a/src/org/mxchange/jphone/exceptions/PhoneNumberAlreadyLinkedException.java +++ b/src/org/mxchange/jphone/exceptions/PhoneNumberAlreadyLinkedException.java @@ -17,9 +17,9 @@ package org.mxchange.jphone.exceptions; import java.text.MessageFormat; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An exception thrown when a fax, land-line or mobile number is not linked but diff --git a/src/org/mxchange/jphone/exceptions/PhoneNumberNotLinkedException.java b/src/org/mxchange/jphone/exceptions/PhoneNumberNotLinkedException.java index ea9b56f..7d12f65 100644 --- a/src/org/mxchange/jphone/exceptions/PhoneNumberNotLinkedException.java +++ b/src/org/mxchange/jphone/exceptions/PhoneNumberNotLinkedException.java @@ -17,9 +17,9 @@ package org.mxchange.jphone.exceptions; import java.text.MessageFormat; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * An exception thrown when a fax, land-line or mobile number is not linked but diff --git a/src/org/mxchange/jphone/phonenumbers/DialableNumber.java b/src/org/mxchange/jphone/model/phonenumbers/DialableNumber.java similarity index 96% rename from src/org/mxchange/jphone/phonenumbers/DialableNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/DialableNumber.java index 29c3897..7fea4a8 100644 --- a/src/org/mxchange/jphone/phonenumbers/DialableNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/DialableNumber.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers; +package org.mxchange.jphone.model.phonenumbers; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcountry.data.Country; +import org.mxchange.jcountry.model.data.Country; /** * A POJI for dial-able numbers diff --git a/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java b/src/org/mxchange/jphone/model/phonenumbers/fax/DialableFaxNumber.java similarity index 89% rename from src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/fax/DialableFaxNumber.java index a8976c1..9d3c552 100644 --- a/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/fax/DialableFaxNumber.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.fax; +package org.mxchange.jphone.model.phonenumbers.fax; -import org.mxchange.jphone.phonenumbers.DialableNumber; +import org.mxchange.jphone.model.phonenumbers.DialableNumber; /** * A POJI for dialable fax numbers diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumber.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumber.java index bcea5cb..d189e89 100644 --- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumber.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.jphone.phonenumbers.fax; +package org.mxchange.jphone.model.phonenumbers.fax; import java.util.Calendar; import java.util.Objects; @@ -33,8 +33,8 @@ 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.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; /** * A POJO for dialable fax numbers diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumbers.java b/src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumbers.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/fax/FaxNumbers.java rename to src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumbers.java index 580f4df..2fd3cc5 100644 --- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumbers.java +++ b/src/org/mxchange/jphone/model/phonenumbers/fax/FaxNumbers.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.jphone.phonenumbers.fax; +package org.mxchange.jphone.model.phonenumbers.fax; import java.io.Serializable; diff --git a/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java b/src/org/mxchange/jphone/model/phonenumbers/landline/DialableLandLineNumber.java similarity index 88% rename from src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/landline/DialableLandLineNumber.java index 5b5a04b..1666db7 100644 --- a/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/landline/DialableLandLineNumber.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.landline; +package org.mxchange.jphone.model.phonenumbers.landline; -import org.mxchange.jphone.phonenumbers.DialableNumber; +import org.mxchange.jphone.model.phonenumbers.DialableNumber; /** * A POJI for dialable land-line numbers diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumber.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumber.java index f7c809b..40f7117 100644 --- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumber.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.jphone.phonenumbers.landline; +package org.mxchange.jphone.model.phonenumbers.landline; import java.util.Calendar; import java.util.Objects; @@ -33,8 +33,8 @@ 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.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; /** * A POJO for dialable phone numbers diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumbers.java b/src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumbers.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/landline/LandLineNumbers.java rename to src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumbers.java index 6f67f7a..e9e70c6 100644 --- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumbers.java +++ b/src/org/mxchange/jphone/model/phonenumbers/landline/LandLineNumbers.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with targetNumber program. If not, see . */ -package org.mxchange.jphone.phonenumbers.landline; +package org.mxchange.jphone.model.phonenumbers.landline; import java.io.Serializable; diff --git a/src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java b/src/org/mxchange/jphone/model/phonenumbers/mobile/DialableMobileNumber.java similarity index 86% rename from src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/mobile/DialableMobileNumber.java index 554b214..abb4632 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobile/DialableMobileNumber.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobile; +package org.mxchange.jphone.model.phonenumbers.mobile; -import org.mxchange.jphone.phonenumbers.DialableNumber; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.DialableNumber; /** * A POJO for dialable mobile numbers with carriers. diff --git a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java b/src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumber.java similarity index 96% rename from src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java rename to src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumber.java index 94162b3..e8ca760 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumber.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.jphone.phonenumbers.mobile; +package org.mxchange.jphone.model.phonenumbers.mobile; import java.util.Calendar; import java.util.Objects; @@ -33,9 +33,9 @@ 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.jphone.phonenumbers.mobileprovider.CellphoneProvider; -import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * A POJO for dialable cellphone numbers diff --git a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumbers.java b/src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumbers.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/mobile/MobileNumbers.java rename to src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumbers.java index 89e57f8..6c92014 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumbers.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobile/MobileNumbers.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with targetNumber program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobile; +package org.mxchange.jphone.model.phonenumbers.mobile; import java.io.Serializable; diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/CellphoneProvider.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java rename to src/org/mxchange/jphone/model/phonenumbers/mobileprovider/CellphoneProvider.java index 431a945..7759610 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/CellphoneProvider.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.jphone.phonenumbers.mobileprovider; +package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.util.Calendar; import java.util.Objects; @@ -33,8 +33,8 @@ 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.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; /** * A POJO for cellphone providers diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProvider.java similarity index 96% rename from src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java rename to src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProvider.java index a5b328d..6b7a775 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProvider.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobileprovider; +package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcountry.data.Country; +import org.mxchange.jcountry.model.data.Country; /** * A POJI for mobile providers diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProviders.java b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProviders.java similarity index 97% rename from src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProviders.java rename to src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProviders.java index c2e0b1e..ac0c52f 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProviders.java +++ b/src/org/mxchange/jphone/model/phonenumbers/mobileprovider/MobileProviders.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with targetMobileProvider program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobileprovider; +package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.io.Serializable; diff --git a/src/org/mxchange/jphone/utils/PhoneUtils.java b/src/org/mxchange/jphone/utils/PhoneUtils.java index 636627c..3bd5c91 100644 --- a/src/org/mxchange/jphone/utils/PhoneUtils.java +++ b/src/org/mxchange/jphone/utils/PhoneUtils.java @@ -18,9 +18,9 @@ package org.mxchange.jphone.utils; import java.io.Serializable; import java.util.Objects; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; /** * -- 2.39.5