please copy a matching file from templates.dist and remove this dummy when you want...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
index 7ef8d3fb760654996aa18af5e1b398135bbc1177..c5f824e61024aefb158f90427a94c6722777620b 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
@@ -414,7 +414,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
index 248d9d74bb9cbd864b5b15b205927f64329c6505..677db969eafa6757885e755e0f74bd19ff00fed5 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
@@ -121,7 +121,7 @@ public interface AddressbookContactWebSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Creates an instance from all properties

diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
index 413bd04318027ecf4bd9dd69cfe663c13f800534..c3efdfc0b9a881c7f45ccbb0522d7d5c0db3be9e 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java
@@ -50,7 +50,7 @@ public class AddressbookLocalizationSessionBean extends BaseAddressbookControlle
        private Locale locale;
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -66,12 +66,15 @@ public class AddressbookLocalizationSessionBean extends BaseAddressbookControlle
                        throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N
                }
 
-               // Set locale here
-               this.setLocale(event.getLoggedInUser().getUserLocale());
+               // Is the locale set?
+               if (event.getLoggedInUser().getUserLocale() instanceof Locale) {
+                       // Set locale here
+                       this.setLocale(event.getLoggedInUser().getUserLocale());
+               }
        }
 
        @Override
-       public void afterUserLogout (@Observes final ObservableUserLogoutEvent event) {
+       public void afterUserLogoutEvent (@Observes final ObservableUserLogoutEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE

diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
index ee3ae05b42a768cf23d34e6278792dce089380c5..35e3be916cdb826572aa70013f8227a9309e10f9 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java
@@ -33,14 +33,14 @@ public interface AddressbookLocalizationSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * Event observer for logged-out user
         * <p>
         * @param event Event instance
         */
-       void afterUserLogout (final ObservableUserLogoutEvent event);
+       void afterUserLogoutEvent (final ObservableUserLogoutEvent event);
 
        /**
         * Getter for locale

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
index 7f779a4dacef422e0f95a85f16bf8ae444bfd897..574bb70ccfcc846b5a95fea677d834deab04643e 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
@@ -313,7 +313,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @Override
-       public void afterUserLogin (@Observes final ObservableUserLoggedInEvent event) {
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N
 

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
index fed63f012613f5eb276e930df70e54812478f781..76bfc7a679af24498a1cbd9b9de97315bc8f55f9 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java
@@ -91,7 +91,7 @@ public interface AddressbookUserWebSessionController extends Serializable {
         * <p>
         * @param event Event instance
         */
-       void afterUserLogin (final ObservableUserLoggedInEvent event);
+       void afterUserLoginEvent (final ObservableUserLoggedInEvent event);
 
        /**
         * All users

diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml
index 6e801e5bd4d71a1a8eb25d956e399d1958c9cae3..ce198007138f39abfc0154dfa715e7a53e5d1430 100644 (file)
--- a/web/WEB-INF/templates.dist/admin_page.xhtml
+++ b/web/WEB-INF/templates.dist/admin_page.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index bd39c79843bee3fe146f4a34fa9400379e88df6d..5640a5b2cfe569fa46ee3b5ec5aa53cc2be30580 100644 (file)
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index c42f45c3e2b7f2e3b7b0f31d11f1ef6abca53083..45d21ae75c954839cc8cc9b10135c44169cb695e 100644 (file)
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index 3d5dbd749094351d55c041e893283a0939aadd17..bebb16d2e61c3e30cd0921a97cd424bb76725dce 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
 
                <ui:define name="footer">

diff --git a/web/WEB-INF/templates/guest/guest_index.tpl b/web/WEB-INF/templates/guest/guest_index.tpl
index 50339f55656dc7b3819c4b92fc7b16e5f2f22a82..d2310a442adf628682c388156fcb8a19b018c432 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_index.tpl
+++ b/web/WEB-INF/templates/guest/guest_index.tpl
@@ -5,5 +5,5 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       Here goes your content.
+       <!-- @TODO Here goes your content. //-->
 </ui:composition>

diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
index c37d12ae893f07168ea4415499d26d830596e515..a12d698a72f495fed533283941bce283adb06d13 100644 (file)
--- a/web/admin/country/admin_country_delete.xhtml
+++ b/web/admin/country/admin_country_delete.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
index 35bba855cca8dbeb6bacab2769010eb08714a1e9..9d2303d41e3dfa49b7e6a16e048a84560dbf0f62 100644 (file)
--- a/web/admin/country/admin_country_edit.xhtml
+++ b/web/admin/country/admin_country_edit.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 836c6acaac087ccff38e22465e4d3def3beb853f..3c4bb59d0ab5d6c0698226d9ea355a68506cb00c 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -22,7 +22,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
index 192ef47a54344768e49a721fa8ce45e457b7fae4..a74b0be6c43019ec5f58f0a0d24e9cc9c356b976 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
index cc4c0c78d21decba47cc4fd60c1bacf586180c2e..fe3a89ab918d5bee2b8fe1a93894f2412a2a983a 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
index 72c8d4c1352b5da3dce117121c7d9443a1853f94..e44982e876c6ebed6a224170c3a96b8e269bca16 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/user_show_addressbook_entries.xhtml b/web/guest/user/user_show_addressbook_entries.xhtml
index c93ee9423f48815400775b12c18f14e14832d33f..7e8fd6c743c95851e730bb1855ccad321843a3c2 100644 (file)
--- a/web/guest/user/user_show_addressbook_entries.xhtml
+++ b/web/guest/user/user_show_addressbook_entries.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index f6b6502d1903857965ebe8de3a19baf0d24bbf87..902550a7309f622d5f1b7873bc71f7d40456f48c 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -19,7 +19,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               Here goes your content.
+                               <!-- @TODO Here goes your content. //-->
                        </ui:fragment>
 
                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">

diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml
index 9947fdd5ef7910990f25edf5d2a0e1e52d4d8fa1..de45751ef06cf8a8f59a7d805ec781d8197718d4 100644 (file)
--- a/web/user/login_list_sharing_addressbooks.xhtml
+++ b/web/user/login_list_sharing_addressbooks.xhtml
@@ -27,7 +27,7 @@
                <ui:define name="content">
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <ui:fragment rendered="#{shareController.isShareeUserIdSet()}">
-                                       Here goes your content.
+                                       <!-- @TODO Here goes your content. //-->
                                </ui:fragment>
 
                                <ui:fragment rendered="#{shareController.isShareeUserIdEmpty()}">

diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml
index 98972dad53f652025a49b4612bc19af9b2f3af58..4e650269ec81758c6c9a97ecffd06ae510f59583 100644 (file)
--- a/web/user/login_other_addressbooks.xhtml
+++ b/web/user/login_other_addressbooks.xhtml
@@ -19,7 +19,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               Here goes your content.
+                               <!-- @TODO Here goes your content. //-->
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">