From 02830017bb45e6a89e10d39b641e49e390f97e63 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 11 Sep 2015 15:40:09 +0200 Subject: [PATCH] =?utf8?q?Continued=20with=20fixing:=20-=20add=20validator?= =?utf8?q?=20for=20amount=20-=20some=20beans=20now=20have=20"cache"=20to?= =?utf8?q?=20save=20EJB=20calls=20and=20notify=20"controller"=20bean=20-?= =?utf8?q?=20the=20gender=20bean=20does=20not=20need=20to=20get=20the=20ge?= =?utf8?q?nders=20from=20an=20EJB=20(saves=20a=20lot=20bandwidth)=20-=20ne?= =?utf8?q?wly=20thrown=20exceptions=20added=20-=20updated=20jars=20Signed-?= =?utf8?q?off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcoreee.jar | Bin 13934 -> 18417 bytes lib/jshop-core.jar | Bin 25508 -> 26951 bytes lib/jshop-ee-lib.jar | Bin 7225 -> 6829 bytes .../localization/bundle_de_DE.properties | 4 +- .../localization/bundle_en_US.properties | 6 +- .../beans/basket/BasketWebBean.java | 188 +++++++++++++----- .../beans/basket/BasketWebController.java | 14 ++ .../beans/category/AdminCategoryWebBean.java | 15 +- .../beans/controller/ShopWebBean.java | 99 +++++---- .../beans/controller/ShopWebController.java | 14 ++ .../beans/gender/GenderWebBean.java | 31 +-- .../beans/product/AdminProductWebBean.java | 16 +- web/WEB-INF/faces-config.xml | 6 +- web/WEB-INF/glassfish-web.xml | 14 +- web/WEB-INF/templates/basket/mini_basket.tpl | 8 +- web/WEB-INF/templates/guest/guest_base.tpl | 8 +- web/WEB-INF/tlds/basket.tld | 4 +- web/index.xhtml | 156 +++++---------- 18 files changed, 316 insertions(+), 267 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index b2760ebae295cbad0437e4e512da91af8eca0b2c..893d1f9aad9b8ec2bf4607d123795b6547d7a940 100644 GIT binary patch delta 4659 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 K+;xnxjlTeoZVey+ delta 1761 zcmdT^T})eL7=F%a>FG{Se`rf#ZCP7rp{2kItYxf<{9FLmA?(5x7t4>p@Iu{mF2=+d zE;KPZC%iFBFh-&*i@Pu`B>wEiE5n7+EXHKf7~P`LaI-AL8~-xj_q4!Bj9z<^_j|tY zd4JA#-t&Cl##hSPhGL8rELI(`16NB+MoRspwA6h;<@vR!j9V!lsb1+4xS*!!^+~6` zn?cJ;k9fXN`UKqSKp8UheUF`9QT1|KufTP+pJ6>{Nm#3|meNCSoIPt;t$^4FO)Ck? zJ7W~_xMOX0gf-MVZ~ze!*!Yg?jZ6eW|z6W#>ew$v`ub8d3&Y zkT&2#s|>XY2I}6`rZst<{Mtblp|Uwo}W7I_x)V1tq5* zp}YS|dT9Q~cOU-U0*DQBr<#^M?f=~*I&HMj8PA_PeR{sS_%D4LkUr5Jca++^H~%lK za_w!^`igH!6_K?CPPqi%jz4Y@bR|6|M$;R1S#NfIst8`r{$|EsJgk}P_j|g{^)LAq zhf73y>gzWhUKXg=O6Q0Ab2**m!b)_YK|`Y*aUB*U9B4wbkV!j2f+-nVG^91OYG~s> zk)nHs|FZJBomNL;7FH3R8_x!PILMTN3_1*SqRYS`95j$cklOG6jJA5~C|oEe5#xFW zE5ykb+}3JEU!q=7rGgsrbOh1?=F94h!-@ne6=p72f1)!v0Y0uG@tcJsN`T@IG-f2K ztnpMO3atDP!W>u6K0Y0HI8D`XKtlwe)f0Z{VCbkWhkU*H_&KZKhbNwr4pK|0hwl=a zE14I=rBX)7Z{EFqbBN^8g z`Chm=7oi(+fn>ammJ^bRgPbz@ep*@>B^e_iT zXsq8!t0%o?@a`D_Yk2orTihJ11l#F@VQqP#9KV07YUbm8fLLxfocmlDHsi02`e=5+ t-1V~yVfFYilfB`$Q(w_VpO-y9u;=H8DjqkbA9K0tS*d(NQJj#fe*>}FY777X diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index ff8228177692e04aa42d48e83eaee3ff342a43c8..34f03eac5266bc772c35170ff88b0f27a631a267 100644 GIT binary patch delta 936 zcmZvaO-NKx6vxlKZ^k>mdGkKzYZu)!He*vgxbJsA{^yPgE zs7%e zi|VzHNe+XX4BH@ z)m(lae^_>ec^G)W3k+&xQXeQFz=!v}N95Hv7yJ)7u|c0^#9PJ(9w3un&$|9K>0k{n z2glXuentUd+zMXuLxw{la~*zTr9%I+uJ zu}2A?>9+i= zFTe2Ot~ZT2M=J>r$_X%BR!OcehXgLi8f9Dh@UD6Y-MU~YV8`q#_R7CcqrWQPL2V`A zQC)LMyn9p8xNKP()#9`!#YZtw-%J-9u8;GLfHc;CPfQ=WR-%%xQf-+pU6pU%{2gGR N7Eh{i0dONkieHxGV;KoDbd!39d*m#`DrsR5xjKeMF3fO? zYob`-L-^VyihH3K_!ygR;iLA=SZ!N*UB3Dw0bs2aa9(!elG}$wUxDBFjUr#0nn~iC zl)yP%B~BS5xTQDYY*E{*g7$&j^>6&GFbsi>B^yO>+oo9k^t`yB(yPIs3!MC zQvMT(dg@bZE}Bjgu=xX>*OVJda6C7Z4t6P{5dwz(p;Si6jgP4W693Mh*>+DWnN+ZI zB$JBZysez=x$3aeIT}o$N}WnJMO%JiEt-`$leNwL`_RM*of{5XD~3 zjg1DQymuwh^q8t7Cuu13Sv^FLM#*~_bo83Q2#gY#fQAJC4lHzR1)FBKgF~~)TJHoG zrJj1a0rtPF+P3zW?{%MPwpnWjTy*(ys<<2%C5vbmz$AcK01M6u37u5{+wzuhlHebs zi4Z*QkdIPTgQlSEM^lgvDl9)WJmKgQTRtxh62=wN8fRk9rR!(@?EnWbfDf(xqLW4! zfJ!>>yY&*0@rXHqk40(uw(Y8>h#`j=J(BZ;c4`AX3oQ?-Z=}tneVM_sb4n}Q1L0)8 zP(e8B2-6b6RR=2r)XO1;23f0(tlY>(D{?EtZ@G)1-Fbmw(b>%K)fs09xq2AxxcV4A zY@^2AYdcgs_`uzSGbJ8u^oo@Sivu7^w^{h*XPy_Km1iXp(i{&aq~HdSpQ$$Nrl+#R z&UUcj@o^cWW-a&DGE0Zo$I*MT@_xK8Rp63WV%AsGI$_adzL<+~+ERuzf+n|{1)7QG YJvAy9x9=>l;B-lqSSrweBPa9t3q_GE7ytkO diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index ef91ec23..97e888d7 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -28,4 +28,6 @@ YES=Ja NO=Nein PARENT_CATEGORY_CANNOT_BE_NULL=Elternkategorie darf nicht leer sein. CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgewaehlt werden. -ITEM_AMOUNT_IS_REQUIRED=Bestellmenge wird benoetigt. +ERROR_AMOUNT_IS_NULL=Die Bestellmenge ist nicht gesetzt. +BUTTON_TITLE_ADD_ITEM_TO_BASKET=F\u00fcgt das Produkt dem Warenkorb hinzu. +INPUT_TITLE_ENTER_ITEM_AMOUNT=Geben Sie hier die Bestellmenge ein. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 9554539c..0b039d7e 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -18,7 +18,7 @@ GENDER_FEMALE=Mrs. GENDER_COMPANY=Company MiniBasketTag.basket_is_empty=The basket is empty. MiniBasketTag.last_item=Last added item: {0} -MiniBasketTag.additional_items=There are {0} items in the basket. +MiniBasketTag.additional_items=There are {0} items in the basketController. MiniBasketTag.to_basket=To basket MiniBasketTag.header=Basket CATEGORY_HAS_NO_PARENT=No parent category @@ -26,4 +26,6 @@ YES=Yes NO=No PARENT_CATEGORY_CANNOT_BE_NULL=Parent category cannot be empty. CATEGORY_MUST_BE_SELECTED=You have to select a category. -ITEM_AMOUNT_IS_REQUIRED=Order amount is required. +ERROR_AMOUNT_IS_NULL=Order amount is not set. +BUTTON_TITLE_ADD_ITEM_TO_BASKET=Adds the product to the basket. +INPUT_TITLE_ENTER_ITEM_AMOUNT=Enter order amount here. diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java index e3965945..89177ad3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.basket; +import java.util.Map; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.FacesException; @@ -25,7 +26,9 @@ 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; import org.mxchange.jshopcore.model.basket.BasketSessionBeanRemote; +import org.mxchange.jshopcore.model.basket.ShopBasket; import org.mxchange.jshopcore.model.item.BasketItem; import org.mxchange.jshopcore.model.product.Product; @@ -34,7 +37,7 @@ import org.mxchange.jshopcore.model.product.Product; * * @author Roland Haeder */ -@Named ("basket") +@Named ("basketController") @SessionScoped public class BasketWebBean extends BaseFrameworkBean implements BasketWebController { @@ -44,14 +47,19 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl private static final long serialVersionUID = 5_476_347_320_198L; /** - * Basket bean + * Ordered amount */ - private final BasketSessionBeanRemote basketBean; + private Long amount; /** - * Ordered amount + * Instance of wrapped basket */ - private Long amount; + private final Basket basket; + + /** + * Basket bean + */ + private final BasketSessionBeanRemote basketBean; /** * Current item @@ -67,10 +75,45 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl // Get initial context InitialContext context = new InitialContext(); + // Get new application instance + this.basket = new ShopBasket(); + // Try to lookup this.basketBean = (BasketSessionBeanRemote) context.lookup("ejb/stateless-basket"); //NOI18N } + @Override + public String addItem (final Product product) { + // Generate item instance + AddableBasketItem item = new BasketItem(product, this.getAmount()); + + // Is amount set? + if (this.getAmount() == null) { + // No amount specified?! + return null; + } + + try { + // item should not be null + if (null == item) { + // Abort here + throw new NullPointerException("item is null"); //NOI18N + } + + // Deligate to model + this.basket.addItem(item); + + // Remove amount + this.setAmount(null); + + // Added + return "item_added"; //NOI18N + } catch (final BasketItemAlreadyAddedException ex) { + // Throw unchecked exception + throw new FacesException(ex); + } + } + @Override public Float calculateItemPrice () { // Is the current item/amount set? @@ -96,31 +139,32 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl public Long getAmount () { return this.amount; } - + @Override public void setAmount (final Long amount) { this.amount = amount; } @Override - public boolean isProductAdded (final Product product) { - // Must not be null - if (null == product) { - // Abort here - throw new NullPointerException("product is null"); //NOI18N - } + public AddableBasketItem getCurrentItem () { + return this.currentItem; + } - // Generate fake instance - AddableBasketItem item = new BasketItem(product); + @Override + public void setCurrentItem (final AddableBasketItem currentItem) { + this.currentItem = currentItem; + } - // Ask bean about it - return this.getBasketBean().isAdded(item); + @Override + public AddableBasketItem getLast () { + // Deligate to basket instance + return this.basket.getLast(); } @Override - public boolean isEmpty () { - // Check local "cache" - return this.getBasketBean().isEmpty(); + public int getLastNumRows () { + // Deligate to basket instance + return this.basket.getLastNumRows(); } @Override @@ -130,11 +174,44 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl } @PostConstruct - public void init () throws RuntimeException { - // Call super init first + public void init () { + // Call generic init first super.genericInit(); } + @Override + public boolean isEmpty () { + // Deligate to basket instance + return this.basket.isEmpty(); + } + + @Override + public boolean isProductAdded (final Product product) { + // Must not be null + if (null == product) { + // Abort here + throw new NullPointerException("product is null"); //NOI18N + } + + // Generate fake instance + AddableBasketItem fake = new BasketItem(product); + + // Ask bean about it + boolean isAdded = this.basket.isAdded(fake); + + // Is it added? + if (isAdded) { + // Get item + AddableBasketItem item = this.getItemFromProduct(product); + + // Set this as current item + this.setCurrentItem(item); + } + + // Return status + return isAdded; + } + /** * Getter for basket bean instance * @@ -144,45 +221,50 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl return this.basketBean; } - @Override - public String addItem (final Product product) { - // Generate item instance - AddableBasketItem item = new BasketItem(product); - - // Is amount set? - if (this.getAmount() == null) { - // No amount specified?! - return null; + /** + * Somewhat getter for an item instance from given product instance. This + * method returns null if no item was found to given product. The product is + * found by checking it's id and itemType=product + * + * @param product Product instance + * @return Item instance or null if not found + */ + private AddableBasketItem getItemFromProduct (final Product product) { + // Product must not be null + if (null == product) { + // Abort here + throw new NullPointerException("product is null"); //NOI18N } - // Set amount - item.setAmount(this.getAmount()); + // Create item instance + AddableBasketItem foundItem = null; - try { - // Handle it to bean - this.getBasketBean().addItem(item); + // Create fake instance + AddableBasketItem fake = new BasketItem(product); - // Add item to local basket, too - //this.basket.addItem(item); + // Get all items + Map map = this.basket.getAll(); - // Remove amount - this.setAmount(null); + // Check all entries + for (Map.Entry entrySet : map.entrySet()) { + // Get item + AddableBasketItem item = entrySet.getValue(); - // Added - return "item_added"; //NOI18N - } catch (final BasketItemAlreadyAddedException ex) { - // Throw unchecked exception - throw new FacesException(ex); - } - } + // item must not be null + if (null == item) { + // Abort here + throw new NullPointerException("item is null"); //NOI18N + } - @Override - public AddableBasketItem getCurrentItem () { - return this.currentItem; - } + // Is it the same? + if (item.equals(fake)) { + // Set found item and abort look + foundItem = item; + break; + } + } - @Override - public void setCurrentItem (final AddableBasketItem currentItem) { - this.currentItem = currentItem; + // Return it + return foundItem; } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java index d0713506..ad81ef88 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java @@ -94,4 +94,18 @@ public interface BasketWebController extends Serializable { * @return Current item's total price */ public Float calculateItemPrice (); + + /** + * Getter for last entry + * + * @return Last added item in basket + */ + public AddableBasketItem getLast (); + + /** + * Getter for last num rows + * + * @return Last num rows + */ + public int getLastNumRows (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java index 2be39da7..0f73f9b4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java @@ -18,6 +18,7 @@ package org.mxchange.pizzaapplication.beans.category; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; +import javax.inject.Inject; import javax.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -26,6 +27,7 @@ import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; import org.mxchange.jshopcore.model.category.ProductCategory; +import org.mxchange.pizzaapplication.beans.controller.ShopWebController; /** * Main application class @@ -36,7 +38,7 @@ import org.mxchange.jshopcore.model.category.ProductCategory; @RequestScoped public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCategoryWebController { /** - * Serial id + * Serial number */ private static final long serialVersionUID = 5_819_375_183_472_871L; @@ -45,6 +47,12 @@ public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCate */ private final CategorySessionBeanRemote categoryBean; + /** + * Shop bean + */ + @Inject + private ShopWebController controller; + /** * Category title */ @@ -76,8 +84,11 @@ public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCate category.setParentId(this.getParentId()); category.setTitle(this.getTitle()); - // Deligate to bean + // Deligate to remote bean this.categoryBean.doAdminAddCategory(category); + + // Also send it to the controller bean + this.controller.addCategory(category); } catch (final CategoryTitleAlreadyUsedException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java index 32eb722f..d01efbc5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.controller; import java.util.Deque; import java.util.Queue; import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.ApplicationScoped; import javax.faces.FacesException; import javax.faces.view.facelets.FaceletException; import javax.inject.Named; @@ -38,47 +38,70 @@ import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; * @author Roland Haeder */ @Named("controller") -@SessionScoped +@ApplicationScoped public class ShopWebBean extends BaseFrameworkBean implements ShopWebController { /** - * Serial id + * Serial number */ private static final long serialVersionUID = 58_137_539_530_279L; /** - * Remote bean for categories + * "Cache" for all available products */ - private final CategorySessionBeanRemote categoryBean; + private Deque availableProducts; /** - * Remote bean for products + * All categories */ - private final ProductSessionBeanRemote productBean; + private Deque categories; - /** - * Default constructor - * - * @throws javax.naming.NamingException Something happened here? - */ - public ShopWebBean () throws NamingException { - // Get initial context - InitialContext context = new InitialContext(); + @Override + public void addCategory (final Category category) { + // Add the category + this.categories.add(category); + } + + @Override + public void addProduct (final Product product) { + // Is the product available? + if (product.getAvailable()) { + // Add it + this.availableProducts.add(product); + } + } + + @PostConstruct + public void init () { + // Call super init for getting resource bundle + super.genericInit(); - // Try to lookup the bean - this.categoryBean = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N + try { + // Get initial context + InitialContext context = new InitialContext(); - // Try to lookup the bean - this.productBean = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N + // Try to lookup the bean + CategorySessionBeanRemote categoryBean = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N + + // Get all categories + this.categories = categoryBean.getAllCategories(); + + // Try to lookup the bean + ProductSessionBeanRemote productBean = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N + + // Get available products list + this.availableProducts = productBean.getAvailableProducts(); + } catch (final NamingException e) { + // Continued to throw + throw new FacesException(e); + } } @Override public Deque getAllCategories () throws FacesException { - // Get List back - Deque deque = this.getCategoryBean().getAllCategories(); - // Return it - return deque; + // TODO Find something better here to prevent warning + return this.categories; } @Override @@ -98,34 +121,8 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController @Override public Queue getAvailableProducts () throws FacesException { - // Get queue from bean - Queue queue = this.getProductBean().getAvailableProducts(); - // Return it - return queue; - } - - @PostConstruct - public void init () { - // Call super init for getting resource bundle - super.genericInit(); - } - - /** - * Getter for shop remote bean - * - * @return Remote shop bean - */ - private CategorySessionBeanRemote getCategoryBean () { - return this.categoryBean; - } - - /** - * Getter for shop remote bean - * - * @return Remote shop bean - */ - private ProductSessionBeanRemote getProductBean () { - return this.productBean; + // TODO Find something better here to prevent warning + return this.availableProducts; } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebController.java index 547c66e9..88e0b1c3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebController.java @@ -30,6 +30,20 @@ import org.mxchange.jshopcore.model.product.Product; */ public interface ShopWebController extends Serializable { + /** + * Adds given category to the "cached" instance + * + * @param category Category instance + */ + public void addCategory (final Category category); + + /** + * Adds given product to the "cached" instance + * + * @param product Product instance + */ + public void addProduct (final Product product); + /** * Some "getter" for a linked list of only available products * diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java index e15647c0..c93c3995 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java @@ -19,10 +19,8 @@ package org.mxchange.pizzaapplication.beans.gender; import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jcore.model.contact.gender.GenderSessionBeanRemote; +import org.mxchange.jcore.model.contact.gender.GenderUtils; import org.mxchange.jcoreee.beans.BaseFrameworkBean; /** @@ -39,46 +37,25 @@ public class GenderWebBean extends BaseFrameworkBean implements GenderWebControl */ private static final long serialVersionUID = 835_482_364_189L; - /** - * Remote bean - */ - private final GenderSessionBeanRemote genderBean; - /** * Default constructor - * - * @throws javax.naming.NamingException If something happens? */ - public GenderWebBean () throws NamingException { - // Get initial context - InitialContext context = new InitialContext(); - - // Try to lookup bean - this.genderBean = (GenderSessionBeanRemote) context.lookup("ejb/stateful-gender"); //NOI18N + public GenderWebBean () { } @Override public Gender[] getAllGenders () { // Return it - return this.getGenderBean().allGenders(); + return Gender.values(); } @Override public List getSelectableGenders () { // Init array // TODO Call EJB here? - List genders = this.getGenderBean().selectableGenders(); + List genders = GenderUtils.selectableGenders(); // Return it return genders; } - - /** - * Getter for data remote bean - * - * @return data remote bean - */ - private GenderSessionBeanRemote getGenderBean () { - return this.genderBean; - } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index 1e098fd3..c37417d8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -19,14 +19,17 @@ package org.mxchange.pizzaapplication.beans.product; import java.util.Deque; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; +import javax.inject.Inject; import javax.inject.Named; 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.GenericProduct; import org.mxchange.jshopcore.model.product.Product; import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; +import org.mxchange.pizzaapplication.beans.controller.ShopWebController; /** * Main application class @@ -38,7 +41,7 @@ import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; public class AdminProductWebBean extends BaseFrameworkBean implements AdminProductWebController { /** - * Serial id + * Serial number */ private static final long serialVersionUID = 5_819_375_183_472_871L; @@ -63,6 +66,12 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu */ private final ProductSessionBeanRemote productBean; + /** + * Shop bean + */ + @Inject + private ShopWebController controller; + /** * Property title */ @@ -96,12 +105,15 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu // Call bean this.productBean.doAdminAddProduct(product); + // Add to shop controller + this.controller.addProduct(product); + // Set all to null this.setAvailable(Boolean.FALSE); this.setId(null); this.setPrice(null); this.setTitle(null); - } catch (final ProductTitleAlreadyUsedException ex) { + } catch (final ProductTitleAlreadyUsedException | CannotAddProductException ex) { // Continue to throw throw new FaceletException(ex); } diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 4a8b5573..46fa5720 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -11,6 +11,10 @@ NameValidator org.mxchange.jcoreee.validator.string.names.NameValidator + + ItemAmountValidator + org.mxchange.jcoreee.validator.number.item_amount.ItemAmountValidator + * @@ -59,7 +63,7 @@ basket - /basket.xhtml + /basketController.xhtml diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml index 730d5867..eaf64487 100644 --- a/web/WEB-INF/glassfish-web.xml +++ b/web/WEB-INF/glassfish-web.xml @@ -1,11 +1,11 @@ - /PizzaService-war - - - - Keep a copy of the generated servlet class' java code. - - + /PizzaService-war + + + + Keep a copy of the generated servlet class' java code. + + diff --git a/web/WEB-INF/templates/basket/mini_basket.tpl b/web/WEB-INF/templates/basket/mini_basket.tpl index 050ca2ce..409b3056 100644 --- a/web/WEB-INF/templates/basket/mini_basket.tpl +++ b/web/WEB-INF/templates/basket/mini_basket.tpl @@ -6,19 +6,19 @@
- #{msg.mini_basket.header} + #{msg.mini_basketController.header}
- #{msg.mini_basket.last_item} + #{msg.mini_basketController.last_item}
- #{msg.mini_basket.additional_items} + #{msg.mini_basketController.additional_items}
- +
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index ee4ced7e..ec484010 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -6,12 +6,12 @@ - + - - + + diff --git a/web/WEB-INF/tlds/basket.tld b/web/WEB-INF/tlds/basket.tld index e87d2592..aff9f901 100644 --- a/web/WEB-INF/tlds/basket.tld +++ b/web/WEB-INF/tlds/basket.tld @@ -8,13 +8,13 @@ mini_basket A mini basket showing latest added item and a link to the full basket web page - org.mxchange.pizzaapplication.tags.basket.MiniBasketTag + org.mxchange.pizzaapplication.tags.basketController.MiniBasketTag basket Basket instance, should be the same as the bean true true - org.mxchange.jshopejb.beans.basket.BasketBean + org.mxchange.jshopejb.beans.basketController.BasketBean diff --git a/web/index.xhtml b/web/index.xhtml index e612d608..aa0f9083 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -22,117 +22,51 @@ - - - - - - - - - - - - - - - - - - - - -
- Folgendes kann bestellt werden: -
- Bestellen? - - Anzahl: - - Produkt: - - Einzelpreis: - - Zwischensumme: -
- - - - - - - - - - - - - - - - - -
- - - #{basket.currentItem.amount} - - #{product.title} - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - #{product.title} - - - - - - - -
- - - + +
+
+ Folgendes kann bestellt werden: +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5