From 746e1e7987d558e2fe7c4e20c08a22f028313d89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 17:00:39 +0200 Subject: [PATCH] Please cherry-pick: - having legal status and company separated was no good idea anyway, so let's get rid of it here, too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ssbookAdminBusinessDataWebRequestBean.java | 23 ------------------- ...AddressbookBusinessDataWebSessionBean.java | 23 ------------------- .../localization/bundle_de_DE.properties | 2 +- .../localization/bundle_en_US.properties | 2 +- .../admin_form_business_data.tpl | 16 ------------- .../admin_business_data_list.xhtml | 2 +- 6 files changed, 3 insertions(+), 65 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java index b11b54a7..dd8257f6 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java @@ -63,11 +63,6 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC */ private String companyEmailAddress; - /** - * Company legal status (example: Incorporated, GmbH) - */ - private String companyLegalStatus; - /** * Company name */ @@ -153,24 +148,6 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC this.companyEmailAddress = companyEmailAddress; } - /** - * Getter for company's legal status - *

- * @return Company's legal status - */ - public String getCompanyLegalStatus () { - return this.companyLegalStatus; - } - - /** - * Setter for company's legal status - *

- * @param companyLegalStatus Company's legal status - */ - public void setCompanyLegalStatus (final String companyLegalStatus) { - this.companyLegalStatus = companyLegalStatus; - } - /** * Getter for company name *

diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java index 11e01f01..d6022b1b 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java @@ -58,11 +58,6 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro */ private String companyEmailAddress; - /** - * Company legal status (example: Incorporated, GmbH) - */ - private String companyLegalStatus; - /** * Company name */ @@ -148,24 +143,6 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro this.companyEmailAddress = companyEmailAddress; } - /** - * Getter for company's legal status - *

- * @return Company's legal status - */ - public String getCompanyLegalStatus () { - return this.companyLegalStatus; - } - - /** - * Setter for company's legal status - *

- * @param companyLegalStatus Company's legal status - */ - public void setCompanyLegalStatus (final String companyLegalStatus) { - this.companyLegalStatus = companyLegalStatus; - } - /** * Getter for company name *

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a1bb1140..8b78ff82 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -880,7 +880,7 @@ ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer: ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer: #@TODO Please fix German umlauts! ADMIN_ADD_CONTACT_BUSINESS_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen -ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsform ein. +ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein. #@TODO Please fix German umlauts! ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format. #@TODO Please fix German umlauts! diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index c2709808..ebc2f6d0 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -859,7 +859,7 @@ ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Comments: ADMIN_BUSINESS_DATA_PHONE_NUMBER=Main phone number: ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number: ADMIN_ADD_CONTACT_BUSINESS_TITLE=Add new business contact -ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name and legal status. +ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name including legal status. ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid. ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basic data for business contact: #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. diff --git a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl index 7781ac4d..af9c01b8 100644 --- a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl +++ b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl @@ -27,22 +27,6 @@ - -

- -
- -
- -
- -
- - - - - -
diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml index 605db6b0..3527e775 100644 --- a/web/admin/business_data/admin_business_data_list.xhtml +++ b/web/admin/business_data/admin_business_data_list.xhtml @@ -47,7 +47,7 @@ - + -- 2.39.5