Auto-formatted whole project

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / beans / customer / CustomerWebBean.java

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index 32638065ab7de5e34a5b802839131573fecef2f2..f61d35203afe94e67e56ea501d9a404587e15f9d 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -22,31 +22,27 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.CustomerContact;
-import org.mxchange.jcore.model.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.UserContact;
+import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jshopcore.model.customer.Customer;
 import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote;
 import org.mxchange.jshopcore.model.customer.ShopCustomer;
 
 /**
  * A customer bean which hides the customer instance
- *
+ * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-@Named("customerController")
+@Named ("customerController")
 @SessionScoped
 public class CustomerWebBean implements CustomerWebController {
+
        /**
         * Serial number
         */
        private static final long serialVersionUID = 542_145_347_916L;
 
-       /**
-        * Remote customer bean
-        */
-       private final CustomerSessionBeanRemote customerBean;
-
        /////////////////////// Properties /////////////////////
        /**
         * Cellphone number
@@ -63,25 +59,20 @@ public class CustomerWebBean implements CustomerWebController {
         */
        private String comment;
 
-       /**
-        * Company name
-        */
-       private String companyName;
-
        /**
         * Country code
         */
        private String countryCode;
 
        /**
-        * Email address
+        * Remote customer bean
         */
-       private String emailAddress;
+       private final CustomerSessionBeanRemote customerBean;
 
        /**
-        * Gender instance
+        * Email address
         */
-       private Gender gender;
+       private String emailAddress;
 
        /**
         * Family name
@@ -98,10 +89,15 @@ public class CustomerWebBean implements CustomerWebController {
         */
        private String firstName;
 
+       /**
+        * Gender instance
+        */
+       private Gender gender;
+
        /**
         * House number
         */
-       private Long houseNumber;
+       private Short houseNumber;
 
        /**
         * Phone number
@@ -116,7 +112,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * ZIP code
         */
-       private Long zipCode;
+       private Integer zipCode;
 
        /**
         * Default constructor
@@ -150,11 +146,7 @@ public class CustomerWebBean implements CustomerWebController {
                Customer customer = new ShopCustomer();
 
                // Create new contact
-               Contact contact = new CustomerContact();
-               contact.setGender(this.getGender());
-               contact.setFirstName(this.getFirstName());
-               contact.setFamilyName(this.getFamilyName());
-               contact.setCompanyName(this.getCompanyName());
+               Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
                contact.setStreet(this.getStreet());
                contact.setHouseNumber(this.getHouseNumber());
                contact.setZipCode(this.getZipCode());
@@ -168,109 +160,98 @@ public class CustomerWebBean implements CustomerWebController {
 
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("createInstance: customer={0} - EXIT!", customer));
-
                // Return it
                return customer;
        }
 
        @Override
-       public Gender getGender () {
-               return this.gender;
-       }
-
-       @Override
-       public void setGender (final Gender gender) {
-               this.gender = gender;
-       }
-
-       @Override
-       public String getCompanyName () {
-               return this.companyName;
+       public String getCellphoneNumber () {
+               return this.cellphoneNumber;
        }
 
        @Override
-       public void setCompanyName (final String companyName) {
-               this.companyName = companyName;
+       public void setCellphoneNumber (final String cellphoneNumber) {
+               this.cellphoneNumber = cellphoneNumber;
        }
 
        @Override
-       public String getFirstName () {
-               return this.firstName;
+       public String getCity () {
+               return this.city;
        }
 
        @Override
-       public void setFirstName (final String firstName) {
-               this.firstName = firstName;
+       public void setCity (final String city) {
+               this.city = city;
        }
 
        @Override
-       public String getFamilyName () {
-               return this.familyName;
+       public String getCountryCode () {
+               return this.countryCode;
        }
 
        @Override
-       public void setFamilyName (final String familyName) {
-               this.familyName = familyName;
+       public void setCountryCode (final String countryCode) {
+               this.countryCode = countryCode;
        }
 
        @Override
-       public String getStreet () {
-               return this.street;
+       public String getEmailAddress () {
+               return this.emailAddress;
        }
 
        @Override
-       public void setStreet (final String street) {
-               this.street = street;
+       public void setEmailAddress (final String emailAddress) {
+               this.emailAddress = emailAddress;
        }
 
        @Override
-       public Long getHouseNumber () {
-               return this.houseNumber;
+       public String getFamilyName () {
+               return this.familyName;
        }
 
        @Override
-       public void setHouseNumber (final Long houseNumber) {
-               this.houseNumber = houseNumber;
+       public void setFamilyName (final String familyName) {
+               this.familyName = familyName;
        }
 
        @Override
-       public Long getZipCode () {
-               return this.zipCode;
+       public String getFaxNumber () {
+               return this.faxNumber;
        }
 
        @Override
-       public void setZipCode (final Long zipCode) {
-               this.zipCode = zipCode;
+       public void setFaxNumber (final String faxNumber) {
+               this.faxNumber = faxNumber;
        }
 
        @Override
-       public String getCity () {
-               return this.city;
+       public String getFirstName () {
+               return this.firstName;
        }
 
        @Override
-       public void setCity (final String city) {
-               this.city = city;
+       public void setFirstName (final String firstName) {
+               this.firstName = firstName;
        }
 
        @Override
-       public String getCountryCode () {
-               return this.countryCode;
+       public Gender getGender () {
+               return this.gender;
        }
 
        @Override
-       public void setCountryCode (final String countryCode) {
-               this.countryCode = countryCode;
+       public void setGender (final Gender gender) {
+               this.gender = gender;
        }
 
        @Override
-       public String getEmailAddress () {
-               return this.emailAddress;
+       public Short getHouseNumber () {
+               return this.houseNumber;
        }
 
        @Override
-       public void setEmailAddress (final String emailAddress) {
-               this.emailAddress = emailAddress;
+       public void setHouseNumber (final Short houseNumber) {
+               this.houseNumber = houseNumber;
        }
 
        @Override
@@ -284,23 +265,23 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public String getFaxNumber () {
-               return this.faxNumber;
+       public String getStreet () {
+               return this.street;
        }
 
        @Override
-       public void setFaxNumber (final String faxNumber) {
-               this.faxNumber = faxNumber;
+       public void setStreet (final String street) {
+               this.street = street;
        }
 
        @Override
-       public String getCellphoneNumber () {
-               return this.cellphoneNumber;
+       public Integer getZipCode () {
+               return this.zipCode;
        }
 
        @Override
-       public void setCellphoneNumber (final String cellphoneNumber) {
-               this.cellphoneNumber = cellphoneNumber;
+       public void setZipCode (final Integer zipCode) {
+               this.zipCode = zipCode;
        }
 
        @Override