From 2b437f98db202f99dde704881ca5adde94340d65 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 29 Sep 2015 10:41:21 +0200 Subject: [PATCH] =?utf8?q?auto-formatted=20project=20+=20updated=20jars=20?= =?utf8?q?Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.xml | 2 +- lib/jcore.jar | Bin 32286 -> 32286 bytes lib/jcoreee.jar | Bin 17864 -> 17864 bytes lib/jshop-core.jar | Bin 48778 -> 48778 bytes lib/jshop-ee-lib.jar | Bin 7400 -> 7400 bytes nbproject/ant-deploy.xml | 210 +++++++++--------- nbproject/build-impl.xml | 60 ++--- nbproject/faces-config.NavData | 44 ++-- nbproject/project.xml | 146 ++++++------ .../model/category/CategoryConverter.java | 6 +- .../beans/AbstractWebBean.java | 6 +- .../beans/basket/BasketWebBean.java | 23 +- .../beans/basket/BasketWebController.java | 36 +-- .../beans/category/AdminCategoryWebBean.java | 2 +- .../category/AdminCategoryWebController.java | 12 +- .../beans/checkout/CheckoutWebBean.java | 4 +- .../beans/checkout/CheckoutWebController.java | 8 +- .../beans/customer/CustomerWebBean.java | 4 +- .../beans/customer/CustomerWebController.java | 58 ++--- .../beans/gender/GenderWebBean.java | 2 +- .../beans/gender/GenderWebController.java | 6 +- .../beans/product/AdminProductWebBean.java | 2 +- .../product/AdminProductWebController.java | 22 +- .../beans/receipt/ReceiptWebBean.java | 2 +- .../beans/receipt/ReceiptWebController.java | 8 +- .../beans/shop/ShopWebBean.java | 12 +- .../beans/shop/ShopWebController.java | 12 +- .../servlet/receipt/PdfReceiptServlet.java | 2 +- 28 files changed, 335 insertions(+), 354 deletions(-) diff --git a/build.xml b/build.xml index 00b4eeda..7cd04328 100644 --- a/build.xml +++ b/build.xml @@ -67,5 +67,5 @@ properties which you can use check the target you are overriding in nbproject/build-impl.xml file. - --> + --> diff --git a/lib/jcore.jar b/lib/jcore.jar index 7884f3df59de98ef74951706b221477a588f99cb..bff5c73b4f02f01a1d004c465d1c99a0d024e32c 100644 GIT binary patch delta 557 zcmX}oJxE(o6bJBgZ$v^&ZA3^3u_b9@NmNwS)}|#W*qYLyKJ*zyU#dX}5rZEzFW;f= zozg1^9kNzRz~QB12XSx^sdVYk)uA1NpsS$oe+QTIyXW5j;lioiu-Xl?D^W{}jmS!r zP^NvwX4wr74MRq zulxMc-`$GTA2^Y@W>Awxd;hc|?;o0w{ra#&_NCB2pB4Xp`siITHsS|X?>piYr6)8+ z&uE4Mq);!-Qa{bpFfEubnixrb??_TBrN~BUYNsu7(6(`z{KX!4sDrxcDfO7)0dbnb z#*AjF(q<~snUJ|m@hvls?tf+wxb+Z->0@ADkAe$*67*%?gM2mujP>h15r!^R+4keB{|n9ZOBM@6I9DfpjrNKzacSK Jk#~octvkCSt-1gJ delta 557 zcmX}oPe{{Y7zgn0`zkVY+C(tM)LgFEFif=6DWYLDaAxbbu|&5JA~QDp1N-fd+n{@= z`3i!ET@4XB{MNBUbm$ppVuC(9By{vx&c2(WtE}0h-e-5Qx!bdRKo32X@AUG@JtKl_quA0G~!*< z^M`#t?T=d#t5@Z&<-DNB4CFH)X^$0 zX4O~AEw(D13EIb0`$qPkznB1yb{!$pc7jc4Q7_;V2BTb>GJF zanI&C>^Ip3vl((2av9ngiWzztN*JayR8DT=zY9{ED)62MM2E?$v4ZG2rJI}}I#TBi z#Eb&HsEeC@4GY*ggBWHr1T!pUh}eA0f{78N=#=F@79c(Ol$|BeUz1tw!R~gqHvkD% z+FOFCE%uHe>bt!+h;nfV08w6!GLttsfc>=!$P{ukgNVj~s8xqPkznB1yb{!$pc7jc4Q7_;fM*cbwB>V zKymXN_M7a2ISe@rc?|6gr3}3cWen39swcPc-vy~n6?o4BqQhj>SV451(oIef9jWsM zVg^fI!H&(oh6U`L!3?t*LKv1ZL~cH2!NdqsbjtD{3y_|C%FYt#ugR?TV0XLQ8-N5W z?JYsn7JEk!_1)eZM7cNwfG96VnaP_R!2VhVWC}T&K}6#~)GEgy5cSV70z^eP1;hO^ od9xE(g|KrLNUGks5kxV$WP+$%mvXQ|kb@_`aY+S<1-q6400m=ubN~PV diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index e271a4aa7306764425f4ef65c6a7067a3cb2e52a..79352af46d8352944b5f1245449b4b8fe19398fb 100644 GIT binary patch delta 800 zcmXxhT}V@57zgm@oHNgM=KKl<8JS{MoQxPr=qSxH3zL?Or7f~fWgjw9%MaR;LG(eb z51ntZMCf8d21c7Z>gIGpbr%E@U33#h7j@x9&=)}no&PIc?EKFEdCqy?z2^xni=k!F z*3>AOtV9-~F;Cd0icdY^%7|#(FO=Z=T{W((NT>jAp#}^IPViQ!1$p8=Fd{mbQ)a|$@wH9FXi{~{u%pwo}GnX zdB1e6JqLZK+RN+lE%{RJn5TOG1QmR3d3^q^KHRCiJqU7|d?OslDfO6dxf z(N)?=K~m`&ZKdnfOt;8Kcgar!)KB+}&I6+}NH^#a`*G?aw!3qBQvv_0)}0N}h)fib zS*N{-)%wbHx#wAyvYlkAq-?5UNxw^|WpW^>6dSvi(K=Gu{QyRz#{wyS@b=&ueu$f) zRrvJ!Fx#6C7f0K9|G?O27V@{}PjF~95OW$+W^ZDAe73j)#hN&usXtzaG#__?+zCEC z??e;Q_(U_15^m74!g#`qBDHx;a0fmrr_>C5QX5E12f;7tfR47;u+;$Frn4f{3Qu#*MV}<(eCZ(XU$%YVS*iHS z`!$bug0op)8s-X~Vp&{Bv zx5!R+XgA#@7u_cxJ<>Zdy)#S^8ll@1*E>n}qvtWUdw6Mk8UL#jd&-xSGEq`yH*J-y z#aE}v11}5A`$(q!WTASN33Uj~Ob$oPRr;>AR7E@3a2TV}Cc{~NaBpNIKg7LgIX=Di zlpQXGt7Bf?KmKB@0QuXi=QuPQnN;*Cv$vCceAbi$#ikUWX(-i-w3O-q#Z!EG?x{|s z@hKOO(kkd$XFTmjlC_h(sGR{5+9@DRw}X!90C+Rq2b?oE!01d6RLl;7`0M~MX08E$ z#sl7G&I3o5r$n|F=}-15@XYbz>pA{HUCv|rKRw2B7xBc;TraQT6En{|-+N{L0$*`~ Y6I^712O$&9r!xWB7ZgC`CruzZS(eclL0VOw2W}N}1bvfQK zg7~srYry=|Ji^Q%{saEkVDYnp{9yh)5e^W4@(WQ*pfe{ci-DbyDrNu@oGu1-+a)n) z5Kmm(6GSD62Y{$8;$a{vK|*G-hJ+b}83dM)2n12=l3*%IG8e=s0x_^06!sfng9R* delta 324 zcmaE1`NEPXz?+$ci-CcIfuSX6B9A6hbI?Td=}bWO1qBfKNfSs;mSr>sQ9+EBAgY(q z0Ysf=bOTY*Oa_zxb8t-dXX1izoj}xlCPxURKe<7O1I3ojs?0e|K*`OMS!aN0U5LEkdT?IAz=n#27x6c0znkJB$$el%mwjIN|u2rN2x-v5(uR( UT>|3GmCgrId@>mzszRm!07^_`!T - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index db322733..4774f90f 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1466,34 +1466,34 @@ exists or setup the property manually. For example like this: - - - - - - - - - - - - - - - - - - - - - - - - - - - - + CLEANUP SECTION + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 2a273b24..dc560dfa 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 191d5579..183d8993 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,76 +1,76 @@ - org.netbeans.modules.web.project - - - PizzaService-war - 1.6.5 - - - ${file.reference.jcore.jar} - WEB-INF/lib - - - ${file.reference.jcore-logger-lib.jar} - WEB-INF/lib - - - ${file.reference.jcoreee.jar} - WEB-INF/lib - - - ${file.reference.jshop-core.jar} - WEB-INF/lib - - - ${file.reference.jshop-ee-lib.jar} - WEB-INF/lib - - - ${reference.PizzaService-lib.jar} - WEB-INF/lib - - - ${file.reference.cdi-api.jar} - WEB-INF/lib - - - ${file.reference.gf-client.jar} - WEB-INF/lib - - - ${file.reference.log4j-api-2.3.jar} - WEB-INF/lib - - - ${file.reference.log4j-core-2.3.jar} - WEB-INF/lib - - - ${file.reference.log4j-web-2.3.jar} - WEB-INF/lib - - - - - - - - - - - - .\lib\nblibraries.properties - - - - PizzaService-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.web.project + + + PizzaService-war + 1.6.5 + + + ${file.reference.jcore.jar} + WEB-INF/lib + + + ${file.reference.jcore-logger-lib.jar} + WEB-INF/lib + + + ${file.reference.jcoreee.jar} + WEB-INF/lib + + + ${file.reference.jshop-core.jar} + WEB-INF/lib + + + ${file.reference.jshop-ee-lib.jar} + WEB-INF/lib + + + ${reference.PizzaService-lib.jar} + WEB-INF/lib + + + ${file.reference.cdi-api.jar} + WEB-INF/lib + + + ${file.reference.gf-client.jar} + WEB-INF/lib + + + ${file.reference.log4j-api-2.3.jar} + WEB-INF/lib + + + ${file.reference.log4j-core-2.3.jar} + WEB-INF/lib + + + ${file.reference.log4j-web-2.3.jar} + WEB-INF/lib + + + + + + + + + + + + .\lib\nblibraries.properties + + + + PizzaService-lib + jar + + jar + clean + jar + + + diff --git a/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java b/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java index 97f7c399..9ad96b28 100644 --- a/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java +++ b/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java @@ -34,7 +34,7 @@ import org.mxchange.pizzaapplication.beans.shop.ShopWebController; /** * A converter for transfering category objects - * + *

* @author Roland Haeder */ @FacesConverter (forClass = ProductCategory.class, value = "category") @@ -61,7 +61,7 @@ public class CategoryConverter implements Converter { try { // Get initial context Context context = new InitialContext(); - + // Lookup logger this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N } catch (final NamingException ex) { @@ -93,7 +93,7 @@ public class CategoryConverter implements Converter { Long categoryId = Long.parseLong(submittedValue); // Category id should not be below 1 - assert(categoryId > 0) : "categoryId is smaller than one: " + categoryId; //NOI18N + assert (categoryId > 0) : "categoryId is smaller than one: " + categoryId; //NOI18N // Debug message this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: categoryId={0}", categoryId)); //NOI18N diff --git a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java index afb864ac..ad78dd88 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java @@ -22,7 +22,7 @@ import java.util.ResourceBundle; /** * An abstract web web bean for web applications. This class currently only * handles loading the resource bundle (i18n). - * + *

* @author Roland Haeder */ public abstract class AbstractWebBean implements Serializable { @@ -47,7 +47,7 @@ public abstract class AbstractWebBean implements Serializable { /** * Getter for bundle instance - * + *

* @return Bundle instance */ protected ResourceBundle getBundle () { @@ -56,7 +56,7 @@ public abstract class AbstractWebBean implements Serializable { /** * Getter for message from given key - * + *

* @param key Key to get message from * @return Message */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java index d1e88221..6a77a62c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java @@ -35,12 +35,12 @@ import org.mxchange.jshopcore.model.product.Product; /** * A bean for the basket - * + *

* @author Roland Haeder */ @Named ("basketController") @SessionScoped -public class BasketWebBean implements BasketWebController { +public class BasketWebBean implements BasketWebController { /** * Serial number @@ -125,7 +125,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("addItem: item {0} - has been added to basket. - EXIT!", item)); - // Added return "item_added"; //NOI18N } catch (final BasketItemAlreadyAddedException ex) { @@ -144,7 +143,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("allItems: list={0} - EXIT!", list)); - // Return it return list; } @@ -171,7 +169,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("calculateCurrentItemPrice: totalPrice={0} - EXIT!", totalPrice)); - // Return it return totalPrice; } @@ -198,7 +195,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("calculateItemPrice: totalPrice={0} - EXIT!", totalPrice)); - // Return it return totalPrice; } @@ -222,7 +218,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("calculateTotalPrice: totalPrice={0} - EXIT!", totalPrice)); - // Return final sum return totalPrice; } @@ -253,7 +248,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("changeItem: targetPage={0} - EXIT!", targetPage)); - // Return page return targetPage; } @@ -317,7 +311,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("getItemAmount: itemAmount={0} - EXIT!", itemAmount)); - // Return it return itemAmount; } @@ -362,13 +355,11 @@ public class BasketWebBean implements BasketWebController { // Debug message //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)); - // Is it added? if (isAdded) { // Get item @@ -376,14 +367,12 @@ public class BasketWebBean implements BasketWebController { // Debug message //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)); - // Return status return isAdded; } @@ -417,14 +406,13 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("outputLastAddedItem: lastItem={0} - EXIT!", lastItem)); - // Return it return lastItem; } /** * Getter for basket bean instance - * + *

* @return Basket bean instance */ private BasketSessionBeanRemote getBasketBean () { @@ -435,7 +423,7 @@ public class BasketWebBean implements BasketWebController { * 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 */ @@ -457,13 +445,11 @@ public class BasketWebBean implements BasketWebController { // Debug message //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)); - // Check all entries for (final AddableBasketItem item : list) { // Debug message @@ -485,7 +471,6 @@ public class BasketWebBean implements BasketWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("getItemFromProduct: foundItem={0} - EXIT!", foundItem)); - // 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 eccff4bf..e5a84197 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java @@ -23,7 +23,7 @@ import org.mxchange.jshopcore.model.product.Product; /** * An interface for a basket - * + *

* @author Roland Haeder */ public interface BasketWebController extends Serializable { @@ -31,7 +31,7 @@ public interface BasketWebController extends Serializable { /** * Adds given product instance to basket by adding amount from form data to * it. - * + *

* @param product Product instance to add * @return Redirect target or null */ @@ -39,7 +39,7 @@ public interface BasketWebController extends Serializable { /** * Gets for all added items - * + *

* @return A list of all added items */ public List allItems (); @@ -47,14 +47,14 @@ public interface BasketWebController extends Serializable { /** * Calculates total price (no tax added) of current item. If no current item * is set and no amount, a NPE is thrown. - * + *

* @return Current item's total price */ public Float calculateCurrentItemPrice (); /** * Calculates total price (no tax added) for given item. - * + *

* @param item Item instance to calculate total price for * @return Total price */ @@ -62,7 +62,7 @@ public interface BasketWebController extends Serializable { /** * Calculates total sum (no tax added) for all items - * + *

* @return Total price of all items */ public Float calculateTotalPrice (); @@ -70,7 +70,7 @@ public interface BasketWebController extends Serializable { /** * Changes given item instance's amount in basket and redirects to proper * page. If the item is not found, another "error" page is called. - * + *

* @param item Item instance to change * @return Page redirection */ @@ -83,28 +83,28 @@ public interface BasketWebController extends Serializable { /** * Getter for item amount property - * + *

* @return Item amount property */ public Long getOrderedAmount (); /** * Setter for item amount property - * + *

* @param amount Item amount property */ public void setOrderedAmount (final Long amount); /** * Getter for current item - * + *

* @return Current item */ public AddableBasketItem getCurrentItem (); /** * Setter for current item - * + *

* @param currentItem Current item */ public void setCurrentItem (final AddableBasketItem currentItem); @@ -113,7 +113,7 @@ public interface BasketWebController extends Serializable { * Some getter for item amount of given product. This method requires a full * iteration over all items in the basket to look for proper product * instance. - * + *

* @param product Product instance * @return Item amount of given product */ @@ -121,14 +121,14 @@ public interface BasketWebController extends Serializable { /** * 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 (); @@ -136,21 +136,21 @@ public interface BasketWebController extends Serializable { /** * Checks whether the basket has items in it. This method is wrapper to * isEmpty() - * + *

* @return Whether the basket is empty */ public boolean hasItems (); /** * Checks whether the basket is empty - * + *

* @return Whether the basket is empty */ public boolean isEmpty (); /** * Checks whether the currently set product is added in basked - * + *

* @param product Product instance * @return Whether the product is added */ @@ -158,7 +158,7 @@ public interface BasketWebController extends Serializable { /** * Outputs last added item in the basket. - * + *

* @return Last added item */ public String outputLastAddedItem (); diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java index e275349f..33b3d1d7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java @@ -32,7 +32,7 @@ import org.mxchange.pizzaapplication.beans.shop.ShopWebController; /** * Main application class - * + *

* @author Roland Haeder */ @Named ("admin_category") diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java index f749293a..c8f5358a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java @@ -21,14 +21,14 @@ import org.mxchange.jshopcore.model.category.Category; /** * An interface for product controllers for "ADMIN" role - * + *

* @author Roland Haeder */ public interface AdminCategoryWebController { /** * Adds given category data from request to database - * + *

* @throws javax.faces.view.facelets.FaceletException If something * unexpected happened */ @@ -36,28 +36,28 @@ public interface AdminCategoryWebController { /** * Getter for parent id - * + *

* @return Parent id */ public Category getParentCategory (); /** * Setter for parent category - * + *

* @param parentCategory Parent category to set */ public void setParentCategory (final Category parentCategory); /** * Getter for category title - * + *

* @return the title */ public String getCategoryTitle (); /** * Setter for category title - * + *

* @param categoryTitle the title to set */ public void setCategoryTitle (final String categoryTitle); diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java index 48c16d91..465ea404 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java @@ -43,7 +43,7 @@ import org.mxchange.pizzaapplication.beans.receipt.ReceiptWebController; /** * Checkout controller - * + *

* @author Roland Haeder */ @Named ("checkoutController") @@ -138,13 +138,11 @@ public class CheckoutWebBean implements CheckoutWebController { // Debug message //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)); - // Construct container WrapableCheckout wrapper = new CheckoutWrapper(); wrapper.setCustomer(this.getCustomer()); diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java index a3250207..395e5439 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java @@ -21,28 +21,28 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for the shop - * + *

* @author Roland Haeder */ public interface CheckoutWebController extends Serializable { /** * Runs the actual checkout and returns a proper page redirection target. - * + *

* @return Page redirection target */ public String doCheckout (); /** * Getter for customer instance - * + *

* @return Customer instance */ public Customer getCustomer (); /** * Setter for customer instance - * + *

* @param customer Customer instance */ public void setCustomer (final Customer customer); diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index eb946987..ff541c69 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -31,7 +31,7 @@ import org.mxchange.jshopcore.model.customer.ShopCustomer; /** * A customer bean which hides the customer instance - * + *

* @author Roland Haeder */ @Named ("customerController") @@ -43,7 +43,6 @@ public class CustomerWebBean implements CustomerWebController { */ private static final long serialVersionUID = 542_145_347_916L; - /////////////////////// Properties ///////////////////// /** * Cellphone number @@ -165,7 +164,6 @@ public class CustomerWebBean implements CustomerWebController { // Trace message //this.getLogger().logTrace(MessageFormat.format("createInstance: customer={0} - EXIT!", customer)); - // Return it return customer; } diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java index cdc51756..8db9fd76 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java @@ -22,203 +22,203 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for customer beans - * + *

* @author Roland Haeder */ public interface CustomerWebController extends Serializable { /** * Creates an instance from all properties - * + *

* @return A Customer instance */ public Customer createCustomerInstance (); /** * Cellphone number - * + *

* @return the cellphoneNumber */ public String getCellphoneNumber (); /** * Cellphone number - * + *

* @param cellphoneNumber the cellphoneNumber to set */ public void setCellphoneNumber (final String cellphoneNumber); /** * City - * + *

* @return the city */ public String getCity (); /** * City - * + *

* @param city the city to set */ public void setCity (final String city); /** * Company name - * + *

* @return the companyName */ public String getCompanyName (); /** * Company name - * + *

* @param companyName the companyName to set */ public void setCompanyName (final String companyName); /** * Country code - * + *

* @return the countryCode */ public String getCountryCode (); /** * Country code - * + *

* @param countryCode the countryCode to set */ public void setCountryCode (final String countryCode); /** * Email address - * + *

* @return the emailAddress */ public String getEmailAddress (); /** * Email address - * + *

* @param emailAddress the emailAddress to set */ public void setEmailAddress (final String emailAddress); /** * Family name - * + *

* @return the familyName */ public String getFamilyName (); /** * Family name - * + *

* @param familyName the familyName to set */ public void setFamilyName (final String familyName); /** * Fax number - * + *

* @return the faxNumber */ public String getFaxNumber (); /** * Fax number - * + *

* @param faxNumber the faxNumber to set */ public void setFaxNumber (final String faxNumber); /** * First name - * + *

* @return the first name */ public String getFirstName (); /** * First name - * + *

* @param firstName the first name to set */ public void setFirstName (final String firstName); /** * Gender of the contact - * + *

* @return the gender */ public Gender getGender (); /** * Gender of the contact - * + *

* @param gender the gender to set */ public void setGender (final Gender gender); /** * House number - * + *

* @return the houseNumber */ public Short getHouseNumber (); /** * House number - * + *

* @param houseNumber the houseNumber to set */ public void setHouseNumber (final Short houseNumber); /** * Phone number - * + *

* @return the phoneNumber */ public String getPhoneNumber (); /** * Phone number - * + *

* @param phoneNumber the phoneNumber to set */ public void setPhoneNumber (final String phoneNumber); /** * Street - * + *

* @return the street */ public String getStreet (); /** * Street - * + *

* @param street the street to set */ public void setStreet (final String street); /** * ZIP code - * + *

* @return the zipCode */ public Long getZipCode (); /** * ZIP code - * + *

* @param zipCode the zipCode to set */ public void setZipCode (final Long zipCode); /** * Checks whether all required personal data is set - * + *

* @return Whether the required personal data is set */ public boolean isRequiredPersonalDataSet (); diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java index 803fbbe8..8203582c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java @@ -24,7 +24,7 @@ import org.mxchange.jcore.model.contact.gender.GenderUtils; /** * A customer bean which hides the customer instance - * + *

* @author Roland Haeder */ @Named ("gender") diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java index 7fa87790..e75f2330 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java @@ -22,21 +22,21 @@ import org.mxchange.jcore.model.contact.gender.Gender; /** * An interface for data beans - * + *

* @author Roland Haeder */ public interface GenderWebController extends Serializable { /** * Getter for all genders as array - * + *

* @return All genders as array */ public Gender[] getAllGenders (); /** * Getter for only selectable genders as array, UNKNOWN is not selectable - * + *

* @return All genders as array */ public List getSelectableGenders (); diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index 49392973..0ec98444 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -34,7 +34,7 @@ import org.mxchange.pizzaapplication.beans.shop.ShopWebController; /** * Main application class - * + *

* @author Roland Haeder */ @Named ("admin_product") diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java index 0942bff8..11dae64d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java @@ -23,14 +23,14 @@ import org.mxchange.jshopcore.model.product.Product; /** * An interface for product controllers for "ADMIN" role - * + *

* @author Roland Haeder */ public interface AdminProductWebController { /** * Adds given product data from request to database - * + *

* @throws javax.faces.view.facelets.FaceletException If something * unexpected happened */ @@ -38,7 +38,7 @@ public interface AdminProductWebController { /** * Some "getter" for a linked list of all products - * + *

* @return All products * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ @@ -46,56 +46,56 @@ public interface AdminProductWebController { /** * Getter for product's available property - * + *

* @return Product's available property */ public Boolean getProductAvailability (); /** * Setter for product's available property - * + *

* @param available Product's available property */ public void setProductAvailability (final Boolean available); /** * Getter for product's category - * + *

* @return Product's category */ public Category getProductCategory (); /** * Setter for product's category instance - * + *

* @param productCategory Product's category instance */ public void setProductCategory (final Category productCategory); /** * Getter for product's price property - * + *

* @return Product's price property */ public Float getProductPrice (); /** * Setter for product's price property - * + *

* @param price Product's price property */ public void setProductPrice (final Float price); /** * Getter for product's title property - * + *

* @return Product's title */ public String getProductTitle (); /** * Setter for product's title property - * + *

* @param title Product's title */ public void setProductTitle (final String title); diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java index 83de0a0c..7874c927 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java @@ -27,7 +27,7 @@ import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; /** * Checkout controller - * + *

* @author Roland Haeder */ @Named ("receiptController") diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java index a06cda1e..ff5998b6 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java @@ -21,28 +21,28 @@ import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for the shop - * + *

* @author Roland Haeder */ public interface ReceiptWebController extends Serializable { /** * Fetches last access key for given customer instance - * + *

* @return Access key to receipt */ public String fetchAccessKey (); /** * Getter for customer instamce - * + *

* @return Customer instance */ public Customer getCustomer (); /** * Setter for customer instamce - * + *

* @param customer Customer instance */ public void setCustomer (final Customer customer); diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java index ced5b406..d661a292 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java @@ -35,7 +35,7 @@ import org.mxchange.pizzaapplication.beans.AbstractWebBean; /** * General shop controller - * + *

* @author Roland Haeder */ @Named ("controller") @@ -94,7 +94,7 @@ public class ShopWebBean extends AbstractWebBean implements ShopWebController { // TODO Find something better here to prevent warning return Collections.unmodifiableList(this.availableProducts); } - + /** * Initialization of this bean */ @@ -103,16 +103,16 @@ public class ShopWebBean extends AbstractWebBean implements ShopWebController { try { // Get initial context Context context = new InitialContext(); - + // 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) { diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java index 4de37aa2..705a66ad 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java @@ -24,28 +24,28 @@ import org.mxchange.jshopcore.model.product.Product; /** * An interface for the shop - * + *

* @author Roland Haeder */ 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 all categories - * + *

* @return All categories * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ @@ -54,7 +54,7 @@ public interface ShopWebController extends Serializable { /** * Some "getter" for a linked list of all categories including "Has no * parent" fake category. - * + *

* @return All categories * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ @@ -62,7 +62,7 @@ public interface ShopWebController extends Serializable { /** * Some "getter" for a linked list of only available products - * + *

* @return Only available products * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ diff --git a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java index 6df5e74d..db32ccae 100644 --- a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java +++ b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java @@ -30,7 +30,7 @@ import org.mxchange.jshopcore.model.receipt.WrapableReceipt; /** * A servlet for a PDF receipt (official) - * + *

* @author Roland Haeder */ public class PdfReceiptServlet extends HttpServlet { -- 2.39.5