From d51c17f62f51cec849f59194368aa8e2d23171df Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 24 Sep 2015 10:54:28 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20removed=20dependency=20to=20Bas?= =?utf8?q?eFrameworkBean=20-=20updated=20jars=20Signed-off-by:Roland=20H?= =?utf8?q?=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcoreee.jar | Bin 19000 -> 17745 bytes lib/jshop-core.jar | Bin 47070 -> 47195 bytes lib/jshop-ee-lib.jar | Bin 7157 -> 7308 bytes .../beans/basket/BasketWebBean.java | 66 ++++++++---------- .../beans/category/AdminCategoryWebBean.java | 3 +- .../beans/checkout/CheckoutWebBean.java | 17 ++--- .../beans/controller/ShopWebBean.java | 9 +-- .../beans/customer/CustomerWebBean.java | 16 ++--- .../beans/gender/GenderWebBean.java | 3 +- .../beans/product/AdminProductWebBean.java | 3 +- .../beans/receipt/ReceiptWebBean.java | 3 +- 11 files changed, 46 insertions(+), 74 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 92367b4d8d9f810b8b83552a1f4e4dbdaaf4fa47..ecead0fbb2adc58d5b691c352966ebcb2ed073a3 100644 GIT binary patch delta 2963 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 kT7+ilHO+|t7SOEc}@(_*q2oj8W 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 diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 71a37dd75d1fe62bdd72a036aed72d39999ef66f..b6734853f80b4e12c5492b4e65723d0fd3ae68be 100644 GIT binary patch delta 945 zcmexr-ebud;LXg!#lXP9z@QspF_Bk;S0}>4{jf;-+;j#8hV+R}e&Qy)T+T(Qi6yBi zx=xi=3Wj>-dIs@k<`XxlGlR6;k_S_NG(gm3bw(pF9m8k=rl&L73j)R6fri0>)?`OP z1*xRO;_TEC{mhco++uwcS4@^=(x3dEonx{96BpPJStds?oyg<>rS&E+5ayVC3nIVy zIa4+hNMds+YX*dIfc-5aSY!j|YKTZ2&r=A)jsF!y%2<$(8LY-dgdHq0*-z90)%%kt zi<*LMJS{3Megx=&{GxQATN#-|nBieI`LC!nIQc)j_+$r3NJvk5Ap61_XbuRwqL}rF6Rg2NNN_U0l(IZ1O3UvRtZD)(1Yr*p z#S%q9)5R8iDCxMhh_A$7m0x zW0>?OU*O=F?9apn;ru?Mw^|AZ#=FBa_DF6@oV)YMMpZ8JU4Tp4=;Hf$HVS zmqbm$F5wcB7C#FNg#4m({Qz%9CJ|;xIDvd;BPPxGesYAEi~`6WpdvUBhqDA2-a1M# zPHq&GoV-?y2W;dXF=-}$kdXZ3A7VThdR0*Lc0m*-u&__|5{KyDC@#%(1|oc(gOeZK zRX}M*fys&z5cjWVJ;MX-2=1&gq=~WvE&D9sFOAV wy9Xu8Q532P0u|c9-61O@&15bD6jGn8E6P8)K!%S`m_e9f0UHB@y(mZ{0MhW;j{pDw diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java index 25da04d7..1d62d65f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java @@ -18,7 +18,6 @@ package org.mxchange.pizzaapplication.beans.basket; import java.text.MessageFormat; import java.util.List; -import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.FacesException; import javax.faces.view.facelets.FaceletException; @@ -26,7 +25,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.basket.Basket; @@ -42,7 +40,7 @@ import org.mxchange.jshopcore.model.product.Product; */ @Named ("basketController") @SessionScoped -public class BasketWebBean extends BaseFrameworkBean implements BasketWebController { +public class BasketWebBean implements BasketWebController { /** * Serial number @@ -92,7 +90,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public String addItem (final Product product) { // Trace message - this.getLogger().logTrace(MessageFormat.format("addItem: product={0} - CALLED!", product)); + //this.getLogger().logTrace(MessageFormat.format("addItem: product={0} - CALLED!", product)); // product should not be null if (null == product) { @@ -106,7 +104,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl // Is amount set? if (this.getAmount() == null) { // Trace message - this.getLogger().logTrace("addItem: amount not specified, returning null ... - EXIT!"); + //this.getLogger().logTrace("addItem: amount not specified, returning null ... - EXIT!"); // No amount specified?! return null; @@ -126,7 +124,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl this.setAmount(null); // Trace message - this.getLogger().logTrace(MessageFormat.format("addItem: item {0} - has been added to basket. - EXIT!", item)); + //this.getLogger().logTrace(MessageFormat.format("addItem: item {0} - has been added to basket. - EXIT!", item)); // Added return "item_added"; //NOI18N @@ -139,13 +137,13 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public List allItems () { // Trace message - this.getLogger().logTrace("allItems: CALLED!"); + //this.getLogger().logTrace("allItems: CALLED!"); // Deligate to basket instance List list = this.basket.getAll(); // Trace message - this.getLogger().logTrace(MessageFormat.format("allItems: list={0} - EXIT!", list)); + //this.getLogger().logTrace(MessageFormat.format("allItems: list={0} - EXIT!", list)); // Return it return list; @@ -154,7 +152,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public Float calculateCurrentItemPrice () { // Trace message - this.getLogger().logTrace("calculateCurrentItemPrice: CALLED!"); + //this.getLogger().logTrace("calculateCurrentItemPrice: CALLED!"); // Is the current item/amount set? if (this.getCurrentItem() == null) { @@ -172,7 +170,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl Float totalPrice = (this.getCurrentItem().getProduct().getPrice() * this.getCurrentItem().getAmount()); // Trace message - this.getLogger().logTrace(MessageFormat.format("calculateCurrentItemPrice: totalPrice={0} - EXIT!", totalPrice)); + //this.getLogger().logTrace(MessageFormat.format("calculateCurrentItemPrice: totalPrice={0} - EXIT!", totalPrice)); // Return it return totalPrice; @@ -181,7 +179,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public Float calculateItemPrice (final AddableBasketItem item) { // Trace message - this.getLogger().logTrace(MessageFormat.format("calculateItemPrice: item={0} - CALLED!", item)); + //this.getLogger().logTrace(MessageFormat.format("calculateItemPrice: item={0} - CALLED!", item)); // item must not be null if (null == item) { @@ -199,7 +197,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("calculateItemPrice: totalPrice={0} - EXIT!", totalPrice)); + //this.getLogger().logTrace(MessageFormat.format("calculateItemPrice: totalPrice={0} - EXIT!", totalPrice)); // Return it return totalPrice; @@ -208,7 +206,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public Float calculateTotalPrice () { // Trace message - this.getLogger().logTrace("calculateTotalPrice: CALLED!"); + //this.getLogger().logTrace("calculateTotalPrice: CALLED!"); // Init total price Float totalPrice = 0.0f; @@ -223,7 +221,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("calculateTotalPrice: totalPrice={0} - EXIT!", totalPrice)); + //this.getLogger().logTrace(MessageFormat.format("calculateTotalPrice: totalPrice={0} - EXIT!", totalPrice)); // Return final sum return totalPrice; @@ -232,7 +230,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public String changeItem (final AddableBasketItem item) { // Trace message - this.getLogger().logTrace(MessageFormat.format("changeItem: item={0} - CALLED!", item)); + //this.getLogger().logTrace(MessageFormat.format("changeItem: item={0} - CALLED!", item)); // item shall not be null if (null == item) { @@ -254,7 +252,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("changeItem: targetPage={0} - EXIT!", targetPage)); + //this.getLogger().logTrace(MessageFormat.format("changeItem: targetPage={0} - EXIT!", targetPage)); // Return page return targetPage; @@ -290,7 +288,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public Long getItemAmount (final Product product) { // Trace message - this.getLogger().logTrace(MessageFormat.format("getItemAmount: product={0} - CALLED!", product)); + //this.getLogger().logTrace(MessageFormat.format("getItemAmount: product={0} - CALLED!", product)); // product should not be null if (null == product) { @@ -304,7 +302,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl // Iterate over all for (final AddableBasketItem item : this.allItems()) { // Debug message - this.getLogger().logDebug(MessageFormat.format("getItemAmount: item={0}", item)); + //this.getLogger().logDebug(MessageFormat.format("getItemAmount: item={0}", item)); // Is this product instance and same? if (null == item) { @@ -318,7 +316,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("getItemAmount: itemAmount={0} - EXIT!", itemAmount)); + //this.getLogger().logTrace(MessageFormat.format("getItemAmount: itemAmount={0} - EXIT!", itemAmount)); // Return it return itemAmount; @@ -342,12 +340,6 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl return (!this.isEmpty()); } - @PostConstruct - public void init () { - // Call generic init first - super.genericInit(); - } - @Override public boolean isEmpty () { // Deligate to basket instance @@ -357,7 +349,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public boolean isProductAdded (final Product product) { // Trace message - this.getLogger().logTrace(MessageFormat.format("isProductAdded: product={0} - EXIT!", product)); + //this.getLogger().logTrace(MessageFormat.format("isProductAdded: product={0} - EXIT!", product)); // Must not be null if (null == product) { @@ -369,13 +361,13 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl AddableBasketItem fake = new BasketItem(product); // Debug message - this.getLogger().logDebug(MessageFormat.format("isProductAdded: fake={0}", fake)); + //this.getLogger().logDebug(MessageFormat.format("isProductAdded: fake={0}", fake)); // Ask bean about it boolean isAdded = this.basket.isAdded(fake); // Debug message - this.getLogger().logDebug(MessageFormat.format("isProductAdded: isAdded={0}", isAdded)); + //this.getLogger().logDebug(MessageFormat.format("isProductAdded: isAdded={0}", isAdded)); // Is it added? if (isAdded) { @@ -383,14 +375,14 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl AddableBasketItem item = this.getItemFromProduct(product); // Debug message - this.getLogger().logDebug(MessageFormat.format("isProductAdded: item={0} - setting as current item.", item)); + //this.getLogger().logDebug(MessageFormat.format("isProductAdded: item={0} - setting as current item.", item)); // Set this as current item this.setCurrentItem(item); } // Trace message - this.getLogger().logTrace(MessageFormat.format("isProductAdded: isAdded={0} - EXIT!", isAdded)); + //this.getLogger().logTrace(MessageFormat.format("isProductAdded: isAdded={0} - EXIT!", isAdded)); // Return status return isAdded; @@ -399,7 +391,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl @Override public String outputLastAddedItem () { // Trace message - this.getLogger().logTrace("outputLastAddedItem: CALLED!"); + //this.getLogger().logTrace("outputLastAddedItem: CALLED!"); // Default message String lastItem = ""; //NOI18N @@ -424,7 +416,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("outputLastAddedItem: lastItem={0} - EXIT!", lastItem)); + //this.getLogger().logTrace(MessageFormat.format("outputLastAddedItem: lastItem={0} - EXIT!", lastItem)); // Return it return lastItem; @@ -449,7 +441,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl */ private AddableBasketItem getItemFromProduct (final Product product) { // Trace message - this.getLogger().logTrace(MessageFormat.format("getItemFromProduct: product={0} - CALLED!", product)); + //this.getLogger().logTrace(MessageFormat.format("getItemFromProduct: product={0} - CALLED!", product)); // Product must not be null if (null == product) { @@ -464,18 +456,18 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl AddableBasketItem fake = new BasketItem(product); // Debug message - this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: fake={0}", fake)); + //this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: fake={0}", fake)); // Get all items List list = this.basket.getAll(); // Debug message - this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: list={0}", list)); + //this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: list={0}", list)); // Check all entries for (final AddableBasketItem item : list) { // Debug message - this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: item={0}", item)); + //this.getLogger().logDebug(MessageFormat.format("getItemFromProduct: item={0}", item)); // item must not be null if (null == item) { @@ -492,7 +484,7 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } // Trace message - this.getLogger().logTrace(MessageFormat.format("getItemFromProduct: foundItem={0} - EXIT!", foundItem)); + //this.getLogger().logTrace(MessageFormat.format("getItemFromProduct: foundItem={0} - EXIT!", foundItem)); // Return it return foundItem; diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java index 6ca20bd4..5531c0c7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java @@ -23,7 +23,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.exceptions.CannotAddCategoryException; import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; @@ -38,7 +37,7 @@ import org.mxchange.pizzaapplication.beans.controller.ShopWebController; */ @Named("admin_category") @RequestScoped -public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCategoryWebController { +public class AdminCategoryWebBean implements AdminCategoryWebController { /** * Serial number */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java index eedb20d5..c85fdb0d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java @@ -16,7 +16,6 @@ */ package org.mxchange.pizzaapplication.beans.checkout; -import java.text.MessageFormat; import java.util.List; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -34,7 +33,6 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.wrapper.CheckoutWrapper; @@ -50,7 +48,7 @@ import org.mxchange.pizzaapplication.beans.receipt.ReceiptWebController; */ @Named ("checkoutController") @SessionScoped -public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebController { +public class CheckoutWebBean implements CheckoutWebController { /** * Serial number @@ -109,7 +107,7 @@ public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebCon @Override public String doCheckout () { // Trace message - this.getLogger().logTrace("doCheckout: CALLED!"); + //this.getLogger().logTrace("doCheckout: CALLED!"); // Are the beans set? if (null == this.basketController) { @@ -123,13 +121,13 @@ public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebCon // Are at least the required fields set? if (!this.customerController.isRequiredPersonalDataSet()) { // Trace message - this.getLogger().logTrace("doCheckout: Not all required fields are set, returning checkout2 ... - EXIT!"); + //this.getLogger().logTrace("doCheckout: Not all required fields are set, returning checkout2 ... - EXIT!"); // Not set, should not happen return "checkout2"; //NOI18N } else if (this.basketController.isEmpty()) { // Trace message - this.getLogger().logTrace("doCheckout: basket is empty, returning empty_basket ... - EXIT!"); + //this.getLogger().logTrace("doCheckout: basket is empty, returning empty_basket ... - EXIT!"); // Nothing to order return "empty_basket"; //NOI18N @@ -139,13 +137,13 @@ public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebCon this.setCustomer(this.customerController.createCustomerInstance()); // Debug message - this.getLogger().logDebug(MessageFormat.format("doCheckout: customer={0}", this.getCustomer())); + //this.getLogger().logDebug(MessageFormat.format("doCheckout: customer={0}", this.getCustomer())); // Get ordered list List list = this.basketController.allItems(); // Debug message - this.getLogger().logTrace(MessageFormat.format("doCheckout: list={0}", list)); + //this.getLogger().logTrace(MessageFormat.format("doCheckout: list={0}", list)); // Construct container WrapableCheckout wrapper = new CheckoutWrapper(); @@ -186,9 +184,6 @@ public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebCon @PostConstruct public void init () { - // Call super init for getting resource bundle - super.genericInit(); - try { // Get initial context Context context = new InitialContext(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java index 9c861d19..c151a605 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java @@ -27,7 +27,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; +import org.mxchange.jcoreee.BaseEeSystem; import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; import org.mxchange.jshopcore.model.category.ProductCategory; @@ -41,7 +41,7 @@ import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; */ @Named("controller") @ApplicationScoped -public class ShopWebBean extends BaseFrameworkBean implements ShopWebController { +public class ShopWebBean extends BaseEeSystem implements ShopWebController { /** * Serial number @@ -75,9 +75,6 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController @PostConstruct public void init () { - // Call super init for getting resource bundle - super.genericInit(); - try { // Get initial context Context context = new InitialContext(); @@ -112,7 +109,7 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController List deque = new LinkedList<>(); // Create fake entry - Category fake = new ProductCategory(0L, this.getMessage("ADMIN_CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N + Category fake = new ProductCategory(0L, this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N // Add it deque.add(fake); diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index de93ed50..32638065 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -16,8 +16,6 @@ */ package org.mxchange.pizzaapplication.beans.customer; -import java.text.MessageFormat; -import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Named; @@ -27,7 +25,6 @@ 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.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote; import org.mxchange.jshopcore.model.customer.ShopCustomer; @@ -39,7 +36,7 @@ import org.mxchange.jshopcore.model.customer.ShopCustomer; */ @Named("customerController") @SessionScoped -public class CustomerWebBean extends BaseFrameworkBean implements CustomerWebController { +public class CustomerWebBean implements CustomerWebController { /** * Serial number */ @@ -144,7 +141,8 @@ public class CustomerWebBean extends BaseFrameworkBean implements CustomerWebCon @Override public Customer createCustomerInstance () { // Trace message - this.getLogger().logTrace("createInstance: CALLED!"); + //this.getLogger().logTrace("createInstance: CALLED!"); + // Required personal data must be set assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N @@ -169,18 +167,12 @@ public class CustomerWebBean extends BaseFrameworkBean implements CustomerWebCon customer.setContact(contact); // Trace message - this.getLogger().logTrace(MessageFormat.format("createInstance: customer={0} - EXIT!", customer)); + //this.getLogger().logTrace(MessageFormat.format("createInstance: customer={0} - EXIT!", customer)); // Return it return customer; } - @PostConstruct - public void init () throws RuntimeException { - // Call super init first - super.genericInit(); - } - @Override public Gender getGender () { return this.gender; diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java index c93c3995..803fbbe8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java @@ -21,7 +21,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcore.model.contact.gender.Gender; import org.mxchange.jcore.model.contact.gender.GenderUtils; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; /** * A customer bean which hides the customer instance @@ -30,7 +29,7 @@ import org.mxchange.jcoreee.beans.BaseFrameworkBean; */ @Named ("gender") @ApplicationScoped -public class GenderWebBean extends BaseFrameworkBean implements GenderWebController { +public class GenderWebBean implements GenderWebController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index 8efd6f92..fcd1a531 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -24,7 +24,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.exceptions.CannotAddProductException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; @@ -39,7 +38,7 @@ import org.mxchange.pizzaapplication.beans.controller.ShopWebController; */ @Named ("admin_product") @RequestScoped -public class AdminProductWebBean extends BaseFrameworkBean implements AdminProductWebController { +public class AdminProductWebBean implements AdminProductWebController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java index 1c6c3e4a..83de0a0c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java @@ -22,7 +22,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; @@ -33,7 +32,7 @@ import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; */ @Named ("receiptController") @SessionScoped -public class ReceiptWebBean extends BaseFrameworkBean implements ReceiptWebController { +public class ReceiptWebBean implements ReceiptWebController { /** * Serial number -- 2.39.5