]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 15:53:23 +0000 (17:53 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 18:25:41 +0000 (20:25 +0200)
- removed event-observing methods from interfaces as they should not be called
  from other beans, but only invoked when the specific event has been fired.
- remember these guide-lines:
  1) Use interface for type-hinting objects, not direct class name.
  2) All methods in interface are considered as callable (by you)
  3) If you still need public methods (like it is needed for @PostConstruct or
     @Observes) don't add that method to interface.
  4) This way, the interface is clean and simple (KISS), no exceptions (of,
     course thrown ...)!

Signed-off-by: Roland Häder <roland@mxchange.org>
26 files changed:
src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java
src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java
src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java
src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java
src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java
src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java
src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestController.java
src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java
src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestController.java
src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileConverter.java
src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java
src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java

index 9ea97178d8d585e2c7a14ac307d0408bfea2db12..f7e085ce87d748b36fa45d24c0f3d8b7c32d2674 100644 (file)
@@ -251,8 +251,13 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.emailAddressList = new LinkedList<>();
        }
 
-       @Override
-       public void afterAdminAddedContact (@Observes final ObservableAdminAddedContactEvent event) {
+       /**
+        * Observes events being fired when an administrator has added a new
+        * contact.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) {
                // The event must be valid
                if (null == event) {
                        // Throw NPE
@@ -278,7 +283,11 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.selectableContacts.add(event.getAddedContact());
        }
 
-       @Override
+       /**
+        * Event observer for newly added users by adminstrator
+        * <p>
+        * @param event Event being fired
+        */
        public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // event should not be null
                if (null == event) {
@@ -299,8 +308,13 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.clear();
        }
 
-       @Override
-       public void afterAdminLinkedUser (@Observes final ObservableAdminLinkedUserEvent event) {
+       /**
+        * Observes events being fired when an administrator has linked a new user
+        * with existing contact data.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminLinkedUserEvent (@Observes final ObservableAdminLinkedUserEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -326,7 +340,11 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.clear();
        }
 
-       @Override
+       /**
+        * Event observer for updated contact data by administrators
+        * <p>
+        * @param event Updated contact data event
+        */
        public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
                // event should not be null
                if (null == event) {
@@ -350,8 +368,12 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.emailAddressList.add(event.getUpdatedContact().getContactEmailAddress());
        }
 
-       @Override
-       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
+       /**
+        * Event observer for new user registrations
+        * <p>
+        * @param event User registration event
+        */
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -383,7 +405,11 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.clear();
        }
 
-       @Override
+       /**
+        * Event observer when user confirmed account.
+        * <p>
+        * @param event Event being fired
+        */
        public void afterUserConfirmedAccount (@Observes final ObservableUserConfirmedAccountEvent event) {
                // event should not be null
                if (null == event) {
@@ -404,7 +430,11 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
                this.uniqueAddContact(event.getConfirmedUser().getUserContact());
        }
 
-       @Override
+       /**
+        * Event observer for logged-in user
+        * <p>
+        * @param event Event instance
+        */
        public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
index df40b397d1fed75f8ca78b46c55e82e5271dd5c6..b0b8b8ac1c2826a100a6b440ffdd5e85169ce436 100644 (file)
@@ -25,13 +25,6 @@ import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
-import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An interface for user beans
@@ -53,20 +46,6 @@ public interface FinancialsContactWebSessionController extends Serializable {
         */
        List<Contact> allContacts ();
 
-       /**
-        * Event observer for newly added users by adminstrator
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
-
-       /**
-        * Event observer when user confirmed account.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterUserConfirmedAccount (final ObservableUserConfirmedAccountEvent event);
-
        /**
         * Updates all data from bean in given contact instance
         * <p>
@@ -86,43 +65,6 @@ public interface FinancialsContactWebSessionController extends Serializable {
         */
        Contact lookupContactById (final Long contactId) throws ContactNotFoundException;
 
-       /**
-        * Event observer for new user registrations
-        * <p>
-        * @param event User registration event
-        */
-       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
-
-       /**
-        * Observes events being fired when an administrator has added a new
-        * contact.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedContact (final ObservableAdminAddedContactEvent event);
-
-       /**
-        * Observes events being fired when an administrator has linked a new user
-        * with existing contact data.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminLinkedUser (final ObservableAdminLinkedUserEvent event);
-
-       /**
-        * Event observer for updated contact data by administrators
-        * <p>
-        * @param event Updated contact data event
-        */
-       void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event);
-
-       /**
-        * Event observer for logged-in user
-        * <p>
-        * @param event Event instance
-        */
-       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
-
        /**
         * Creates an instance from all properties
         * <p>
index 27fe38156b70ce0dd08030f13703e200ba858eb5..cc9f9862dc63fe11ba2c5607ef6b2972517ff155 100644 (file)
@@ -30,14 +30,14 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
+import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
 import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
+import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * A general contact bean (controller)
@@ -96,8 +96,13 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
                this.contacts = new HashMap<>(10);
        }
 
-       @Override
-       public void afterAdminAddedContact (@Observes final ObservableAdminAddedContactEvent event) {
+       /**
+        * Observes events being fired when an administrator has added a new
+        * contact.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) {
                // The event must be valid
                if (null == event) {
                        // Throw NPE
@@ -117,7 +122,11 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
                this.clear();
        }
 
-       @Override
+       /**
+        * Event observer for newly added users by adminstrator
+        * <p>
+        * @param event Event being fired
+        */
        public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // event should not be null
                if (null == event) {
@@ -138,7 +147,11 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll
                this.clear();
        }
 
-       @Override
+       /**
+        * Event observer for updated contact data by administrators
+        * <p>
+        * @param event Updated contact data event
+        */
        public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
                // event should not be null
                if (null == event) {
index 2ad5cae4795a5ceb33eddf0fbdfed81d2c316d2a..a32509892c4865d04fa85caa0b6abade5cd37451 100644 (file)
@@ -20,9 +20,6 @@ import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 
 /**
  * An interface for user beans
@@ -44,26 +41,4 @@ public interface FinancialsContactPhoneWebSessionController extends Serializable
         */
        List<Contact> allMobileContacts ();
 
-       /**
-        * Event observer for newly added users by adminstrator
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
-
-       /**
-        * Observes events being fired when an administrator has added a new
-        * contact.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedContact (final ObservableAdminAddedContactEvent event);
-
-       /**
-        * Event observer for updated contact data by administrators
-        * <p>
-        * @param event Updated contact data event
-        */
-       void afterAdminUpdatedContactDataEvent (final ObservableAdminUpdatedContactEvent event);
-
 }
index 4333eaa42bad30399804eae3213adf882103d238..af4bef91f95c950a617f79a2f27a15d669a561b4 100644 (file)
@@ -26,10 +26,10 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
 import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
+import org.mxchange.jfinancials.beans.BaseFinancialsController;
 
 /**
  * A country bean
@@ -72,8 +72,13 @@ public class FinancialsCountryWebApplicationBean extends BaseFinancialsControlle
                }
        }
 
-       @Override
-       public void afterAdminAddedCountry (@Observes final ObservableAdminAddedCountryEvent event) {
+       /**
+        * Observing method when the event is fired that an administrator added a
+        * new country
+        * <p>
+        * @param event Event instance
+        */
+       public void afterAdminAddedCountryEvent (@Observes final ObservableAdminAddedCountryEvent event) {
                // Is all valid?
                if (null == event) {
                        // Throw NPE
index 93d4ecd6ced90b2159cf03c2d031645f0d6d3e77..9605ecf7be7ad44d9b0f8341e856d4ab99934ac7 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jfinancials.beans.country;
 import java.io.Serializable;
 import java.util.List;
 import org.mxchange.jcountry.data.Country;
-import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
 
 /**
  * An interface for country beans
@@ -35,12 +34,4 @@ public interface FinancialsCountryWebApplicationController extends Serializable
         */
        List<Country> allCountries ();
 
-       /**
-        * Observing method when the event is fired that an administrator added a
-        * new country
-        * <p>
-        * @param event Event instance
-        */
-       void afterAdminAddedCountry (final ObservableAdminAddedCountryEvent event);
-
 }
index 9f0bff86e5f851865b65e20d2199346ccc67a35c..16f669f799e98f88fa41ab2f560dcfbb63f29fd7 100644 (file)
@@ -49,7 +49,11 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
         */
        private Locale locale;
 
-       @Override
+       /**
+        * Event observer for logged-in user
+        * <p>
+        * @param event Event instance
+        */
        public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
@@ -73,7 +77,11 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController
                }
        }
 
-       @Override
+       /**
+        * Event observer for logged-out user
+        * <p>
+        * @param event Event instance
+        */
        public void afterUserLogoutEvent (@Observes final ObservableUserLogoutEvent event) {
                // event should not be null
                if (null == event) {
index 4d56fb9c43b9fbaa17d306c75be7d3aa0cc3bd9d..e420470c255ab953726e3a6f7542146849c9f783 100644 (file)
@@ -18,8 +18,6 @@ package org.mxchange.jfinancials.beans.localization;
 
 import java.io.Serializable;
 import java.util.Locale;
-import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
-import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
 
 /**
  * An interface for localization change beans
@@ -28,20 +26,6 @@ import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
  */
 public interface FinancialsLocalizationSessionController extends Serializable {
 
-       /**
-        * Event observer for logged-in user
-        * <p>
-        * @param event Event instance
-        */
-       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
-
-       /**
-        * Event observer for logged-out user
-        * <p>
-        * @param event Event instance
-        */
-       void afterUserLogoutEvent (final ObservableUserLogoutEvent event);
-
        /**
         * Getter for locale
         * <p>
index 3d8d5082c1851d460a2b526ca729e5b6acda28c7..edeca07b516c449106be70c099c8aa9bdf2b482f 100644 (file)
@@ -32,10 +32,14 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
 import org.mxchange.jusercore.container.login.LoginContainer;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
+import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
+import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
 import org.mxchange.jusercore.events.logout.UserLogoutEvent;
+import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
@@ -47,10 +51,6 @@ import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
 import org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
-import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
-import org.mxchange.jusercore.events.logout.ObservableUserLogoutEvent;
-import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * A web bean for user registration
@@ -154,7 +154,12 @@ public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController
                }
        }
 
-       @Override
+       /**
+        * Method being call after user's password has been updated (and history
+        * entry has been created).
+        * <p>
+        * @param event Event being observed
+        */
        public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) {
                // Check parameter
                if (null == event) {
index 8089502a657d311b606cb55c57ce7260b52fd2db..1e56985495bee0310fa00bb707ec9d65fd71feb5 100644 (file)
@@ -21,7 +21,6 @@ import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
-import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
 
 /**
  * An interface for registration web controllers
@@ -31,14 +30,6 @@ import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserP
 @Local
 public interface FinancialsUserLoginWebSessionController extends Serializable {
 
-       /**
-        * Method being call after user's password has been updated (and history
-        * entry has been created).
-        * <p>
-        * @param event Event being observed
-        */
-       void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event);
-
        /**
         * Checks whether given clear-text password is in user's password history.
         * <p>
index 99693d438f602164f4605fc793115fa132e7776d..43f3684b3a81b00a597a36e8879b5a85cc23fd53 100644 (file)
@@ -72,8 +72,13 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
                }
        }
 
-       @Override
-       public void afterAdminAddedMobileProvider (@Observes final AdminAddedMobileProviderEvent event) {
+       /**
+        * Observes events being fired after the administrator has added a new
+        * mobile provider
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedMobileProviderEvent (@Observes final AdminAddedMobileProviderEvent event) {
                // Is all valid?
                if (null == event) {
                        // Throw NPE
index 482971700cee0fdaba3b71905ff7bbfdb9f93121..2f8c3fe0317509a76fe049100b2583530547e0d5 100644 (file)
@@ -18,7 +18,6 @@ package org.mxchange.jfinancials.beans.mobileprovider;
 
 import java.io.Serializable;
 import java.util.List;
-import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 
 /**
@@ -35,12 +34,4 @@ public interface FinancialsMobileProviderWebRequestController extends Serializab
         */
        List<MobileProvider> allMobileProviders ();
 
-       /**
-        * Observes events being fired after the administrator has added a new
-        * mobile provider
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedMobileProvider (final AdminAddedMobileProviderEvent event);
-
 }
index 49dc0697f191164b4552c97f2a90d686daa848d6..2ded159e0e547d389886c0849f780442c8bd5eb8 100644 (file)
@@ -26,10 +26,15 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcoreee.utils.FacesUtils;
+import org.mxchange.jfinancials.beans.BaseFinancialsController;
+import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
+import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
+import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.exceptions.DataRepeatMismatchException;
 import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException;
@@ -38,11 +43,6 @@ import org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController;
-import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
-import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;
-import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
-import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * A web bean for user registration
@@ -77,7 +77,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
        private FinancialsFeaturesWebApplicationController featureController;
 
        /**
-        * Reemote register session bean
+        * Remote register session bean
         */
        private UserRegistrationSessionBeanRemote registerBean;
 
@@ -221,7 +221,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
                }
 
                // Now only redirect to next page as the JSF does it
-               return "register_page2"; //NOI18N
+               return "user_register_page2"; //NOI18N
        }
 
 }
index 411153d8b4704c35252205b7e392af63b2128297..030e32ebec7b9084ae3684d2d68d4bd5f607e601 100644 (file)
@@ -144,12 +144,12 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
        private String userName;
 
        /**
-        * User password (unencrypted from web form)
+        * User password (clear-text from web form)
         */
        private String userPassword;
 
        /**
-        * User password repeated (unencrypted from web form)
+        * User password repeated (clear-text from web form)
         */
        private String userPasswordRepeat;
 
@@ -297,8 +297,12 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
                return "admin_list_user"; //NOI18N
        }
 
-       @Override
-       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
+       /**
+        * Event observer for new user registrations
+        * <p>
+        * @param event User registration event
+        */
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -318,7 +322,6 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController
                User registeredUser = event.getRegisteredUser();
 
                // @TODO Nothing to do with the user here?
-
                // Clear all data
                this.clear();
        }
index 52a0229f5cb360e8ee370c0195112300c2270723..f73f2edb79e0a31fca879eb0b21569a417d39975 100644 (file)
@@ -18,7 +18,6 @@ package org.mxchange.jfinancials.beans.user;
 
 import java.io.Serializable;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * An interface for user beans
@@ -27,13 +26,6 @@ import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
  */
 public interface FinancialsAdminUserWebRequestController extends Serializable {
 
-       /**
-        * Event observer for new user registrations
-        * <p>
-        * @param event User registration event
-        */
-       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
-
        /**
         * Adds user instance to database by preparing a complete user instance and
         * sending it to the EJB. The data set in the controller is being verified,
@@ -85,30 +77,30 @@ public interface FinancialsAdminUserWebRequestController extends Serializable {
        void setUserName (final String userName);
 
        /**
-        * Getter for unencrypted user password
+        * Getter for clear-text user password
         * <p>
-        * @return Unencrypted user password
+        * @return Clear-text user password
         */
        String getUserPassword ();
 
        /**
-        * Setter for unencrypted user password
+        * Setter for clear-text user password
         * <p>
-        * @param userPassword Unencrypted user password
+        * @param userPassword Clear-text user password
         */
        void setUserPassword (final String userPassword);
 
        /**
-        * Getter for unencrypted user password repeated
+        * Getter for clear-text user password repeated
         * <p>
-        * @return Unencrypted user password repeated
+        * @return Clear-text user password repeated
         */
        String getUserPasswordRepeat ();
 
        /**
-        * Setter for unencrypted user password repeated
+        * Setter for clear-text user password repeated
         * <p>
-        * @param userPasswordRepeat Unencrypted user password repeated
+        * @param userPasswordRepeat Clear-text user password repeated
         */
        void setUserPasswordRepeat (final String userPasswordRepeat);
 
index 3d4415d53929f7f94c83049d23dd350436f42201..29d95c4fd3c60dcf99bc53b3f232f8dfb0e01c0a 100644 (file)
@@ -132,12 +132,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        private List<String> userNameList;
 
        /**
-        * User password (unencrypted from web form)
+        * User password (clear-text from web form)
         */
        private String userPassword;
 
        /**
-        * User password repeated (unencrypted from web form)
+        * User password repeated (clear-text from web form)
         */
        private String userPasswordRepeat;
 
@@ -174,7 +174,11 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                }
        }
 
-       @Override
+       /**
+        * Event observer for newly added users by adminstrator
+        * <p>
+        * @param event Event being fired
+        */
        public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // event should not be null
                if (null == event) {
@@ -201,7 +205,11 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.setUserId(event.getAddedUser().getUserId());
        }
 
-       @Override
+       /**
+        * Event observer for updated user data by administrator
+        * <p>
+        * @param event Event being updated
+        */
        public void afterAdminUpdatedUserDataEvent (@Observes final ObservableAdminUpdatedUserDataEvent event) {
                // event should not be null
                if (null == event) {
@@ -225,8 +233,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.clear();
        }
 
-       @Override
-       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
+       /**
+        * Event observer for new user registrations
+        * <p>
+        * @param event User registration event
+        */
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -267,8 +279,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.setUserId(registeredUser.getUserId());
        }
 
-       @Override
-       public void afterUserConfirmedAccount (@Observes final ObservableUserConfirmedAccountEvent event) {
+       /**
+        * Event observer when user confirmed account.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterUserConfirmedAccountEvent (@Observes final ObservableUserConfirmedAccountEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -288,7 +304,11 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.uniqueAddUser(event.getConfirmedUser());
        }
 
-       @Override
+       /**
+        * Event observer for logged-in user
+        * <p>
+        * @param event Event instance
+        */
        public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
@@ -318,7 +338,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                }
        }
 
-       @Override
+       /**
+        * Method being call after user's password has been updated (and history
+        * entry has been created).
+        * <p>
+        * @param event Event being observed
+        */
        public void afterUserUpdatedPasswordEvent (@Observes final ObservableUpdatedUserPasswordEvent event) {
                // Check parameter
                if (null == event) {
@@ -339,8 +364,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.updateList(event.getPasswordHistory().getUserPasswordHistoryUser());
        }
 
-       @Override
-       public void afterUserUpdatedPersonalData (@Observes final ObservableUpdatedUserPersonalDataEvent event) {
+       /**
+        * Listens to fired event when user updated personal data
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterUserUpdatedPersonalDataEvent (@Observes final ObservableUpdatedUserPersonalDataEvent event) {
                // Check parameter
                if (null == event) {
                        // Throw NPE
@@ -383,7 +412,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                User user = new LoginUser();
 
                // Is user name required?
-               if (!this.isUserNameRequired()) {
+               if ((!this.featureController.isFeatureEnabled("user_name_required")) && (this.getUserName() == null)) { //NOI18N
                        // Generate pseudo-random user name
                        String randomName = this.userBean.generateRandomUserName();
 
@@ -450,7 +479,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
                        throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
-               } else if (!this.featureController.isFeatureEnabled("edit_user_data")) {
+               } else if (!this.featureController.isFeatureEnabled("edit_user_data")) { //NOI18N
                        // Editing is not allowed
                        throw new IllegalStateException("User tried to edit personal data."); //NOI18N
                }
@@ -462,12 +491,12 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                this.contactController.updateContactDataFromController(user.getUserContact());
 
                // It should be there, so run some tests on it
-               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null";
-               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null";
-               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId());
-               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null";
-               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null";
-               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId());
+               assert (user instanceof User) : "Instance userLoginController.loggedInUser is null"; //NOI18N
+               assert (user.getUserId() instanceof Long) : "Instance userLoginController.loggedInUser.userId is null"; //NOI18N
+               assert (user.getUserId() > 0) : MessageFormat.format("userLoginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N
+               assert (user.getUserContact() instanceof Contact) : "Instance userLoginController.loggedInUser.userContact is null"; //NOI18N
+               assert (user.getUserContact().getContactId() instanceof Long) : "Instance userLoginController.userContact.contactId is null"; //NOI18N
+               assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
 
                // Update all fields
                user.setUserProfileMode(this.getUserProfileMode());
@@ -599,7 +628,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                boolean isEnabled = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
 
                // This requires user names being enabled, too.
-               if ((isEnabled) && (!this.isUserNameRequired())) {
+               if ((isEnabled) && (!this.featureController.isFeatureEnabled("user_name_required"))) { //NOI18N
                        // Not valid state, users must be able to modify their profile, especially when it is public
                        throw new IllegalStateException("Public user profiles are enabled but user name requirement is disabled, this is not possible."); //NOI18N
                }
@@ -622,7 +651,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                        return this.contactController.isRequiredPersonalDataSet();
                } else {
                        // Single registration page
-                       return (((this.getUserName() != null) || (!this.isUserNameRequired())) &&
+                       return (((this.getUserName() != null) || (!this.featureController.isFeatureEnabled("user_name_required"))) && //NOI18N
                                        (this.getUserProfileMode() != null) &&
                                        (this.contactController.isRequiredPersonalDataSet()) &&
                                        (this.getUserPassword() != null) &&
@@ -645,18 +674,6 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
                return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName())));
        }
 
-       @Override
-       public boolean isUserNameRequired () {
-               // Get context parameter
-               String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_name_required"); //NOI18N
-
-               // Is it set?
-               boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
-
-               // Return value
-               return isRequired;
-       }
-
        @Override
        public boolean isVisibleUserFound () {
                return ((this.visibleUserList instanceof List) && (!this.visibleUserList.isEmpty()));
index b67a1be71c4d43aa38614f3df7183e40651da63b..48a3e29d57bf1248291121e2310f740fb17f839e 100644 (file)
@@ -23,13 +23,6 @@ import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent;
-import org.mxchange.jusercore.events.user.update.ObservableAdminUpdatedUserDataEvent;
-import org.mxchange.jusercore.events.user.update.ObservableUpdatedUserPersonalDataEvent;
 
 /**
  * An interface for user beans
@@ -43,56 +36,6 @@ public interface FinancialsUserWebSessionController extends Serializable {
         */
        public static final Integer MINIMUM_PASSWORD_LENGTH = 5;
 
-       /**
-        * Event observer for newly added users by adminstrator
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedUserEvent (final ObservableAdminAddedUserEvent event);
-
-       /**
-        * Event observer for updated user data by administrator
-        * <p>
-        * @param event Event being updated
-        */
-       void afterAdminUpdatedUserDataEvent (final ObservableAdminUpdatedUserDataEvent event);
-
-       /**
-        * Event observer when user confirmed account.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterUserConfirmedAccount (final ObservableUserConfirmedAccountEvent event);
-
-       /**
-        * Method being call after user's password has been updated (and history
-        * entry has been created).
-        * <p>
-        * @param event Event being observed
-        */
-       void afterUserUpdatedPasswordEvent (final ObservableUpdatedUserPasswordEvent event);
-
-       /**
-        * Listens to fired event when user updated personal data
-        * <p>
-        * @param event Event being fired
-        */
-       void afterUserUpdatedPersonalData (final ObservableUpdatedUserPersonalDataEvent event);
-
-       /**
-        * Event observer for new user registrations
-        * <p>
-        * @param event User registration event
-        */
-       void afterRegistrationEvent (final ObservableUserRegisteredEvent event);
-
-       /**
-        * Event observer for logged-in user
-        * <p>
-        * @param event Event instance
-        */
-       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
-
        /**
         * All users
         * <p>
@@ -202,30 +145,30 @@ public interface FinancialsUserWebSessionController extends Serializable {
        void setUserName (final String userName);
 
        /**
-        * Getter for unencrypted user password
+        * Getter for clear-text user password
         * <p>
-        * @return Unencrypted user password
+        * @return Clear-text user password
         */
        String getUserPassword ();
 
        /**
-        * Setter for unencrypted user password
+        * Setter for clear-text user password
         * <p>
-        * @param userPassword Unencrypted user password
+        * @param userPassword Clear-text user password
         */
        void setUserPassword (final String userPassword);
 
        /**
-        * Getter for unencrypted user password repeated
+        * Getter for clear-text user password repeated
         * <p>
-        * @return Unencrypted user password repeated
+        * @return Clear-text user password repeated
         */
        String getUserPasswordRepeat ();
 
        /**
-        * Setter for unencrypted user password repeated
+        * Setter for clear-text user password repeated
         * <p>
-        * @param userPasswordRepeat Unencrypted user password repeated
+        * @param userPasswordRepeat Clear-text user password repeated
         */
        void setUserPasswordRepeat (final String userPasswordRepeat);
 
@@ -279,14 +222,6 @@ public interface FinancialsUserWebSessionController extends Serializable {
         */
        String doChangePersonalData ();
 
-       /**
-        * Checks whether this application requires a user name to be entered.
-        * Otherwise a random name like "userXXXXX" is generated
-        * <p>
-        * @return Whether this application requires a user name
-        */
-       boolean isUserNameRequired ();
-
        /**
         * Checks wether public user profiles are enabled. This requires that user
         * names are also enabled.
index 5564dc5599706c74243375bab394c18081317690..fc0f235a680a1967c7c0e529805e670da454d4cc 100644 (file)
@@ -78,12 +78,12 @@ public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsControll
        private FinancialsUserLoginWebSessionController userLoginController;
 
        /**
-        * User password (unencrypted from web form)
+        * User password (clear-text from web form)
         */
        private String userPassword;
 
        /**
-        * User password repeated (unencrypted from web form)
+        * User password repeated (clear-text from web form)
         */
        private String userPasswordRepeat;
 
index 9241dae6cf75241c157c9f08b110b5ebd173c139..72c4de4db672927eef57111fc61237bcad1d6d20 100644 (file)
@@ -28,44 +28,44 @@ import javax.ejb.Local;
 public interface FinancialsUserPasswordWebRequestController extends Serializable {
 
        /**
-        * Getter for unencrypted user password
+        * Getter for clear-text user password
         * <p>
-        * @return Unencrypted user password
+        * @return Clear-text user password
         */
        String getUserPassword ();
 
        /**
-        * Setter for unencrypted user password
+        * Setter for clear-text user password
         * <p>
-        * @param userPassword Unencrypted user password
+        * @param userPassword Clear-text user password
         */
        void setUserPassword (final String userPassword);
 
        /**
-        * Getter for current unencrypted user password
+        * Getter for current clear-text user password
         * <p>
-        * @return Current unencrypted user password
+        * @return Current clear-text user password
         */
        String getUserCurrentPassword ();
 
        /**
-        * Setter for current unencrypted user password
+        * Setter for current clear-text user password
         * <p>
-        * @param userCurrentPassword Current unencrypted user password
+        * @param userCurrentPassword Current clear-text user password
         */
        void setUserCurrentPassword (final String userCurrentPassword);
 
        /**
-        * Getter for unencrypted user password repeated
+        * Getter for clear-text user password repeated
         * <p>
-        * @return Unencrypted user password repeated
+        * @return Clear-text user password repeated
         */
        String getUserPasswordRepeat ();
 
        /**
-        * Setter for unencrypted user password repeated
+        * Setter for clear-text user password repeated
         * <p>
-        * @param userPasswordRepeat Unencrypted user password repeated
+        * @param userPasswordRepeat Clear-text user password repeated
         */
        void setUserPasswordRepeat (final String userPasswordRepeat);
 
index db41c04f89b8427e2516150ced0e60a37b688f5b..2b0227fc371972781236a068d55ae5fbae4b0d64 100644 (file)
@@ -61,9 +61,6 @@ public class FinancialsContactConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2} - CALLED!", context, component, submittedValue)); //NOI18N
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -80,14 +77,8 @@ public class FinancialsContactConverter implements Converter {
                        // Try to parse the value as long
                        Long contactId = Long.valueOf(submittedValue);
 
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: contactId{0}", contactId)); //NOI18N
-
                        // Try to get user instance from it
                        contact = this.contactBean.findContactById(contactId);
-
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: contact={0}", contact)); //NOI18N
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
@@ -96,9 +87,6 @@ public class FinancialsContactConverter implements Converter {
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
                }
 
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: contact={0} - EXIT!", contact)); //NOI18N
-
                // Return it
                return contact;
        }
index 470a63ad6d230beb3f05fa5afd681e509ae6dfac..db941ab4d81bc331981a2d3fdb010c27b34c3bd1 100644 (file)
@@ -62,9 +62,6 @@ public class FinancialsCountryConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2},this.countryBean={3} - CALLED!", context, component, submittedValue, this.countryBean)); //NOI18N
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -88,9 +85,6 @@ public class FinancialsCountryConverter implements Converter {
                        // Category id should not be below 1
                        assert (countryId > 0) : "countryId is smaller than one: " + countryId; //NOI18N
 
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: countryId={0}", countryId)); //NOI18N
-
                        // Try to find it
                        for (final Country cntry : countryList) {
                                // Is the id the same? (null-safe)
@@ -105,9 +99,6 @@ public class FinancialsCountryConverter implements Converter {
                        throw new ConverterException(ex);
                }
 
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: country={0} - EXIT!", country)); //NOI18N
-
                // Return it
                return country;
        }
index 8a791568f452ad82a605d71c8c603bdedf57cd82..f22b5d53d752e37254542c9953495e497fb022c7 100644 (file)
@@ -62,9 +62,6 @@ public class FinancialsMobileConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2} - CALLED!", context, component, submittedValue)); //NOI18N
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -81,14 +78,8 @@ public class FinancialsMobileConverter implements Converter {
                        // Try to parse the value as long
                        Long mobileId = Long.valueOf(submittedValue);
 
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: userId{0}", userId)); //NOI18N
-
                        // Try to get mobile instance from it
                        mobile = this.phoneBean.findMobileNumberById(mobileId);
-
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: mobile={0}", mobile)); //NOI18N
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
@@ -97,9 +88,6 @@ public class FinancialsMobileConverter implements Converter {
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
                }
 
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: mobile={0} - EXIT!", mobile)); //NOI18N
-
                // Return it
                return mobile;
        }
index b4afd58f0de622161899e16ab414cae2da79fda1..161ba24983dd6520fba58556e6154c9f597a17c9 100644 (file)
@@ -62,9 +62,6 @@ public class FinancialsMobileProviderConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2} - CALLED!", context, component, submittedValue)); //NOI18N
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -88,9 +85,6 @@ public class FinancialsMobileProviderConverter implements Converter {
                        // Category id should not be below 1
                        assert (providerId > 0) : "providerId is smaller than one: " + providerId; //NOI18N
 
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: providerId={0}", providerId)); //NOI18N
-
                        // Try to find it
                        for (final MobileProvider prov : providerList) {
                                // Is the id the same? (null-safe)
@@ -105,9 +99,6 @@ public class FinancialsMobileProviderConverter implements Converter {
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logException(ex);
                }
 
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: provider={0} - EXIT!", provider)); //NOI18N
-
                // Return it
                return provider;
        }
index 633fab80e869d697ae23c91767903dc1c8fc4e76..cd37f065c81a03b967caa17de9c47a6aa69e68ea 100644 (file)
@@ -61,9 +61,6 @@ public class FinancialsUserConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2} - CALLED!", context, component, submittedValue)); //NOI18N
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -80,14 +77,8 @@ public class FinancialsUserConverter implements Converter {
                        // Try to parse the value as long
                        Long userId = Long.valueOf(submittedValue);
 
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: userId{0}", userId)); //NOI18N
-
                        // Try to get user instance from it
                        user = this.userBean.findUserById(userId);
-
-                       // Debug message
-                       // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: user={0}", user)); //NOI18N
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
@@ -96,9 +87,6 @@ public class FinancialsUserConverter implements Converter {
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: Exception: {0} - Returning null ...", ex)); //NOI18N
                }
 
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: user={0} - EXIT!", user)); //NOI18N
-
                // Return it
                return user;
        }
index d385f334dec6536f80a63bc5a713d0184a91b701..bc3ea9d5784ac1a0e460221fdac0a2469cd6e1f5 100644 (file)
@@ -58,9 +58,6 @@ public class FinancialsBirthdayValidator extends BaseDateValidator 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
-
                // All accepted, required fields
                String[] requiredFields = {"birthday", "contactBirthday"}; //NOI18N
 
@@ -71,8 +68,6 @@ public class FinancialsBirthdayValidator extends BaseDateValidator implements Va
                Date birthday = (Date) value;
 
                // @TODO Finish this, e.g. load maximum,minimum birthday from properties file
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N
        }
 
 }
index 2b172dde95444b057b663778420d1fd180f90657..b8ffd6348605681f6413d5baf13ed58aa0c6fc61 100644 (file)
@@ -80,10 +80,7 @@ public class FinancialsUserIdValidator extends BaseLongValidator implements Vali
         * <p>
         * @param event User registration event
         */
-       public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("UserIdValidator:afterRegistrationEvent: event={0} - CALLED!", event)); //NOI18N
-
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -102,21 +99,12 @@ public class FinancialsUserIdValidator extends BaseLongValidator implements Vali
                // Get user instance
                User registeredUser = event.getRegisteredUser();
 
-               // Debug message
-               // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("UserIdValidator:afterRegistrationEvent: registeredUser={0}", registeredUser)); //NOI18N
-
                // Update cache
                FinancialsUserIdValidator.cachedStatus.add(registeredUser.getUserId());
-
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace("UserIdValidator:afterRegistrationEvent: EXIT!"); //NOI18N
        }
 
        @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
-
                // All accepted, required fields
                String[] requiredFields = {"userId"}; //NOI18N
 
@@ -146,9 +134,6 @@ public class FinancialsUserIdValidator extends BaseLongValidator implements Vali
 
                // Add to cache if valid
                FinancialsUserIdValidator.cachedStatus.add(userId);
-
-               // Trace message
-               // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N
        }
 
 }