fixed tpzo

[jcore-utils.git] / src / org / mxchange / jcoreee / validator / bool / BaseBooleanValidator.java

diff --git a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
index 5ddf0fff58c7b48664b407b84bfefc933b57af3c..7cbad80942bae6cf74643a9cbda25f280b946643 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
+++ b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Roland Haeder
+ * Copyright (C) 2016, 2017 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
@@ -30,7 +30,7 @@ import org.mxchange.jcoreee.validator.BaseObjectValidator;
  * A general boolean value validator.
  * <p>
  * @author BalusC
- * @author Roland Haeder<roland@mxchange.org>
+ * @author Roland Häder<roland@mxchange.org>
  */
 public abstract class BaseBooleanValidator extends BaseObjectValidator implements Validator {
 
@@ -40,17 +40,16 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement
        private static final long serialVersionUID = 42_378_178_715_910_689L;
 
        @Override
-       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, boolean allowNull) throws ValidatorException {
+       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, Boolean allowNull) throws ValidatorException {
                // Trace message
-               //this.getLogger().logTrace(MessageFormat.format("preValidate: context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("preValidate: context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
 
                // Pre-validate
                super.preValidate(context, component, value, requiredFields, allowNull);
 
                // Get client id and init message + key
                String clientId = component.getClientId();
-               FacesMessage facesMessage = null;
-               String requiredMessage;
+               String requiredMessage = null;
 
                // So far all fine, no check if the field is fine
                for (final String field : requiredFields) {
@@ -65,7 +64,6 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement
                                        requiredMessage = MessageFormat.format("Field {0} is not Boolean: {1}", field, value); //NOI18N
 
                                        // Value is not right type
-                                       facesMessage = new FacesMessage(FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage); //NOI18N
                                        break;
                                }
 
@@ -98,16 +96,16 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement
                                        }
 
                                        // Abort processing here
-                                       facesMessage = new FacesMessage(FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage);
                                        break;
                                }
                        }
                }
 
                // Is facesMessage set?
-               if (facesMessage != null) {
+               if (null != requiredMessage) {
                        // Abort here
-                       throw new ValidatorException(facesMessage);
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage));
                }
        }
+
 }