Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / validator / password / JobsUserPasswordValidator.java

diff --git a/src/java/org/mxchange/jjobs/validator/password/JobsUserPasswordValidator.java b/src/java/org/mxchange/jjobs/validator/password/JobsUserPasswordValidator.java
index ec513437cc04682512ef0a37b4e09008bd7086bc..8430d9c600dba75d7330161f536880d2a1de8613 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/password/JobsUserPasswordValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/password/JobsUserPasswordValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,6 @@ import java.text.MessageFormat;
 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 javax.naming.Context;
 import javax.naming.InitialContext;
@@ -33,7 +32,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UserPasswordValidator")
-public class JobsUserPasswordValidator extends BaseStringValidator implements Validator {
+public class JobsUserPasswordValidator extends BaseStringValidator {
 
        /**
         * Serial number
@@ -56,11 +55,8 @@ public class JobsUserPasswordValidator extends BaseStringValidator implements Va
 
        @Override
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
-
                // The required field
-               String[] requiredFields = {"currentPassword"}; //NOI18N
+               final String[] requiredFields = {"currentPassword"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
                super.preValidate(context, component, value, requiredFields, false);
@@ -73,12 +69,9 @@ public class JobsUserPasswordValidator extends BaseStringValidator implements Va
                // Test it here
                if (!UserUtils.ifPasswordMatches(container, this.userLoginController.getLoggedInUser())) {
                        // Password mismatches
-                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
                }
                 */
-
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N
        }
 
 }