From 6b72bf647cedfff6270b7e06741593e75bbc9239 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 19 Apr 2017 23:40:32 +0200 Subject: [PATCH] no more .strings/bool package + added name fields/validator where missing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../names/PizzaNameValidator.java | 4 +- .../item_amount/PizzaItemAmountValidator.java | 2 - .../abroad/PizzaAbroadDialValidator.java | 71 +++++++++++++++++++ .../number/PizzaPhoneNumberValidator.java | 48 +++++++++++++ .../PizzaPrivacyTermsCheckboxValidator.java | 6 +- 5 files changed, 122 insertions(+), 9 deletions(-) rename src/java/org/mxchange/pizzaapplication/validator/{string => }/names/PizzaNameValidator.java (94%) create mode 100644 src/java/org/mxchange/pizzaapplication/validator/phone/abroad/PizzaAbroadDialValidator.java create mode 100644 src/java/org/mxchange/pizzaapplication/validator/phone/number/PizzaPhoneNumberValidator.java rename src/java/org/mxchange/pizzaapplication/validator/{bool => }/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java (90%) diff --git a/src/java/org/mxchange/pizzaapplication/validator/string/names/PizzaNameValidator.java b/src/java/org/mxchange/pizzaapplication/validator/names/PizzaNameValidator.java similarity index 94% rename from src/java/org/mxchange/pizzaapplication/validator/string/names/PizzaNameValidator.java rename to src/java/org/mxchange/pizzaapplication/validator/names/PizzaNameValidator.java index 8b7fd678..e778ebb0 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/string/names/PizzaNameValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/names/PizzaNameValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.pizzaapplication.validator.string.names; +package org.mxchange.pizzaapplication.validator.names; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -27,10 +27,8 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator; * A validation class for names, such as first name or family name. *

* @author Roland Häder - * @deprecated Please copy this to your project */ @FacesValidator (value = "NameValidator") -@Deprecated public class PizzaNameValidator extends BaseStringValidator implements Validator { /** diff --git a/src/java/org/mxchange/pizzaapplication/validator/number/item_amount/PizzaItemAmountValidator.java b/src/java/org/mxchange/pizzaapplication/validator/number/item_amount/PizzaItemAmountValidator.java index f0ef5186..dfe3266f 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/number/item_amount/PizzaItemAmountValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/number/item_amount/PizzaItemAmountValidator.java @@ -27,10 +27,8 @@ import org.mxchange.jcoreee.validator.number.BaseLongValidator; * A validator for item amount *

* @author Roland Häder - * @deprecated Please copy this to your project */ @FacesValidator (value = "ItemAmountValidator") -@Deprecated public class PizzaItemAmountValidator extends BaseLongValidator implements Validator { /** diff --git a/src/java/org/mxchange/pizzaapplication/validator/phone/abroad/PizzaAbroadDialValidator.java b/src/java/org/mxchange/pizzaapplication/validator/phone/abroad/PizzaAbroadDialValidator.java new file mode 100644 index 00000000..0ed2ac57 --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/validator/phone/abroad/PizzaAbroadDialValidator.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2016 Roland Häder + * + * 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.pizzaapplication.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 Häder + */ +@FacesValidator (value = "AbroadDialValidator") +public class PizzaAbroadDialValidator 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/pizzaapplication/validator/phone/number/PizzaPhoneNumberValidator.java b/src/java/org/mxchange/pizzaapplication/validator/phone/number/PizzaPhoneNumberValidator.java new file mode 100644 index 00000000..f44ff67f --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/validator/phone/number/PizzaPhoneNumberValidator.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2016 Roland Häder + * + * 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.pizzaapplication.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 + *

+ * @author Roland Häder + */ +@FacesValidator (value = "PhoneNumberValidator") +public class PizzaPhoneNumberValidator 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); + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/validator/bool/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java b/src/java/org/mxchange/pizzaapplication/validator/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java similarity index 90% rename from src/java/org/mxchange/pizzaapplication/validator/bool/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java rename to src/java/org/mxchange/pizzaapplication/validator/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java index ac4f63ef..60c1811f 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/bool/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/privacy_terms/PizzaPrivacyTermsCheckboxValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.pizzaapplication.validator.bool.privacy_terms; +package org.mxchange.pizzaapplication.validator.privacy_terms; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -24,13 +24,11 @@ import javax.faces.validator.ValidatorException; import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator; /** - * A validator for privacy and terms checkboxes + * A validator for privacy and terms check boxes *

* @author Roland Häder - * @deprecated Please copy this to your project and remove the deprecation annotation */ @FacesValidator (value = "PrivacyTermsCheckboxValidator") -@Deprecated public class PizzaPrivacyTermsCheckboxValidator extends BaseBooleanValidator implements Validator { /** -- 2.39.5