From: Roland Häder Date: Mon, 26 Jun 2017 21:43:28 +0000 (+0200) Subject: Rewrite continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=85812e4a193036d920bcaa7aa58bf432bb77bc6e;p=jfinancials-war.git Rewrite continued: - Now all project-specific abstract web beans (controllers) inherit from BaseFacesBean to have these nice showFacesMessage() methods. - Also all project-specific abstract EJBs inherit now only BaseDataBean (one was missing in an old project) - So, if you have a WAR project, inherit from BaseFacesBean, if you have an EJB project, inherit from BaseDatabaseBean Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java index 6ecb7e3e..13d77f5a 100644 --- a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java +++ b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java @@ -16,16 +16,16 @@ */ package org.mxchange.jfinancials.beans; -import java.io.Serializable; -import org.mxchange.jcoreee.bean.BaseBean; -import org.mxchange.jusercore.model.user.UserUtils; +import java.util.Locale; +import java.util.ResourceBundle; +import org.mxchange.jcoreee.bean.faces.BaseFacesBean; /** * A general controller *

* @author Roland Häder */ -public abstract class BaseFinancialsController extends BaseBean implements Serializable { +public abstract class BaseFinancialsController extends BaseFacesBean { /** * Serial number @@ -38,28 +38,13 @@ public abstract class BaseFinancialsController extends BaseBean implements Seria protected BaseFinancialsController () { } - /** - * Checks if given password is to weak to be used - *

- * @param password Clear-text password - *

- * @return Whether the entered password is to weak - */ - protected boolean isWeakPassword (final String password) { - // Is parameter set? - if (null == password) { - // Throw NPE - throw new NullPointerException("password is null"); //NOI18N - } - - // Get score value - double passwordScore = UserUtils.calculatePasswordScore(password); - - // Is the score within range? - boolean isWeak = (passwordScore <= this.getIntegerContextParameter("min_user_password_score")); //NOI18N + @Override + protected ResourceBundle loadResourceBundle (final Locale locale) { + // Load resource bundle + ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); // Return it - return isWeak; + return bundle; } } diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java index 5ee49885..f536a8c7 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java @@ -34,9 +34,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; +import org.mxchange.jcontacts.contact.ContactUtils; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.title.PersonalTitle; -import org.mxchange.jcontacts.contact.ContactUtils; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; import org.mxchange.jcontactsbusiness.exceptions.BusinessContactNotFoundException; diff --git a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java index baf1885c..5b6125dd 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java @@ -35,8 +35,8 @@ import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionCo import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; -import org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote; /** * A web session-scoped bean for changing email addresses