From ebebe1d437bc13032c5ff28130e8c3902b985e63 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 9 Oct 2015 21:40:49 +0200 Subject: [PATCH] Auto-formatted whole project --- nbproject/ant-deploy.xml | 212 +++++++++--------- nbproject/build-impl.xml | 72 +++--- nbproject/faces-config.NavData | 44 ++-- nbproject/project.xml | 130 +++++------ .../beans/AbstractWebBean.java | 1 + .../beans/basket/BasketWebBean.java | 1 + .../beans/basket/BasketWebController.java | 5 + .../beans/customer/CustomerWebBean.java | 1 + .../product/AdminProductWebController.java | 1 + .../beans/shop/ShopWebController.java | 3 + web/WEB-INF/templates/basket/total_sum.tpl | 2 +- web/WEB-INF/templates/guest/guest_base.tpl | 4 +- web/WEB-INF/templates/guest/guest_footer.tpl | 16 +- web/WEB-INF/templates/guest/guest_menu.tpl | 24 +- web/errorHandler.xhtml | 2 +- web/resources/css/default.css | 2 +- 16 files changed, 277 insertions(+), 243 deletions(-) diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml index 2d5f8778..3c015605 100644 --- a/nbproject/ant-deploy.xml +++ b/nbproject/ant-deploy.xml @@ -1,111 +1,111 @@ - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 8672aa81..c98c1438 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -1364,7 +1364,7 @@ exists or setup the property manually. For example like this: @@ -1403,7 +1403,7 @@ exists or setup the property manually. For example like this: @@ -1439,7 +1439,7 @@ exists or setup the property manually. For example like this: @@ -1461,35 +1461,35 @@ 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 c2d4339f..2296f909 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 d8749ee1..9c6aa1fc 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,68 +1,68 @@ - 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.jcontacts-core.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 - - - - - - - - - - - - .\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.jcontacts-core.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 + + + + + + + + + + + + .\lib\nblibraries.properties + + + + PizzaService-lib + jar + + jar + clean + jar + + + diff --git a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java index ad78dd88..1e632c58 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java @@ -58,6 +58,7 @@ public abstract class AbstractWebBean implements Serializable { * Getter for message from given key *

* @param key Key to get message from + *

* @return Message */ protected String getMessageStringFromKey (final String key) { diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java index 6a77a62c..467033c4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java @@ -425,6 +425,7 @@ public class BasketWebBean implements BasketWebController { * 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) { diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java index e5a84197..f976aba2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java @@ -33,6 +33,7 @@ public interface BasketWebController extends Serializable { * it. *

* @param product Product instance to add + *

* @return Redirect target or null */ public String addItem (final Product product); @@ -56,6 +57,7 @@ public interface BasketWebController extends Serializable { * Calculates total price (no tax added) for given item. *

* @param item Item instance to calculate total price for + *

* @return Total price */ public Float calculateItemPrice (final AddableBasketItem item); @@ -72,6 +74,7 @@ public interface BasketWebController extends Serializable { * page. If the item is not found, another "error" page is called. *

* @param item Item instance to change + *

* @return Page redirection */ public String changeItem (final AddableBasketItem item); @@ -115,6 +118,7 @@ public interface BasketWebController extends Serializable { * instance. *

* @param product Product instance + *

* @return Item amount of given product */ public Long getItemAmount (final Product product); @@ -152,6 +156,7 @@ public interface BasketWebController extends Serializable { * Checks whether the currently set product is added in basked *

* @param product Product instance + *

* @return Whether the product is added */ public boolean isProductAdded (final Product product); diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index 22fed4fa..f61d3520 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -63,6 +63,7 @@ public class CustomerWebBean implements CustomerWebController { * Country code */ private String countryCode; + /** * Remote customer bean */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java index 11dae64d..2da2b11a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java @@ -40,6 +40,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 */ public List getAllProducts () throws FaceletException; diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java index 705a66ad..cfc888dd 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java @@ -47,6 +47,7 @@ public interface ShopWebController extends Serializable { * Some "getter" for a linked list of all categories *

* @return All categories + *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ public List getAllCategories () throws FaceletException; @@ -56,6 +57,7 @@ public interface ShopWebController extends Serializable { * parent" fake category. *

* @return All categories + *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ public List getAllCategoriesParent () throws FaceletException; @@ -64,6 +66,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 */ public List getAvailableProducts () throws FaceletException; diff --git a/web/WEB-INF/templates/basket/total_sum.tpl b/web/WEB-INF/templates/basket/total_sum.tpl index 274f9a49..a105a3f9 100644 --- a/web/WEB-INF/templates/basket/total_sum.tpl +++ b/web/WEB-INF/templates/basket/total_sum.tpl @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core" - > +>

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 53d3de54..a25966d9 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -4,7 +4,9 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"> - + + + diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index e327def5..2449e844 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -6,10 +6,18 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 467165b5..c85f5549 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -12,9 +12,15 @@

@@ -22,9 +28,15 @@

diff --git a/web/errorHandler.xhtml b/web/errorHandler.xhtml index adb51696..e3178a93 100644 --- a/web/errorHandler.xhtml +++ b/web/errorHandler.xhtml @@ -21,7 +21,7 @@ Author : Roland Haeder -

Pizza-Service - Fehler