]> git.mxchange.org Git - jcontacts-core.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sun, 22 Jan 2023 00:37:13 +0000 (01:37 +0100)
committerRoland Häder <roland@mxchange.org>
Sun, 22 Jan 2023 00:37:13 +0000 (01:37 +0100)
- moved utilities class into own package

src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java [deleted file]
src/org/mxchange/jcontacts/model/utils/ContactUtils.java
src/org/mxchange/jcontacts/model/utils/GenderUtils.java [new file with mode: 0644]

diff --git a/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java b/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java
deleted file mode 100644 (file)
index d0a7f82..0000000
+++ /dev/null
@@ -1,109 +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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jcontacts.model.contact.gender;
-
-import java.io.Serializable;
-import java.text.MessageFormat;
-
-/**
- * Gender utilities class
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-public class GenderUtils implements Serializable {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 185_683_479_107L;
-
-       /**
-        * Cache for valid chars
-        */
-       private static char[] validChars;
-
-       /**
-        * Getter for Gender enumeration from given character
-        * <p>
-        * @param c Gender character
-        * <p>
-        * @return Gender enumeration
-        */
-       public static Gender fromChar (final char c) {
-               // Init variable
-               Gender found = null;
-
-               // Loop through all
-               for (final Gender gender : Gender.values()) {
-                       // Does the char match?
-                       if (c == gender.getAccessChar()) {
-                               // Found it
-                               found = gender;
-                               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)
-        * <p>
-        * @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 Gender gender : Gender.values()) {
-                       // Get access key as this is also the access
-                       valid[i] = gender.getAccessChar();
-
-                       // Increment index
-                       i++;
-               }
-
-               // Set it here
-               validChars = valid;
-
-               // Return finialized array
-               return valid;
-       }
-
-       /**
-        * Private constructor as this is an utility class
-        */
-       private GenderUtils () {
-       }
-
-}
index 0a70b10ea3476e8b8a88c109817f5450bf4775ae..8df677fc8a664dc981878b2ac5669d75198e6d88 100644 (file)
@@ -148,7 +148,7 @@ public class ContactUtils implements Serializable {
        }
 
        /**
-        * Updates land-line data in contact instance. This method also removes the
+        * Updates fax number data in contact instance. This method also removes the
         * land-line instance if no country is selected. A bean (mostly EJB) should
         * then make sure that the land-line entry is being unlinked from contact
         * instance or being removed, if no longer used.
diff --git a/src/org/mxchange/jcontacts/model/utils/GenderUtils.java b/src/org/mxchange/jcontacts/model/utils/GenderUtils.java
new file mode 100644 (file)
index 0000000..db3b339
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jcontacts.model.utils;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import org.mxchange.jcontacts.model.contact.gender.Gender;
+
+/**
+ * Gender utilities class
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+public class GenderUtils implements Serializable {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 185_683_479_107L;
+
+       /**
+        * Cache for valid chars
+        */
+       private static char[] validChars;
+
+       /**
+        * Getter for Gender enumeration from given character
+        * <p>
+        * @param c Gender character
+        * <p>
+        * @return Gender enumeration
+        */
+       public static Gender fromChar (final char c) {
+               // Init variable
+               Gender found = null;
+
+               // Loop through all
+               for (final Gender gender : Gender.values()) {
+                       // Does the char match?
+                       if (c == gender.getAccessChar()) {
+                               // Found it
+                               found = gender;
+                               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)
+        * <p>
+        * @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 Gender gender : Gender.values()) {
+                       // Get access key as this is also the access
+                       valid[i] = gender.getAccessChar();
+
+                       // Increment index
+                       i++;
+               }
+
+               // Set it here
+               validChars = valid;
+
+               // Return finialized array
+               return valid;
+       }
+
+       /**
+        * Private constructor as this is an utility class
+        */
+       private GenderUtils () {
+       }
+
+}