Continued:

- always validate parameter of public/package/protected methods and constructors
- renamed i18nKey to messageKey

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java
index cac582556d62d32350c6f3c4f0dd5df4be4412eb..bd1fc45fb84ab2efeec15446c10d333fcf0c998b 100644 (file)
--- a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java
+++ b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java
@@ -53,6 +53,15 @@ 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 a9a385313f9b3fc8d0b1f3c41822aa3d818a495e..36d30f3fbbd761009a8ebc8b62a14b70009dbbe6 100644 (file)
--- a/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java
+++ b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java
@@ -53,6 +53,15 @@ 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;