Please cherry-pick:

- moved PhoneNumberValidator to deeper package
- added missing AbroadDialValidator

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

diff --git a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java
deleted file mode 100644 (file)
index 0fcf0e6..0000000
--- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jjobs.validator.booleans;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
-
-/**
- * A validator for user profile visibility
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@FacesValidator (value = "UserProfileVisibilityValidator")
-public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator implements Validator {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 185_768_717_676_910_450L;
-
-       @Override
-       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
-               // The required field
-               String[] requiredFields = {"landLineAreaCode", "landLineNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N
-
-               // Pre-validation (example: not null, not a string, empty string ...)
-               super.preValidate(context, component, value, requiredFields, true);
-       }
-
-}

diff --git a/src/java/org/mxchange/jjobs/validator/phone/abroad/JobsAbroadDialValidator.java b/src/java/org/mxchange/jjobs/validator/phone/abroad/JobsAbroadDialValidator.java
new file mode 100644 (file)
index 0000000..29a9c04
--- /dev/null
+++ b/src/java/org/mxchange/jjobs/validator/phone/abroad/JobsAbroadDialValidator.java
@@ -0,0 +1,71 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.validator.phone.abroad;
+
+import java.text.MessageFormat;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+import org.mxchange.jcoreee.validator.BaseObjectValidator;
+
+/**
+ * A validator for phone, fax and mobile numbers
+ * <p>
+ * @author Roland Haeder<roland@mxchange.org>
+ */
+@FacesValidator (value = "AbroadDialValidator")
+public class JobsAbroadDialValidator extends BaseObjectValidator implements Validator {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 186_897_817_692_786_900L;
+
+       @Override
+       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // The required field
+               String[] requiredFields = {"countryAbroadDialPrefix"}; //NOI18N
+
+               // Pre-validation (example: not null, not a string, empty string ...)
+               super.preValidate(context, component, value, requiredFields, true);
+
+               // Parse value as string first
+               String dial = String.valueOf(value);
+
+               // Is it not +?
+               if (!dial.equals("+")) { //NOI18N
+                       // No, then try to ...
+                       try {
+                               // ..parse as number
+                               Long number = Long.parseLong(dial);
+
+                               // Not valid range? (1 - 99, very rude)
+                               if (number < 1 || number > 99) {
+                                       // Not allowed
+                                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, MessageFormat.format("Number {0} is not between 1 and 99 inclusive.", number), MessageFormat.format("The entered number {0} is not in the range of 1 and 99 inclusive. This cannot be used as abroad dial prefix. Alternatively enter international '+' sign.", number))); //NOI18N
+                               }
+                       } catch (final NumberFormatException ex) {
+                               // Didn't work
+                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "No number or + entered", "No number or + sign has been entered."), ex); //NOI18N
+                       }
+               }
+       }
+
+}

diff --git a/src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java b/src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java
new file mode 100644 (file)
index 0000000..dcb85d5
--- /dev/null
+++ b/src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java
@@ -0,0 +1,48 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jjobs.validator.phone.number;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+import org.mxchange.jcoreee.validator.number.BaseLongValidator;
+
+/**
+ * A validator for phone, fax and mobile numbers
+ * <p>
+ * @author Roland Haeder<roland@mxchange.org>
+ */
+@FacesValidator (value = "PhoneNumberValidator")
+public class JobsPhoneNumberValidator extends BaseLongValidator implements Validator {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 186_897_817_692_786_900L;
+
+       @Override
+       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // The required field
+               String[] requiredFields = {"landLineAreaCode", "landLineNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N
+
+               // Pre-validation (example: not null, not a string, empty string ...)
+               super.preValidate(context, component, value, requiredFields, true);
+       }
+
+}