From b4043f2ecea8ecb59e86655e715ab4f094cf5d4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Apr 2017 12:34:31 +0200 Subject: [PATCH] please copy a matching file from templates.dist and remove this dummy when you want to create your JSF pages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../contact/AddressbookContactWebSessionBean.java | 2 +- .../AddressbookContactWebSessionController.java | 2 +- .../AddressbookLocalizationSessionBean.java | 11 +++++++---- .../AddressbookLocalizationSessionController.java | 4 ++-- .../beans/user/AddressbookUserWebSessionBean.java | 2 +- .../user/AddressbookUserWebSessionController.java | 2 +- web/WEB-INF/templates.dist/admin_page.xhtml | 2 +- web/WEB-INF/templates.dist/guest_login_page.xhtml | 2 +- web/WEB-INF/templates.dist/guest_page.xhtml | 2 +- web/WEB-INF/templates.dist/login_page.xhtml | 2 +- web/WEB-INF/templates/guest/guest_index.tpl | 2 +- web/admin/country/admin_country_delete.xhtml | 2 +- web/admin/country/admin_country_edit.xhtml | 2 +- web/admin/mobile/admin_contact_mobile_unlink.xhtml | 2 +- .../admin_mobile_provider_delete.xhtml | 2 +- .../mobile_provider/admin_mobile_provider_edit.xhtml | 2 +- .../mobile_provider/admin_mobile_provider_show.xhtml | 2 +- web/guest/user/user_show_addressbook_entries.xhtml | 2 +- web/user/login_index.xhtml | 2 +- web/user/login_list_sharing_addressbooks.xhtml | 2 +- web/user/login_other_addressbooks.xhtml | 2 +- 21 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 7ef8d3fb..c5f824e6 100644 --- 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 248d9d74..677db969 100644 --- 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 { *

* @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 413bd043..c3efdfc0 100644 --- 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 ee3ae05b..35e3be91 100644 --- 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 { *

* @param event Event instance */ - void afterUserLogin (final ObservableUserLoggedInEvent event); + void afterUserLoginEvent (final ObservableUserLoggedInEvent event); /** * Event observer for logged-out user *

* @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 7f779a4d..574bb70c 100644 --- 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 fed63f01..76bfc7a6 100644 --- 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 { *

* @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 6e801e5b..ce198007 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -17,7 +17,7 @@ - Here goes your content. + diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml index bd39c798..5640a5b2 100644 --- a/web/WEB-INF/templates.dist/guest_login_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml @@ -17,7 +17,7 @@ - Here goes your content. + diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index c42f45c3..45d21ae7 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -17,7 +17,7 @@ - Here goes your content. + diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index 3d5dbd74..bebb16d2 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -16,7 +16,7 @@ - Here goes your content. + diff --git a/web/WEB-INF/templates/guest/guest_index.tpl b/web/WEB-INF/templates/guest/guest_index.tpl index 50339f55..d2310a44 100644 --- 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. + diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index c37d12ae..a12d698a 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -17,7 +17,7 @@ - Here goes your content. + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index 35bba855..9d2303d4 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -18,7 +18,7 @@ - Here goes your content. + diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml index 836c6aca..3c4bb59d 100644 --- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -22,7 +22,7 @@ - Here goes your content. + diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index 192ef47a..a74b0be6 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -18,7 +18,7 @@ - Here goes your content. + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index cc4c0c78..fe3a89ab 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -18,7 +18,7 @@ - Here goes your content. + diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index 72c8d4c1..e44982e8 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -18,7 +18,7 @@ - Here goes your content. + diff --git a/web/guest/user/user_show_addressbook_entries.xhtml b/web/guest/user/user_show_addressbook_entries.xhtml index c93ee942..7e8fd6c7 100644 --- a/web/guest/user/user_show_addressbook_entries.xhtml +++ b/web/guest/user/user_show_addressbook_entries.xhtml @@ -18,7 +18,7 @@ - Here goes your content. + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index f6b6502d..902550a7 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -19,7 +19,7 @@ - Here goes your content. + diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml index 9947fdd5..de45751e 100644 --- a/web/user/login_list_sharing_addressbooks.xhtml +++ b/web/user/login_list_sharing_addressbooks.xhtml @@ -27,7 +27,7 @@ - Here goes your content. + diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml index 98972dad..4e650269 100644 --- a/web/user/login_other_addressbooks.xhtml +++ b/web/user/login_other_addressbooks.xhtml @@ -19,7 +19,7 @@ - Here goes your content. + -- 2.39.5