]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 22:54:51 +0000 (00:54 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 22:54:51 +0000 (00:54 +0200)
- used MessageFormat.format() instead of concating, reducing String objects
- moved comment out of ui:composition which avoids adding another ui-row to the
  DOM document
- removed extra space in CSS class list

Signed-off-by: Roland Häder <roland@mxchange.org>
16 files changed:
src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java
web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl
web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_list.xhtml

index 08c7a92ca8bf3ada58b926de3383d89f77b036b1..6659b2ea24f3c912d9fe2d3fed12d12693de067c 100644 (file)
@@ -127,7 +127,7 @@ public class FinancialsBranchOfficeWebRequestBean extends BaseFinancialsBean imp
                        throw new NullPointerException("branchOfficeId is null"); //NOI18N
                } else if (branchOfficeId < 1) {
                        // Throw IAE
-                       throw new IllegalArgumentException("branchOfficeId=" + branchOfficeId + " is invalid"); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("branchOfficeId={0} is invalid", branchOfficeId)); //NOI18N
                } else if (!this.branchOfficeCache.containsKey(branchOfficeId)) {
                        // Not found
                        throw new BranchOfficeNotFoundException(branchOfficeId);
index a3e3da2efe7a63d12e6e551bd07c6112a76ccdd2..57ccb99cb38bf015774022038544585a536847a8 100644 (file)
@@ -11,7 +11,7 @@
        @TODO title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
        -->
        <p:fieldset legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" rendered="#{empty rendered or rendered}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
                        <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
 
index 64a27fe2547a0eeb9677bcfa7402a860ab7d1ad8..8f38ce10dc3511f60e862509bb7c8ac42d4adeff 100644 (file)
@@ -12,7 +12,7 @@
        -->
        <ui:fragment rendered="#{not empty mode}">
                <p:fieldset legend="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}">
-                       <p:panelGrid columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                                <p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
 
index 51cb109489f4ee43d0375696d724c5bfc5302792..036d19cc5a87d5a29118e034340f975ced9fd95e 100644 (file)
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
@@ -8,11 +11,8 @@
        xmlns:p="http://primefaces.org/ui">
 
        <h:panelGroup styleClass="para" layout="block">
-               <!--
-               @TODO: title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}"
-               -->
                <p:fieldset legend="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND}">
-                       <p:panelGrid columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                                <p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
                                <p:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminBasicCompanyDataController.companyName}">
                                        <f:validator validatorId="CompanyNameValidator" />
index c28a53ae2f6db57c0f420c81e5e656a70648ad08..3cfbf3f109d30a2bf95be454c2c6a54ca6055c8a 100644 (file)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="branchCompany"
@@ -68,7 +67,7 @@
        </p:fieldset>
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
                        <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
 
index 240aa49142914b83fff2cc07b66ab623e196816b..b581c709a50f5ddba3a2502432cb31172ab61b97 100644 (file)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
index 1eb97de64a83ecd369cedfe3b6ee4be6acba36a8..750eff43b46bcaa8187037eea0b94ed6fea587c9 100644 (file)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_DEPARTMENT_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{msg.ADMIN_DEPARTMENT_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_DEPARTMENT_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
                        <p:inputText styleClass="input" id="departmentI18nKey" size="2" maxlength="10" value="#{adminDepartmentController.departmentI18nKey}" required="true" requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}" />
 
index eccc9438fd7a4e2bb3e8a352888228dbf898b8cc..78dfa304cffdc0eb883ba90654c5d213992793f0 100644 (file)
@@ -11,7 +11,7 @@
        @TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
        -->
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="employeeCompany" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
                        <p:selectOneMenu
                                id="employeeCompany"
@@ -77,7 +77,7 @@
        @TODO title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}"
        -->
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
                        <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
 
index 8be1098887b83693ec64c29f23d9d1d6fe68e3ec..9587f92d749c786dcbc23e510cda34a6924668c3 100644 (file)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_OPENING_TIME_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{msg.ADMIN_OPENING_TIME_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
index c45091084e5ca11e697e363cdd5a7d1466a7f446..f75eb4faecdbdd61e0f1ce14616b4d9429b90dcb 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_BASIC_COMPANY_DATA_HEADER}" />
 
                                                <h:panelGroup>
index 8888eed8d6b6d89a1dc420ed7454ee8e8b0f24af..bac9b466691fe6b41ac6615d3398c40b6211bad1 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
 
                                                <h:panelGroup>
index c54620290db5c3ab844b03e28a55870e35d5ff5d..e1a7ce903fc2ed65c6063de6a8a6147be04e7ec9 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_DEPARTMENTS_HEADER}" />
 
                                                <h:panelGroup>
index 07c6d8ce4c238b8ee14e0ef61e5988403f9d019e..73b199729b0ca9cb26b85adcc6635e6590ac7d9d 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_EMPLOYEES_HEADER}" />
 
                                                <h:panelGroup>
index a7c0734e2cda093b6df821ac8face7ad4e815780..b9f44055a726ba1a0b06a2baf0f727f149b08533 100644 (file)
@@ -36,7 +36,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
index 83e79006028b4adf353a170bff8aad6f41d34937..de7973ff4892c69429c8eff44c3d4d68010fd4d1 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_OPENING_TIMES_HEADER}" />
 
                                                <h:panelGroup>
index 3bcc3e7713f7d2339f2d72facdbca6f4abd4b7ba..54f122a883ccb7e2071af82a0ef2f1bc974fb3f6 100644 (file)
@@ -37,7 +37,7 @@
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
                                @TODO title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}"
                                -->
                                <p:fieldset legend="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-3, ui-grid-col-9" styleClass="table table-full ui-noborder" layout="grid">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-3,ui-grid-col-9" styleClass="table table-full ui-noborder" layout="grid">
                                                <p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                <p:selectOneMenu
                                                        id="userContact"