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 eb9469879609214d7551db619525eeff79f17d8b..f61d35203afe94e67e56ea501d9a404587e15f9d 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -22,16 +22,16 @@ 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.UserContact;
-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")
@@ -43,7 +43,6 @@ public class CustomerWebBean implements CustomerWebController {
         */
        private static final long serialVersionUID = 542_145_347_916L;
 
-
        /////////////////////// Properties /////////////////////
        /**
         * Cellphone number
@@ -60,15 +59,11 @@ public class CustomerWebBean implements CustomerWebController {
         */
        private String comment;
 
-       /**
-        * Company name
-        */
-       private String companyName;
-
        /**
         * Country code
         */
        private String countryCode;
+
        /**
         * Remote customer bean
         */
@@ -117,7 +112,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * ZIP code
         */
-       private Long zipCode;
+       private Integer zipCode;
 
        /**
         * Default constructor
@@ -151,7 +146,7 @@ public class CustomerWebBean implements CustomerWebController {
                Customer customer = new ShopCustomer();
 
                // Create new contact
-               Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName());
+               Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
                contact.setStreet(this.getStreet());
                contact.setHouseNumber(this.getHouseNumber());
                contact.setZipCode(this.getZipCode());
@@ -165,7 +160,6 @@ public class CustomerWebBean implements CustomerWebController {
 
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("createInstance: customer={0} - EXIT!", customer));
-
                // Return it
                return customer;
        }
@@ -190,16 +184,6 @@ public class CustomerWebBean implements CustomerWebController {
                this.city = city;
        }
 
-       @Override
-       public String getCompanyName () {
-               return this.companyName;
-       }
-
-       @Override
-       public void setCompanyName (final String companyName) {
-               this.companyName = companyName;
-       }
-
        @Override
        public String getCountryCode () {
                return this.countryCode;
@@ -291,12 +275,12 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public Long getZipCode () {
+       public Integer getZipCode () {
                return this.zipCode;
        }
 
        @Override
-       public void setZipCode (final Long zipCode) {
+       public void setZipCode (final Integer zipCode) {
                this.zipCode = zipCode;
        }