From bd0bc29ee0ecd58e2ebd4bd139d390efaf59023e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Aug 2016 10:02:45 +0200 Subject: [PATCH] Renaming season has started: - renamed cellphone to mobile (all occurences) - let's don't discrimite other mobile phones, right? --- .../AdminDeletedMobileNumberEvent.java} | 8 +- .../AdminMobileNumberDeletedEvent.java} | 12 +- ...dminMobileNumberRemovedFromListEvent.java} | 12 +- ...AdminRemoveMobileNumberFromListEvent.java} | 8 +- .../AdminMobileNumberUpdatedEvent.java} | 12 +- .../AdminUpdatedMobileNumberEvent.java} | 8 +- ...va => MobileNumberNotLinkedException.java} | 6 +- .../DialableMobileNumber.java} | 20 +- .../MobileNumber.java} | 56 ++-- src/org/mxchange/jphone/utils/PhoneUtils.java | 250 +++++++++--------- 10 files changed, 196 insertions(+), 196 deletions(-) rename src/org/mxchange/jphone/events/{cellphone/deleted/AdminDeletedCellphoneNumberEvent.java => mobile/deleted/AdminDeletedMobileNumberEvent.java} (78%) rename src/org/mxchange/jphone/events/{cellphone/deleted/AdminCellphoneNumberDeletedEvent.java => mobile/deleted/AdminMobileNumberDeletedEvent.java} (73%) rename src/org/mxchange/jphone/events/{cellphone/remove/AdminCellphoneNumberRemovedFromListEvent.java => mobile/remove/AdminMobileNumberRemovedFromListEvent.java} (73%) rename src/org/mxchange/jphone/events/{cellphone/remove/AdminRemoveCellphoneNumberFromListEvent.java => mobile/remove/AdminRemoveMobileNumberFromListEvent.java} (79%) rename src/org/mxchange/jphone/events/{cellphone/updated/AdminCellphoneNumberUpdatedEvent.java => mobile/updated/AdminMobileNumberUpdatedEvent.java} (73%) rename src/org/mxchange/jphone/events/{cellphone/updated/AdminUpdatedCellphoneNumberEvent.java => mobile/updated/AdminUpdatedMobileNumberEvent.java} (78%) rename src/org/mxchange/jphone/exceptions/{CellphoneNotLinkedException.java => MobileNumberNotLinkedException.java} (86%) rename src/org/mxchange/jphone/phonenumbers/{cellphone/DialableCellphoneNumber.java => mobile/DialableMobileNumber.java} (68%) rename src/org/mxchange/jphone/phonenumbers/{cellphone/CellphoneNumber.java => mobile/MobileNumber.java} (76%) diff --git a/src/org/mxchange/jphone/events/cellphone/deleted/AdminDeletedCellphoneNumberEvent.java b/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java similarity index 78% rename from src/org/mxchange/jphone/events/cellphone/deleted/AdminDeletedCellphoneNumberEvent.java rename to src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java index 9f35293..b7188e2 100644 --- a/src/org/mxchange/jphone/events/cellphone/deleted/AdminDeletedCellphoneNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/deleted/AdminDeletedMobileNumberEvent.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.events.cellphone.deleted; +package org.mxchange.jphone.events.mobile.deleted; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a cell phone number has been updated *

* @author Roland Haeder */ -public interface AdminDeletedCellphoneNumberEvent extends Serializable { +public interface AdminDeletedMobileNumberEvent extends Serializable { /** * Getter for deleted cell phone numbers *

* @return Deleted cell phone numbers */ - DialableCellphoneNumber getDeletedCellphoneNumber (); + DialableMobileNumber getDeletedCellphoneNumber (); } diff --git a/src/org/mxchange/jphone/events/cellphone/deleted/AdminCellphoneNumberDeletedEvent.java b/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java similarity index 73% rename from src/org/mxchange/jphone/events/cellphone/deleted/AdminCellphoneNumberDeletedEvent.java rename to src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.java index 06e405b..00ba635 100644 --- a/src/org/mxchange/jphone/events/cellphone/deleted/AdminCellphoneNumberDeletedEvent.java +++ b/src/org/mxchange/jphone/events/mobile/deleted/AdminMobileNumberDeletedEvent.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.jphone.events.cellphone.deleted; +package org.mxchange.jphone.events.mobile.deleted; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An event when a cell phone number has been updated *

* @author Roland Haeder */ -public class AdminCellphoneNumberDeletedEvent implements AdminDeletedCellphoneNumberEvent { +public class AdminMobileNumberDeletedEvent implements AdminDeletedMobileNumberEvent { /** * Serial number @@ -33,20 +33,20 @@ public class AdminCellphoneNumberDeletedEvent implements AdminDeletedCellphoneNu /** * Added mobile provider instance */ - private final DialableCellphoneNumber deletedCellphoneNumber; + private final DialableMobileNumber deletedCellphoneNumber; /** * Constructor with deleted cell phone number *

* @param deletedCellphoneNumber Updated cell phone number */ - public AdminCellphoneNumberDeletedEvent (final DialableCellphoneNumber deletedCellphoneNumber) { + public AdminMobileNumberDeletedEvent (final DialableMobileNumber deletedCellphoneNumber) { // Set it here this.deletedCellphoneNumber = deletedCellphoneNumber; } @Override - public DialableCellphoneNumber getDeletedCellphoneNumber () { + public DialableMobileNumber getDeletedCellphoneNumber () { return this.deletedCellphoneNumber; } diff --git a/src/org/mxchange/jphone/events/cellphone/remove/AdminCellphoneNumberRemovedFromListEvent.java b/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java similarity index 73% rename from src/org/mxchange/jphone/events/cellphone/remove/AdminCellphoneNumberRemovedFromListEvent.java rename to src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java index 595df99..68f6460 100644 --- a/src/org/mxchange/jphone/events/cellphone/remove/AdminCellphoneNumberRemovedFromListEvent.java +++ b/src/org/mxchange/jphone/events/mobile/remove/AdminMobileNumberRemovedFromListEvent.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.events.cellphone.remove; +package org.mxchange.jphone.events.mobile.remove; import java.util.List; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An event when a cell phone number has been updated *

* @author Roland Haeder */ -public class AdminCellphoneNumberRemovedFromListEvent implements AdminRemoveCellphoneNumberFromListEvent { +public class AdminMobileNumberRemovedFromListEvent implements AdminRemoveMobileNumberFromListEvent { /** * Serial number @@ -34,21 +34,21 @@ public class AdminCellphoneNumberRemovedFromListEvent implements AdminRemoveCell /** * Updated mobile provider instance */ - private final List cellphoneList; + private final List cellphoneList; /** * Constructor with updated cell phone number *

* @param cellphoneList Updated cell phone number */ - public AdminCellphoneNumberRemovedFromListEvent (final List cellphoneList) { + public AdminMobileNumberRemovedFromListEvent (final List cellphoneList) { // Set it here this.cellphoneList = cellphoneList; } @Override @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List getCellphoneList () { + public List getCellphoneList () { return this.cellphoneList; } diff --git a/src/org/mxchange/jphone/events/cellphone/remove/AdminRemoveCellphoneNumberFromListEvent.java b/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java similarity index 79% rename from src/org/mxchange/jphone/events/cellphone/remove/AdminRemoveCellphoneNumberFromListEvent.java rename to src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.java index 3dbbfe3..b558eae 100644 --- a/src/org/mxchange/jphone/events/cellphone/remove/AdminRemoveCellphoneNumberFromListEvent.java +++ b/src/org/mxchange/jphone/events/mobile/remove/AdminRemoveMobileNumberFromListEvent.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.events.cellphone.remove; +package org.mxchange.jphone.events.mobile.remove; import java.io.Serializable; import java.util.List; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a list needs to be cleared from cell phone @@ -26,13 +26,13 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; *

* @author Roland Haeder */ -public interface AdminRemoveCellphoneNumberFromListEvent extends Serializable { +public interface AdminRemoveMobileNumberFromListEvent extends Serializable { /** * Getter for cell phone numer list *

* @return Cell phone number list */ - List getCellphoneList (); + List getCellphoneList (); } diff --git a/src/org/mxchange/jphone/events/cellphone/updated/AdminCellphoneNumberUpdatedEvent.java b/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java similarity index 73% rename from src/org/mxchange/jphone/events/cellphone/updated/AdminCellphoneNumberUpdatedEvent.java rename to src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.java index 8a26c1b..5647d8a 100644 --- a/src/org/mxchange/jphone/events/cellphone/updated/AdminCellphoneNumberUpdatedEvent.java +++ b/src/org/mxchange/jphone/events/mobile/updated/AdminMobileNumberUpdatedEvent.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.jphone.events.cellphone.updated; +package org.mxchange.jphone.events.mobile.updated; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An event when a cell phone number has been updated *

* @author Roland Haeder */ -public class AdminCellphoneNumberUpdatedEvent implements AdminUpdatedCellphoneNumberEvent { +public class AdminMobileNumberUpdatedEvent implements AdminUpdatedMobileNumberEvent { /** * Serial number @@ -33,20 +33,20 @@ public class AdminCellphoneNumberUpdatedEvent implements AdminUpdatedCellphoneNu /** * Updated mobile provider instance */ - private final DialableCellphoneNumber updatedCellphoneNumber; + private final DialableMobileNumber updatedCellphoneNumber; /** * Constructor with updated cell phone number *

* @param updatedCellphoneNumber Updated cell phone number */ - public AdminCellphoneNumberUpdatedEvent (final DialableCellphoneNumber updatedCellphoneNumber) { + public AdminMobileNumberUpdatedEvent (final DialableMobileNumber updatedCellphoneNumber) { // Set it here this.updatedCellphoneNumber = updatedCellphoneNumber; } @Override - public DialableCellphoneNumber getUpdatedCellphoneNumber () { + public DialableMobileNumber getUpdatedCellphoneNumber () { return this.updatedCellphoneNumber; } diff --git a/src/org/mxchange/jphone/events/cellphone/updated/AdminUpdatedCellphoneNumberEvent.java b/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java similarity index 78% rename from src/org/mxchange/jphone/events/cellphone/updated/AdminUpdatedCellphoneNumberEvent.java rename to src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java index 43a4ddc..1cc4d14 100644 --- a/src/org/mxchange/jphone/events/cellphone/updated/AdminUpdatedCellphoneNumberEvent.java +++ b/src/org/mxchange/jphone/events/mobile/updated/AdminUpdatedMobileNumberEvent.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.events.cellphone.updated; +package org.mxchange.jphone.events.mobile.updated; import java.io.Serializable; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An interface for an event when a cell phone number has been updated *

* @author Roland Haeder */ -public interface AdminUpdatedCellphoneNumberEvent extends Serializable { +public interface AdminUpdatedMobileNumberEvent extends Serializable { /** * Getter for updated cell phone numbers *

* @return Updated cell phone numbers */ - DialableCellphoneNumber getUpdatedCellphoneNumber (); + DialableMobileNumber getUpdatedCellphoneNumber (); } diff --git a/src/org/mxchange/jphone/exceptions/CellphoneNotLinkedException.java b/src/org/mxchange/jphone/exceptions/MobileNumberNotLinkedException.java similarity index 86% rename from src/org/mxchange/jphone/exceptions/CellphoneNotLinkedException.java rename to src/org/mxchange/jphone/exceptions/MobileNumberNotLinkedException.java index 037b0bb..4b959db 100644 --- a/src/org/mxchange/jphone/exceptions/CellphoneNotLinkedException.java +++ b/src/org/mxchange/jphone/exceptions/MobileNumberNotLinkedException.java @@ -17,14 +17,14 @@ package org.mxchange.jphone.exceptions; import java.text.MessageFormat; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; /** * An exception thrown when a cell phone number is not linked but should be. *

* @author Roland Haeder */ -public class CellphoneNotLinkedException extends Exception { +public class MobileNumberNotLinkedException extends Exception { /** * Serial number @@ -36,7 +36,7 @@ public class CellphoneNotLinkedException extends Exception { *

* @param cellphoneNumber Cell phone instance */ - public CellphoneNotLinkedException (final DialableCellphoneNumber cellphoneNumber) { + public MobileNumberNotLinkedException (final DialableMobileNumber cellphoneNumber) { // Call super constructor with message super(MessageFormat.format("cellphoneNumber={0} with phoneId={1} is not linked.", cellphoneNumber, cellphoneNumber.getPhoneId())); //NOI18N } diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java similarity index 68% rename from src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java rename to src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java index ce9021e..4cad25b 100644 --- a/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java +++ b/src/org/mxchange/jphone/phonenumbers/mobile/DialableMobileNumber.java @@ -14,38 +14,38 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.cellphone; +package org.mxchange.jphone.phonenumbers.mobile; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; /** - * A POJO for dialable cellphone numbers with carriers. + * A POJO for dialable mobile numbers with carriers. *

* @author Roland Haeder */ -public interface DialableCellphoneNumber extends DialableNumber { +public interface DialableMobileNumber extends DialableNumber { /** - * Getter for SMS provider instance + * Getter for mobile provider *

- * @return SMS provider instance + * @return Mobile provider */ - MobileProvider getCellphoneProvider (); + MobileProvider getMobileProvider (); /** - * Setter for SMS provider instance + * Setter for mobile provider *

- * @param cellphoneProvider SMS provider instance + * @param mobileProvider Mobile provider */ - void setCellphoneProvider (final MobileProvider cellphoneProvider); + void setMobileProvider (final MobileProvider mobileProvider); /** * Copy all fields from source object to this *

* @param sourceNumber Source number object */ - void copyAll (final DialableCellphoneNumber sourceNumber); + void copyAll (final DialableMobileNumber sourceNumber); @Override boolean equals (final Object object); diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java similarity index 76% rename from src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java rename to src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java index d2e835f..49baf19 100644 --- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java +++ b/src/org/mxchange/jphone/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.cellphone; +package org.mxchange.jphone.phonenumbers.mobile; import java.util.Calendar; import java.util.Objects; @@ -42,16 +42,16 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; *

* @author Roland Haeder */ -@Entity (name = "cellphone_numbers") -@Table (name = "cellphone_numbers") +@Entity (name = "mobile_numbers") +@Table (name = "mobile_numbers") @NamedQueries ( { - @NamedQuery (name = "AllCellphoneNumbers", query = "SELECT c FROM cellphone_numbers AS c ORDER BY c.phoneId ASC"), - @NamedQuery (name = "SearchCellphoneId", query = "SELECT c FROM cellphone_numbers AS c WHERE c.phoneId = :cellphoneId") + @NamedQuery (name = "AllCellphoneNumbers", query = "SELECT c FROM mobile_numbers AS c ORDER BY c.phoneId ASC"), + @NamedQuery (name = "SearchCellphoneId", query = "SELECT c FROM mobile_numbers AS c WHERE c.phoneId = :cellphoneId") } ) @SuppressWarnings ("PersistenceUnitPresent") -public class CellphoneNumber implements DialableCellphoneNumber { +public class MobileNumber implements DialableMobileNumber { /** * Serial number @@ -60,25 +60,25 @@ public class CellphoneNumber implements DialableCellphoneNumber { private static final long serialVersionUID = 13_859_879_482_106L; /** - * Connection to table "cellphone_provider" (for dial prefix and more data) + * Connection to table "mobile_provider" (for dial prefix and more data) */ - @JoinColumn (name = "cellphone_provider_id", nullable = false) + @JoinColumn (name = "mobile_provider_id", nullable = false) @OneToOne (targetEntity = CellphoneProvider.class, cascade = CascadeType.REFRESH, optional = false) - private MobileProvider cellphoneProvider; + private MobileProvider mobileProvider; /** * Timestamp when this entry has been created */ @Basic (optional = false) @Temporal (TemporalType.TIMESTAMP) - @Column (name = "cellphone_entry_created", nullable = false, updatable = false) + @Column (name = "mobile_entry_created", nullable = false, updatable = false) private Calendar phoneEntryCreated; /** * Timestamp when this entry has been created */ @Temporal (TemporalType.TIMESTAMP) - @Column (name = "phone_entry_updated", updatable = false) + @Column (name = "mobile_entry_updated", updatable = false) private Calendar phoneEntryUpdated; /** @@ -86,41 +86,41 @@ public class CellphoneNumber implements DialableCellphoneNumber { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "cellphone_id", nullable = false, updatable = false) + @Column (name = "mobile_id", nullable = false, updatable = false) private Long phoneId; /** * Number without prefix to dial */ @Basic (optional = false) - @Column (name = "cellphone_number", nullable = false) + @Column (name = "mobile_number", nullable = false) private Long phoneNumber; /** * Default constructor */ - public CellphoneNumber () { + public MobileNumber () { } /** * Constructor with cellphone provider and number *

- * @param cellphoneProvider Cellphone provider instance - * @param cellphoneNumber Cellphone number + * @param mobileProvider Mobile provider + * @param mobileNumber Mobile number */ - public CellphoneNumber (final MobileProvider cellphoneProvider, final Long cellphoneNumber) { + public MobileNumber (final MobileProvider mobileProvider, final Long mobileNumber) { // Call default constructor this(); // Set all values - this.cellphoneProvider = cellphoneProvider; - this.phoneNumber = cellphoneNumber; + this.mobileProvider = mobileProvider; + this.phoneNumber = mobileNumber; } @Override - public void copyAll (final DialableCellphoneNumber sourceNumber) { + public void copyAll (final DialableMobileNumber sourceNumber) { // Copy all - this.setCellphoneProvider(sourceNumber.getCellphoneProvider()); + this.setMobileProvider(sourceNumber.getMobileProvider()); this.setPhoneEntryCreated(sourceNumber.getPhoneEntryCreated()); this.setPhoneId(sourceNumber.getPhoneId()); this.setPhoneNumber(sourceNumber.getPhoneNumber()); @@ -134,9 +134,9 @@ public class CellphoneNumber implements DialableCellphoneNumber { return false; } - final DialableCellphoneNumber other = (DialableCellphoneNumber) object; + final DialableMobileNumber other = (DialableMobileNumber) object; - if (!Objects.equals(this.getCellphoneProvider(), other.getCellphoneProvider())) { + if (!Objects.equals(this.getMobileProvider(), other.getMobileProvider())) { return false; } else if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) { return false; @@ -146,13 +146,13 @@ public class CellphoneNumber implements DialableCellphoneNumber { } @Override - public MobileProvider getCellphoneProvider () { - return this.cellphoneProvider; + public MobileProvider getMobileProvider () { + return this.mobileProvider; } @Override - public void setCellphoneProvider (final MobileProvider cellphoneProvider) { - this.cellphoneProvider = cellphoneProvider; + public void setMobileProvider (final MobileProvider mobileProvider) { + this.mobileProvider = mobileProvider; } @Override @@ -227,7 +227,7 @@ public class CellphoneNumber implements DialableCellphoneNumber { public int hashCode () { int hash = 5; - hash = 97 * hash + Objects.hashCode(this.getCellphoneProvider()); + hash = 97 * hash + Objects.hashCode(this.getMobileProvider()); hash = 97 * hash + Objects.hashCode(this.getPhoneNumber()); return hash; diff --git a/src/org/mxchange/jphone/utils/PhoneUtils.java b/src/org/mxchange/jphone/utils/PhoneUtils.java index 94e28ed..ed9bba6 100644 --- a/src/org/mxchange/jphone/utils/PhoneUtils.java +++ b/src/org/mxchange/jphone/utils/PhoneUtils.java @@ -1,125 +1,125 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * 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.jphone.utils; - -import java.io.Serializable; -import java.util.Objects; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; - -/** - * - * @author Roland Haeder - */ -public class PhoneUtils implements Serializable { - - /** - * Serial number - */ - private static final long serialVersionUID = 183_598_328_176_450L; - - /** - * Checks if both are the same - *

- * @param cellphoneNumber Cellphone number 1 - * @param otherNumber Cellphone number 2 - *

- * @return Whether both are the same number - */ - public static boolean isSameCellphoneNumber (final DialableCellphoneNumber cellphoneNumber, final DialableCellphoneNumber otherNumber) { - // Test object equality first - if (Objects.equals(cellphoneNumber, otherNumber)) { - // Both the same object (null/null or same object) - return true; - } else if (((null == cellphoneNumber) && (otherNumber instanceof DialableCellphoneNumber)) || ((null == otherNumber) && (cellphoneNumber instanceof DialableCellphoneNumber))) { - // One is null the other not - return false; - } - - // Now compare deeper - @SuppressWarnings ("null") - boolean sameProvider = Objects.equals(cellphoneNumber.getCellphoneProvider(), otherNumber.getCellphoneProvider()); - boolean sameNumber = Objects.equals(cellphoneNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); - - // All are the same? - return (sameProvider && sameNumber); - } - - /** - * Checks if both are the same - *

- * @param faxNumber First fax number - * @param otherNumber Second fax number - *

- * @return Whether both are the same - */ - public static boolean isSameFaxNumber (final DialableFaxNumber faxNumber, DialableFaxNumber otherNumber) { - // Test object equality first - if (Objects.equals(faxNumber, otherNumber)) { - // Both the same object (null/null or same object) - return true; - } else if (((null == faxNumber) && (otherNumber instanceof DialableFaxNumber)) || ((null == otherNumber) && (faxNumber instanceof DialableFaxNumber))) { - // One is null the other not - return false; - } - - // Now compare deeper - @SuppressWarnings ("null") - boolean sameCountry = Objects.equals(faxNumber.getPhoneCountry(), otherNumber.getPhoneCountry()); - boolean sameAreaCode = Objects.equals(faxNumber.getPhoneAreaCode(), otherNumber.getPhoneAreaCode()); - boolean sameNumber = Objects.equals(faxNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); - - // All are the same? - return (sameCountry && sameAreaCode && sameNumber); - } - - /** - * Checks if both are the same - *

- * @param landLineNumber First land-line number - * @param otherNumber Second land-line number - *

- * @return Whether both are the same - */ - public static boolean isSameLandLineNumber (final DialableLandLineNumber landLineNumber, final DialableLandLineNumber otherNumber) { - // Test object equality first - if (Objects.equals(landLineNumber, otherNumber)) { - // Both the same object (null/null or same object) - return true; - } else if (((null == landLineNumber) && (otherNumber instanceof DialableLandLineNumber)) || ((null == otherNumber) && (landLineNumber instanceof DialableLandLineNumber))) { - // One is null the other not - return false; - } - - // Now compare deeper - @SuppressWarnings ("null") - boolean sameCountry = Objects.equals(landLineNumber.getPhoneCountry(), otherNumber.getPhoneCountry()); - boolean sameAreaCode = Objects.equals(landLineNumber.getPhoneAreaCode(), otherNumber.getPhoneAreaCode()); - boolean sameNumber = Objects.equals(landLineNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); - - // All are the same? - return (sameCountry && sameAreaCode && sameNumber); - } - - /** - * Private constructor for utility classes - */ - private PhoneUtils () { - } - -} +/* + * Copyright (C) 2016 Roland Haeder + * + * 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.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; + +/** + * + * @author Roland Haeder + */ +public class PhoneUtils implements Serializable { + + /** + * Serial number + */ + private static final long serialVersionUID = 183_598_328_176_450L; + + /** + * Checks if both are the same + *

+ * @param cellphoneNumber Cellphone number 1 + * @param otherNumber Cellphone number 2 + *

+ * @return Whether both are the same number + */ + public static boolean isSameCellphoneNumber (final DialableMobileNumber cellphoneNumber, final DialableMobileNumber otherNumber) { + // Test object equality first + if (Objects.equals(cellphoneNumber, otherNumber)) { + // Both the same object (null/null or same object) + return true; + } else if (((null == cellphoneNumber) && (otherNumber instanceof DialableMobileNumber)) || ((null == otherNumber) && (cellphoneNumber instanceof DialableMobileNumber))) { + // One is null the other not + return false; + } + + // Now compare deeper + @SuppressWarnings ("null") + boolean sameProvider = Objects.equals(cellphoneNumber.getMobileProvider(), otherNumber.getMobileProvider()); + boolean sameNumber = Objects.equals(cellphoneNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); + + // All are the same? + return (sameProvider && sameNumber); + } + + /** + * Checks if both are the same + *

+ * @param faxNumber First fax number + * @param otherNumber Second fax number + *

+ * @return Whether both are the same + */ + public static boolean isSameFaxNumber (final DialableFaxNumber faxNumber, DialableFaxNumber otherNumber) { + // Test object equality first + if (Objects.equals(faxNumber, otherNumber)) { + // Both the same object (null/null or same object) + return true; + } else if (((null == faxNumber) && (otherNumber instanceof DialableFaxNumber)) || ((null == otherNumber) && (faxNumber instanceof DialableFaxNumber))) { + // One is null the other not + return false; + } + + // Now compare deeper + @SuppressWarnings ("null") + boolean sameCountry = Objects.equals(faxNumber.getPhoneCountry(), otherNumber.getPhoneCountry()); + boolean sameAreaCode = Objects.equals(faxNumber.getPhoneAreaCode(), otherNumber.getPhoneAreaCode()); + boolean sameNumber = Objects.equals(faxNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); + + // All are the same? + return (sameCountry && sameAreaCode && sameNumber); + } + + /** + * Checks if both are the same + *

+ * @param landLineNumber First land-line number + * @param otherNumber Second land-line number + *

+ * @return Whether both are the same + */ + public static boolean isSameLandLineNumber (final DialableLandLineNumber landLineNumber, final DialableLandLineNumber otherNumber) { + // Test object equality first + if (Objects.equals(landLineNumber, otherNumber)) { + // Both the same object (null/null or same object) + return true; + } else if (((null == landLineNumber) && (otherNumber instanceof DialableLandLineNumber)) || ((null == otherNumber) && (landLineNumber instanceof DialableLandLineNumber))) { + // One is null the other not + return false; + } + + // Now compare deeper + @SuppressWarnings ("null") + boolean sameCountry = Objects.equals(landLineNumber.getPhoneCountry(), otherNumber.getPhoneCountry()); + boolean sameAreaCode = Objects.equals(landLineNumber.getPhoneAreaCode(), otherNumber.getPhoneAreaCode()); + boolean sameNumber = Objects.equals(landLineNumber.getPhoneNumber(), otherNumber.getPhoneNumber()); + + // All are the same? + return (sameCountry && sameAreaCode && sameNumber); + } + + /** + * Private constructor for utility classes + */ + private PhoneUtils () { + } + +} -- 2.39.5