Please cherry-pick:

- having legal status and company separated was no good idea anyway, so let's
  get rid of it here, too

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java
index b11b54a771d336ef2fdcd20a11b1025db44957cf..dd8257f6395e6468ec07128400f9c0f28fc7cabb 100644 (file)
--- 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
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java
index 11e01f01cde871ed2ef2d1262b74f29ed99880de..d6022b1b0b007f5468a39e35401a7e431114f251 100644 (file)
--- 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
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index a1bb1140789df28a275b32ddc1a0ca6aaf0c6298..8b78ff82ffa3415a2d70fc7625ed5d7016e3fa9a 100644 (file)
--- 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 c2709808118c8e2dad32e770739c516d9e7c5a8c..ebc2f6d0e08a23c9fe497fae34842c4b92629f21 100644 (file)
--- 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 7781ac4dbd177541823d2bf21373d362fea76650..af9c01b85fe426505e5209b4a9cd36f1bd1e5cc0 100644 (file)
--- 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 @@
                                <h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="companyLegalStatus" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyLegalStatus" size="5" maxlength="10" value="#{adminBusinessDataController.companyLegalStatus}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyLegalStatus" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />

diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
index 605db6b00a350b2d7dc06cf09d3e783acd8e6e31..3527e775868c840469cc5fefb954a10cf94dd8c7 100644 (file)
--- a/web/admin/business_data/admin_business_data_list.xhtml
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -47,7 +47,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
                                </f:facet>
 
-                               <h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+                               <h:outputText value="#{businessContact.companyName}" />
                        </h:column>
 
                        <h:column>