From: Roland Häder Date: Fri, 20 May 2016 15:54:59 +0000 (+0200) Subject: used more instead of directly having... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fa59e5d716801dfc1b10339f1d36e401255f9d40;p=jfinancials-war.git used more instead of directly having it in JSF page Signed-off-by: Roland Häder --- diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 943c684b..c4aa97e9 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -1388,7 +1388,7 @@ exists or setup the property manually. For example like this: @@ -1427,7 +1427,7 @@ exists or setup the property manually. For example like this: @@ -1463,7 +1463,7 @@ exists or setup the property manually. For example like this: @@ -1485,7 +1485,7 @@ exists or setup the property manually. For example like this: diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 8f8b1794..4f7fd810 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=c4cf12de -nbproject/build-impl.xml.script.CRC32=e6ac02b3 +nbproject/build-impl.xml.data.CRC32=71b488fe +nbproject/build-impl.xml.script.CRC32=8618eafc nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index 52c34583..9d081be9 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -174,7 +174,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme } @Override - public void afterAddressbookLoadedEvent (final @Observes AddressbookLoadedEvent event) { + public void afterAddressbookLoadedEvent (@Observes final AddressbookLoadedEvent event) { // event should not be null if (null == event) { // Throw NPE @@ -207,7 +207,7 @@ public class AddressbookWebSessionBean extends BaseAddressbookController impleme } @Override - public void afterLoginEvent (final @Observes UserLoggedInEvent event) { + public void afterLoginEvent (@Observes final UserLoggedInEvent event) { // Is the user logged in? if (null == event) { // Is null diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 053fec1a..bf8d7ed6 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -320,7 +320,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController } @Override - public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) { + public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) { // Trace message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N diff --git a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java index 75a37829..5664e088 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java @@ -114,7 +114,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i } @Override - public void afterAdressbookShareEnded (final @Observes AddressbookSharingEvent event) { + public void afterAdressbookShareEnded (@Observes final AddressbookSharingEvent event) { // Validate parameter if (null == event) { // Throw NPE @@ -135,7 +135,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i } @Override - public void afterAdressbookShareStarted (final @Observes AddressbookSharingEvent event) { + public void afterAdressbookShareStarted (@Observes final AddressbookSharingEvent event) { // Validate parameter if (null == event) { // Throw NPE @@ -156,7 +156,7 @@ public class AddressbookSharesWebSessionBean extends BaseAddressbookController i } @Override - public void afterLoginEvent (final @Observes UserLoggedInEvent event) { + public void afterLoginEvent (@Observes final UserLoggedInEvent event) { // Is the user logged in? if (null == event) { // Is null diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index af009469..21816e6d 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -156,7 +156,7 @@
- #{msg.ADMIN_EXPORT_CONTACTS_TITLE} +
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 1e43fcde..af2c2af1 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -18,7 +18,9 @@ - #{msg.ADMIN_CONTACT_ID} + + + @@ -26,31 +28,41 @@ - #{msg.ADMIN_CONTACT_GENDER} + + + - #{msg.ADMIN_CONTACT_FIRST_NAME} + + + - #{msg.ADMIN_CONTACT_FAMILY_NAME} + + + - #{msg.ADMIN_CONTACT_USAGE} + + + - #{msg.ADMIN_CONTACT_CREATED} + + + @@ -61,7 +73,7 @@
- #{msg.ADMIN_ADD_CONTACT_TITLE} +
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 73737268..102d02fc 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -18,7 +18,9 @@ - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID} + + + @@ -26,19 +28,25 @@ - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE} + + + - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX} + + + - #{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME} + + + @@ -47,7 +55,7 @@
- #{msg.ADMIN_ADD_COUNTRY_TITLE} +
@@ -59,9 +67,9 @@
- #{msg.ADMIN_ADD_COUNTRY_NOTICES} +
    -
  • #{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}
  • +
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index ebb50f94..dbd27752 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -18,7 +18,9 @@ - #{msg.ADMIN_LIST_MOBILE_PROVIDER_ID} + + + @@ -26,25 +28,33 @@ - #{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME} + + + - #{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX} + + + - #{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY} + + + - #{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED} + + + @@ -55,7 +65,7 @@
- #{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE} +
@@ -67,9 +77,9 @@
- #{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES} +
    -
  • #{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}
  • +
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 15564ace..42e78ad7 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -18,7 +18,9 @@ - #{msg.ADMIN_LIST_USER_ID} + + + @@ -26,43 +28,57 @@ - #{msg.ADMIN_LIST_USER_NAME} + + + - #{msg.ADMIN_LIST_USER_GENDER} + + + - #{msg.ADMIN_LIST_USER_FIRST_NAME} + + + - #{msg.ADMIN_LIST_USER_FAMILY_NAME} + + + - #{msg.ADMIN_LIST_USER_ACCOUNT_STATUS} + + + - #{msg.ADMIN_LIST_USER_PROFILE_MODE} + + + - #{msg.ADMIN_LIST_USER_CREATED} + + + @@ -73,12 +89,14 @@
- #{msg.ADMIN_ADD_USER_TITLE} +
- #{msg.ADMIN_SELECT_USER_CONTACT_LEGEND} + + +
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index e8e779d1..5f5c2a04 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -28,15 +28,13 @@ - - #{msg.ERROR_PROFILE_NOT_VISIBLE} - +
- #{msg.PUBLIC_USER_PROFILE} +