]> git.mxchange.org Git - addressbook-war.git/commitdiff
no more .strings/bool package + added name fields/validator where missing
authorRoland Häder <roland@mxchange.org>
Wed, 19 Apr 2017 21:40:32 +0000 (23:40 +0200)
committerRoland Häder <roland@mxchange.org>
Wed, 19 Apr 2017 21:44:25 +0000 (23:44 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java [new file with mode: 0644]
src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java [new file with mode: 0644]
src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java [new file with mode: 0644]

index ecf00a9011592bda6cf9bf3a61c512154d248160..26b841588addf7c8bb63d5fc36bfcfe144034c9f 100644 (file)
@@ -42,7 +42,7 @@ public class AddressbookNameValidator extends BaseStringValidator implements Val
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
 
                // All accepted, required fields
-               String[] requiredFields = {"addressbookName"}; //NOI18N
+               String[] requiredFields = {"firstName", "familyName", "city", "street", "addressbookName"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
                super.preValidate(context, component, value, requiredFields, false);
diff --git a/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java b/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java
new file mode 100644 (file)
index 0000000..80633ae
--- /dev/null
@@ -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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.addressbook.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 Häder<roland@mxchange.org>
+ */
+@FacesValidator (value = "AbroadDialValidator")
+public class AddressbookAbroadDialValidator 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/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java b/src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java
new file mode 100644 (file)
index 0000000..b439b69
--- /dev/null
@@ -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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.addressbook.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 Häder<roland@mxchange.org>
+ */
+@FacesValidator (value = "PhoneNumberValidator")
+public class AddressbookPhoneNumberValidator 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/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java b/src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java
new file mode 100644 (file)
index 0000000..91d7c16
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.addressbook.validator.privacy_terms;
+
+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 privacy and terms check boxes
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesValidator (value = "PrivacyTermsCheckboxValidator")
+public class AddressbookPrivacyTermsCheckboxValidator extends BaseBooleanValidator implements Validator {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 49_241_787_855_847_581L;
+
+       @Override
+       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
+
+               // All accepted, required fields
+               String[] requiredFields = {"privacy", "terms"}; //NOI18N
+
+               // Pre-validation (example: not null, not a string, empty string ...)
+               super.preValidate(context, component, value, requiredFields, false);
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println("validate: EXIT!"); //NOI18N
+       }
+}