From d8bdc2ea96b12c3da52d2a39e0dbdcac6bf678e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 31 Aug 2016 18:07:06 +0200 Subject: [PATCH] Please cherry-pick: - moved PhoneNumberValidator to deeper package - added missing AbroadDialValidator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../phone/abroad/JobsAbroadDialValidator.java | 71 +++++++++++++++++++ .../number/JobsPhoneNumberValidator.java} | 12 ++-- 2 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 src/java/org/mxchange/jjobs/validator/phone/abroad/JobsAbroadDialValidator.java rename src/java/org/mxchange/jjobs/validator/{booleans/JobsUserProfileVisibilityValidator.java => phone/number/JobsPhoneNumberValidator.java} (78%) 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 index 00000000..29a9c04f --- /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 . + */ +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 + *

+ * @author Roland Haeder + */ +@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/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java similarity index 78% rename from src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java rename to src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java index 0fcf0e6a..dcb85d59 100644 --- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java +++ b/src/java/org/mxchange/jjobs/validator/phone/number/JobsPhoneNumberValidator.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jjobs.validator.booleans; +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.bool.BaseBooleanValidator; +import org.mxchange.jcoreee.validator.number.BaseLongValidator; /** - * A validator for user profile visibility + * A validator for phone, fax and mobile numbers *

* @author Roland Haeder */ -@FacesValidator (value = "UserProfileVisibilityValidator") -public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator implements Validator { +@FacesValidator (value = "PhoneNumberValidator") +public class JobsPhoneNumberValidator extends BaseLongValidator implements Validator { /** * Serial number */ - private static final long serialVersionUID = 185_768_717_676_910_450L; + 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 { -- 2.39.5