Please cherry-pick:

- renamed currentPassword -> userCurrentPassword

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index 54b5d8c04fe12bda45cf864847788e1c2678ddd7..17cb770bea774801e1995736447336095e9b49ae 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
@@ -85,7 +85,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
        /**
         * Current password
         */
-       private String currentPassword;
+       private String userCurrentPassword;
 
        /**
         * Logged-in user instance
@@ -285,13 +285,13 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
        }
 
        @Override
-       public String getCurrentPassword () {
-               return this.currentPassword;
+       public String getUserCurrentPassword () {
+               return this.userCurrentPassword;
        }
 
        @Override
-       public void setCurrentPassword (final String currentPassword) {
-               this.currentPassword = currentPassword;
+       public void setUserCurrentPassword (final String userCurrentPassword) {
+               this.userCurrentPassword = userCurrentPassword;
        }
 
        @Override
@@ -312,16 +312,16 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
        @Override
        public boolean ifCurrentPasswordMatches () {
                // The current password must be set and not empty
-               if (this.getCurrentPassword() == null) {
+               if (this.getUserCurrentPassword() == null) {
                        // Is not set
-                       throw new NullPointerException("this.currentPassword is null"); //NOI18N
-               } else if (this.getCurrentPassword().isEmpty()) {
+                       throw new NullPointerException("this.userCurrentPassword is null"); //NOI18N
+               } else if (this.getUserCurrentPassword().isEmpty()) {
                        // Is set empty
-                       throw new IllegalStateException("this.currentPassword is empty."); //NOI18N
+                       throw new IllegalStateException("this.userCurrentPassword is empty."); //NOI18N
                }
 
                // Create "container"
-               LoginContainer container = new UserLoginContainer(this.getLoggedInUser(), this.getCurrentPassword());
+               LoginContainer container = new UserLoginContainer(this.getLoggedInUser(), this.getUserCurrentPassword());
 
                // Now check if it matches
                return UserUtils.ifPasswordMatches(container, this.getLoggedInUser());
@@ -387,7 +387,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
         */
        private void clear () {
                // Clear all fields
-               this.setCurrentPassword(null);
+               this.setUserCurrentPassword(null);
        }
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java
index 597a1738e9c2146994b2276926d3d801805aad6b..f7a1cbb8cf9c1a1196f24a2b58240ec35f5d757d 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java
@@ -122,16 +122,16 @@ public interface JobsUserLoginWebSessionController extends Serializable {
        /**
         * Setter for current password (clear text)
         * <p>
-        * @param currentPassword Current password
+        * @param userCurrentPassword Current password
         */
-       void setCurrentPassword (final String currentPassword);
+       void setUserCurrentPassword (final String userCurrentPassword);
 
        /**
         * Getter for current password (clear text)
         * <p>
         * @return Current password
         */
-       String getCurrentPassword ();
+       String getUserCurrentPassword ();
 
        /**
         * Checks whether the (previously entered) current password matches with

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 0a6ab254685401dc84c618629fad26535d082a5d..8c6e2ecee0b1759a4bda0ba294d5b8b334a3296e 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -25,7 +25,7 @@
                                        </div>
 
                                        <div class="table_right">
-                                               <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{targetController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+                                               <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{targetController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
                                                        <!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
                                                </h:inputSecret>
                                        </div>