From: Roland Häder Date: Thu, 3 Nov 2022 20:52:24 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=09d7c7533535ca4dd4b7152dff8e84144862190b;p=jcontacts-core.git Continued: - renamed TitleUtils to PersonalTitleUtils - removed null-check as enumerations won't have this --- diff --git a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java index ff5041a..72a1b17 100644 --- a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java +++ b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java @@ -53,15 +53,6 @@ public enum Gender implements Serializable { * @param messageKey Message key for resource file */ private Gender (final char accessChar, final String messageKey) { - // Validate parameter - if (null == messageKey) { - // Throw NPE - throw new NullPointerException("messageKey is null"); //NOI18N - } else if (messageKey.isEmpty()) { - // Throw IAE - throw new IllegalArgumentException("messageKey is empty"); //NOI18N - } - // Set both this.accessChar = accessChar; this.messageKey = messageKey; diff --git a/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java index b74f571..4de2adf 100644 --- a/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java +++ b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java @@ -53,15 +53,6 @@ public enum PersonalTitle implements Serializable { * @param messageKey Message key for resource file */ private PersonalTitle (final char accessChar, final String messageKey) { - // Validate parameter - if (null == messageKey) { - // Throw NPE - throw new NullPointerException("messageKey is null"); //NOI18N - } else if (messageKey.isEmpty()) { - // Throw IAE - throw new IllegalArgumentException("messageKey is empty"); //NOI18N - } - // Set both this.accessChar = accessChar; this.messageKey = messageKey; diff --git a/src/org/mxchange/jcontacts/model/contact/title/PersonalTitleUtils.java b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitleUtils.java new file mode 100644 index 0000000..419fb2a --- /dev/null +++ b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitleUtils.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2016 - 2022 Free Software Foundation + * + * 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.jcontacts.model.contact.title; + +import java.io.Serializable; +import java.text.MessageFormat; +import java.util.LinkedList; +import java.util.List; + +/** + * Title utilities class + *

+ * @author Roland Häder + */ +public class PersonalTitleUtils implements Serializable { + + /** + * Serial number + */ + private static final long serialVersionUID = 185_683_479_107L; + + /** + * Cache for valid chars + */ + private static char[] validChars; + + /** + * Getter for personal title enumeration from given character + *

+ * @param c PersonalTitle character + *

+ * @return PersonalTitle enumeration + */ + public static PersonalTitle getPersonalTitleFromChar (final char c) { + // Init variable + PersonalTitle found = null; + + // Loop through all + for (final PersonalTitle title : PersonalTitle.values()) { + // Does the char match? + if (c == title.getAccessChar()) { + // Found it + found = title; + break; + } + } + + // Still null? + if (null == found) { + // Didn't found a valid one + throw new IllegalArgumentException(MessageFormat.format("Gender {0} is invalid.", c)); //NOI18N + } + + // Return it + return found; + } + + /** + * Valid chars (mostly for console client) + *

+ * @return Valid chars + */ + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public static char[] validChars () { + // Is cache set? + if (validChars != null) { + // Return it + return validChars; + } + + // Init array, only 2 are valid. + char[] valid = new char[2]; + + // Get values + int i = 0; + for (final PersonalTitle title : PersonalTitle.values()) { + // Get access key as this is also the access + valid[i] = title.getAccessChar(); + + // Increment index + i++; + } + + // Set it here + validChars = valid; + + // Return finialized array + return valid; + } + + /** + * Private constructor as this is an utility class + */ + private PersonalTitleUtils () { + } + +} diff --git a/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java b/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java deleted file mode 100644 index 0d100d7..0000000 --- a/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2016 - 2022 Free Software Foundation - * - * 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.jcontacts.model.contact.title; - -import java.io.Serializable; -import java.text.MessageFormat; -import java.util.LinkedList; -import java.util.List; - -/** - * Title utilities class - *

- * @author Roland Häder - */ -public class TitleUtils implements Serializable { - - /** - * Serial number - */ - private static final long serialVersionUID = 185_683_479_107L; - - /** - * Cache for valid chars - */ - private static char[] validChars; - - /** - * Getter for personal title enumeration from given character - *

- * @param c PersonalTitle character - *

- * @return PersonalTitle enumeration - */ - public static PersonalTitle getPersonalTitleFromChar (final char c) { - // Init variable - PersonalTitle found = null; - - // Loop through all - for (final PersonalTitle title : PersonalTitle.values()) { - // Does the char match? - if (c == title.getAccessChar()) { - // Found it - found = title; - break; - } - } - - // Still null? - if (null == found) { - // Didn't found a valid one - throw new IllegalArgumentException(MessageFormat.format("Gender {0} is invalid.", c)); //NOI18N - } - - // Return it - return found; - } - - /** - * Valid chars (mostly for console client) - *

- * @return Valid chars - */ - @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public static char[] validChars () { - // Is cache set? - if (validChars != null) { - // Return it - return validChars; - } - - // Init array, only 2 are valid. - char[] valid = new char[2]; - - // Get values - int i = 0; - for (final PersonalTitle title : PersonalTitle.values()) { - // Get access key as this is also the access - valid[i] = title.getAccessChar(); - - // Increment index - i++; - } - - // Set it here - validChars = valid; - - // Return finialized array - return valid; - } - - /** - * Private constructor as this is an utility class - */ - private TitleUtils () { - } - -}