From 65abaef1162e9c3255f532ea5262eb33922d423e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Oct 2017 00:54:51 +0200 Subject: [PATCH] Please cherry-pick: - 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialsBranchOfficeWebRequestBean.java | 2 +- .../form_data/contact/admin_form_contact_data.tpl | 2 +- .../admin/form_data/user/admin_form_user_data.tpl | 2 +- .../admin_form_basic_company_data.tpl | 8 ++++---- .../branch_office/admin_form_branch_office_data.tpl | 11 +++++------ .../admin/branch_office/admin_form_opening_time.tpl | 10 ++++------ .../admin/department/admin_form_department_data.tpl | 10 ++++------ .../admin/employee/admin_form_employee_data.tpl | 4 ++-- .../admin/opening_time/admin_form_opening_time.tpl | 10 ++++------ .../admin_basic_company_data_list.xhtml | 2 +- .../branch_office/admin_branch_office_list.xhtml | 2 +- web/admin/department/admin_department_list.xhtml | 2 +- web/admin/employee/admin_employee_list.xhtml | 2 +- .../mobile_provider/admin_mobile_provider_list.xhtml | 2 +- web/admin/opening_time/admin_opening_time_list.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 4 ++-- 16 files changed, 34 insertions(+), 41 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java index 08c7a92c..6659b2ea 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java @@ -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); diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl index a3e3da2e..57ccb99c 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl @@ -11,7 +11,7 @@ @TODO title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}" --> - + diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl index 64a27fe2..8f38ce10 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl @@ -12,7 +12,7 @@ --> - + diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl index 51cb1094..036d19cc 100644 --- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl +++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl @@ -1,4 +1,7 @@ + - - + diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl index c28a53ae..3cfbf3f1 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl @@ -1,17 +1,16 @@ + - - + - + diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl index 240aa491..b581c709 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl @@ -1,17 +1,15 @@ + - - + diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl index 1eb97de6..750eff43 100644 --- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl +++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl @@ -1,17 +1,15 @@ + - - + diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl index eccc9438..78dfa304 100644 --- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl +++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl @@ -11,7 +11,7 @@ @TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}" --> - + - + diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl index 8be10988..9587f92d 100644 --- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl +++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl @@ -1,17 +1,15 @@ + - - + diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml index c4509108..f75eb4fa 100644 --- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml +++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml @@ -37,7 +37,7 @@ > - + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index 8888eed8..bac9b466 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -37,7 +37,7 @@ > - + diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index c5462029..e1a7ce90 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -37,7 +37,7 @@ > - + diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index 07c6d8ce..73b19972 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -37,7 +37,7 @@ > - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index a7c0734e..b9f44055 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -36,7 +36,7 @@ > - + diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml index 83e79006..de7973ff 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -37,7 +37,7 @@ > - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 3bcc3e77..54f122a8 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -37,7 +37,7 @@ > - + @@ -155,7 +155,7 @@ @TODO title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}" --> - +